From fda072e2a492a3b6b400dfd0f501dd59780a96b7 Mon Sep 17 00:00:00 2001 From: shi_jq Date: Wed, 12 Mar 2025 14:17:53 +0800 Subject: [PATCH] [refactor]kbd_ -> iot_ --- .../DataImput_cfd/Client_DataProThread.cpp | 36 +- .../DataImput_cfd/Client_DataProThread.h | 4 +- .../DataImput_cfd/Client_MsgManger.cpp | 26 +- .../DataImput_cfd/Client_MsgManger.h | 6 +- .../application/DataImput_cfd/Client_cfd.cpp | 22 +- .../application/DataImput_cfd/Client_cfd.h | 8 +- .../application/DataImput_cfd/WebSrvRedunSw.h | 2 +- .../alarm_send_server/CAlmJson.cpp | 18 +- .../application/alarm_send_server/CAlmJson.h | 2 +- .../alarm_send_server/CAlmRcvThread.cpp | 52 +- .../alarm_send_server/CAlmRcvThread.h | 20 +- .../alarm_send_server/CAlmSendApp.cpp | 44 +- .../alarm_send_server/CAlmSendApp.h | 14 +- .../alarm_send_server/CAlmSendMng.cpp | 10 +- .../alarm_send_server/CAlmSendMng.h | 10 +- .../alarm_send_server/CAlmSendThread.cpp | 10 +- .../alarm_send_server/CAlmSendThread.h | 4 +- .../alarm_send_server/almsendcommon.h | 2 +- .../alarm_send_server/datastructdef.h | 2 +- .../application/alarm_send_server/main.cpp | 2 +- .../application/apc_if_srv/CApcIfRedunSw.h | 2 +- .../src/application/apc_if_srv/CApcIfSrv.cpp | 32 +- .../src/application/apc_if_srv/CApcIfSrv.h | 12 +- .../application/apc_if_srv/CThreadAnalog.cpp | 88 +- .../application/apc_if_srv/CThreadAnalog.h | 12 +- .../application/apc_if_srv/CThreadDigital.cpp | 68 +- .../application/apc_if_srv/CThreadDigital.h | 10 +- .../apc_if_srv/CThreadLocalCurve.cpp | 96 +- .../apc_if_srv/CThreadLocalCurve.h | 18 +- .../app_ats_timetable/CAtsTimeTable.cpp | 4 +- .../app_ats_timetable/CAtsTimeTable.h | 12 +- .../CAtsTimeTableRedundantSwitch.cpp | 4 +- .../CAtsTimeTableRedundantSwitch.h | 10 +- .../app_ats_timetable/CAtsTimeTableThread.cpp | 8 +- .../app_ats_timetable/CAtsTimeTableThread.h | 8 +- .../app_bas_timetable/BasicOperation.cpp | 12 +- .../app_bas_timetable/BasicOperation.h | 10 +- .../app_bas_timetable/DownloadTimetable.cpp | 8 +- .../app_bas_timetable/DownloadTimetable.h | 4 +- .../app_bas_timetable/ParamMng.cpp | 8 +- .../application/app_bas_timetable/ParamMng.h | 12 +- .../app_bas_timetable/ReadTimetable.cpp | 4 +- .../app_bas_timetable/ReadTimetable.h | 4 +- .../app_bas_timetable/TimetableCommon.h | 2 +- .../app_bas_timetable/TimetableMsgBusMng.cpp | 12 +- .../app_bas_timetable/TimetableMsgBusMng.h | 14 +- .../TimetableRtdbTableOperate.cpp | 8 +- .../TimetableRtdbTableOperate.h | 18 +- .../app_bas_timetable/TimetableServerApp.cpp | 8 +- .../app_bas_timetable/TimetableServerApp.h | 12 +- .../app_bas_timetable/TimetableServerMng.cpp | 6 +- .../app_bas_timetable/TimetableServerMng.h | 14 +- .../app_bas_timetable/TimetableThread.cpp | 20 +- .../app_bas_timetable/TimetableThread.h | 22 +- .../fbd_module/alarm_delay/CAlarmDelay.cpp | 6 +- .../fbd_module/alarm_push/CAlarmPush.cpp | 72 +- .../fbd_module/alarm_push/CAlarmPush.h | 14 +- .../fbd_module/alarm_split/CAlarmSplit.cpp | 8 +- .../alarm_subscribe/CAlarmSubscribe.cpp | 2 +- .../fbd_module/apc_pd_gen/CApcPdGen.cpp | 2 +- .../fbd_module/apc_pd_gen/CGenUnit.cpp | 4 +- .../fbd_module/apc_pd_pcs/CApcPdPcs.cpp | 2 +- .../fbd_module/apc_pd_pcs/CPcsUnit.cpp | 4 +- .../app_fbd/fbd_module/fmt_text/FmtText.cpp | 2 +- .../fbd_module/multi_map/CMultiMap.cpp | 18 +- .../app_fbd/fbd_module/phone_call/Call.cpp | 6 +- .../app_fbd/fbd_module/phone_call/Call.h | 4 +- .../app_fbd/fbd_module/send_sms/Sms.cpp | 6 +- .../app_fbd/fbd_module/send_sms/Sms.h | 4 +- .../app_fbd/fbd_module/smtp_mail/SmtpMail.cpp | 22 +- .../app_fbd/fbd_module/smtp_mail/SmtpMail.h | 6 +- .../fbd_module/time_trigger/CTimeTrigger.cpp | 52 +- .../video_control/CVideoControl.cpp | 18 +- .../fbd_module/video_control/CVideoControl.h | 2 +- .../app_pa_server/BasicOperation.cpp | 12 +- .../app_pa_server/BasicOperation.h | 6 +- .../application/app_pa_server/PaMsgBusMng.cpp | 10 +- .../application/app_pa_server/PaMsgBusMng.h | 10 +- .../app_pa_server/PaRtdbTableOperate.cpp | 6 +- .../app_pa_server/PaRtdbTableOperate.h | 12 +- .../application/app_pa_server/PaServerApp.cpp | 6 +- .../application/app_pa_server/PaServerApp.h | 12 +- .../application/app_pa_server/PaServerMng.cpp | 4 +- .../application/app_pa_server/PaServerMng.h | 10 +- .../app_pa_server/PaTimedAudioThread.cpp | 18 +- .../app_pa_server/PaTimedAudioThread.h | 12 +- .../app_safety_day/SafetyDayApp.cpp | 6 +- .../application/app_safety_day/SafetyDayApp.h | 12 +- .../app_safety_day/SafetyDayMng.cpp | 4 +- .../application/app_safety_day/SafetyDayMng.h | 10 +- .../app_safety_day/SafetyDayThread.cpp | 12 +- .../app_safety_day/SafetyDayThread.h | 8 +- .../app_topo_server/CTopoServer.cpp | 8 +- .../application/app_topo_server/CTopoServer.h | 8 +- .../app_topo_server/CTopoThread.cpp | 34 +- .../application/app_topo_server/CTopoThread.h | 8 +- .../app_topo_server/RedundantSwitch.cpp | 4 +- .../app_topo_server/RedundantSwitch.h | 6 +- .../fault_recall_srv/CFaultRecallRedunSw.h | 2 +- .../fault_recall_srv/CFaultRecallSrv.cpp | 32 +- .../fault_recall_srv/CFaultRecallSrv.h | 8 +- .../fault_recall_srv/CHisDataMng.cpp | 80 +- .../fault_recall_srv/CHisDataMng.h | 34 +- .../fault_recall_srv/CListenThread.cpp | 8 +- .../fault_recall_srv/CListenThread.h | 4 +- .../fault_recall_srv/CSessionThread.cpp | 30 +- .../fault_recall_srv/CSessionThread.h | 10 +- .../fault_recall_srv/CTriggerThread.cpp | 34 +- .../fault_recall_srv/CTriggerThread.h | 6 +- .../test/FrTest_JsonMsgClass/main.cpp | 4 +- .../his_amend/his_amend_srv/CCfgParser.cpp | 6 +- .../his_amend/his_amend_srv/CCfgParser.h | 6 +- .../his_amend_srv/HisAmendRdbUtility.cpp | 28 +- .../his_amend_srv/HisAmendRdbUtility.h | 14 +- .../his_amend_srv/HisAmendSrvApp.cpp | 14 +- .../his_amend/his_amend_srv/HisAmendSrvApp.h | 12 +- .../his_amend_srv/HisAmendSrvMng.cpp | 2 +- .../his_amend/his_amend_srv/HisAmendSrvMng.h | 8 +- .../his_amend_srv/HisAmendWrkThd.cpp | 50 +- .../his_amend/his_amend_srv/HisAmendWrkThd.h | 18 +- .../his_amend/his_amend_srv/RdbTable.h | 4 +- .../his_amend/his_amend_srv/RecvMsgThread.cpp | 10 +- .../his_amend/his_amend_srv/RecvMsgThread.h | 4 +- .../his_amend_srv/RtuStatMontThd.cpp | 10 +- .../his_amend/his_amend_srv/RtuStatMontThd.h | 2 +- .../his_amend/his_amend_studio/main.cpp | 4 +- .../his_amend/his_amend_studio/mainwindow.cpp | 18 +- .../his_amend/his_amend_studio/mainwindow.h | 2 +- .../HTTPClient_ezjcMsgManger.cpp | 26 +- .../HTTPClient_ezjcMsgManger.h | 6 +- .../httpClient_ezjc/HttpClient_ezjc.cpp | 22 +- .../httpClient_ezjc/HttpClient_ezjc.h | 8 +- .../HttpClient_ezjcDataProThread.cpp | 4 +- .../HttpClient_ezjcDataProThread.h | 10 +- .../httpClient_ezjc/WebSrvRedunSw.h | 2 +- .../application/idong_srv_api/CCfgParser.cpp | 4 +- .../application/idong_srv_api/CCfgParser.h | 4 +- .../idong_srv_api/CIDongSrvApi.cpp | 2 +- .../idong_task_link/MainWindow.cpp | 2 +- .../application/idong_task_link/MainWindow.h | 2 +- .../src/application/idong_task_link/main.cpp | 4 +- .../linkage_server/CActionMsgSender.cpp | 2 +- .../linkage_server/CActionNodeAnalysis.cpp | 18 +- .../linkage_server/CActionNodeAnalysis.h | 8 +- .../linkage_server/CAppService.cpp | 14 +- .../application/linkage_server/CAppService.h | 12 +- .../linkage_server/CAppServiceThread.cpp | 2 +- .../linkage_server/CAppServiceThread.h | 6 +- .../linkage_server/CCheckFuncCondition.cpp | 18 +- .../linkage_server/CCheckFuncCondition.h | 2 +- .../linkage_server/CDbSaveCtrl.cpp | 28 +- .../linkage_server/CHmiMessageAnalysis.cpp | 4 +- .../linkage_server/CHmiMessageAnalysis.h | 6 +- .../linkage_server/CLinkProcessQuit.h | 2 +- .../linkage_server/CLinkRedundant.h | 2 +- .../linkage_server/CLinkageService.cpp | 16 +- .../linkage_server/CLinkageService.h | 4 +- .../linkage_server/CLinkageServiceThread.cpp | 8 +- .../linkage_server/CLinkageServiceThread.h | 2 +- .../linkage_server/CMethodAction.cpp | 4 +- .../linkage_server/CMethodFailedAction.cpp | 8 +- .../linkage_server/CMethodFunc.cpp | 6 +- .../linkage_server/CMethodLink.cpp | 2 +- .../linkage_server/CMethodRecoverAction.cpp | 2 +- .../linkage_server/CMethodRecoverFunc.cpp | 2 +- .../linkage_server/CMethodRecoverLink.cpp | 2 +- .../linkage_server/CModuleAlarmCreater.cpp | 86 +- .../linkage_server/CModuleAlarmCreater.h | 22 +- .../linkage_server/CModuleExecuteMngr.cpp | 2 +- .../linkage_server/CModuleMbComm.cpp | 2 +- .../linkage_server/CModuleMbComm.h | 4 +- .../linkage_server/CModuleMsgDeal.cpp | 2 +- .../linkage_server/CModuleNodeMngr.cpp | 8 +- .../linkage_server/CModuleNodeMngr.h | 2 +- .../linkage_server/CModuleTrigger.cpp | 2 +- .../linkage_server/CRdbLinkRunningAccess.cpp | 12 +- .../linkage_server/CRdbLinkRunningAccess.h | 2 +- .../linkage_server/CRdbLinkSettingAccess.cpp | 6 +- .../linkage_server/CRdbLinkSettingAccess.h | 4 +- .../application/linkage_server/CSqlDbCtrl.cpp | 2 +- .../application/linkage_server/CSqlDbCtrl.h | 2 +- .../CLinkageForHmiApiImpl.cpp | 14 +- .../CLinkageForHmiApiImpl.h | 14 +- .../CLinkageForServerApi.cpp | 2 +- .../CLinkageForServerApiImpl.cpp | 30 +- .../CLinkageForServerApiImpl.h | 24 +- .../opc_server/opc_server/LightOpcOpt.cpp | 2 +- .../opc_server/opc_server/LightOpcOpt.h | 2 +- .../opc_server/opc_server/OpcDataCache.h | 4 +- .../opc_server/opc_server/OpcMsgBusMng.cpp | 20 +- .../opc_server/opc_server/OpcMsgBusMng.h | 14 +- .../opc_server/opc_server/OpcRtdbTable.h | 4 +- .../opc_server/OpcRtdbTableOperate.cpp | 10 +- .../opc_server/OpcRtdbTableOperate.h | 22 +- .../opc_server/opc_server/OpcServerApp.cpp | 34 +- .../opc_server/opc_server/OpcServerApp.h | 16 +- .../opc_server/opc_server/OpcServerCommon.h | 2 +- .../opc_server/opc_server/OpcServerMng.cpp | 10 +- .../opc_server/opc_server/OpcServerMng.h | 14 +- .../opc_server/opc_server/OpcServerThread.cpp | 52 +- .../opc_server/opc_server/OpcServerThread.h | 14 +- .../opc_server/opc_server/OpcToolsThread.cpp | 34 +- .../opc_server/opc_server/OpcToolsThread.h | 16 +- .../opc_server/opc_server/main.cpp | 2 +- .../test/iflytek_tts_sdk_test/main.cpp | 8 +- .../sequence_server/CActionNodeAnalysis.cpp | 8 +- .../sequence_server/CActionNodeAnalysis.h | 4 +- .../sequence_server/CAppService.cpp | 14 +- .../application/sequence_server/CAppService.h | 12 +- .../sequence_server/CAppServiceThread.cpp | 2 +- .../sequence_server/CAppServiceThread.h | 6 +- .../sequence_server/CDbSaveCtrl.cpp | 28 +- .../sequence_server/CHmiMessageAnalysis.cpp | 2 +- .../sequence_server/CHmiMessageAnalysis.h | 6 +- .../sequence_server/CMbCommunicateInfo.cpp | 2 +- .../sequence_server/CMbCommunicateInfo.h | 4 +- .../sequence_server/CMethodAction.cpp | 4 +- .../sequence_server/CMethodAction.h | 2 +- .../sequence_server/CMethodFailedAction.cpp | 8 +- .../sequence_server/CMethodFailedAction.h | 2 +- .../sequence_server/CMethodFunc.cpp | 6 +- .../sequence_server/CMethodRecoverAction.cpp | 2 +- .../sequence_server/CMethodRecoverFunc.cpp | 2 +- .../sequence_server/CMethodRecoverSeq.cpp | 2 +- .../sequence_server/CMethodSeq.cpp | 2 +- .../sequence_server/CModuleAlarmCreater.cpp | 74 +- .../sequence_server/CModuleAlarmCreater.h | 20 +- .../sequence_server/CModuleExecuteMngr.cpp | 2 +- .../sequence_server/CModuleNodeMngr.cpp | 8 +- .../sequence_server/CModuleNodeMngr.h | 2 +- .../sequence_server/CRdbSeqRunningAccess.cpp | 12 +- .../sequence_server/CRdbSeqRunningAccess.h | 2 +- .../sequence_server/CRdbSeqSettingAccess.cpp | 6 +- .../sequence_server/CRdbSeqSettingAccess.h | 4 +- .../sequence_server/CSeqCtrlService.cpp | 16 +- .../sequence_server/CSeqCtrlService.h | 4 +- .../sequence_server/CSeqProcessQuit.h | 2 +- .../sequence_server/CSeqRedundant.h | 2 +- .../sequence_server/CSeqServiceThread.cpp | 2 +- .../sequence_server/CSeqServiceThread.h | 2 +- .../sequence_server/CSqlDbCtrl.cpp | 2 +- .../application/sequence_server/CSqlDbCtrl.h | 2 +- .../sequence_server_api/CSeqForHmiApi.cpp | 2 +- .../sequence_server_api/CSeqForHmiApiImpl.cpp | 14 +- .../sequence_server_api/CSeqForHmiApiImpl.h | 14 +- .../sequence_server_api/CSeqForServerApi.cpp | 2 +- .../CSeqForServerApiImpl.cpp | 24 +- .../CSeqForServerApiImpl.h | 24 +- .../src/application/trigger_api/CDotNode.cpp | 2 +- .../src/application/trigger_api/CDotValue.h | 2 +- .../application/trigger_api/CRdbAccessMngr.h | 2 +- .../trigger_api/CRdbAccessMngrInterface.cpp | 8 +- .../trigger_api/CRdbAccessMngrInterface.h | 2 +- .../src/application/trigger_api/CRdbNetBase.h | 8 +- .../trigger_api/CRdbNetInterface.cpp | 6 +- .../trigger_api/CRdbNetInterface.h | 6 +- .../application/trigger_api/CRdbNetThread.cpp | 16 +- .../application/trigger_api/CRdbNetThread.h | 8 +- .../trigger_api/CTagAnalysiser.cpp | 6 +- .../application/trigger_api/CTagAnalysiser.h | 2 +- .../application/trigger_api/CTestRdbNet.cpp | 6 +- .../src/application/trigger_api/CTestRdbNet.h | 6 +- .../trigger_api/CTriggerApiImpl.cpp | 4 +- .../application/trigger_api/CTriggerApiImpl.h | 2 +- .../application/trigger_api/CTriggerNode.cpp | 8 +- .../trigger_api/CTriggerNodeCondition.cpp | 2 +- .../trigger_api/CTriggerNodePeriod.cpp | 2 +- .../video_server/VideoMsgBusMng.cpp | 8 +- .../application/video_server/VideoMsgBusMng.h | 10 +- .../video_server/VideoMsgRecvThread.cpp | 14 +- .../video_server/VideoMsgRecvThread.h | 16 +- .../video_server/VideoOnvifDataThread.cpp | 6 +- .../video_server/VideoOnvifDataThread.h | 6 +- .../video_server/VideoOrientationTable.h | 2 +- .../video_server/VideoPacketQueue.cpp | 8 +- .../video_server/VideoPacketQueue.h | 10 +- .../video_server/VideoRtdbTableOpt.cpp | 4 +- .../video_server/VideoRtdbTableOpt.h | 8 +- .../video_server/VideoServerApp.cpp | 6 +- .../application/video_server/VideoServerApp.h | 12 +- .../video_server/VideoServerMng.cpp | 2 +- .../application/video_server/VideoServerMng.h | 10 +- .../video_server/VideoServerThread.cpp | 28 +- .../video_server/VideoServerThread.h | 16 +- .../wave_record_server/wave_recordApp.cpp | 6 +- .../wave_record_server/wave_recordApp.h | 12 +- .../wave_record_server/wave_recordMng.cpp | 4 +- .../wave_record_server/wave_recordMng.h | 10 +- .../wave_record_server/wave_recordThread.cpp | 18 +- .../wave_record_server/wave_recordThread.h | 10 +- .../CXmAlmConfigThread.cpp | 20 +- .../xm_alarm_send_server/CXmAlmConfigThread.h | 2 +- .../xm_alarm_send_server/CXmAlmRcvThread.cpp | 30 +- .../xm_alarm_send_server/CXmAlmRcvThread.h | 16 +- .../xm_alarm_send_server/CXmAlmSendApp.cpp | 44 +- .../xm_alarm_send_server/CXmAlmSendApp.h | 14 +- .../xm_alarm_send_server/CXmAlmSendMng.cpp | 10 +- .../xm_alarm_send_server/CXmAlmSendMng.h | 10 +- .../xm_alarm_send_server/CXmAlmSendThread.cpp | 70 +- .../xm_alarm_send_server/CXmAlmSendThread.h | 4 +- .../CXmAlmSocketThread.cpp | 32 +- .../xm_alarm_send_server/CXmAlmSocketThread.h | 4 +- .../xm_alarm_send_server/almsendcommon.h | 2 +- .../xm_alarm_send_server/datastructdef.h | 2 +- .../application/xm_alarm_send_server/main.cpp | 2 +- .../CDbSaveRedundant.cpp | 6 +- .../db_save_cloud_platform/CDbSaveRedundant.h | 10 +- .../db_save_cloud_platform/CDbSaveService.cpp | 28 +- .../db_save_cloud_platform/CDbSaveService.h | 10 +- .../CDbSaveServiceThread.cpp | 48 +- .../CDbSaveServiceThread.h | 10 +- .../CDbSaveServiceWorkThread.cpp | 28 +- .../CDbSaveServiceWorkThread.h | 24 +- .../db_save_cloud_platform/CIStreamFile.cpp | 8 +- .../db_save_cloud_platform/CIStreamFile.h | 6 +- .../db_save_cloud_platform/COStreamFile.cpp | 6 +- .../db_save_cloud_platform/COStreamFile.h | 4 +- .../ConvertForOtherDatabase.cpp | 4 +- .../ConvertForOtherDatabase.h | 4 +- .../db_save_cloud_platform/DbSaveCommon.h | 4 +- .../PredefineForDbSaveServer.cpp | 18 +- .../PredefineForDbSaveServer.h | 12 +- .../src/dbms/db_save_cloud_platform/main.cpp | 2 +- .../tsdb_save_cloud_platform/CFrontThread.cpp | 28 +- .../tsdb_save_cloud_platform/CFrontThread.h | 12 +- .../tsdb_save_cloud_platform/CNodeMng.cpp | 12 +- .../dbms/tsdb_save_cloud_platform/CNodeMng.h | 4 +- .../tsdb_save_cloud_platform/CNodeThread.cpp | 18 +- .../tsdb_save_cloud_platform/CNodeThread.h | 6 +- .../CTsdbSaveRedunSw.cpp | 4 +- .../CTsdbSaveRedunSw.h | 6 +- .../tsdb_save_cloud_platform/CTsdbSaveSrv.cpp | 22 +- .../tsdb_save_cloud_platform/CTsdbSaveSrv.h | 10 +- .../dbms/tsdb_save_cloud_platform/Main.cpp | 2 +- .../TsdbSaveCommon.cpp | 22 +- .../tsdb_save_cloud_platform/TsdbSaveCommon.h | 8 +- .../src/example/CheckIfShield/MainWindow.cpp | 12 +- .../src/example/CheckIfShield/MainWindow.h | 6 +- .../src/example/create_alarm/CCreateAlarm.cpp | 10 +- .../src/example/create_alarm/CCreateAlarm.h | 2 +- .../example/daemon_debug_helper/AppMng.cpp | 92 +- .../src/example/daemon_debug_helper/AppMng.h | 6 +- .../AccessTest/TestCRtdbLocalTable.cpp | 2 +- .../AccessTest/testCQDbInterface.cpp | 2 +- .../AccessTest/testCRTdbSpeedyQuery.cpp | 2 +- .../dbms_test/AccessTest/testCRtdbAccess.cpp | 4 +- .../dbms_test/AccessTest/testcrtdbsql.cpp | 2 +- .../example/dbms_test/db_api_ex_test/main.cpp | 4 +- .../dbms_test/db_model_server_test/main.cpp | 10 +- .../example/dbms_test/db_save_test/main.cpp | 20 +- .../dbms_test/db_sysinfo_api_test/main.cpp | 4 +- .../rdb_changedata_api_test.cpp | 2 +- .../rdb_changedata_api_test.h | 6 +- .../example/dbms_test/rdb_lock_test/main.cpp | 4 +- .../dbms_test/rdb_net_api_test/main.cpp | 68 +- .../rdb_redundant_test/rdb_redundant_test.cpp | 4 +- .../frame_example/common/MessageQueue.cpp | 4 +- .../frame_example/common/MessageQueue.h | 2 +- .../frame_example/common/NetMsgBusThread.cpp | 6 +- .../frame_example/common/NetMsgBusThread.h | 12 +- .../frame_example/common/RdbTableMng.cpp | 10 +- .../frame_example/common/RdbTableMng.h | 18 +- .../frame_example/data_process/AnaProcess.cpp | 16 +- .../frame_example/data_process/AnaProcess.h | 28 +- .../data_process/AnaStructDefine.h | 2 +- .../data_process/DataCommThread.cpp | 6 +- .../data_process/DataCommThread.h | 12 +- .../data_process/DataProcess.cpp | 12 +- .../frame_example/data_process/DataProcess.h | 12 +- .../data_process/DataProcessDefine.h | 2 +- .../data_process/DataProcessMain.cpp | 4 +- .../frame_example/data_process/DigProcess.cpp | 10 +- .../frame_example/data_process/DigProcess.h | 12 +- .../data_process/MainWorkThread.cpp | 8 +- .../data_process/MainWorkThread.h | 4 +- .../data_process/MessageBuffer.cpp | 4 +- .../data_process/MessageBuffer.h | 2 +- .../data_process/RealDataPublish.cpp | 6 +- .../data_process/RealDataPublish.h | 4 +- .../data_process/RedundantSwitch.cpp | 6 +- .../data_process/RedundantSwitch.h | 8 +- product/src/example/genMySQLConfig/main.cpp | 2 +- product/src/example/i18n/main.cpp | 2 +- product/src/example/kbdlogtest/main.cpp | 4 +- .../kbdlogtest_thread/kbdlogtest_thread.cpp | 2 +- .../linkage_server_test/CGetDBData.cpp | 2 +- .../linkage_server_test/CGetDBData.h | 2 +- .../linkage_server_test/CGetRdbData.h | 2 +- .../CLinkageForHmiApiInterface.cpp | 4 +- .../CLinkageForHmiApiInterface.h | 2 +- .../CRdbLinkRunningAccess.cpp | 6 +- .../CRdbLinkRunningAccess.h | 4 +- .../linkage_server_test/CSetReqMsgInfo.h | 2 +- .../linkage_server_test/ConfigureDialog.h | 2 +- .../RefreshExeStateThread.cpp | 12 +- .../RefreshExeStateThread.h | 2 +- .../linkage_server_test/main.cpp | 8 +- .../linkage_server_test/mainwindow.cpp | 2 +- .../linkage_server_test/mainwindow.h | 4 +- .../clinkageforhmiapiimpl.cpp | 8 +- .../clinkageforhmiapiimpl.h | 12 +- .../linkage_tuihuamian_test/main.cpp | 8 +- .../sequence_server_test/CConfigureDialog.h | 6 +- .../sequence_server_test/CGetRdbDataThread.h | 2 +- .../CRdbSeqRunningAccess.cpp | 10 +- .../CRdbSeqRunningAccess.h | 4 +- .../CRefreshExeStatusThread.cpp | 12 +- .../CRefreshExeStatusThread.h | 2 +- .../CSequenceForHmiApiInterface.cpp | 4 +- .../CSequenceForHmiApiInterface.h | 2 +- .../sequence_server_test/CSetSeqMsgInfo.h | 2 +- .../sequence_server_test/CSqlDbCtrl.cpp | 10 +- .../sequence_server_test/CSqlDbCtrl.h | 6 +- .../sequence_server_test/main.cpp | 8 +- .../sequence_server_test/mainwindow.cpp | 4 +- .../trigger_test/CEditTimerWidget.cpp | 6 +- .../link_seq_test/trigger_test/CSqlDbCtrl.cpp | 14 +- .../link_seq_test/trigger_test/CSqlDbCtrl.h | 8 +- .../trigger_test/CTriggerMngr.cpp | 2 +- .../link_seq_test/trigger_test/main.cpp | 8 +- .../link_seq_test/trigger_test/mainwindow.cpp | 2 +- product/src/example/lua_test/main.cpp | 2 +- .../src/example/luabridge_test/incomeTest.hpp | 206 +-- product/src/example/luabridge_test/main.cpp | 10 +- product/src/example/luabridge_test/price.hpp | 14 +- product/src/example/performanceTest/testex.h | 2 +- product/src/example/program_option/App.cpp | 2 +- product/src/example/program_option/App.h | 2 +- .../src/example/rdb_open_test/MainWindow.cpp | 2 +- product/src/example/service_test/App.h | 2 +- .../example/sys_login_api_test/MainWindow.cpp | 2 +- product/src/example/testFileUtil/Main.cpp | 2 +- product/src/example/testHibernation/Main.cpp | 2 +- product/src/example/thread_test/App.cpp | 4 +- product/src/example/thread_test/App.h | 2 +- product/src/example/thread_test/AppThread.cpp | 2 +- product/src/example/thread_test/AppThread.h | 2 +- product/src/fes/R80Info/R80Info.cpp | 8 +- product/src/fes/R80Info/R80Info.h | 10 +- product/src/fes/R80Info/R80InfoDataThread.cpp | 2 +- product/src/fes/R80Info/R80InfoDataThread.h | 2 +- .../fes/R80Info/R80InfoRedundantManage.cpp | 4 +- .../src/fes/R80Info/R80InfoRedundantManage.h | 6 +- product/src/fes/fes/AccWorkThread.cpp | 14 +- product/src/fes/fes/AccWorkThread.h | 6 +- product/src/fes/fes/AnaWorkThread.cpp | 12 +- product/src/fes/fes/AnaWorkThread.h | 6 +- product/src/fes/fes/DigWorkThread.cpp | 4 +- product/src/fes/fes/DigWorkThread.h | 8 +- product/src/fes/fes/FesApp.cpp | 16 +- product/src/fes/fes/FesApp.h | 10 +- product/src/fes/fes/FesBase.cpp | 50 +- product/src/fes/fes/FesChan.cpp | 2 +- product/src/fes/fes/FesChanManageThread.cpp | 8 +- product/src/fes/fes/FesChanManageThread.h | 10 +- product/src/fes/fes/FesDataPublish.cpp | 10 +- product/src/fes/fes/FesDataPublish.h | 12 +- product/src/fes/fes/FesDataSyncThread.cpp | 6 +- product/src/fes/fes/FesDataSyncThread.h | 4 +- product/src/fes/fes/FesForwardConfig.cpp | 18 +- .../src/fes/fes/FesFwRxControlCmdThread.cpp | 6 +- product/src/fes/fes/FesFwRxControlCmdThread.h | 6 +- .../src/fes/fes/FesFwTxControlCmdThread.cpp | 6 +- product/src/fes/fes/FesFwTxControlCmdThread.h | 4 +- product/src/fes/fes/FesRedundantManage.cpp | 4 +- product/src/fes/fes/FesRedundantManage.h | 6 +- product/src/fes/fes/FesRtu.cpp | 2 +- product/src/fes/fes/FesRxControlCmdThread.cpp | 8 +- product/src/fes/fes/FesRxControlCmdThread.h | 4 +- product/src/fes/fes/FesRxDPDataThread.cpp | 14 +- product/src/fes/fes/FesRxDPDataThread.h | 10 +- product/src/fes/fes/FesRxDataUpDateThread.cpp | 6 +- product/src/fes/fes/FesRxDataUpDateThread.h | 4 +- product/src/fes/fes/FesRxFesDataThread.cpp | 8 +- product/src/fes/fes/FesRxFesDataThread.h | 8 +- product/src/fes/fes/FesSimServerThread.cpp | 2 +- product/src/fes/fes/FesSimServerThread.h | 2 +- product/src/fes/fes/FesTxControlCmdThread.cpp | 6 +- product/src/fes/fes/FesTxControlCmdThread.h | 4 +- product/src/fes/fes/FesTxDataChangeThread.cpp | 10 +- product/src/fes/fes/FesTxDataChangeThread.h | 8 +- product/src/fes/fes/FesTxEventThread.cpp | 4 +- product/src/fes/fes/FesTxEventThread.h | 4 +- product/src/fes/fes/FesWaveFormThread.cpp | 8 +- product/src/fes/fes/FesWaveFormThread.h | 8 +- product/src/fes/fes/FesWaveRecord.cpp | 8 +- product/src/fes/fes/FesWaveRecord.h | 4 +- product/src/fes/fes/MixWorkThread.cpp | 14 +- product/src/fes/fes/MixWorkThread.h | 6 +- product/src/fes/fes/PacketQueue.cpp | 40 +- product/src/fes/fes/PacketQueue.h | 54 +- .../iec61850/common/IEC850C_RDBInterface.cpp | 4 +- .../fes/iec61850/common/IEC850C_Resource.cpp | 24 +- .../fes/iec61850/include/IEC850C_Resource.h | 24 +- product/src/fes/include/ComTcpClient.h | 2 +- product/src/fes/include/FesBase.h | 2 +- product/src/fes/include/FesDef.h | 2 +- product/src/fes/include/SerialPortThread.h | 2 +- product/src/fes/include/SnmpUdpClientThread.h | 2 +- .../fes/include/TcpClientNotChangeThread.h | 2 +- product/src/fes/include/TcpClientThread.h | 2 +- .../src/fes/include/TcpServerListenThread.h | 2 +- product/src/fes/include/TcpServerRxTxThread.h | 2 +- product/src/fes/include/TcpServerThread.h | 2 +- product/src/fes/include/UdpClientThread.h | 2 +- .../httpServer_szdt/HttpServer_szdt.cpp | 2 +- .../HttpServer_szdtDataProcThread.cpp | 2 +- .../HttpServer_szdtDataProcThread.h | 2 +- .../httpsSer_bjjc/HttpHttpsSer_bjjc.cpp | 2 +- .../HttpHttpsSer_bjjcDataProcThread.cpp | 2 +- .../HttpHttpsSer_bjjcDataProcThread.h | 2 +- .../Testexample/iec61850client2/IEC61850c.cpp | 10 +- .../IEC61850cDataProcThread.cpp | 2 +- .../iec61850client2/IEC61850cDataProcThread.h | 2 +- .../Testexample/iec61850client2/KBD_dll.cpp | 4 +- .../Testexample/iec61850dll2/IEC61850dll.cpp | 2 +- product/src/fes/protocol/ad104s/AD104S.cpp | 2 +- .../protocol/ad104s/AD104SDataProcThread.cpp | 2 +- .../protocol/ad104s/AD104SDataProcThread.h | 2 +- .../ad104s/ADTcpServerListenThread.cpp | 2 +- .../protocol/ad104s/ADTcpServerListenThread.h | 2 +- .../protocol/ad104s/ADTcpServerRxTxThread.cpp | 2 +- .../protocol/ad104s/ADTcpServerRxTxThread.h | 2 +- .../src/fes/protocol/ats_casco/CascoAts.cpp | 2 +- .../ats_casco/CascoAtsDataProcThread.cpp | 6 +- .../ats_casco/CascoAtsDataProcThread.h | 4 +- product/src/fes/protocol/cdt/Cdt.cpp | 2 +- .../fes/protocol/cdt/CdtDataProcThread.cpp | 2 +- .../src/fes/protocol/cdt/CdtDataProcThread.h | 2 +- product/src/fes/protocol/cdts/Cdts.cpp | 2 +- .../fes/protocol/cdts/CdtsDataProcThread.cpp | 2 +- .../fes/protocol/cdts/CdtsDataProcThread.h | 2 +- .../src/fes/protocol/combase/ComTcpClient.cpp | 2 +- .../fes/protocol/combase/SerialPortThread.cpp | 4 +- .../protocol/combase/SnmpUdpClientThread.cpp | 2 +- .../combase/TcpClientNotChangeThread.cpp | 2 +- .../fes/protocol/combase/TcpClientThread.cpp | 2 +- .../combase/TcpServerListenThread.cpp | 2 +- .../protocol/combase/TcpServerRxTxThread.cpp | 2 +- .../fes/protocol/combase/TcpServerThread.cpp | 2 +- .../fes/protocol/combase/UdpClientThread.cpp | 2 +- product/src/fes/protocol/dlt645/DLT645.cpp | 2 +- .../protocol/dlt645/DLT645DataProcThread.cpp | 2 +- .../protocol/dlt645/DLT645DataProcThread.h | 2 +- .../fes/protocol/fesdatarecv/fesdatarecv.cpp | 2 +- .../fesdatarecv/fesdatarecvDataProcThread.cpp | 2 +- .../fesdatarecv/fesdatarecvDataProcThread.h | 2 +- .../src/fes/protocol/fesdatazf/fesdatazf.cpp | 2 +- .../fesdatazf/fesdatazfDataProcThread.cpp | 2 +- .../fesdatazf/fesdatazfDataProcThread.h | 2 +- product/src/fes/protocol/gf104/GF104.cpp | 2 +- .../protocol/gf104/GF104DataProcThread.cpp | 2 +- .../fes/protocol/gf104/GF104DataProcThread.h | 2 +- .../gf104/GFTcpServerListenThread.cpp | 2 +- .../protocol/gf104/GFTcpServerListenThread.h | 2 +- .../protocol/gf104/GFTcpServerRxTxThread.cpp | 2 +- .../protocol/gf104/GFTcpServerRxTxThread.h | 2 +- product/src/fes/protocol/gf104s/GF104S.cpp | 2 +- .../protocol/gf104s/GF104SDataProcThread.cpp | 2 +- .../protocol/gf104s/GF104SDataProcThread.h | 2 +- .../httpClient_szdt/HttpClient_szdt.cpp | 2 +- .../HttpClient_szdtDataProcThread.cpp | 2 +- .../HttpClient_szdtDataProcThread.h | 2 +- .../httpsClient_bjjc/HttpsClient_bjjc.cpp | 2 +- .../HttpsClient_bjjcDataProcThread.cpp | 2 +- .../HttpsClient_bjjcDataProcThread.h | 2 +- product/src/fes/protocol/iec101s/IEC101S.cpp | 2 +- .../iec101s/IEC101SDataProcThread.cpp | 2 +- .../protocol/iec101s/IEC101SDataProcThread.h | 2 +- product/src/fes/protocol/iec103/IEC103.cpp | 2 +- .../protocol/iec103/IEC103DataProcThread.cpp | 4 +- .../protocol/iec103/IEC103DataProcThread.h | 2 +- .../fes/protocol/iec103/IEC103RtuLbStruct.h | 2 +- product/src/fes/protocol/iec104/IEC104.cpp | 2 +- .../protocol/iec104/IEC104DataProcThread.cpp | 2 +- .../protocol/iec104/IEC104DataProcThread.h | 2 +- .../src/fes/protocol/iec104V2/IEC104V2.cpp | 2 +- .../iec104V2/IEC104V2DataProcThread.cpp | 2 +- .../iec104V2/IEC104V2DataProcThread.h | 2 +- product/src/fes/protocol/iec104s/IEC104S.cpp | 2 +- .../iec104s/IEC104SDataProcThread.cpp | 2 +- .../protocol/iec104s/IEC104SDataProcThread.h | 2 +- .../protocol/iec61850client2/IEC61850c.cpp | 2 +- .../IEC61850cDataProcThread.cpp | 2 +- .../iec61850client2/IEC61850cDataProcThread.h | 2 +- .../iec61850client2/IEC61850cThread.cpp | 8 +- .../iec61850client2/IEC61850cThread.h | 2 +- .../fes/protocol/iec61850client2/KBD_dll.cpp | 2 +- product/src/fes/protocol/kbd104/KBD104.cpp | 2 +- .../protocol/kbd104/KBD104DataProcThread.cpp | 2 +- .../protocol/kbd104/KBD104DataProcThread.h | 2 +- .../kbd61850m/IEC61850DataParseThread.cpp | 2 +- .../kbd61850m/IEC61850DataParseThread.h | 2 +- .../kbd61850m/IEC61850DataRecvThread.cpp | 2 +- .../kbd61850m/IEC61850DataRecvThread.h | 2 +- .../protocol/kbd61850m/IEC61850TCPThread.cpp | 2 +- .../protocol/kbd61850m/IEC61850TCPThread.h | 2 +- .../kbd61850m/IEC61850_FormReqCmd.cpp | 2 +- .../src/fes/protocol/kbd61850m/KBD61850m.cpp | 24 +- .../kbd61850m/KBD61850mDataProcThread.cpp | 2 +- .../kbd61850m/KBD61850mDataProcThread.h | 2 +- product/src/fes/protocol/khbas/Khbas.cpp | 2 +- .../protocol/khbas/KhbasDataProcThread.cpp | 2 +- .../fes/protocol/khbas/KhbasDataProcThread.h | 2 +- .../fes/protocol/modbus_c30/ModbusRtuC30.cpp | 2 +- .../modbus_c30/ModbusRtuC30DataProcThread.cpp | 2 +- .../modbus_c30/ModbusRtuC30DataProcThread.h | 2 +- .../protocol/modbus_micomP/ModbusMicomP.cpp | 2 +- .../ModbusMicomPDataProcThread.cpp | 2 +- .../ModbusMicomPDataProcThread.h | 2 +- .../fes/protocol/modbus_pm/ModbusRtuPm.cpp | 2 +- .../modbus_pm/ModbusRtuPmDataProcThread.cpp | 2 +- .../modbus_pm/ModbusRtuPmDataProcThread.h | 2 +- .../src/fes/protocol/modbus_rtu/ModbusRtu.cpp | 18 +- .../modbus_rtu/ModbusRtuDataProcThread.cpp | 2 +- .../modbus_rtu/ModbusRtuDataProcThread.h | 2 +- .../protocol/modbus_rtu_s/ModbusRtuSer.cpp | 2 +- .../ModbusRtuSerDataProcThread.cpp | 2 +- .../modbus_rtu_s/ModbusRtuSerDataProcThread.h | 2 +- .../protocol/modbus_sepam/ModbusRtuSepam.cpp | 2 +- .../ModbusRtuSepamDataProcThread.cpp | 2 +- .../ModbusRtuSepamDataProcThread.h | 2 +- .../modbus_tcp/ModbusDataProcThread.cpp | 2 +- .../modbus_tcp/ModbusDataProcThread.h | 2 +- .../src/fes/protocol/modbus_tcp/ModbusTcp.cpp | 2 +- .../fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp | 18 +- .../ModbusTcpV3DataProcThread.cpp | 2 +- .../modbus_tcpV3/ModbusTcpV3DataProcThread.h | 2 +- .../modbus_tcp_epm9200/ModbusTcpEpm9200.cpp | 2 +- .../ModbusTcpEpm9200DataProcThread.cpp | 2 +- .../ModbusTcpEpm9200DataProcThread.h | 2 +- .../modbus_tcp_fpd/ModbusDataProcThread.cpp | 2 +- .../modbus_tcp_fpd/ModbusDataProcThread.h | 2 +- .../fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp | 2 +- .../fes/protocol/modbus_tcp_nhats/NHAts.cpp | 2 +- .../modbus_tcp_nhats/NHAtsDataProcThread.cpp | 4 +- .../modbus_tcp_nhats/NHAtsDataProcThread.h | 2 +- .../protocol/modbus_tcp_pa/ModbusTcpPa.cpp | 2 +- .../ModbusTcpPaDataProcThread.cpp | 2 +- .../modbus_tcp_pa/ModbusTcpPaDataProcThread.h | 2 +- .../protocol/modbus_tcp_pis/ModbusTcpPis.cpp | 2 +- .../ModbusTcpPisDataProcThread.cpp | 2 +- .../ModbusTcpPisDataProcThread.h | 2 +- .../fes/protocol/modbus_tcp_s/MdbTcpSer.cpp | 2 +- .../modbus_tcp_s/MdbTcpSerDataProcThread.cpp | 2 +- .../modbus_tcp_s/MdbTcpSerDataProcThread.h | 2 +- .../modbus_tcp_vamp/ModbusTcpVamp.cpp | 2 +- .../ModbusTcpVampDataProcThread.cpp | 2 +- .../ModbusTcpVampDataProcThread.h | 2 +- .../src/fes/protocol/opcclient/OpcClient.cpp | 16 +- .../opcclient/OpcClientDataProcThread.cpp | 4 +- .../opcclient/OpcClientDataProcThread.h | 2 +- .../src/fes/protocol/r80x_io/r80x_ioRtu.cpp | 2 +- .../r80x_io/r80x_ioRtuDataProcThread.cpp | 6 +- .../r80x_io/r80x_ioRtuDataProcThread.h | 2 +- .../protocol/siemens103_tcp/SIEMENS103.cpp | 2 +- .../SIEMENS103DataProcThread.cpp | 2 +- .../siemens103_tcp/SIEMENS103DataProcThread.h | 2 +- product/src/fes/protocol/snmp/snmp.cpp | 22 +- .../fes/protocol/snmp/snmpDataProcThread.cpp | 2 +- .../fes/protocol/snmp/snmpDataProcThread.h | 2 +- .../protocol/snmps/snmpAgent/AgentCommon.cpp | 4 +- .../protocol/snmps/snmpAgent/AgentCommon.h | 6 +- .../protocol/snmps/snmpAgent/CAgentServer.cpp | 24 +- .../protocol/snmps/snmpAgent/CAgentServer.h | 4 +- .../fes/protocol/snmps/snmpAgent/CpuGroup.cpp | 4 +- .../fes/protocol/snmps/snmpAgent/CpuGroup.h | 4 +- .../protocol/snmps/snmpAgent/FileSysGroup.cpp | 4 +- .../protocol/snmps/snmpAgent/FileSysGroup.h | 4 +- .../protocol/snmps/snmpAgent/MainLinux.cpp | 20 +- .../protocol/snmps/snmpAgent/MainWindows.cpp | 32 +- .../protocol/snmps/snmpAgent/MemoryGroup.cpp | 4 +- .../protocol/snmps/snmpAgent/MemoryGroup.h | 4 +- .../snmps/snmpAgent/NetInterfaceGroup.cpp | 4 +- .../snmps/snmpAgent/NetInterfaceGroup.h | 4 +- .../protocol/snmps/snmpAgent/ProcessGroup.cpp | 4 +- .../protocol/snmps/snmpAgent/ProcessGroup.h | 4 +- .../protocol/snmps/snmpAgent/SystemGroup.cpp | 4 +- .../protocol/snmps/snmpAgent/SystemGroup.h | 4 +- product/src/fes/protocol/snmps/snmps.cpp | 2 +- .../protocol/snmps/snmpsDataProcThread.cpp | 2 +- .../fes/protocol/snmps/snmpsDataProcThread.h | 2 +- product/src/fes/protocol/snmpv3/snmp.cpp | 18 +- .../protocol/snmpv3/snmpDataProcThread.cpp | 2 +- .../fes/protocol/snmpv3/snmpDataProcThread.h | 2 +- .../protocol/sqlserver_s/DataProcThread.cpp | 2 +- .../fes/protocol/sqlserver_s/DataProcThread.h | 2 +- .../fes/protocol/sqlserver_s/SqlServer.cpp | 2 +- .../fes/protocol/szdt_robot/SZDT_Robot.cpp | 2 +- .../szdt_robot/SZDT_RobotDataProcThread.cpp | 2 +- .../szdt_robot/SZDT_RobotDataProcThread.h | 2 +- .../fes/protocol/virtualrtu/virtualrtu.cpp | 2 +- .../virtualrtu/virtualrtuDataProcThread.cpp | 2 +- .../virtualrtu/virtualrtuDataProcThread.h | 2 +- .../src/fes/protocol/wfudpcdt/wfudpcdt.cpp | 2 +- .../wfudpcdt/wfudpcdtDataProcThread.cpp | 2 +- .../wfudpcdt/wfudpcdtDataProcThread.h | 2 +- .../gui/GraphTool/IconActTool/CFileOpt.cpp | 2 +- .../GraphTool/IconActTool/CIconActDialog.cpp | 2 +- .../gui/GraphTool/NavigationApi/CJsonOpt.cpp | 2 +- .../NavigationTool/CNavigationDialog.cpp | 4 +- .../gui/GraphTool/fileSync/CConfirmDialog.h | 2 +- .../GraphTool/fileSync/CFileSyncDialog.cpp | 4 +- .../gui/GraphTool/fileSync/CFileSyncDialog.h | 2 +- .../AlarmAnalyzeWidget/CAlarmStatistics.cpp | 8 +- .../CCompareQueryThread.cpp | 4 +- .../AlarmAnalyzeWidget/CCompareQueryThread.h | 2 +- .../CStatisticsQueryThread.cpp | 4 +- .../CStatisticsQueryThread.h | 2 +- .../AlarmAnalyzeWidget/CWaveListDialog.cpp | 4 +- .../gui/plugin/AlarmAnalyzeWidget/main.cpp | 4 +- .../AlarmManageWidget/AddObjAlarmDialog.cpp | 2 +- .../AlarmManageWidget/AddObjAlarmDialog.h | 2 +- .../AlarmManageWidget/AlarmManageForm.cpp | 4 +- .../AlarmManageWidget/AlarmManageWidget.cpp | 8 +- .../AlarmManageWidget/AlarmManageWidget.h | 4 +- .../gui/plugin/AlarmManageWidget/AlarmMng.cpp | 20 +- .../gui/plugin/AlarmManageWidget/AlarmMng.h | 4 +- .../src/gui/plugin/AlarmManageWidget/main.cpp | 10 +- .../AlarmShieldWidget/CAddShieldDialog.cpp | 8 +- .../plugin/AlarmShieldWidget/CAlarmShield.cpp | 4 +- .../AlarmShieldWidget/CDbInfoManage.cpp | 38 +- .../plugin/AlarmShieldWidget/CDbInfoManage.h | 18 +- .../plugin/AlarmShieldWidget/CHeaderView.cpp | 4 +- .../src/gui/plugin/AlarmShieldWidget/main.cpp | 6 +- .../AlarmStatisWidget/CDataInfoManage.cpp | 62 +- .../AlarmStatisWidget/CDataInfoManage.h | 6 +- .../AlarmStatisWidget/CHisEventManage.cpp | 6 +- .../AlarmStatisWidget/CHisEventManage.h | 4 +- .../plugin/AlarmStatisWidget/CMainWidget.cpp | 10 +- .../plugin/AlarmStatisWidget/CTsdbQuery.cpp | 10 +- .../gui/plugin/AlarmStatisWidget/CTsdbQuery.h | 4 +- .../src/gui/plugin/AlarmStatisWidget/main.cpp | 14 +- .../AlarmWidget/CAccidentReviewDialog.cpp | 4 +- .../AlarmWidget/CAiAlarmDataCollect.cpp | 34 +- .../plugin/AlarmWidget/CAiAlarmDataCollect.h | 20 +- .../plugin/AlarmWidget/CAiAlarmDelegate.cpp | 12 +- .../plugin/AlarmWidget/CAiAlarmMsgInfo.cpp | 2 +- .../gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h | 2 +- .../gui/plugin/AlarmWidget/CAlarmBaseData.cpp | 110 +- .../gui/plugin/AlarmWidget/CAlarmBaseData.h | 10 +- .../plugin/AlarmWidget/CAlarmDataCollect.cpp | 38 +- .../plugin/AlarmWidget/CAlarmDataCollect.h | 24 +- .../gui/plugin/AlarmWidget/CAlarmDelegate.cpp | 12 +- .../plugin/AlarmWidget/CAlarmFilterDialog.cpp | 36 +- .../plugin/AlarmWidget/CAlarmFilterDialog.h | 2 +- .../src/gui/plugin/AlarmWidget/CAlarmForm.cpp | 66 +- .../src/gui/plugin/AlarmWidget/CAlarmForm.h | 6 +- .../AlarmWidget/CAlarmInhibitDialog.cpp | 4 +- .../plugin/AlarmWidget/CAlarmItemModel.cpp | 2 +- .../plugin/AlarmWidget/CAlarmMediaPlayer.cpp | 6 +- .../gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp | 2 +- .../gui/plugin/AlarmWidget/CAlarmMsgInfo.h | 2 +- .../plugin/AlarmWidget/CAlarmMsgManage.cpp | 22 +- .../gui/plugin/AlarmWidget/CAlarmMsgManage.h | 6 +- .../gui/plugin/AlarmWidget/CAlarmPlugin.cpp | 30 +- .../gui/plugin/AlarmWidget/CAlarmSetDlg.cpp | 4 +- .../gui/plugin/AlarmWidget/CAlarmSetMng.cpp | 4 +- .../src/gui/plugin/AlarmWidget/CAlarmSetMng.h | 2 +- .../plugin/AlarmWidget/CAlarmShiledDialog.cpp | 6 +- .../gui/plugin/AlarmWidget/CAlarmWidget.cpp | 10 +- product/src/gui/plugin/AlarmWidget/main.cpp | 10 +- .../gui/plugin/AssetWidget/CAssetDataMng.cpp | 4 +- .../gui/plugin/AssetWidget/CAssetDataMng.h | 2 +- .../gui/plugin/AssetWidget/CAssetDelegate.cpp | 4 +- .../gui/plugin/AssetWidget/CAssetWidget.cpp | 4 +- .../plugin/AssetWidget/CPropertyDialog.cpp | 4 +- .../gui/plugin/AssetWidget/CRecordDialog.cpp | 4 +- .../AssetWidget/CRecordPropertyDialog.cpp | 4 +- product/src/gui/plugin/BIWidget/CBIWidget.cpp | 16 +- product/src/gui/plugin/BIWidget/CBIWidget.h | 2 +- .../CBreadcrumbNavWidget.cpp | 4 +- .../BreadcrumbNavWidget/CNavInfoManage.cpp | 2 +- .../BriefReportWidget/BriefReportWidget.cpp | 10 +- .../plugin/BriefReportWidget/QueryThread.cpp | 2 +- .../plugin/BriefReportWidget/QueryThread.h | 2 +- .../BTRealDataCollect.cpp | 20 +- .../BTRealDataCollect.h | 4 +- .../BusbarTemperatureWidget.cpp | 26 +- .../BusbarTemperatureWidget.h | 6 +- .../plugin/BusbarTemperatureWidget/main.cpp | 4 +- .../ButtonGroupWidget/CButtonGroupWidget.cpp | 2 +- .../plugin/ButtonGroupWidget/CJsonReader.cpp | 2 +- .../ChanStatusWidget/CRealDataCollect.cpp | 42 +- .../ChanStatusWidget/CRealDataCollect.h | 4 +- .../ChanStatusWidget/ChanStatusWidget.cpp | 16 +- .../ChanStatusWidget/ChanStatusWidget.h | 2 +- .../src/gui/plugin/ChanStatusWidget/main.cpp | 12 +- .../gui/plugin/ConstCurves/CConstCurves.cpp | 4 +- .../gui/plugin/ConstCurves/CDbInterface.cpp | 2 +- .../src/gui/plugin/ConstCurves/CDbInterface.h | 2 +- .../gui/plugin/ConstCurves/CMessageManage.cpp | 6 +- .../gui/plugin/ConstCurves/CMessageManage.h | 6 +- product/src/gui/plugin/ConstCurves/main.cpp | 14 +- .../plugin/DataOptWidget/CDataOptWidget.cpp | 16 +- .../gui/plugin/DataOptWidget/CDataOptWidget.h | 6 +- .../gui/plugin/DataOptWidget/CDataOptWork.cpp | 4 +- .../gui/plugin/DataOptWidget/CDataOptWork.h | 4 +- product/src/gui/plugin/DataOptWidget/main.cpp | 10 +- .../plugin/DevHisDataWidget/CDbInterface.cpp | 10 +- .../plugin/DevHisDataWidget/CDbInterface.h | 4 +- .../DevHisDataWidget/CDevHisDataWidget.cpp | 6 +- .../DevHisDataWidget/CDevHisDataWidget.h | 2 +- .../DevHisDataWidget/CHisDataManage.cpp | 2 +- .../plugin/DevHisDataWidget/CHisDataManage.h | 6 +- .../src/gui/plugin/DevHisDataWidget/main.cpp | 14 +- .../plugin/DevRealDataWidget/CDbInterface.cpp | 16 +- .../plugin/DevRealDataWidget/CDbInterface.h | 4 +- .../DevRealDataWidget/CDevRealDataWidget.cpp | 18 +- .../DevRealDataWidget/CDevRealDataWidget.h | 8 +- .../DevRealDataWidget/CRealDataCollect.cpp | 18 +- .../DevRealDataWidget/CRealDataCollect.h | 4 +- .../src/gui/plugin/DevRealDataWidget/main.cpp | 10 +- .../DevSpePointWidget/CDevSpePointWidget.cpp | 52 +- .../DevSpePointWidget/CDevSpePointWidget.h | 16 +- .../DevSpePointWidget/CRealDataCollect.cpp | 20 +- .../DevSpePointWidget/CRealDataCollect.h | 4 +- .../DevSpePointWidget/CRealTableModel.cpp | 12 +- .../DocumentManageWidget/CDocComManage.h | 4 +- .../CDocumentManageWidget.cpp | 4 +- .../EventWidget/CAccidentReviewDialog.cpp | 4 +- .../plugin/EventWidget/CEventDataCollect.cpp | 112 +- .../plugin/EventWidget/CEventDataCollect.h | 12 +- .../gui/plugin/EventWidget/CEventDelegate.cpp | 18 +- .../plugin/EventWidget/CEventFilterDialog.cpp | 32 +- .../plugin/EventWidget/CEventFilterDialog.h | 2 +- .../src/gui/plugin/EventWidget/CEventForm.cpp | 6 +- .../plugin/EventWidget/CEventHisThread.cpp | 12 +- .../gui/plugin/EventWidget/CEventHisThread.h | 4 +- .../plugin/EventWidget/CEventHistoryModel.cpp | 14 +- .../gui/plugin/EventWidget/CEventMsgInfo.cpp | 2 +- .../gui/plugin/EventWidget/CEventMsgInfo.h | 2 +- product/src/gui/plugin/EventWidget/main.cpp | 16 +- .../CFaultRecallRecordWidget.cpp | 22 +- .../CFaultRecallRecordWidget.h | 4 +- .../plugin/FaultRecallRecordWidget/main.cpp | 10 +- .../FaultRecordWidget/FaultRecordWidget.cpp | 18 +- .../FaultRecordWidget/FaultRecordWidget.h | 2 +- .../HangPanelWidget/CHangPanelWidget.cpp | 14 +- .../plugin/HangPanelWidget/CHangPanelWidget.h | 6 +- .../plugin/HangPanelWidget/CHangPanelWork.cpp | 4 +- .../plugin/HangPanelWidget/CHangPanelWork.h | 4 +- .../src/gui/plugin/HangPanelWidget/main.cpp | 10 +- .../plugin/HmiRollWidget/CHmiRollWidget.cpp | 4 +- .../HtmlBrowserWidget/CBrowserWidget.cpp | 36 +- .../plugin/HtmlBrowserWidget/CBrowserWidget.h | 6 +- .../ISCSAlarmWidget/CAiAlarmDataCollect.cpp | 34 +- .../ISCSAlarmWidget/CAiAlarmDataCollect.h | 20 +- .../ISCSAlarmWidget/CAiAlarmDelegate.cpp | 6 +- .../ISCSAlarmWidget/CAiAlarmMsgInfo.cpp | 2 +- .../plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h | 2 +- .../ISCSAlarmWidget/CAlarmDataCollect.cpp | 36 +- .../ISCSAlarmWidget/CAlarmDataCollect.h | 22 +- .../plugin/ISCSAlarmWidget/CAlarmDelegate.cpp | 4 +- .../ISCSAlarmWidget/CAlarmFilterDialog.cpp | 36 +- .../ISCSAlarmWidget/CAlarmFilterDialog.h | 2 +- .../gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp | 62 +- .../ISCSAlarmWidget/CAlarmInhibitDialog.cpp | 4 +- .../ISCSAlarmWidget/CAlarmItemModel.cpp | 66 +- .../plugin/ISCSAlarmWidget/CAlarmItemModel.h | 2 +- .../ISCSAlarmWidget/CAlarmMediaPlayer.cpp | 4 +- .../plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp | 2 +- .../plugin/ISCSAlarmWidget/CAlarmMsgInfo.h | 2 +- .../ISCSAlarmWidget/CAlarmMsgManage.cpp | 86 +- .../plugin/ISCSAlarmWidget/CAlarmMsgManage.h | 12 +- .../plugin/ISCSAlarmWidget/CAlarmPlugin.cpp | 28 +- .../plugin/ISCSAlarmWidget/CAlarmWidget.cpp | 10 +- .../src/gui/plugin/ISCSAlarmWidget/main.cpp | 10 +- .../ISCSEventWidget/CEventDataCollect.cpp | 90 +- .../ISCSEventWidget/CEventDataCollect.h | 12 +- .../ISCSEventWidget/CEventFilterDialog.cpp | 32 +- .../ISCSEventWidget/CEventFilterDialog.h | 2 +- .../gui/plugin/ISCSEventWidget/CEventForm.cpp | 4 +- .../ISCSEventWidget/CEventHistoryModel.cpp | 14 +- .../plugin/ISCSEventWidget/CEventMsgInfo.cpp | 2 +- .../plugin/ISCSEventWidget/CEventMsgInfo.h | 2 +- .../src/gui/plugin/ISCSEventWidget/main.cpp | 16 +- .../plugin/ISCSTrendCurves/CHisDataManage.cpp | 14 +- .../plugin/ISCSTrendCurves/CHisDataManage.h | 38 +- .../ISCSTrendCurves/CHisEventManage.cpp | 2 +- .../plugin/ISCSTrendCurves/CHisEventManage.h | 2 +- .../plugin/ISCSTrendCurves/CPlotWidget.cpp | 22 +- .../gui/plugin/ISCSTrendCurves/CPlotWidget.h | 30 +- .../ISCSTrendCurves/CRealTimeDataCollect.cpp | 22 +- .../ISCSTrendCurves/CRealTimeDataCollect.h | 2 +- .../ISCSTrendCurves/CTrendEditDialog.cpp | 2 +- .../ISCSTrendCurves/CTrendFavTreeWidget.cpp | 8 +- .../ISCSTrendCurves/CTrendInfoManage.cpp | 30 +- .../plugin/ISCSTrendCurves/CTrendInfoManage.h | 4 +- .../plugin/ISCSTrendCurves/CTrendWindow.cpp | 4 +- .../src/gui/plugin/ISCSTrendCurves/main.cpp | 14 +- .../InverseTimeLimit/inversetimelimit.cpp | 2 +- .../plugin/IpcPlusWidget/CRdbAccessUtilty.cpp | 16 +- .../plugin/IpcPlusWidget/CRdbAccessUtilty.h | 2 +- .../plugin/IpcPlusWidget/IpcPlusWidget.cpp | 6 +- .../gui/plugin/IpcPlusWidget/IpcPlusWidget.h | 2 +- product/src/gui/plugin/IpcPlusWidget/main.cpp | 8 +- .../IpcViewerWidget/cipcviewermsgbusmng.cpp | 2 +- .../IpcViewerWidget/cipcviewermsgbusmng.h | 2 +- .../IpcViewerWidget/crdbaccessutilty.cpp | 16 +- .../plugin/IpcViewerWidget/crdbaccessutilty.h | 2 +- .../IpcViewerWidget/ipcviewerwidget.cpp | 4 +- .../src/gui/plugin/IpcViewerWidget/main.cpp | 4 +- .../gui/plugin/IpcWallWidget/VideoWall.cpp | 6 +- .../src/gui/plugin/IpcWallWidget/VideoWall.h | 2 +- product/src/gui/plugin/IpcWallWidget/main.cpp | 8 +- .../plugin/LimitOptWidget/CLimitOptWidget.cpp | 24 +- .../plugin/LimitOptWidget/CLimitOptWidget.h | 6 +- .../plugin/LimitOptWidget/CLimitOptWork.cpp | 18 +- .../gui/plugin/LimitOptWidget/CLimitOptWork.h | 8 +- .../LinkCtrlWidget/CLinkCtrlDataManage.cpp | 30 +- .../LinkCtrlWidget/CLinkCtrlDataManage.h | 16 +- .../LinkCtrlWidget/CLinkCtrlMessageHandle.cpp | 8 +- .../LinkCtrlWidget/CLinkCtrlMessageHandle.h | 12 +- .../LinkCtrlWidget/CLinkCtrlStateManage.cpp | 42 +- .../LinkCtrlWidget/CLinkCtrlStateManage.h | 2 +- .../plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp | 52 +- .../plugin/LinkCtrlWidget/CLinkCtrlWidget.h | 8 +- .../LinkCtrlWidget/CLinkDBInterface.cpp | 64 +- .../plugin/LinkCtrlWidget/CLinkDBInterface.h | 6 +- .../LinkCtrlWidget/CLinkageForHmiApiImpl.cpp | 14 +- .../LinkCtrlWidget/CLinkageForHmiApiImpl.h | 14 +- .../src/gui/plugin/LinkCtrlWidget/main.cpp | 8 +- .../gui/plugin/MediaWidget/CMediaWidget.cpp | 4 +- product/src/gui/plugin/MediaWidget/main.cpp | 4 +- .../CNavigationConfigDialog.cpp | 4 +- .../NavigationWidget/CNavigationWidget.cpp | 10 +- .../OrderManageWidget/COperationOrderForm.cpp | 2 +- .../OrderManageWidget/COrderManageWidget.cpp | 6 +- .../plugin/OrderManageWidget/CSqlDbCtrl.cpp | 6 +- .../gui/plugin/OrderManageWidget/CSqlDbCtrl.h | 2 +- .../plugin/OrderManageWidget/Mainwindow.cpp | 4 +- .../src/gui/plugin/OrderManageWidget/main.cpp | 10 +- .../PointLockWidget/CDbInterfaceMng.cpp | 14 +- .../plugin/PointLockWidget/CDbInterfaceMng.h | 4 +- .../PointLockWidget/CPointLockWidget.cpp | 4 +- .../PointRealDataWidget/CDbInterface.cpp | 8 +- .../plugin/PointRealDataWidget/CDbInterface.h | 6 +- .../CPointRealDataWidget.cpp | 2 +- .../CPointRealDataWidget.h | 2 +- .../PointRealDataWidget/CRealDataCollect.cpp | 20 +- .../PointRealDataWidget/CRealDataCollect.h | 4 +- .../gui/plugin/PointRealDataWidget/main.cpp | 4 +- .../PointsLockWidget/CDbInterfaceMng.cpp | 14 +- .../plugin/PointsLockWidget/CDbInterfaceMng.h | 4 +- .../PointsLockWidget/PointsLockWidget.cpp | 4 +- .../gui/plugin/RelaySettingWidget/CDbMng.cpp | 10 +- .../gui/plugin/RelaySettingWidget/CDbMng.h | 4 +- .../CRelaySettingMsgMng.cpp | 8 +- .../RelaySettingWidget/CRelaySettingMsgMng.h | 8 +- .../CRelaySettingWidget.cpp | 6 +- .../RelaySettingWidget/CRelaySettingWidget.h | 8 +- .../gui/plugin/RelaySettingWidget/main.cpp | 10 +- .../src/gui/plugin/ReportApp/CReportWidget.h | 4 +- .../gui/plugin/ReportWidget/CReportWidget.cpp | 44 +- .../gui/plugin/ReportWidget/CReportWidget.h | 8 +- .../RobotCtrlWidget/CRobotCtrlWidget.cpp | 16 +- .../plugin/RobotCtrlWidget/CRobotCtrlWidget.h | 12 +- .../RobotCtrlWidget/CRobotFileCollect.cpp | 4 +- .../plugin/RobotCtrlWidget/CRobotWidget.cpp | 4 +- .../RobotCtrlWidget/OnTimeQueryThread.cpp | 2 +- .../RobotCtrlWidget/OnTimeQueryThread.h | 2 +- .../plugin/RobotCtrlWidget/SWitchButton.cpp | 6 +- .../gui/plugin/RobotCtrlWidget/SWitchButton.h | 4 +- .../src/gui/plugin/RobotCtrlWidget/main.cpp | 8 +- .../plugin/RobotWidget/CRobotCtrlWidget.cpp | 16 +- .../gui/plugin/RobotWidget/CRobotCtrlWidget.h | 12 +- .../plugin/RobotWidget/CRobotFileCollect.cpp | 4 +- .../gui/plugin/RobotWidget/CRobotWidget.cpp | 4 +- .../plugin/RobotWidget/OnTimeQueryThread.cpp | 2 +- .../plugin/RobotWidget/OnTimeQueryThread.h | 2 +- .../plugin/RobotWidget/OnTimeRecvThread.cpp | 22 +- .../gui/plugin/RobotWidget/OnTimeRecvThread.h | 4 +- product/src/gui/plugin/RobotWidget/main.cpp | 8 +- .../ScheduleWidget/CDutyDefineDialog.cpp | 10 +- .../plugin/ScheduleWidget/CDutySetting.cpp | 18 +- .../gui/plugin/ScheduleWidget/CDutySetting.h | 6 +- .../src/gui/plugin/ScheduleWidget/main.cpp | 8 +- .../CSequenceDBInterface.cpp | 64 +- .../CSequenceDBInterface.h | 8 +- .../CSequenceManageWidget.cpp | 8 +- .../CSequenceManageWidget.h | 2 +- .../gui/plugin/SequenceManageWidget/main.cpp | 8 +- .../plugin/SequenceWidget/CSeqForHmiApi.cpp | 2 +- .../SequenceWidget/CSeqForHmiApiImpl.cpp | 14 +- .../plugin/SequenceWidget/CSeqForHmiApiImpl.h | 14 +- .../plugin/SequenceWidget/CSeqPermDialog.cpp | 2 +- .../plugin/SequenceWidget/CSeqPermDialog.h | 2 +- .../SequenceWidget/CSequenceDataManage.cpp | 38 +- .../SequenceWidget/CSequenceDataManage.h | 14 +- .../SequenceWidget/CSequenceMsgHandle.cpp | 6 +- .../SequenceWidget/CSequenceMsgHandle.h | 10 +- .../SequenceWidget/CSequenceStateManage.cpp | 40 +- .../SequenceWidget/CSequenceStateManage.h | 10 +- .../plugin/SequenceWidget/CSequenceWidget.cpp | 98 +- .../plugin/SequenceWidget/CSequenceWidget.h | 10 +- .../src/gui/plugin/SequenceWidget/main.cpp | 10 +- .../SerialDevStatusWidget/CDataManage.cpp | 16 +- .../SerialDevStatusWidget/CDataManage.h | 10 +- .../CRealDataCollect.cpp | 42 +- .../SerialDevStatusWidget/CRealDataCollect.h | 4 +- .../CSerialDevStatusWidget.cpp | 6 +- .../CSerialDevStatusWidget.h | 2 +- .../gui/plugin/SerialDevStatusWidget/main.cpp | 12 +- .../gui/plugin/ShiftWidget/CRecordWidget.cpp | 2 +- .../gui/plugin/ShiftWidget/CRecordWidget.h | 6 +- .../gui/plugin/ShiftWidget/CShiftWidget.cpp | 10 +- .../src/gui/plugin/ShiftWidget/CShiftWidget.h | 4 +- .../gui/plugin/ShiftWidget/HandoverWidget.cpp | 8 +- .../gui/plugin/ShiftWidget/HandoverWidget.h | 8 +- .../gui/plugin/ShiftWidget/QueryThread.cpp | 4 +- .../src/gui/plugin/ShiftWidget/QueryThread.h | 2 +- .../plugin/ShiftWidget/SelectGroupWidget.cpp | 2 +- .../plugin/ShiftWidget/SelectGroupWidget.h | 6 +- .../gui/plugin/SimOptWidget/CSimOptWidget.cpp | 16 +- product/src/gui/plugin/SimOptWidget/main.cpp | 10 +- .../TelBookWidget/CRelaySettingMsgMng.cpp | 8 +- .../TelBookWidget/CRelaySettingMsgMng.h | 8 +- .../plugin/TelBookWidget/CTelBookWidget.cpp | 4 +- .../gui/plugin/TelBookWidget/CTelBookWidget.h | 4 +- product/src/gui/plugin/TelBookWidget/main.cpp | 10 +- .../gui/plugin/TrendCurves/CHisDataManage.cpp | 18 +- .../gui/plugin/TrendCurves/CHisDataManage.h | 46 +- .../gui/plugin/TrendCurves/CHisEventManage.h | 2 +- .../gui/plugin/TrendCurves/CPlotWidget.cpp | 44 +- .../src/gui/plugin/TrendCurves/CPlotWidget.h | 46 +- .../TrendCurves/CRealTimeDataCollect.cpp | 22 +- .../plugin/TrendCurves/CRealTimeDataCollect.h | 2 +- .../plugin/TrendCurves/CTrendEditDialog.cpp | 2 +- .../TrendCurves/CTrendFavTreeWidget.cpp | 8 +- .../plugin/TrendCurves/CTrendInfoManage.cpp | 38 +- .../gui/plugin/TrendCurves/CTrendInfoManage.h | 10 +- .../gui/plugin/TrendCurves/CTrendWindow.cpp | 6 +- product/src/gui/plugin/TrendCurves/main.cpp | 14 +- .../UserManageWidget/UserManageWidget.cpp | 6 +- .../UserManageWidget/UserManageWidget.h | 2 +- .../src/gui/plugin/UserManageWidget/main.cpp | 10 +- .../WaveAnalyzeWidget/CFileTableWidget.cpp | 4 +- .../WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp | 4 +- .../WebBrowserWidget/CBiCookieManage.cpp | 24 +- .../plugin/WebBrowserWidget/CBiCookieManage.h | 4 +- .../plugin/WebBrowserWidget/CBiTabWidget.cpp | 2 +- .../WebBrowserWidget/CBrowserWidget.cpp | 4 +- .../WebBrowserWidget/CEnergyTabWidget.cpp | 2 +- .../src/gui/plugin/WebBrowserWidget/main.cpp | 10 +- .../plugin/WorkTicket/CWorkTicketManage.cpp | 6 +- .../plugin/WorkTicket/WorkTicketWidget.cpp | 6 +- .../gui/plugin/WorkTicket/WorkTicketWidget.h | 8 +- .../gui/plugin/iDongOpsWidget/CCfgParser.cpp | 4 +- .../gui/plugin/iDongOpsWidget/CCfgParser.h | 4 +- .../plugin/iDongOpsWidget/CReportWidget.cpp | 42 +- .../gui/plugin/iDongOpsWidget/CReportWidget.h | 10 +- product/src/idl_files/AlarmLinkMessage.pb.cc | 50 +- product/src/idl_files/AlarmLinkMessage.pb.h | 62 +- product/src/idl_files/AlarmLinkMessage.proto | 2 +- product/src/idl_files/FesDataMessage.pb.cc | 26 +- product/src/idl_files/FesDataMessage.pb.h | 62 +- product/src/idl_files/FesDataMessage.proto | 2 +- product/src/idl_files/FesFwMessage.pb.cc | 270 ++-- product/src/idl_files/FesFwMessage.pb.h | 384 ++--- product/src/idl_files/FesFwMessage.proto | 2 +- product/src/idl_files/FileSyncBySvn.pb.cc | 90 +- product/src/idl_files/FileSyncBySvn.pb.h | 154 +- product/src/idl_files/FileSyncBySvn.proto | 2 +- product/src/idl_files/FileSynch.pb.cc | 348 ++--- product/src/idl_files/FileSynch.pb.h | 676 ++++---- product/src/idl_files/FileSynch.proto | 2 +- product/src/idl_files/HisAmendMessage.pb.cc | 58 +- product/src/idl_files/HisAmendMessage.pb.h | 58 +- product/src/idl_files/HisAmendMessage.proto | 2 +- product/src/idl_files/LinkageMessage.pb.cc | 864 +++++------ product/src/idl_files/LinkageMessage.pb.h | 1380 ++++++++--------- product/src/idl_files/LinkageMessage.proto | 2 +- product/src/idl_files/OpcMessage.pb.cc | 166 +- product/src/idl_files/OpcMessage.pb.h | 382 ++--- product/src/idl_files/OpcMessage.proto | 2 +- product/src/idl_files/SequenceMessage.pb.cc | 690 ++++----- product/src/idl_files/SequenceMessage.pb.h | 1136 +++++++------- product/src/idl_files/SequenceMessage.proto | 2 +- .../src/idl_files/VideoControlMessage.pb.cc | 76 +- .../src/idl_files/VideoControlMessage.pb.h | 144 +- .../src/idl_files/VideoControlMessage.proto | 2 +- .../application/idong_srv_api/CIDongSrvApi.h | 6 +- .../linkage_server_api/CLinkageForHmiApi.h | 2 +- .../linkage_server_api/CLinkageForServerApi.h | 2 +- .../sequence_server_api/CSeqForHmiApi.h | 2 +- .../sequence_server_api/CSeqForServerApi.h | 2 +- .../sys/sys_file_sync_api/FilesyncApi.h | 4 +- .../sys/sys_file_sync_api/FilesyncApiCommon.h | 4 +- .../sys_file_sync_api/filesyncapifortool.h | 6 +- .../sys_svn_file_sync_api/CSysFileSyncApi.h | 20 +- .../sys/sys_svn_file_sync_api/structdDefine.h | 2 +- .../src/service/calc_server/CalcDefTable.h | 4 +- .../src/service/calc_server/CalcInParaTable.h | 4 +- .../src/service/calc_server/CalcMsgBusMng.cpp | 22 +- .../src/service/calc_server/CalcMsgBusMng.h | 12 +- .../service/calc_server/CalcOutParaTable.h | 4 +- .../calc_server/CalcRtdbTableOperate.cpp | 22 +- .../calc_server/CalcRtdbTableOperate.h | 14 +- .../src/service/calc_server/CalcServerApp.cpp | 34 +- .../src/service/calc_server/CalcServerApp.h | 16 +- .../service/calc_server/CalcServerCommon.h | 6 +- .../src/service/calc_server/CalcServerMng.cpp | 10 +- .../src/service/calc_server/CalcServerMng.h | 14 +- .../service/calc_server/CalcServerThread.cpp | 94 +- .../service/calc_server/CalcServerThread.h | 30 +- product/src/service/calc_server/main.cpp | 2 +- .../stat_server/stat_server/CComputeTask.cpp | 76 +- .../stat_server/stat_server/CComputeTask.h | 4 +- .../stat_server/stat_server/CComputeUnit.cpp | 36 +- .../stat_server/stat_server/CComputeUnit.h | 4 +- .../stat_server/CComputeWorker.cpp | 14 +- .../stat_server/stat_server/CComputeWorker.h | 4 +- .../stat_server/CMainThreadMng.cpp | 14 +- .../stat_server/stat_server/CMainThreadMng.h | 8 +- .../service/stat_server/stat_server/CPara.cpp | 14 +- .../service/stat_server/stat_server/CPara.h | 4 +- .../stat_server/stat_server/CParaGrp.cpp | 14 +- .../stat_server/stat_server/CParaGrp.h | 2 +- .../stat_server/stat_server/CParaPoint.cpp | 12 +- .../stat_server/stat_server/CParaPoint.h | 4 +- .../stat_server/stat_server/CParaTime.cpp | 42 +- .../stat_server/stat_server/CParaTime.h | 4 +- .../stat_server/CPublishWorker.cpp | 44 +- .../stat_server/stat_server/CPublishWorker.h | 16 +- .../stat_server/CRdbReloadWorker.cpp | 144 +- .../stat_server/CRdbReloadWorker.h | 28 +- .../service/stat_server/stat_server/CRet.cpp | 14 +- .../service/stat_server/stat_server/CRet.h | 4 +- .../stat_server/stat_server/CRetGrp.cpp | 10 +- .../service/stat_server/stat_server/CRetGrp.h | 4 +- .../stat_server/stat_server/CRetPara.cpp | 20 +- .../stat_server/stat_server/CRetPara.h | 4 +- .../stat_server/CStatMsgBusMng.cpp | 18 +- .../stat_server/stat_server/CStatMsgBusMng.h | 12 +- .../stat_server/stat_server/CStatSrvApp.cpp | 42 +- .../stat_server/stat_server/CStatSrvApp.h | 16 +- .../stat_server/stat_server/CStatSrvMng.cpp | 8 +- .../stat_server/stat_server/CStatSrvMng.h | 10 +- .../stat_server/stat_server/CStatTemplate.h | 4 +- .../stat_server/CSubDpChgWorker.cpp | 60 +- .../stat_server/stat_server/CSubDpChgWorker.h | 18 +- .../stat_server/stat_server/RdbTable.h | 4 +- .../stat_server/stat_server/StatCommon.h | 4 +- .../service/stat_server/stat_server/main.cpp | 2 +- .../stat_server_function/CLuaBuiltInFunc.cpp | 176 +-- .../stat_server_function/CLuaBuiltInFunc.h | 4 +- .../stat_server_function/CStatServerFunc.cpp | 2 +- .../stat_server_function/CStatServerFunc.h | 2 +- .../stat_server_function/StatUtil.cpp | 312 ++-- .../stat_server_function/StatUtil.h | 78 +- .../src/sys/sys_file_sync/appconfigparse.cpp | 16 +- .../src/sys/sys_file_sync/appconfigparse.h | 4 +- .../src/sys/sys_file_sync/appprocessquit.h | 2 +- product/src/sys/sys_file_sync/appredundant.h | 2 +- product/src/sys/sys_file_sync/appservice.cpp | 14 +- product/src/sys/sys_file_sync/appservice.h | 12 +- .../sys/sys_file_sync/appservicethread.cpp | 2 +- .../src/sys/sys_file_sync/appservicethread.h | 6 +- product/src/sys/sys_file_sync/checkignore.cpp | 2 +- product/src/sys/sys_file_sync/def.h | 2 +- .../sys/sys_file_sync/exebroadcasttask.cpp | 6 +- .../src/sys/sys_file_sync/exebroadcasttask.h | 2 +- .../src/sys/sys_file_sync/exetaskfilenode.cpp | 2 +- .../src/sys/sys_file_sync/exetaskfilenode.h | 2 +- .../src/sys/sys_file_sync/filesyncserver.cpp | 16 +- .../src/sys/sys_file_sync/filesyncserver.h | 4 +- .../sys_file_sync/filesyncservicethread.cpp | 8 +- .../sys/sys_file_sync/filesyncservicethread.h | 4 +- .../src/sys/sys_file_sync/localfilereader.cpp | 2 +- .../src/sys/sys_file_sync/localfilereader.h | 2 +- .../src/sys/sys_file_sync/localfilewriter.cpp | 2 +- .../src/sys/sys_file_sync/localfilewriter.h | 2 +- .../src/sys/sys_file_sync/modulembcomm.cpp | 20 +- product/src/sys/sys_file_sync/modulembcomm.h | 20 +- .../src/sys/sys_file_sync/receiverthread.cpp | 18 +- .../src/sys/sys_file_sync/receiverthread.h | 8 +- .../src/sys/sys_file_sync/senderthread.cpp | 10 +- product/src/sys/sys_file_sync/senderthread.h | 6 +- .../src/sys/sys_file_sync_api/FilesyncApi.cpp | 4 +- .../sys/sys_file_sync_api/FilesyncApiImpl.cpp | 22 +- .../sys_file_sync_api/SimpleFilesyncApiImpl.h | 12 +- .../sys_file_sync_api/filesyncapifortool.cpp | 4 +- .../src/sys/sys_startup/BrushDataThread.cpp | 4 +- product/src/sys/sys_startup/BrushDataThread.h | 4 +- product/src/sys/sys_startup/ButtonForm.cpp | 26 +- product/src/sys/sys_startup/DataMng.cpp | 6 +- product/src/sys/sys_startup/DbCheck.cpp | 12 +- product/src/sys/sys_startup/DbCheck.h | 8 +- product/src/sys/sys_startup/DbCheckSync.cpp | 4 +- product/src/sys/sys_startup/DbCheckSync.h | 8 +- product/src/sys/sys_startup/DogCheck.cpp | 2 +- product/src/sys/sys_startup/Main.cpp | 6 +- product/src/sys/sys_startup/MainWindow.cpp | 36 +- product/src/sys/sys_startup/MainWindow.h | 2 +- .../src/sys/sys_startup/OnTimeCheckThread.cpp | 2 +- product/src/sys/sys_startup/ProcMngForm.cpp | 8 +- product/src/sys/sys_startup/SetupFunc.h | 4 +- .../src/sys/sys_startup/SetupFuncLinux.cpp | 8 +- .../src/sys/sys_startup/SetupFuncWindows.cpp | 8 +- product/src/sys/sys_startup/SheetStyle.cpp | 2 +- .../sys/sys_svn_file_sync/CFileSyncThread.cpp | 156 +- .../sys/sys_svn_file_sync/CFileSyncThread.h | 32 +- .../sys/sys_svn_file_sync/CSysFileSync.cpp | 40 +- .../src/sys/sys_svn_file_sync/CSysFileSync.h | 18 +- .../sys/sys_svn_file_sync/FileSyncCommon.h | 4 +- product/src/sys/sys_svn_file_sync/main.cpp | 2 +- .../sys_svn_file_sync_api/CSysFileSyncApi.cpp | 44 +- .../src/tools/DataImput_cfd_tool/CSvnThread.h | 4 +- .../Client_DataProThread.cpp | 36 +- .../DataImput_cfd_tool/Client_DataProThread.h | 2 +- .../tools/DataImput_cfd_tool/MainWidget.cpp | 10 +- product/src/tools/DataImput_cfd_tool/main.cpp | 2 +- .../CDevGroupLockWidget.cpp | 6 +- product/src/tools/ReportEdit/main.cpp | 2 +- product/src/tools/calc_lua_api/CCalcLua.cpp | 4 +- .../camera_statistics/ccameraorientation.cpp | 4 +- .../camera_statistics/ccameraorientation.h | 4 +- product/src/tools/camera_statistics/main.cpp | 4 +- product/src/tools/debug_tool/CDataMng.cpp | 2 +- product/src/tools/debug_tool/CDataMng.h | 2 +- product/src/tools/debug_tool/CDebugTool.cpp | 12 +- .../tools/debug_tool/CEventDataCollect.cpp | 98 +- .../src/tools/debug_tool/CEventDataCollect.h | 14 +- .../src/tools/debug_tool/CEventDelegate.cpp | 10 +- .../src/tools/debug_tool/CEventMsgInfo.cpp | 2 +- product/src/tools/debug_tool/CEventMsgInfo.h | 2 +- product/src/tools/debug_tool/CRdbWorker.cpp | 6 +- product/src/tools/debug_tool/CRdbWorker.h | 8 +- .../src/tools/debug_tool/CRealDataControl.cpp | 62 +- .../src/tools/debug_tool/CRealDataControl.h | 8 +- .../src/tools/debug_tool/CRealDataSelect.h | 2 +- .../src/tools/debug_tool/CRealDataWatch.cpp | 2 +- product/src/tools/debug_tool/CRealDataWatch.h | 4 +- .../debug_tool/CRealDatabaseItemInfo.cpp | 20 +- .../tools/debug_tool/CRealDatabaseItemInfo.h | 4 +- .../tools/debug_tool/CRealDatabaseSelect.h | 2 +- .../tools/debug_tool/CRealDatabaseShow.cpp | 44 +- .../src/tools/debug_tool/CRealDatabaseShow.h | 20 +- product/src/tools/debug_tool/CStatusDialog.h | 2 +- .../src/tools/debug_tool/CSystemResources.cpp | 22 +- .../src/tools/debug_tool/CSystemResources.h | 8 +- .../src/tools/debug_tool/CUpdateThread.cpp | 16 +- product/src/tools/debug_tool/CUpdateThread.h | 6 +- product/src/tools/debug_tool/CommonSheet.cpp | 2 +- product/src/tools/debug_tool/FesDef.h | 2 +- product/src/tools/debug_tool/chanmondlg.cpp | 2 +- product/src/tools/debug_tool/chanmondlg.h | 2 +- product/src/tools/debug_tool/main.cpp | 6 +- .../alarmpushplugin/alarmpushdlg.cpp | 4 +- .../alarmpushplugin/pushtypedlg.cpp | 2 +- .../alarmpushplugin/userchoosedlg.cpp | 2 +- .../CPointPropertySet.cpp | 2 +- .../CSinglePropertySet.cpp | 2 +- .../fbd_plugins/multimapplugin/mapcfgdlg.cpp | 2 +- product/src/tools/file_sync_tool/main.cpp | 10 +- .../src/tools/file_sync_tool/mainwindow.cpp | 10 +- product/src/tools/file_sync_tool/mainwindow.h | 2 +- product/src/tools/file_sync_tool/msgtrans.cpp | 2 +- product/src/tools/file_sync_tool/msgtrans.h | 4 +- .../src/tools/file_sync_tool/treeupdatefun.h | 2 +- .../src/tools/his_event_del/CCheckUser.cpp | 4 +- product/src/tools/his_event_del/CCheckUser.h | 4 +- product/src/tools/his_event_del/CDbOpt.cpp | 82 +- product/src/tools/his_event_del/CDbOpt.h | 6 +- .../his_event_del/CEventFilterDialog.cpp | 32 +- .../tools/his_event_del/CEventFilterDialog.h | 2 +- .../src/tools/his_event_del/CEventForm.cpp | 8 +- .../his_event_del/CEventHistoryModel.cpp | 6 +- .../src/tools/his_event_del/CInfluxdbOpt.cpp | 4 +- .../src/tools/his_event_del/CInfluxdbOpt.h | 2 +- .../PCPMS_IP_Setting/IPSetting.cpp | 4 +- .../ScreenBrightnessSetting.cpp | 4 +- .../StaticsWidget/statlinkinstdlg.cpp | 4 +- .../model_plan_curve/CDbInterface.cpp | 2 +- .../model_plan_curve/CDbInterface.h | 2 +- .../model_plan_curve/CPlanCurvesConfigure.cpp | 4 +- .../model_plugin/model_plan_curve/main.cpp | 14 +- product/src/tools/opc_tool/MainWindow.cpp | 26 +- product/src/tools/opc_tool/MainWindow.h | 4 +- product/src/tools/opc_tool/OpcWorkThread.cpp | 30 +- product/src/tools/opc_tool/OpcWorkThread.h | 6 +- .../playerCfgParser/CPlayerCfgParser.cpp | 4 +- .../tools/setup/setup_installer/SetupFunc.h | 4 +- .../setup/setup_installer/SetupFuncLinux.cpp | 4 +- .../setup_installer/SetupFuncWindows.cpp | 4 +- .../setup/setup_installer/SetupWidget.cpp | 20 +- .../setup_installer/SingleProcInstance.cpp | 12 +- .../setup_installer/SingleProcInstance.h | 4 +- .../src/tools/setup/setup_installer/main.cpp | 2 +- .../tools/setup/setup_uninstall/SetupFunc.h | 4 +- .../setup/setup_uninstall/SetupFuncLinux.cpp | 4 +- .../setup_uninstall/SetupFuncWindows.cpp | 4 +- .../setup/setup_uninstall/SetupWidget.cpp | 10 +- .../setup_install_helper/SetupWidget.cpp | 4 +- .../tools/svn_file_sync_tool/CSvnThread.cpp | 6 +- .../src/tools/svn_file_sync_tool/CSvnThread.h | 4 +- .../tools/svn_file_sync_tool/MainWidget.cpp | 8 +- product/src/tools/svn_file_sync_tool/main.cpp | 2 +- .../upgrade_install_helper/upgrade_db.cpp | 14 +- product/src/z_discard/db_api/DbBase.cpp | 2 +- product/src/z_discard/db_api/DbBase.h | 2 +- product/src/z_discard/db_api/DbMaster.cpp | 2 +- product/src/z_discard/db_api/DbMaster.h | 8 +- product/src/z_discard/db_api/DbMySQL.cpp | 2 +- product/src/z_discard/db_api/DbMySQL.h | 2 +- product/src/z_discard/db_api/DbODBC.cpp | 2 +- product/src/z_discard/db_api/DbODBC.h | 2 +- product/src/z_discard/db_api/DbOci.cpp | 2 +- product/src/z_discard/db_api/DbOci.h | 2 +- product/src/z_discard/db_api/DbSQLite.cpp | 2 +- product/src/z_discard/db_api/DbSQLite.h | 2 +- product/src/z_discard/db_api/QDbInterface.cpp | 10 +- .../db_model_api/CDbModelApiImpl.cpp | 14 +- .../z_discard/db_model_api/CDbModelApiImpl.h | 6 +- .../db_model_server/CDbModelRedundant.cpp | 2 +- .../db_model_server/CDbModelRedundant.h | 6 +- .../db_model_server/CDbModelService.cpp | 22 +- .../db_model_server/CDbModelService.h | 6 +- .../db_model_server/CDbModelServiceThread.cpp | 12 +- .../db_model_server/CDbModelServiceThread.h | 6 +- .../CDbModelServiceWorkThread.cpp | 6 +- .../CDbModelServiceWorkThread.h | 30 +- .../fbd_plugins/alarmplugin/alarmplugin.cpp | 2 +- .../z_discard/fbd_plugins/dlgs/DAOContrl.cpp | 2 +- .../src/z_discard/fbd_plugins/dlgs/alarm.cpp | 2 +- .../fbd_plugins/reffplugin/reffplugin.cpp | 2 +- .../fbd_plugins/refplugin/refplugin.cpp | 2 +- .../fbd_plugins/setAOplugin/setAOplugin.cpp | 2 +- .../fbd_plugins/setDOplugin/setDOplugin.cpp | 2 +- .../idl_files/ModelServerMessage.pb.cc | 146 +- .../idl_files/ModelServerMessage.pb.h | 204 +-- .../idl_files/ModelServerMessage.proto | 2 +- .../z_discard/include/db_api/QDbInterface.h | 2 +- .../include/db_model_api/CDbModelApi.h | 2 +- .../z_discard/sys_ftp_sync/CDownloadFile.cpp | 66 +- .../z_discard/sys_ftp_sync/CDownloadFile.h | 30 +- .../src/z_discard/sys_ftp_sync/CFileSync.cpp | 44 +- .../src/z_discard/sys_ftp_sync/CFileSync.h | 16 +- .../z_discard/sys_ftp_sync/CFileSyncMng.cpp | 16 +- .../src/z_discard/sys_ftp_sync/CFileSyncMng.h | 16 +- .../z_discard/sys_ftp_sync/CSendFileInfo.cpp | 56 +- .../z_discard/sys_ftp_sync/CSendFileInfo.h | 16 +- .../z_discard/sys_ftp_sync/CUploadFile.cpp | 56 +- .../src/z_discard/sys_ftp_sync/CUploadFile.h | 24 +- .../z_discard/sys_ftp_sync/FileSyncCommon.h | 2 +- product/src/z_discard/sys_ftp_sync/main.cpp | 2 +- 1347 files changed, 10790 insertions(+), 10790 deletions(-) diff --git a/product/src/application/DataImput_cfd/Client_DataProThread.cpp b/product/src/application/DataImput_cfd/Client_DataProThread.cpp index bdb23227..c58bfd58 100644 --- a/product/src/application/DataImput_cfd/Client_DataProThread.cpp +++ b/product/src/application/DataImput_cfd/Client_DataProThread.cpp @@ -17,7 +17,7 @@ clienDataprothread::clienDataprothread(QVector devgroupVec,QString sy :CTimerThreadBase("Client_cfd_DataProThread", clientszdtThreadtime, 0, true),haveValue(false),m_noFirst(0) { LOGFATAL( "线程1 !" ); - if (!kbd_dbms::initTsdbApi()) + if (!iot_dbms::initTsdbApi()) { LOGERROR("initTsdbApi() failed !"); //return 1; @@ -36,7 +36,7 @@ clienDataprothread::clienDataprothread(QVector devgroupVec,QString sy clienDataprothread::~clienDataprothread() { - if (!kbd_dbms::releaseTsdbApi()) + if (!iot_dbms::releaseTsdbApi()) { LOGERROR("releaseTsdbApi() failed !"); @@ -200,7 +200,7 @@ bool clienDataprothread::InsertHisPointDB(DEVPOINT point, QDateTime beginTime, Q } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -211,7 +211,7 @@ bool clienDataprothread::InsertHisPointDB(DEVPOINT point, QDateTime beginTime, Q } QSqlQuery query( m_oracleConnection ); - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); QString strdatetTime=beginTime.toString("yyyy-MM-dd 00:00:00"); QDateTime qdt=endTime; @@ -224,34 +224,34 @@ bool clienDataprothread::InsertHisPointDB(DEVPOINT point, QDateTime beginTime, Q boost::int64_t nTimeEnd= endTime.toMSecsSinceEpoch() ; int count=1; - std::vector curveKey(count); - // std::vector *> vecResult; - // vecResult.push_back(new std::vector); + std::vector curveKey(count); + // std::vector *> vecResult; + // vecResult.push_back(new std::vector); curveKey[0].m_pszTagName = point.tag_name.c_str(); if(point.table_name =="analog") { - curveKey[0].m_enType = kbd_dbms::MPT_AI; + curveKey[0].m_enType = iot_dbms::MPT_AI; } else if(point.table_name == "accuml") { - curveKey[0].m_enType = kbd_dbms::MPT_ACC; + curveKey[0].m_enType = iot_dbms::MPT_ACC; } else if(point.table_name == "digital") { - curveKey[0].m_enType = kbd_dbms::MPT_DI; + curveKey[0].m_enType = iot_dbms::MPT_DI; } - std::vector *> vecResult; - vecResult.push_back(new std::vector); + std::vector *> vecResult; + vecResult.push_back(new std::vector); - // if(kbd_dbms::getHisValue(objConn, -1, curveKey, -1, nTimeEnd, - // NULL, NULL, NULL,NULL,NULL,kbd_dbms::CM_LAST, -1,kbd_dbms::FM_NONE, vecResult)== false) + // if(iot_dbms::getHisValue(objConn, -1, curveKey, -1, nTimeEnd, + // NULL, NULL, NULL,NULL,NULL,iot_dbms::CM_LAST, -1,iot_dbms::FM_NONE, vecResult)== false) - if(kbd_dbms::getHisValue(objConn, -1, curveKey, nTimeBegin, nTimeEnd, - NULL, NULL, NULL,NULL,NULL,kbd_dbms::CM_NULL, -1,kbd_dbms::FM_NONE, vecResult)== false) + if(iot_dbms::getHisValue(objConn, -1, curveKey, nTimeBegin, nTimeEnd, + NULL, NULL, NULL,NULL,NULL,iot_dbms::CM_NULL, -1,iot_dbms::FM_NONE, vecResult)== false) { QString errorInfo = QString("查询数据库错误:code:%1 table:%2 begin:%3 timeEnd:%4 size:%5 ").arg(curveKey[0].m_pszTagName) .arg(curveKey[0].m_enType).arg(nTimeBegin).arg(nTimeEnd).arg(vecResult.size()); @@ -369,8 +369,8 @@ struct memory { int clienDataprothread::readConfigForGenerate() { - kbd_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(kbd_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) + iot_public::CCommonConfigParse objCfgParse; + if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) { LOGERROR("加载HTTP转发配置文件失败"); return kbdFailed; diff --git a/product/src/application/DataImput_cfd/Client_DataProThread.h b/product/src/application/DataImput_cfd/Client_DataProThread.h index 5f1ec887..5653f023 100644 --- a/product/src/application/DataImput_cfd/Client_DataProThread.h +++ b/product/src/application/DataImput_cfd/Client_DataProThread.h @@ -17,7 +17,7 @@ #include "qdatetime.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; typedef struct aa { string tag_name; //本地代码 @@ -97,7 +97,7 @@ private: // bool initDevroup(); //初始化所有设备组信息 // bool initCurrentGroup(); //初始化需要发送的设备组信息 // void initKbdService(); //订阅需要的测点 -// void dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg); +// void dealMsgFromNetMsgBus(const iot_net::CMbMessage& objMsg); // bool initDbInterface(); //连接数据库 int readConfigForGenerate(); diff --git a/product/src/application/DataImput_cfd/Client_MsgManger.cpp b/product/src/application/DataImput_cfd/Client_MsgManger.cpp index ad9ed86a..2d0a67a7 100644 --- a/product/src/application/DataImput_cfd/Client_MsgManger.cpp +++ b/product/src/application/DataImput_cfd/Client_MsgManger.cpp @@ -11,7 +11,7 @@ client_MsgManger::client_MsgManger() m_pDpSub(NULL) { curl_global_init(CURL_GLOBAL_DEFAULT); - m_pDpSub = new kbd_service::CDpcdaForApp(); + m_pDpSub = new iot_service::CDpcdaForApp(); if(m_pDpSub->initGlobalThread()) { LOGINFO("初始化全局成功"); @@ -112,7 +112,7 @@ void client_MsgManger::execute() m_first=true; if(m_pComm==nullptr) { - m_pComm = new kbd_net::CMbCommunicator(); + m_pComm = new iot_net::CMbCommunicator(); int nRet = kbdSuccess; if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { @@ -127,11 +127,11 @@ void client_MsgManger::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 ); } @@ -183,7 +183,7 @@ void client_MsgManger::onCommun() int nRet = kbdSuccess; if(m_pComm==nullptr) { - m_pComm = new kbd_net::CMbCommunicator(); + m_pComm = new iot_net::CMbCommunicator(); if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); @@ -197,7 +197,7 @@ void client_MsgManger::onCommun() } if(m_pDpSub == nullptr) { - m_pDpSub = new kbd_service::CDpcdaForApp(); + m_pDpSub = new iot_service::CDpcdaForApp(); initKbdService(); } @@ -205,7 +205,7 @@ void client_MsgManger::onCommun() bool client_MsgManger::initDevroup() { - kbd_dbms::CDbApi *m_pObjDbInterface = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi *m_pObjDbInterface = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pObjDbInterface->open()) { LOGERROR("数据库接口打开失败"); @@ -396,10 +396,10 @@ void client_MsgManger::initKbdService() } } -void client_MsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg) +void client_MsgManger::dealMsgFromNetMsgBus(const iot_net::CMbMessage& objMsg) { // 反序列化 - kbd_idlfile::SRealTimeDataPkg objPkg; + iot_idl::SRealTimeDataPkg objPkg; QVector DistributionUpdateDevGroup; /* QVector MeterUpdateDevGroup; QVector ProtectorUpdateDevGroup; @@ -418,7 +418,7 @@ void client_MsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg) for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); @@ -494,7 +494,7 @@ void client_MsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg) for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); @@ -532,7 +532,7 @@ void client_MsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg) for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); @@ -569,7 +569,7 @@ void client_MsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg) for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); diff --git a/product/src/application/DataImput_cfd/Client_MsgManger.h b/product/src/application/DataImput_cfd/Client_MsgManger.h index d9e99b1d..1e2ffee5 100644 --- a/product/src/application/DataImput_cfd/Client_MsgManger.h +++ b/product/src/application/DataImput_cfd/Client_MsgManger.h @@ -31,12 +31,12 @@ private: bool initDevroup(); //初始化所有设备组信息 bool initCurrentGroup(); //初始化需要发送的设备组信息 void initKbdService(); //订阅需要的测点 - void dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg); + void dealMsgFromNetMsgBus(const iot_net::CMbMessage& objMsg); void dealDayFromHistory(); void initClient();//建立客户端 void initSignalSlot(); private: - kbd_net::CMbCommunicator* m_pComm; + iot_net::CMbCommunicator* m_pComm; QString m_systemName; QMap> m_currentDevGroup; // QMap allDevGroup; @@ -45,7 +45,7 @@ private: QMap m_pointInfo; QVector m_allDevGorup; QVector m_point; - kbd_service::CDpcdaForApp* m_pDpSub;// 订阅服务接口 + iot_service::CDpcdaForApp* m_pDpSub;// 订阅服务接口 qint64 lastUpateTime; bool m_first=false;//确认是否第一次启动 diff --git a/product/src/application/DataImput_cfd/Client_cfd.cpp b/product/src/application/DataImput_cfd/Client_cfd.cpp index ede8e06d..312ffce7 100644 --- a/product/src/application/DataImput_cfd/Client_cfd.cpp +++ b/product/src/application/DataImput_cfd/Client_cfd.cpp @@ -12,19 +12,19 @@ client_cfd::client_cfd() client_cfd::~client_cfd() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool client_cfd::start(int argc, char *argv[], int &nStatus) { assert( !m_ptrRedunSw ); //< NULL - kbd_public::CSysInfoInterfacePtr ptrSysInfo; + iot_public::CSysInfoInterfacePtr ptrSysInfo; EnRunModel enRunModel = RM_NORMAL; std::string strAppName = CN_AppName_COMAPP; //< 启动日志 - kbd_public::StartLogSystem( strAppName.c_str(), EZ_NYGK_PROC_NAME ); - if ( kbd_public::createSysInfoInstance(ptrSysInfo) == false ) + iot_public::StartLogSystem( strAppName.c_str(), EZ_NYGK_PROC_NAME ); + if ( iot_public::createSysInfoInstance(ptrSysInfo) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); return false; @@ -53,7 +53,7 @@ bool client_cfd::start(int argc, char *argv[], int &nStatus) } //< 消息总线 - if ( !kbd_net::initMsgBus( EZ_NYGK_PROC_NAME, "", true )) + if ( !iot_net::initMsgBus( EZ_NYGK_PROC_NAME, "", true )) { LOGFATAL( "消息总线初始化失败，程序启动失败！" ); return false; @@ -81,13 +81,13 @@ bool client_cfd::start(int argc, char *argv[], int &nStatus) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = m_stRunAppInfo.nAppId; objProcInfo.nDomainId = m_stRunAppInfo.nDomainId; objProcInfo.strNodeName = m_stRunAppInfo.strLocalNodeName; objProcInfo.strProcName = EZ_NYGK_PROC_NAME; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance( objProcInfo ); + m_ptrProcMng = iot_sys::getProcMngInstance( objProcInfo ); if ( !m_ptrProcMng ) { LOGFATAL( "getProcMngInstance return NULL" ); @@ -98,7 +98,7 @@ bool client_cfd::start(int argc, char *argv[], int &nStatus) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance( m_stRunAppInfo.nDomainId, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance( m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId, m_stRunAppInfo.strLocalNodeName ); @@ -189,11 +189,11 @@ bool client_cfd::stop() } //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -216,7 +216,7 @@ int client_cfd::updateProcInfo(bool bActive, bool bMaster, bool bSlave) bool client_cfd::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning( EZ_NYGK_PROC_NAME ); + return iot_public::CSingleProcInstance::hasInstanceRunning( EZ_NYGK_PROC_NAME ); } bool client_cfd::parseCommandLine( int argc, char *argv[], EnRunModel &enRunModel, std::string &strAppName ) diff --git a/product/src/application/DataImput_cfd/Client_cfd.h b/product/src/application/DataImput_cfd/Client_cfd.h index 578f756d..bd2b20dd 100644 --- a/product/src/application/DataImput_cfd/Client_cfd.h +++ b/product/src/application/DataImput_cfd/Client_cfd.h @@ -20,7 +20,7 @@ enum EnRunModel RM_NO_PROC_MNG_SLAVE, //< 不注册进程管理、冗余管理，备机模式 }; -class client_cfd final:public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class client_cfd final:public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: client_cfd(); @@ -41,10 +41,10 @@ private: CWebSrvRedunSwPtr m_ptrRedunSw; private: - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; //< 运行参数 - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; bool parseCommandLine( int argc, char *argv[], EnRunModel &enRunModel, std::string &strAppName); bool isAlreadyRunning(); }; diff --git a/product/src/application/DataImput_cfd/WebSrvRedunSw.h b/product/src/application/DataImput_cfd/WebSrvRedunSw.h index 9254e05f..12ebc56c 100644 --- a/product/src/application/DataImput_cfd/WebSrvRedunSw.h +++ b/product/src/application/DataImput_cfd/WebSrvRedunSw.h @@ -14,7 +14,7 @@ namespace cfd_Server { class client_cfd; -class CWebSrvRedunSw final : public ::kbd_sys::CRedundantSwitchInterface +class CWebSrvRedunSw final : public ::iot_sys::CRedundantSwitchInterface { public: explicit CWebSrvRedunSw(client_cfd *pParent ); diff --git a/product/src/application/alarm_send_server/CAlmJson.cpp b/product/src/application/alarm_send_server/CAlmJson.cpp index 199a87de..8d65b931 100644 --- a/product/src/application/alarm_send_server/CAlmJson.cpp +++ b/product/src/application/alarm_send_server/CAlmJson.cpp @@ -3,17 +3,17 @@ -kbd_service::CAlmJson::CAlmJson() +iot_service::CAlmJson::CAlmJson() { } -kbd_service::CAlmJson::~CAlmJson() +iot_service::CAlmJson::~CAlmJson() { } -bool kbd_service::CAlmJson::generateAlmInfoToJson(const stAlmInfo &_item, std::string &_json) +bool iot_service::CAlmJson::generateAlmInfoToJson(const stAlmInfo &_item, std::string &_json) { _json.clear(); Document doc; @@ -39,7 +39,7 @@ bool kbd_service::CAlmJson::generateAlmInfoToJson(const stAlmInfo &_item, std::s return false; } -bool kbd_service::CAlmJson::generateTokenRequest(std::string &json, std::string &apiId, std::string &apiSecret) +bool iot_service::CAlmJson::generateTokenRequest(std::string &json, std::string &apiId, std::string &apiSecret) { json.clear(); Document doc; @@ -63,7 +63,7 @@ bool kbd_service::CAlmJson::generateTokenRequest(std::string &json, std::string return false; } -bool kbd_service::CAlmJson::parseTokenRequest(std::string &json, std::string &apiId, std::string &apiSecret, std::string &errStr) +bool iot_service::CAlmJson::parseTokenRequest(std::string &json, std::string &apiId, std::string &apiSecret, std::string &errStr) { Document doc; doc.Parse<0>(json.c_str()); @@ -92,7 +92,7 @@ bool kbd_service::CAlmJson::parseTokenRequest(std::string &json, std::string &ap return true; } -bool kbd_service::CAlmJson::generateTokenReponse(std::string &json, std::string &msg, int &code, std::string &token) +bool iot_service::CAlmJson::generateTokenReponse(std::string &json, std::string &msg, int &code, std::string &token) { json.clear(); Document doc; @@ -120,7 +120,7 @@ bool kbd_service::CAlmJson::generateTokenReponse(std::string &json, std::string return false; } -bool kbd_service::CAlmJson::parseTokenReponse(std::string &json, std::string &msg, int &code, std::string &token,std::string &errStr) +bool iot_service::CAlmJson::parseTokenReponse(std::string &json, std::string &msg, int &code, std::string &token,std::string &errStr) { Document doc; doc.Parse<0>(json.c_str()); @@ -166,7 +166,7 @@ bool kbd_service::CAlmJson::parseTokenReponse(std::string &json, std::string &ms return true; } -bool kbd_service::CAlmJson::generateAlarmReponse(std::string &json, std::string &msg, int &code, std::string &body) +bool iot_service::CAlmJson::generateAlarmReponse(std::string &json, std::string &msg, int &code, std::string &body) { json.clear(); Document doc; @@ -192,7 +192,7 @@ bool kbd_service::CAlmJson::generateAlarmReponse(std::string &json, std::string return false; } -bool kbd_service::CAlmJson::parseAlarmReponse(std::string &json, std::string &msg, int &code, std::string &body, std::string &errStr) +bool iot_service::CAlmJson::parseAlarmReponse(std::string &json, std::string &msg, int &code, std::string &body, std::string &errStr) { Document doc; doc.Parse<0>(json.c_str()); diff --git a/product/src/application/alarm_send_server/CAlmJson.h b/product/src/application/alarm_send_server/CAlmJson.h index 8ae69604..a87127c3 100644 --- a/product/src/application/alarm_send_server/CAlmJson.h +++ b/product/src/application/alarm_send_server/CAlmJson.h @@ -13,7 +13,7 @@ using namespace rapidjson; -namespace kbd_service +namespace iot_service { class CAlmJson diff --git a/product/src/application/alarm_send_server/CAlmRcvThread.cpp b/product/src/application/alarm_send_server/CAlmRcvThread.cpp index fd565378..405a28c6 100644 --- a/product/src/application/alarm_send_server/CAlmRcvThread.cpp +++ b/product/src/application/alarm_send_server/CAlmRcvThread.cpp @@ -6,8 +6,8 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_logger_api/logger.h" -kbd_service::CAlmRcvThread::CAlmRcvThread(): - kbd_service::CAlmApiForAlmClt(false), +iot_service::CAlmRcvThread::CAlmRcvThread(): + iot_service::CAlmApiForAlmClt(false), m_nAlmNo(0), m_pCurl(NULL), m_pAlmHead(NULL), @@ -16,12 +16,12 @@ kbd_service::CAlmRcvThread::CAlmRcvThread(): } -kbd_service::CAlmRcvThread::~CAlmRcvThread() +iot_service::CAlmRcvThread::~CAlmRcvThread() { } -int kbd_service::CAlmRcvThread::initialize() +int iot_service::CAlmRcvThread::initialize() { if(kbdSuccess != readConfig()) { @@ -37,12 +37,12 @@ int kbd_service::CAlmRcvThread::initialize() } //全同步的直接不处理 -void kbd_service::CAlmRcvThread::handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void iot_service::CAlmRcvThread::handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm) { return; } -void kbd_service::CAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) +void iot_service::CAlmRcvThread::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) { int alm_size = objAddAlm.alm_info_size(); @@ -56,7 +56,7 @@ void kbd_service::CAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &obj for(int i = 0; i < alm_size;++i) { - const ::kbd_idlfile::SAlmInfoToAlmClt & almCtlAlmInfo = objAddAlm.alm_info(i); + const ::iot_idl::SAlmInfoToAlmClt & almCtlAlmInfo = objAddAlm.alm_info(i); if(!almCtlAlmInfo.has_key_id_tag()) //根据key_id_tag对报警做过滤，如果没有key_id_tag，直接不要了 { continue; @@ -86,7 +86,7 @@ void kbd_service::CAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &obj appIdTableKey = boost::join(appTableVec,":"); if(m_pMapAppTableToRdt.end() == m_pMapAppTableToRdt.find(appIdTableKey)) //如果这个应用下这个表未被打开 { - kbd_dbms::CRdbAccess * pRdbAccess = new kbd_dbms::CRdbAccess(); + iot_dbms::CRdbAccess * pRdbAccess = new iot_dbms::CRdbAccess(); if(pRdbAccess->open(appId,tableName.c_str())) //如果打开成功，就把这个表加入到map中 { m_pMapAppTableToRdt.insert({appIdTableKey,pRdbAccess}); @@ -97,7 +97,7 @@ void kbd_service::CAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &obj continue; } } - kbd_dbms::CVarType var; + iot_dbms::CVarType var; vecDevTag = {vecKeyIdTagSplit[1],vecKeyIdTagSplit[2]}; //例如：qy1.dlq_a06 std::string devTag = boost::join(vecDevTag,"."); @@ -112,7 +112,7 @@ void kbd_service::CAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &obj } m_queueAlmInfo.push(almInfoItem); } - for(std::map::iterator it = m_pMapAppTableToRdt.begin();m_pMapAppTableToRdt.end() != it ; ++it) + for(std::map::iterator it = m_pMapAppTableToRdt.begin();m_pMapAppTableToRdt.end() != it ; ++it) { if(NULL != it->second) { @@ -126,22 +126,22 @@ void kbd_service::CAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &obj m_pMapAppTableToRdt.clear(); } //这里的确认，删除均不做处理 -void kbd_service::CAlmRcvThread::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +void iot_service::CAlmRcvThread::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) { return; } //这里的确认，删除均不做处理 -void kbd_service::CAlmRcvThread::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +void iot_service::CAlmRcvThread::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) { return; } -void kbd_service::CAlmRcvThread::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm) +void iot_service::CAlmRcvThread::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objReleaseAlm) { return; } -void kbd_service::CAlmRcvThread::httpPostMultiAlm(int sendNum, int nTimeoutMs) +void iot_service::CAlmRcvThread::httpPostMultiAlm(int sendNum, int nTimeoutMs) { //如果没有报警需要被发送，直接返回 if(m_queueAlmInfo.empty()) @@ -203,7 +203,7 @@ void kbd_service::CAlmRcvThread::httpPostMultiAlm(int sendNum, int nTimeoutMs) } } -void kbd_service::CAlmRcvThread::httpPostToken(int nTimeoutMs) +void iot_service::CAlmRcvThread::httpPostToken(int nTimeoutMs) { if(m_bTokenValid) { @@ -269,7 +269,7 @@ void kbd_service::CAlmRcvThread::httpPostToken(int nTimeoutMs) return; } -void kbd_service::CAlmRcvThread::setTokenInfo(bool valid, std::string token) +void iot_service::CAlmRcvThread::setTokenInfo(bool valid, std::string token) { if(valid) //设置token { @@ -299,10 +299,10 @@ void kbd_service::CAlmRcvThread::setTokenInfo(bool valid, std::string token) } -int kbd_service::CAlmRcvThread::readConfig() +int iot_service::CAlmRcvThread::readConfig() { - kbd_public::CCommonConfigParse objCfgParse; + iot_public::CCommonConfigParse objCfgParse; if(kbdSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Url_Config_File)) { LOGERROR("加载URL配置文件失败"); @@ -371,7 +371,7 @@ int kbd_service::CAlmRcvThread::readConfig() return kbdSuccess; } -int kbd_service::CAlmRcvThread::initCurl() +int iot_service::CAlmRcvThread::initCurl() { const CURLcode nRc = curl_global_init(CURL_GLOBAL_ALL); if(CURLE_OK != nRc) @@ -394,9 +394,9 @@ int kbd_service::CAlmRcvThread::initCurl() return kbdSuccess; } -std::string kbd_service::CAlmRcvThread::convertUin64ToString(const uint64 &time) +std::string iot_service::CAlmRcvThread::convertUin64ToString(const uint64 &time) { - kbd_public::LOCALTIME locationTime = kbd_public::convertUTCMsecToLocalTime(time); + iot_public::LOCALTIME locationTime = iot_public::convertUTCMsecToLocalTime(time); //year std::string year = std::to_string(locationTime.wYear); //month @@ -441,7 +441,7 @@ std::string kbd_service::CAlmRcvThread::convertUin64ToString(const uint64 &time) return strTime; } -int kbd_service::CAlmRcvThread::httpPostOneAlm(const kbd_service::stAlmInfo &_almInfoElem, int nTimeoutMs, std::string &strReponse) +int iot_service::CAlmRcvThread::httpPostOneAlm(const iot_service::stAlmInfo &_almInfoElem, int nTimeoutMs, std::string &strReponse) { strReponse.clear(); std::string jsonStr; @@ -469,7 +469,7 @@ int kbd_service::CAlmRcvThread::httpPostOneAlm(const kbd_service::stAlmInfo &_al } -void kbd_service::CAlmRcvThread::httpPost(const char *pUrl, +void iot_service::CAlmRcvThread::httpPost(const char *pUrl, const curl_slist *pHead, const char *pBody, int nTimeOutMs, @@ -525,7 +525,7 @@ void kbd_service::CAlmRcvThread::httpPost(const char *pUrl, return; } -size_t kbd_service::CAlmRcvThread::write_data_call_back(char *buf, size_t size, size_t nmemb, void *pWriteTo) +size_t iot_service::CAlmRcvThread::write_data_call_back(char *buf, size_t size, size_t nmemb, void *pWriteTo) { const size_t nRealSize = size * nmemb; if (pWriteTo != NULL) @@ -542,7 +542,7 @@ size_t kbd_service::CAlmRcvThread::write_data_call_back(char *buf, size_t size, -//bool kbd_service::CAlmRcvThread::filterAlm(const kbd_idlfile::SAlmInfoToAlmClt &_almInfo) +//bool iot_service::CAlmRcvThread::filterAlm(const iot_idl::SAlmInfoToAlmClt &_almInfo) //{ // if(!_almInfo.has_key_id_tag()) // { @@ -569,7 +569,7 @@ size_t kbd_service::CAlmRcvThread::write_data_call_back(char *buf, size_t size, //} -bool kbd_service::CAlmRcvThread::filterAlm(const std::string &locationName, const std::string &devName, const std::string &pointName) +bool iot_service::CAlmRcvThread::filterAlm(const std::string &locationName, const std::string &devName, const std::string &pointName) { if(m_setFileterTag.empty()) //如果没有填写过滤条件，就认为不做过滤，都返回true。这里可能有点奇怪 { diff --git a/product/src/application/alarm_send_server/CAlmRcvThread.h b/product/src/application/alarm_send_server/CAlmRcvThread.h index 58561b8d..e1a18d21 100644 --- a/product/src/application/alarm_send_server/CAlmRcvThread.h +++ b/product/src/application/alarm_send_server/CAlmRcvThread.h @@ -11,9 +11,9 @@ #include "CAlmJson.h" #include "curl/curl.h" -namespace kbd_service { +namespace iot_service { - class CAlmRcvThread : public kbd_service::CAlmApiForAlmClt + class CAlmRcvThread : public iot_service::CAlmApiForAlmClt { public: @@ -22,19 +22,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) ; /* * @brief : 批量post一批报警 @@ -93,13 +93,13 @@ namespace kbd_service { -// bool filterAlm(const ::kbd_idlfile::SAlmInfoToAlmClt & _almInfo); +// bool filterAlm(const ::iot_idl::SAlmInfoToAlmClt & _almInfo); bool filterAlm(const std::string &locationName,const std::string &devName,const std::string &pointName); private: CURL *m_pCurl; // CURL用于执行post的对象指针 - kbd_service::CAlmJson m_objAlmJson; //用于将报警信息生成json字符串的对象 + iot_service::CAlmJson m_objAlmJson; //用于将报警信息生成json字符串的对象 int m_nAlmNo; //记录的最大报警ID @@ -109,7 +109,7 @@ namespace kbd_service { //这个map的key是使用appId和表名使用冒号拼接的，例如 5:digital - std::map m_pMapAppTableToRdt; //不同的应用和表分别打开一个事实库指针 + std::map m_pMapAppTableToRdt; //不同的应用和表分别打开一个事实库指针 std::string m_strTokenUrl; //得到token的URL diff --git a/product/src/application/alarm_send_server/CAlmSendApp.cpp b/product/src/application/alarm_send_server/CAlmSendApp.cpp index cafa783e..65bda85b 100644 --- a/product/src/application/alarm_send_server/CAlmSendApp.cpp +++ b/product/src/application/alarm_send_server/CAlmSendApp.cpp @@ -11,7 +11,7 @@ #define OPT_DESC_HELP "help" -kbd_service::CAlmSendApp::CAlmSendApp(): +iot_service::CAlmSendApp::CAlmSendApp(): m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundantMng(NULL), @@ -20,12 +20,12 @@ kbd_service::CAlmSendApp::CAlmSendApp(): } -kbd_service::CAlmSendApp::~CAlmSendApp() +iot_service::CAlmSendApp::~CAlmSendApp() { stop(); } -bool kbd_service::CAlmSendApp::start(int argc, char *argv[], int &nStatus) +bool iot_service::CAlmSendApp::start(int argc, char *argv[], int &nStatus) { std::cout << "start" << std::endl; //1.解析启动参数 @@ -59,7 +59,7 @@ bool kbd_service::CAlmSendApp::start(int argc, char *argv[], int &nStatus) return false; } //6.创建冗余管理 - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(m_stRunAppInfo.nDomainId, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId, m_stRunAppInfo.strLocalNodeName); if(NULL == m_ptrRedundantMng) @@ -88,7 +88,7 @@ bool kbd_service::CAlmSendApp::start(int argc, char *argv[], int &nStatus) return true; } -bool kbd_service::CAlmSendApp::stop() +bool iot_service::CAlmSendApp::stop() { LOGINFO("stop"); //9.更新当前进程冗余状态 @@ -115,13 +115,13 @@ bool kbd_service::CAlmSendApp::stop() //4.获取系统信息 //3.检查重复启动 //2.销毁日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); //1.检查启动参数 return true; } -int kbd_service::CAlmSendApp::toQuit() +int iot_service::CAlmSendApp::toQuit() { LOGERROR("to Quit"); if(NULL != m_ptrProcMng) @@ -132,7 +132,7 @@ int kbd_service::CAlmSendApp::toQuit() return kbdSuccess; } -bool kbd_service::CAlmSendApp::parseCmdLine(int argc, char *argv[]) +bool iot_service::CAlmSendApp::parseCmdLine(int argc, char *argv[]) { //拼接参数 for(int i = 1; i < argc ; ++i) @@ -180,29 +180,29 @@ bool kbd_service::CAlmSendApp::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_service::CAlmSendApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_service::CAlmSendApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_AlmSendServer << "[-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_service::CAlmSendApp::isAlreadyRunning() +bool iot_service::CAlmSendApp::isAlreadyRunning() { m_strUniqueName.clear(); m_strUniqueName = CN_ProcName_AlmSendServer; m_strUniqueName += m_strStartArgs; - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strUniqueName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strUniqueName); } -bool kbd_service::CAlmSendApp::initLog() +bool iot_service::CAlmSendApp::initLog() { - kbd_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_AlmSendServer.c_str()); + iot_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_AlmSendServer.c_str()); return true; } -bool kbd_service::CAlmSendApp::getSystemInfo() +bool iot_service::CAlmSendApp::getSystemInfo() { - if(!kbd_public::createSysInfoInstance(m_ptrSysInfo)) + if(!iot_public::createSysInfoInstance(m_ptrSysInfo)) { LOGERROR("创建系统信息访问库失败"); return false; @@ -215,16 +215,16 @@ bool kbd_service::CAlmSendApp::getSystemInfo() return true; } -bool kbd_service::CAlmSendApp::registerToProcMng() +bool iot_service::CAlmSendApp::registerToProcMng() { - kbd_sys::SProcessInfoKey stProcKey; + iot_sys::SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; stProcKey.nAppId = m_stRunAppInfo.nAppId; stProcKey.strNodeName = m_stRunAppInfo.strLocalNodeName; stProcKey.strProcName = CN_ProcName_AlmSendServer; stProcKey.strProcParam = m_strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(stProcKey); + m_ptrProcMng = iot_sys::getProcMngInstance(stProcKey); if(NULL == m_ptrProcMng) { LOGERROR("创建进程管理访问库失败"); @@ -238,9 +238,9 @@ bool kbd_service::CAlmSendApp::registerToProcMng() return true; } -bool kbd_service::CAlmSendApp::initialize() +bool iot_service::CAlmSendApp::initialize() { - if(!kbd_net::initMsgBus(CN_ProcName_AlmSendServer.c_str(),m_strUniqueName.c_str())) + if(!iot_net::initMsgBus(CN_ProcName_AlmSendServer.c_str(),m_strUniqueName.c_str())) { LOGERROR("初始化消息总线失败"); return false; @@ -260,9 +260,9 @@ bool kbd_service::CAlmSendApp::initialize() return true; } -bool kbd_service::CAlmSendApp::clean() +bool iot_service::CAlmSendApp::clean() { - if(!kbd_net::releaseMsgBus()) + if(!iot_net::releaseMsgBus()) { LOGERROR("销毁消息总线资源失败"); return false; diff --git a/product/src/application/alarm_send_server/CAlmSendApp.h b/product/src/application/alarm_send_server/CAlmSendApp.h index 945a81b1..c94d3257 100644 --- a/product/src/application/alarm_send_server/CAlmSendApp.h +++ b/product/src/application/alarm_send_server/CAlmSendApp.h @@ -10,12 +10,12 @@ #include "boost/program_options.hpp" #include "CAlmSendMng.h" -namespace kbd_service { +namespace iot_service { - class CAlmSendApp : public kbd_public::CBaseService,public kbd_sys::CProcessQuitInterface + class CAlmSendApp : public iot_public::CBaseService,public iot_sys::CProcessQuitInterface { public: CAlmSendApp(); @@ -94,12 +94,12 @@ namespace kbd_service { private: std::string m_strUniqueName; 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_ptrRedundantMng; + iot_public::SNodeInfo m_stLocalNodeInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; CAlmSendMngPtr m_ptrAlmSendMng; }; diff --git a/product/src/application/alarm_send_server/CAlmSendMng.cpp b/product/src/application/alarm_send_server/CAlmSendMng.cpp index fc28bcff..725dcf66 100644 --- a/product/src/application/alarm_send_server/CAlmSendMng.cpp +++ b/product/src/application/alarm_send_server/CAlmSendMng.cpp @@ -1,8 +1,8 @@ #include "CAlmSendMng.h" #include "pub_logger_api/logger.h" -kbd_service::CAlmSendMng::CAlmSendMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng): +iot_service::CAlmSendMng::CAlmSendMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng): m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrAlmRcvThread(NULL), @@ -11,7 +11,7 @@ kbd_service::CAlmSendMng::CAlmSendMng(const kbd_public::SRunAppInfo &stRunAppInf } -kbd_service::CAlmSendMng::~CAlmSendMng() +iot_service::CAlmSendMng::~CAlmSendMng() { LOGINFO("管理类析构"); if(NULL != m_ptrAlmSendThread) @@ -25,7 +25,7 @@ kbd_service::CAlmSendMng::~CAlmSendMng() } } -int kbd_service::CAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_service::CAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) { LOGINFO("接收到冗余切换指令.Master=[%d],Slave=[%d]",bMaster,bSlave); @@ -47,7 +47,7 @@ int kbd_service::CAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) return kbdSuccess; } -int kbd_service::CAlmSendMng::initialize() +int iot_service::CAlmSendMng::initialize() { m_ptrAlmRcvThread = boost::make_shared(); if(NULL == m_ptrAlmRcvThread) diff --git a/product/src/application/alarm_send_server/CAlmSendMng.h b/product/src/application/alarm_send_server/CAlmSendMng.h index 63a0ea83..aca30bca 100644 --- a/product/src/application/alarm_send_server/CAlmSendMng.h +++ b/product/src/application/alarm_send_server/CAlmSendMng.h @@ -10,11 +10,11 @@ -namespace kbd_service { - class CAlmSendMng:public kbd_sys::CRedundantSwitchInterface +namespace iot_service { + class CAlmSendMng:public iot_sys::CRedundantSwitchInterface { public: - CAlmSendMng(const kbd_public::SRunAppInfo &stRunAppInfo,const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CAlmSendMng(const iot_public::SRunAppInfo &stRunAppInfo,const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CAlmSendMng(); @@ -26,8 +26,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; //进程管理访问库智能指针 CAlmRcvThreadPtr m_ptrAlmRcvThread; //报警接收的智能指针 CAlmSendThreadPtr m_ptrAlmSendThread; //报警发送智能指针 diff --git a/product/src/application/alarm_send_server/CAlmSendThread.cpp b/product/src/application/alarm_send_server/CAlmSendThread.cpp index acd109e3..664e8d23 100644 --- a/product/src/application/alarm_send_server/CAlmSendThread.cpp +++ b/product/src/application/alarm_send_server/CAlmSendThread.cpp @@ -1,19 +1,19 @@ #include "CAlmSendThread.h" #include "pub_logger_api/logger.h" -kbd_service::CAlmSendThread::CAlmSendThread(CAlmRcvThreadPtr ptrAlmRcvThread): - kbd_public::CTimerThreadBase("AlmSendThread",500), +iot_service::CAlmSendThread::CAlmSendThread(CAlmRcvThreadPtr ptrAlmRcvThread): + iot_public::CTimerThreadBase("AlmSendThread",500), m_ptrAlmRcvThread(ptrAlmRcvThread) { } -kbd_service::CAlmSendThread::~CAlmSendThread() +iot_service::CAlmSendThread::~CAlmSendThread() { m_ptrAlmRcvThread.reset(); } -void kbd_service::CAlmSendThread::execute() +void iot_service::CAlmSendThread::execute() { if(NULL != m_ptrAlmRcvThread) { @@ -23,7 +23,7 @@ void kbd_service::CAlmSendThread::execute() } } -int kbd_service::CAlmSendThread::initialize() +int iot_service::CAlmSendThread::initialize() { return kbdSuccess; } diff --git a/product/src/application/alarm_send_server/CAlmSendThread.h b/product/src/application/alarm_send_server/CAlmSendThread.h index 5c3485c6..e2cc6bd9 100644 --- a/product/src/application/alarm_send_server/CAlmSendThread.h +++ b/product/src/application/alarm_send_server/CAlmSendThread.h @@ -6,9 +6,9 @@ #include "CAlmRcvThread.h" -namespace kbd_service { +namespace iot_service { - class CAlmSendThread : public kbd_public::CTimerThreadBase + class CAlmSendThread : public iot_public::CTimerThreadBase { public: CAlmSendThread(CAlmRcvThreadPtr ptrAlmRcvThread); diff --git a/product/src/application/alarm_send_server/almsendcommon.h b/product/src/application/alarm_send_server/almsendcommon.h index d1a9b704..7596dd76 100644 --- a/product/src/application/alarm_send_server/almsendcommon.h +++ b/product/src/application/alarm_send_server/almsendcommon.h @@ -1,7 +1,7 @@ #ifndef ALMSENDCOMMON_H #define ALMSENDCOMMON_H -namespace kbd_service +namespace iot_service { diff --git a/product/src/application/alarm_send_server/datastructdef.h b/product/src/application/alarm_send_server/datastructdef.h index 2328d0d8..1ac834df 100644 --- a/product/src/application/alarm_send_server/datastructdef.h +++ b/product/src/application/alarm_send_server/datastructdef.h @@ -2,7 +2,7 @@ #define DATASTRUCTDEF_H #include -namespace kbd_service { +namespace iot_service { typedef struct almInfo diff --git a/product/src/application/alarm_send_server/main.cpp b/product/src/application/alarm_send_server/main.cpp index 4a3d12f5..0e218b6c 100644 --- a/product/src/application/alarm_send_server/main.cpp +++ b/product/src/application/alarm_send_server/main.cpp @@ -5,6 +5,6 @@ using namespace std; int main(int argc,char *argv[]) { - kbd_service::CAlmSendApp appObj; + iot_service::CAlmSendApp appObj; return appObj.main(argc,argv); } diff --git a/product/src/application/apc_if_srv/CApcIfRedunSw.h b/product/src/application/apc_if_srv/CApcIfRedunSw.h index a7e371db..7e98dc6a 100644 --- a/product/src/application/apc_if_srv/CApcIfRedunSw.h +++ b/product/src/application/apc_if_srv/CApcIfRedunSw.h @@ -20,7 +20,7 @@ class CThreadDigital; class CThreadLocalCurve; -class CApcIfRedunSw : public ::kbd_sys::CRedundantSwitchInterface +class CApcIfRedunSw : public ::iot_sys::CRedundantSwitchInterface { public: CApcIfRedunSw(); diff --git a/product/src/application/apc_if_srv/CApcIfSrv.cpp b/product/src/application/apc_if_srv/CApcIfSrv.cpp index 9dafc116..5c077540 100644 --- a/product/src/application/apc_if_srv/CApcIfSrv.cpp +++ b/product/src/application/apc_if_srv/CApcIfSrv.cpp @@ -64,7 +64,7 @@ CApcIfSrv::~CApcIfSrv() { CApcIfSrv::stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -92,7 +92,7 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem(m_strAppName.c_str(), g_pSzProcName); + iot_public::StartLogSystem(m_strAppName.c_str(), g_pSzProcName); LOGINFO("\n\n%s is now starting ...\n", g_pSzProcName); @@ -120,14 +120,14 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) //LOGDEBUG("m_nInvalidStatus_DI == %u",m_nInvalidStatus_DI); //< 消息总线 - if (!kbd_net::initMsgBus(g_pSzProcName, "", true)) + if (!iot_net::initMsgBus(g_pSzProcName, "", true)) { LOGFATAL("初始化消息总线失败，程序启动失败！"); return false; } //< 报警服务接口 - m_ptrAlmApi.reset(new kbd_service::CAlmApiForApp(m_nDomainID, m_nAppID)); + m_ptrAlmApi.reset(new iot_service::CAlmApiForApp(m_nDomainID, m_nAppID)); if (!m_ptrAlmApi->resumeThread()) { LOGFATAL("报警服务接口初始化失败，程序启动失败！"); @@ -135,7 +135,7 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) } //< 初始化翻译 - if (kbd_public::initI18N("/apc_if_srv/translate", "apc_if_srv")) + if (iot_public::initI18N("/apc_if_srv/translate", "apc_if_srv")) { if (g_bVerboseLog) { @@ -169,7 +169,7 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = m_nAppID; objProcInfo.nDomainId = m_nDomainID; objProcInfo.strNodeName = m_strNodeName; @@ -177,7 +177,7 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) objProcInfo.strProcName = g_pSzProcName; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(objProcInfo); + m_ptrProcMng = iot_sys::getProcMngInstance(objProcInfo); if (!m_ptrProcMng) { LOGFATAL("getProcMngInstance return NULL"); @@ -189,7 +189,7 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(m_nDomainID, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(m_nDomainID, m_nAppID, m_strNodeName); if (!m_ptrRedundantMng) @@ -287,11 +287,11 @@ bool CApcIfSrv::stop() } //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -345,7 +345,7 @@ const std::string &CApcIfSrv::getNodeName() const } -bool CApcIfSrv::addAlarm(kbd_idlfile::SAppAddAlm &objAlarm) +bool CApcIfSrv::addAlarm(iot_idl::SAppAddAlm &objAlarm) { return m_ptrAlmApi->addAlarm(objAlarm); } @@ -353,7 +353,7 @@ bool CApcIfSrv::addAlarm(kbd_idlfile::SAppAddAlm &objAlarm) bool CApcIfSrv::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(g_pSzProcName); + return iot_public::CSingleProcInstance::hasInstanceRunning(g_pSzProcName); } @@ -433,14 +433,14 @@ bool CApcIfSrv::parseCommandLine(int argc, char *argv[]) bool CApcIfSrv::loadSysInfo() { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if (kbd_public::createSysInfoInstance(sysInfoPtr) == false) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if (iot_public::createSysInfoInstance(sysInfoPtr) == false) { LOGERROR("createSysInfoInstance() return false !"); return false; } - kbd_public::SRunAppInfo objRunAppInfo; + iot_public::SRunAppInfo objRunAppInfo; int nRc = sysInfoPtr->getLocalRunAppInfoByName(m_strAppName, objRunAppInfo); if (kbdSuccess != nRc) { @@ -459,7 +459,7 @@ bool CApcIfSrv::loadSysInfo() bool CApcIfSrv::initPntStatus() { - kbd_service::CDataProcessApiPtr ptrDP = kbd_service::getDataProcInstance(); + iot_service::CDataProcessApiPtr ptrDP = iot_service::getDataProcInstance(); if (!ptrDP) { LOGERROR("initPntStatus(): getDataProcInstance失败"); diff --git a/product/src/application/apc_if_srv/CApcIfSrv.h b/product/src/application/apc_if_srv/CApcIfSrv.h index 716d5a7c..2cc1a81f 100644 --- a/product/src/application/apc_if_srv/CApcIfSrv.h +++ b/product/src/application/apc_if_srv/CApcIfSrv.h @@ -19,8 +19,8 @@ namespace kbd_application { class CApcIfSrv : - public kbd_public::CBaseService, - kbd_sys::CProcessQuitInterface + public iot_public::CBaseService, + iot_sys::CProcessQuitInterface { public: class GC @@ -69,7 +69,7 @@ public: unsigned int getInvalidStatus_DI() const; //< 添加报警 - bool addAlarm(kbd_idlfile::SAppAddAlm &objAlarm); + bool addAlarm(iot_idl::SAppAddAlm &objAlarm); private: @@ -106,10 +106,10 @@ private: std::string m_strNodeName; //< 本机节点名 CApcIfRedunSwPtr m_ptrRedunSw; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; - kbd_service::CAlmApiForAppPtr m_ptrAlmApi; //< 报警服务接口 + iot_service::CAlmApiForAppPtr m_ptrAlmApi; //< 报警服务接口 }; } //< namespace kbd_application diff --git a/product/src/application/apc_if_srv/CThreadAnalog.cpp b/product/src/application/apc_if_srv/CThreadAnalog.cpp index c5074d20..210646db 100644 --- a/product/src/application/apc_if_srv/CThreadAnalog.cpp +++ b/product/src/application/apc_if_srv/CThreadAnalog.cpp @@ -62,7 +62,7 @@ CThreadAnalog::CThreadAnalog() : //< 初始化 m_objSetAiToDp Head 部分信息，不用运行时每次都填充，提高效率 { - kbd_idlfile::SOptDataPkgHead *pHead = m_objSetAiToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead *pHead = m_objSetAiToDp.mutable_package_head(); pHead->set_str_src_tag(g_pSzProcName); pHead->set_b_not_alarm(false); //< 若是true，则DP不产生报警和事件 @@ -72,12 +72,12 @@ CThreadAnalog::CThreadAnalog() : //pHead->set_para1(CApcIfSrv::getInstance().getDomainID()); //< 实际发送时填充 - //pHead->set_nopttime(kbd_public::getUTCTimeMsec()); + //pHead->set_nopttime(iot_public::getUTCTimeMsec()); } //< 初始化 m_objSetDiToDp Head 部分信息，不用运行时每次都填充，提高效率 { - kbd_idlfile::SOptDataPkgHead *pHead = m_objSetDiToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead *pHead = m_objSetDiToDp.mutable_package_head(); pHead->set_str_src_tag(g_pSzProcName); pHead->set_b_not_alarm(false); //< 若是true，则DP不产生报警和事件 @@ -87,7 +87,7 @@ CThreadAnalog::CThreadAnalog() : //pHead->set_para1(CApcIfSrv::getInstance().getDomainID()); //< 实际发送时填充 - //pHead->set_nopttime(kbd_public::getUTCTimeMsec()); + //pHead->set_nopttime(iot_public::getUTCTimeMsec()); } } @@ -115,7 +115,7 @@ bool CThreadAnalog::resumeThread() //< 构建通讯器 if (NULL == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } const int nAppId = CApcIfSrv::getInstance().getAppID(); @@ -141,9 +141,9 @@ bool CThreadAnalog::resumeThread() //< 设置初始值 { //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); - kbd_dbms::CVarType objValue = 0; + iot_dbms::CVarType objValue = 0; const int nRcdCnt = m_objRtdb_apc_analog.getRecordCount(); for (int nRcdIdx = 0; nRcdIdx < nRcdCnt; ++nRcdIdx) @@ -194,7 +194,7 @@ void CThreadAnalog::execute() //< 接收并处理消息 { - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; if (m_pMbComm->recvMsg(objMbMsgRcv, 500)) { const int nChannelID = objMbMsgRcv.getChannelID(); @@ -204,11 +204,11 @@ void CThreadAnalog::execute() { switch (nMsgType) { - case kbd_idlfile::MT_OPT2APP_VIRT_CTRL_ANA_REQUEST: + case iot_idl::MT_OPT2APP_VIRT_CTRL_ANA_REQUEST: handleOptCtrlReq(objMbMsgRcv); break; - case kbd_idlfile::MT_OPT2APP_VIRT_CTRL_DIG_REQUEST: - case kbd_idlfile::MT_OPT2APP_VIRT_CTRL_MIX_REQUEST: + case iot_idl::MT_OPT2APP_VIRT_CTRL_DIG_REQUEST: + case iot_idl::MT_OPT2APP_VIRT_CTRL_MIX_REQUEST: //< 无需处理 break; default: LOGERROR("execute(): 无效的消息类型 nMsgType = %d ，忽略消息！", nMsgType); @@ -228,10 +228,10 @@ void CThreadAnalog::execute() } -bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) +bool CThreadAnalog::handleOptCtrlReq(const iot_net::CMbMessage &objMbMsgRcv) { //< 反序列化 - kbd_idlfile::SOptVirtCtrlRequest objRequest; + iot_idl::SOptVirtCtrlRequest objRequest; bool bRc = objRequest.ParseFromArray(objMbMsgRcv.getDataPtr(), (int) objMbMsgRcv.getDataSize()); if (!bRc) { @@ -256,7 +256,7 @@ bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) { //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); const int nRcdIndex = m_objRtdb_apc_analog.searchRecordByKey(strKeyIdTag.c_str()); if (nRcdIndex < 0) @@ -273,8 +273,8 @@ bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) CApcIfSrv &objSrv = CApcIfSrv::getInstance(); //< 预设置回复消息 - kbd_idlfile::SOptVirtCtrlReply objReply; - kbd_net::CMbMessage objMbMSgRep; + iot_idl::SOptVirtCtrlReply objReply; + iot_net::CMbMessage objMbMSgRep; { objReply.set_str_tab_name(objRequest.str_tab_name()); objReply.set_str_tag_name(objRequest.str_tag_name()); @@ -286,7 +286,7 @@ bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) objReply.set_str_source_tag(g_pSzProcName); - objMbMSgRep.setMsgType(kbd_idlfile::MT_APP2OPT_VIRT_CTRL_ANA_REPLY); + objMbMSgRep.setMsgType(iot_idl::MT_APP2OPT_VIRT_CTRL_ANA_REPLY); objMbMSgRep.setSubject(objSrv.getAppID(), CH_APP_TO_OPT_VIRT_CTRL); //< 后续设置 @@ -295,7 +295,7 @@ bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) } //< 控制目标值 - if (kbd_idlfile::CN_DATATYPE_DOUBLE != objRequest.var_value().edatatype() + if (iot_idl::CN_DATATYPE_DOUBLE != objRequest.var_value().edatatype() || !(objRequest.var_value().has_dvalue())) { const std::string strErr = I18N("控制目标值非法，控制消息中var_value不是DOUBLE或dValue未填充！"); @@ -318,12 +318,12 @@ bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) } const boost::float64_t dCtrlValue = objRequest.var_value().dvalue(); - const boost::int64_t nTimeNow_steady = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow_steady = iot_public::getMonotonicMsec(); //< 提交模型修改 { bool bModelCommOk = true; - kbd_dbms::CDbApi objDb( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDb( DB_CONN_MODEL_WRITE ); QString strSql; @@ -357,19 +357,19 @@ bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) //< 失败时的报警内容 if ( !bModelCommOk ) { - 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_OPERATE ); //< 人工操作 - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); - pAlmInfo->set_status( kbd_service::ALM_STAT_OPT_MODEL_MODIFY ); //< 模型修改 + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_OPERATE ); //< 人工操作 + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); + pAlmInfo->set_status( iot_service::ALM_STAT_OPT_MODEL_MODIFY ); //< 模型修改 pAlmInfo->set_location_id( objSrv.getLocationID()); - 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( strSql.toStdString() + I18N( " 提交失败" ).str()); objSrv.addAlarm( objAddAlm ); @@ -379,9 +379,9 @@ bool CThreadAnalog::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) //< 更新实时库 { //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); - std::vector vecUpdateCol(2); + std::vector vecUpdateCol(2); strncpy(vecUpdateCol[0].updcolname, "value", RDB_COLUMN_NAME_LEN); vecUpdateCol[0].updvalue = dCtrlValue; @@ -434,7 +434,7 @@ void CThreadAnalog::handleOutput() bool bFullOutput = false; //< 本次执行是否全输出 //< 开机后时间 - const boost::int64_t nTimeNow_steady = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow_steady = iot_public::getMonotonicMsec(); //< 每60s全输出一次，发送本机不考虑丢消息 if (m_nLastFullOutputTime + 60000 <= nTimeNow_steady) @@ -444,16 +444,16 @@ void CThreadAnalog::handleOutput() } //< UTC 时间 - const boost::uint64_t nTimeNow_UTC = kbd_public::getUTCTimeMsec(); + const boost::uint64_t nTimeNow_UTC = iot_public::getUTCTimeMsec(); const CApcIfSrv &objSrv = CApcIfSrv::getInstance(); //< 括号，控制锁表生命周期 { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_analog); const int nRcdCnt = m_objRtdb_apc_analog.getRecordCount(); for (int nRcdIdx = 0; nRcdIdx < nRcdCnt; ++nRcdIdx) @@ -513,12 +513,12 @@ void CThreadAnalog::handleOutput() LOGDEBUG("handleOutput(): AI量 [ %s ] 值变化，新值 [ %f ]", strTagName.c_str(), dValue); } - kbd_idlfile::SOptSetDataMsg *pSetData = m_objSetAiToDp.add_seq_set_data_info(); + iot_idl::SOptSetDataMsg *pSetData = m_objSetAiToDp.add_seq_set_data_info(); pSetData->set_str_tag_name(strTagName); pSetData->set_u_add_status(0); pSetData->set_u_del_status(objSrv.getInvalidStatus_AI()); - pSetData->mutable_var_value()->set_edatatype(kbd_idlfile::CN_DATATYPE_DOUBLE); + pSetData->mutable_var_value()->set_edatatype(iot_idl::CN_DATATYPE_DOUBLE); pSetData->mutable_var_value()->set_dvalue(dValue); } } @@ -605,12 +605,12 @@ void CThreadAnalog::handleOutput() LOGDEBUG("handleOutput(): DI量 [ %s ] 值变化，新值 [ %d ]", strTagName.c_str(), nTimeout); } - kbd_idlfile::SOptSetDataMsg *pSetData = m_objSetDiToDp.add_seq_set_data_info(); + iot_idl::SOptSetDataMsg *pSetData = m_objSetDiToDp.add_seq_set_data_info(); pSetData->set_str_tag_name(strTagName); pSetData->set_u_add_status(0); pSetData->set_u_del_status(objSrv.getInvalidStatus_DI()); - pSetData->mutable_var_value()->set_edatatype(kbd_idlfile::CN_DATATYPE_INT32); + pSetData->mutable_var_value()->set_edatatype(iot_idl::CN_DATATYPE_INT32); pSetData->mutable_var_value()->set_nvalue(nTimeout); } } @@ -621,15 +621,15 @@ void CThreadAnalog::handleOutput() if (m_objSetAiToDp.seq_set_data_info_size() > 0) { { - kbd_idlfile::SOptDataPkgHead *pHead = m_objSetAiToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead *pHead = m_objSetAiToDp.mutable_package_head(); //< 其他参数在构造函数已填充 pHead->set_n_opt_time(nTimeNow_UTC); } - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; if (objMbMsgSend.setData(m_objSetAiToDp)) { - objMbMsgSend.setMsgType(kbd_idlfile::MT_OPT_SET_CAL_DATA_DOWN); + objMbMsgSend.setMsgType(iot_idl::MT_OPT_SET_CAL_DATA_DOWN); objMbMsgSend.setSubject(objSrv.getAppID(), CH_OPT_TO_SCADA_VALUE_SET); objMbMsgSend.setPara1(objSrv.getDomainID()); @@ -658,15 +658,15 @@ void CThreadAnalog::handleOutput() if (m_objSetDiToDp.seq_set_data_info_size() > 0) { { - kbd_idlfile::SOptDataPkgHead *pHead = m_objSetDiToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead *pHead = m_objSetDiToDp.mutable_package_head(); //< 其他参数在构造函数已填充 pHead->set_n_opt_time(nTimeNow_UTC); } - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; if (objMbMsgSend.setData(m_objSetDiToDp)) { - objMbMsgSend.setMsgType(kbd_idlfile::MT_OPT_SET_CAL_DATA_DOWN); + objMbMsgSend.setMsgType(iot_idl::MT_OPT_SET_CAL_DATA_DOWN); objMbMsgSend.setSubject(objSrv.getAppID(), CH_OPT_TO_SCADA_VALUE_SET); objMbMsgSend.setPara1(objSrv.getDomainID()); diff --git a/product/src/application/apc_if_srv/CThreadAnalog.h b/product/src/application/apc_if_srv/CThreadAnalog.h index 9311e8c7..af2ee43f 100644 --- a/product/src/application/apc_if_srv/CThreadAnalog.h +++ b/product/src/application/apc_if_srv/CThreadAnalog.h @@ -19,7 +19,7 @@ namespace kbd_application { class CThreadAnalog - : private kbd_public::CTimerThreadBase + : private iot_public::CTimerThreadBase { public: CThreadAnalog(); @@ -37,7 +37,7 @@ public: private: void execute() override; - bool handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv); + bool handleOptCtrlReq(const iot_net::CMbMessage &objMbMsgRcv); void handleOutput(); @@ -48,13 +48,13 @@ private: //< 上一次输出完整断面的时间，开机后ms数 boost::int64_t m_nLastFullOutputTime; - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; - kbd_dbms::CRdbAccess m_objRtdb_apc_analog; + iot_dbms::CRdbAccess m_objRtdb_apc_analog; //< 常驻有利于降低构造、释放开销 - kbd_idlfile::SOptSetDataPkg m_objSetAiToDp; - kbd_idlfile::SOptSetDataPkg m_objSetDiToDp; //< 超时状态输出 + iot_idl::SOptSetDataPkg m_objSetAiToDp; + iot_idl::SOptSetDataPkg m_objSetDiToDp; //< 超时状态输出 }; diff --git a/product/src/application/apc_if_srv/CThreadDigital.cpp b/product/src/application/apc_if_srv/CThreadDigital.cpp index 34633701..7769e594 100644 --- a/product/src/application/apc_if_srv/CThreadDigital.cpp +++ b/product/src/application/apc_if_srv/CThreadDigital.cpp @@ -61,7 +61,7 @@ CThreadDigital::CThreadDigital() : //< 初始化 m_objSetDataToDp Head 部分信息，不用运行时每次都填充，提高效率 { - kbd_idlfile::SOptDataPkgHead *pHead = m_objSetDataToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead *pHead = m_objSetDataToDp.mutable_package_head(); pHead->set_str_src_tag(g_pSzProcName); pHead->set_b_not_alarm(false); //< 若是true，则DP不产生报警和事件 @@ -71,7 +71,7 @@ CThreadDigital::CThreadDigital() : //pHead->set_para1(CApcIfSrv::getInstance().getDomainID()); //< 实际发送时填充 - //pHead->set_nopttime(kbd_public::getUTCTimeMsec()); + //pHead->set_nopttime(iot_public::getUTCTimeMsec()); } } @@ -99,7 +99,7 @@ bool CThreadDigital::resumeThread() //< 构建通讯器 if (NULL == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } const int nAppId = CApcIfSrv::getInstance().getAppID(); @@ -164,7 +164,7 @@ void CThreadDigital::execute() //< 接收并处理消息 { - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; if (m_pMbComm->recvMsg(objMbMsgRcv, 500)) { const int nChannelID = objMbMsgRcv.getChannelID(); @@ -174,11 +174,11 @@ void CThreadDigital::execute() { switch (nMsgType) { - case kbd_idlfile::MT_OPT2APP_VIRT_CTRL_DIG_REQUEST: + case iot_idl::MT_OPT2APP_VIRT_CTRL_DIG_REQUEST: handleOptCtrlReq(objMbMsgRcv); break; - case kbd_idlfile::MT_OPT2APP_VIRT_CTRL_ANA_REQUEST: - case kbd_idlfile::MT_OPT2APP_VIRT_CTRL_MIX_REQUEST: + case iot_idl::MT_OPT2APP_VIRT_CTRL_ANA_REQUEST: + case iot_idl::MT_OPT2APP_VIRT_CTRL_MIX_REQUEST: //< 无需处理 break; default: LOGERROR("execute(): 无效的消息类型 nMsgType = %d ，忽略消息！", nMsgType); @@ -198,10 +198,10 @@ void CThreadDigital::execute() } -bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) +bool CThreadDigital::handleOptCtrlReq(const iot_net::CMbMessage &objMbMsgRcv) { //< 反序列化 - kbd_idlfile::SOptVirtCtrlRequest objRequest; + iot_idl::SOptVirtCtrlRequest objRequest; bool bRc = objRequest.ParseFromArray(objMbMsgRcv.getDataPtr(), (int) objMbMsgRcv.getDataSize()); if (!bRc) { @@ -226,7 +226,7 @@ bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) { //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_digital); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_digital); const int nRcdIndex = m_objRtdb_apc_digital.searchRecordByKey(strKeyIdTag.c_str()); if (nRcdIndex < 0) @@ -243,8 +243,8 @@ bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) CApcIfSrv &objSrv = CApcIfSrv::getInstance(); //< 预设置回复消息 - kbd_idlfile::SOptVirtCtrlReply objReply; - kbd_net::CMbMessage objMbMSgRep; + iot_idl::SOptVirtCtrlReply objReply; + iot_net::CMbMessage objMbMSgRep; { objReply.set_str_tab_name(objRequest.str_tab_name()); objReply.set_str_tag_name(objRequest.str_tag_name()); @@ -256,7 +256,7 @@ bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) objReply.set_str_source_tag(g_pSzProcName); - objMbMSgRep.setMsgType(kbd_idlfile::MT_APP2OPT_VIRT_CTRL_DIG_REPLY); + objMbMSgRep.setMsgType(iot_idl::MT_APP2OPT_VIRT_CTRL_DIG_REPLY); objMbMSgRep.setSubject(objSrv.getAppID(), CH_APP_TO_OPT_VIRT_CTRL); //< 后续设置 @@ -265,7 +265,7 @@ bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) } //< 控制目标值 - if (kbd_idlfile::CN_DATATYPE_INT32 != objRequest.var_value().edatatype() + if (iot_idl::CN_DATATYPE_INT32 != objRequest.var_value().edatatype() || !(objRequest.var_value().has_nvalue())) { const std::string strErr = I18N("控制目标值非法，控制消息中var_value不是INT32或nValue未填充！"); @@ -291,7 +291,7 @@ bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) //< 提交模型修改 { bool bModelCommOk = true; - kbd_dbms::CDbApi objDb( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDb( DB_CONN_MODEL_WRITE ); QString strSql; @@ -325,19 +325,19 @@ bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) //< 失败时的报警内容 if ( !bModelCommOk ) { - 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_OPERATE ); //< 人工操作 - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); - pAlmInfo->set_status( kbd_service::ALM_STAT_OPT_MODEL_MODIFY ); //< 模型修改 + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_OPERATE ); //< 人工操作 + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); + pAlmInfo->set_status( iot_service::ALM_STAT_OPT_MODEL_MODIFY ); //< 模型修改 pAlmInfo->set_location_id( objSrv.getLocationID()); - 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( strSql.toStdString() + I18N( " 提交失败" ).str()); objSrv.addAlarm( objAddAlm ); @@ -347,9 +347,9 @@ bool CThreadDigital::handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv) //< 更新实时库 { //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_digital); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_digital); - kbd_dbms::CVarType varCtrlValue(nCtrlValue); + iot_dbms::CVarType varCtrlValue(nCtrlValue); bRc = m_objRtdb_apc_digital.setColumnValueByKey(strKeyIdTag.c_str(), "value", varCtrlValue); } @@ -394,7 +394,7 @@ void CThreadDigital::handleOutput() { bool bFullOutput = false; //< 本次执行是否全输出 - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); const CApcIfSrv &objSrv = CApcIfSrv::getInstance(); @@ -408,10 +408,10 @@ void CThreadDigital::handleOutput() //< 括号，控制锁表生命周期 { bool bValChanged = false; - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_digital); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_digital); const int nRcdCnt = m_objRtdb_apc_digital.getRecordCount(); for (int nRcdIdx = 0; nRcdIdx < nRcdCnt; ++nRcdIdx) @@ -469,12 +469,12 @@ void CThreadDigital::handleOutput() LOGDEBUG("handleOutput(): DI量 [ %s ] 值变化，新值 [ %d ]", strTagName.c_str(), nValue); } - kbd_idlfile::SOptSetDataMsg *pSetData = m_objSetDataToDp.add_seq_set_data_info(); + iot_idl::SOptSetDataMsg *pSetData = m_objSetDataToDp.add_seq_set_data_info(); pSetData->set_str_tag_name(strTagName); pSetData->set_u_add_status(0); pSetData->set_u_del_status(objSrv.getInvalidStatus_DI()); - pSetData->mutable_var_value()->set_edatatype(kbd_idlfile::CN_DATATYPE_INT32); + pSetData->mutable_var_value()->set_edatatype(iot_idl::CN_DATATYPE_INT32); pSetData->mutable_var_value()->set_nvalue(nValue); } } @@ -485,15 +485,15 @@ void CThreadDigital::handleOutput() return; { - kbd_idlfile::SOptDataPkgHead *pHead = m_objSetDataToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead *pHead = m_objSetDataToDp.mutable_package_head(); //< 其他参数在构造函数已填充 - pHead->set_n_opt_time(kbd_public::getUTCTimeMsec()); + pHead->set_n_opt_time(iot_public::getUTCTimeMsec()); } - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; if (objMbMsgSend.setData(m_objSetDataToDp)) { - objMbMsgSend.setMsgType(kbd_idlfile::MT_OPT_SET_CAL_DATA_DOWN); + objMbMsgSend.setMsgType(iot_idl::MT_OPT_SET_CAL_DATA_DOWN); objMbMsgSend.setSubject(objSrv.getAppID(), CH_OPT_TO_SCADA_VALUE_SET); objMbMsgSend.setPara1(objSrv.getDomainID()); diff --git a/product/src/application/apc_if_srv/CThreadDigital.h b/product/src/application/apc_if_srv/CThreadDigital.h index e917cf55..48ff96c2 100644 --- a/product/src/application/apc_if_srv/CThreadDigital.h +++ b/product/src/application/apc_if_srv/CThreadDigital.h @@ -19,7 +19,7 @@ namespace kbd_application { class CThreadDigital - : private kbd_public::CTimerThreadBase + : private iot_public::CTimerThreadBase { public: CThreadDigital(); @@ -37,7 +37,7 @@ public: private: void execute() override; - bool handleOptCtrlReq(const kbd_net::CMbMessage &objMbMsgRcv); + bool handleOptCtrlReq(const iot_net::CMbMessage &objMbMsgRcv); void handleOutput(); @@ -48,12 +48,12 @@ private: //< 上一次输出完整断面的时间，开机后ms数 boost::int64_t m_nLastFullOutputTime; - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; - kbd_dbms::CRdbAccess m_objRtdb_apc_digital; + iot_dbms::CRdbAccess m_objRtdb_apc_digital; //< 常驻有利于降低构造、释放开销 - kbd_idlfile::SOptSetDataPkg m_objSetDataToDp; + iot_idl::SOptSetDataPkg m_objSetDataToDp; }; diff --git a/product/src/application/apc_if_srv/CThreadLocalCurve.cpp b/product/src/application/apc_if_srv/CThreadLocalCurve.cpp index bb5f8385..2e698231 100644 --- a/product/src/application/apc_if_srv/CThreadLocalCurve.cpp +++ b/product/src/application/apc_if_srv/CThreadLocalCurve.cpp @@ -66,7 +66,7 @@ CThreadLocalCurve::CThreadLocalCurve() : //< 初始化 m_objSetAiToDp Head 部分信息，不用运行时每次都填充，提高效率 { - kbd_idlfile::SOptDataPkgHead* pHead = m_objSetAiToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead* pHead = m_objSetAiToDp.mutable_package_head(); pHead->set_str_src_tag(g_pSzProcName); pHead->set_b_not_alarm(false); //< 若是true，则DP不产生报警和事件 @@ -76,7 +76,7 @@ CThreadLocalCurve::CThreadLocalCurve() : //pHead->set_para1(CApcIfSrv::getInstance().getDomainID()); //< 实际发送时填充 - //pHead->set_nopttime(kbd_public::getUTCTimeMsec()); + //pHead->set_nopttime(iot_public::getUTCTimeMsec()); } } @@ -102,7 +102,7 @@ bool CThreadLocalCurve::resumeThread() //< 构建通讯器 if (NULL == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } const int nAppId = CApcIfSrv::getInstance().getAppID(); @@ -188,9 +188,9 @@ void CThreadLocalCurve::execute() return; //< 更新时间 - m_nSteadyTimeNow = kbd_public::getMonotonicMsec(); - m_nUtcTimeNow = kbd_public::getUTCTimeMsec(); - kbd_public::getLocalSysTime(m_stLocalTimeNow); + m_nSteadyTimeNow = iot_public::getMonotonicMsec(); + m_nUtcTimeNow = iot_public::getUTCTimeMsec(); + iot_public::getLocalSysTime(m_stLocalTimeNow); m_nSecondsOfDay = (m_stLocalTimeNow.wHour * 60 * 60) + (m_stLocalTimeNow.wMinute * 60) + m_stLocalTimeNow.wSecond; @@ -209,10 +209,10 @@ void CThreadLocalCurve::execute() { SCurve stCurve; SYearWeekRule stYearWeekRule; - kbd_dbms::CVarType rtdbValue; + iot_dbms::CVarType rtdbValue; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve); const int nRcdCnt = m_objRtdb_apc_curve.getRecordCount(); for (int nRcdIdx = 0; nRcdIdx < nRcdCnt; ++nRcdIdx) @@ -324,12 +324,12 @@ void CThreadLocalCurve::execute() LOGDEBUG("execute(): AI量 [ %s ] 值变化，新值 [ %f ]", strTagName.c_str(), dValue); } - kbd_idlfile::SOptSetDataMsg *pSetData = m_objSetAiToDp.add_seq_set_data_info(); + iot_idl::SOptSetDataMsg *pSetData = m_objSetAiToDp.add_seq_set_data_info(); pSetData->set_str_tag_name(strTagName); pSetData->set_u_add_status(0); pSetData->set_u_del_status(objSrv.getInvalidStatus_AI()); - pSetData->mutable_var_value()->set_edatatype(kbd_idlfile::CN_DATATYPE_DOUBLE); + pSetData->mutable_var_value()->set_edatatype(iot_idl::CN_DATATYPE_DOUBLE); pSetData->mutable_var_value()->set_dvalue(dValue); } } @@ -339,15 +339,15 @@ void CThreadLocalCurve::execute() if (m_objSetAiToDp.seq_set_data_info_size() > 0) { { - kbd_idlfile::SOptDataPkgHead *pHead = m_objSetAiToDp.mutable_package_head(); + iot_idl::SOptDataPkgHead *pHead = m_objSetAiToDp.mutable_package_head(); //< 其他参数在构造函数已填充 pHead->set_n_opt_time(m_nUtcTimeNow); } - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; if (objMbMsgSend.setData(m_objSetAiToDp)) { - objMbMsgSend.setMsgType(kbd_idlfile::MT_OPT_SET_CAL_DATA_DOWN); + objMbMsgSend.setMsgType(iot_idl::MT_OPT_SET_CAL_DATA_DOWN); objMbMsgSend.setSubject(objSrv.getAppID(), CH_OPT_TO_SCADA_VALUE_SET); objMbMsgSend.setPara1(objSrv.getDomainID()); @@ -381,7 +381,7 @@ void CThreadLocalCurve::execute() //< 本函数内部不锁 apc_curve 表，外部加锁 bool CThreadLocalCurve::getCurveByIndex(const int nIndex, SCurve &stCurve) { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (!m_objRtdb_apc_curve.getColumnValueByIndex(nIndex, "key_id_tag", objValue)) { @@ -440,34 +440,34 @@ bool CThreadLocalCurve::getYearWeekRule(const int nTypeId, CThreadLocalCurve::SY CThreadLocalCurve::SYearWeekRule &stRuleInCache = m_mapYearWeekRuleCache[nTypeId]; stRule = stRuleInCache; - kbd_dbms::CVarType rdbVal; + iot_dbms::CVarType rdbVal; //< 找 apc_curve_year 表 { - kbd_dbms::CRdbQueryResult rdbResult; + iot_dbms::CRdbQueryResult rdbResult; - std::vector vecCondInfo; + std::vector vecCondInfo; { - kbd_dbms::CRdbPublic::addCondInfo + iot_dbms::CRdbPublic::addCondInfo (vecCondInfo, "type_id", nTypeId, ATTRCOND_EQU, ATTRCOND_AND); //< 开始时间 小于等于 当前 - kbd_dbms::CRdbPublic::addCondInfo + iot_dbms::CRdbPublic::addCondInfo (vecCondInfo, "month_begin", m_stLocalTimeNow.wMonth, ATTRCOND_SMALLEQU, ATTRCOND_AND); - kbd_dbms::CRdbPublic::addCondInfo + iot_dbms::CRdbPublic::addCondInfo (vecCondInfo, "day_begin", m_stLocalTimeNow.wDay, ATTRCOND_SMALLEQU, ATTRCOND_AND); //< 结束时间 大于等于 当前 - kbd_dbms::CRdbPublic::addCondInfo + iot_dbms::CRdbPublic::addCondInfo (vecCondInfo, "month_end", m_stLocalTimeNow.wMonth, ATTRCOND_LARGEEQU, ATTRCOND_AND); - kbd_dbms::CRdbPublic::addCondInfo + iot_dbms::CRdbPublic::addCondInfo (vecCondInfo, "day_end", m_stLocalTimeNow.wDay, ATTRCOND_LARGEEQU, ATTRCOND_AND); } static const std::vector vecSelectCol({"year_rule_id", "exctption"}); //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_year); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_year); if (!m_objRtdb_apc_curve_year.select(vecCondInfo, rdbResult, vecSelectCol)) { @@ -518,7 +518,7 @@ bool CThreadLocalCurve::getYearWeekRule(const int nTypeId, CThreadLocalCurve::SY objKey.m_nWeekDay = m_stLocalTimeNow.wDayOfWeek; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_week); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_week); const int nRecIndex = m_objRtdb_apc_curve_week.searchRecordByKey(&objKey); @@ -559,10 +559,10 @@ int CThreadLocalCurve::getDayRuleId(const char *pSzKeyIdTag, const int nYearRule objKey.m_nYearRuleId = nYearRuleId; objKey.m_nWeekRuleId = nWeekRuleId; - kbd_dbms::CVarType rdbVal; + iot_dbms::CVarType rdbVal; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_day_index); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_day_index); const int nRecIndex = m_objRtdb_apc_curve_day_index.searchRecordByKey(&objKey); @@ -593,23 +593,23 @@ bool CThreadLocalCurve::getCurveValue(const int nDayRuleId, double &dValue) //< 写入一个不会与实际ID冲突的记录，使map不为空 m_mapDayValueCache[-999] = -999; - kbd_dbms::CRdbQueryResult rdbResult; + iot_dbms::CRdbQueryResult rdbResult; - std::vector vecCondInfo; + std::vector vecCondInfo; { //< 开始时间 小于等于 当前 - kbd_dbms::CRdbPublic::addCondInfo + iot_dbms::CRdbPublic::addCondInfo (vecCondInfo, "start_sec", m_nSecondsOfDay, ATTRCOND_SMALLEQU, ATTRCOND_AND); //< 结束时间 大于等于 当前 - kbd_dbms::CRdbPublic::addCondInfo + iot_dbms::CRdbPublic::addCondInfo (vecCondInfo, "end_sec", m_nSecondsOfDay, ATTRCOND_LARGEEQU, ATTRCOND_AND); } static const std::vector vecSelectColumn = {"day_rule_id", "value"}; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_day_value); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_apc_curve_day_value); if (!m_objRtdb_apc_curve_day_value.select(vecCondInfo, rdbResult, vecSelectColumn)) { @@ -617,7 +617,7 @@ bool CThreadLocalCurve::getCurveValue(const int nDayRuleId, double &dValue) return false; } - kbd_dbms::CVarType rdbVal_DayRuleId, rdbVal_Value; + iot_dbms::CVarType rdbVal_DayRuleId, rdbVal_Value; const int nRowCnt = rdbResult.getRecordCount(); for (int i = 0; i < nRowCnt; ++i) @@ -671,21 +671,21 @@ void CThreadLocalCurve::sendCfgErrAlarm(const std::string &strErr) LOGERROR("sendCfgErrAlarm(): %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(); CApcIfSrv &objSrv = CApcIfSrv::getInstance(); // 报警参数-必填项目 - pAlmInfo->set_alm_type(kbd_service::ALM_TYPE_SYSTEM); //< 系统事件 + pAlmInfo->set_alm_type(iot_service::ALM_TYPE_SYSTEM); //< 系统事件 pAlmInfo->set_time_stamp(m_nUtcTimeNow); - pAlmInfo->set_status(kbd_service::ALM_STAT_SYS_PROC_ERROR); //< 进程故障 + pAlmInfo->set_status(iot_service::ALM_STAT_SYS_PROC_ERROR); //< 进程故障 pAlmInfo->set_location_id(objSrv.getLocationID()); - 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); objSrv.addAlarm(objAddAlm); @@ -704,7 +704,7 @@ void CThreadLocalCurve::updateModelCurrentDayRuleId(const char *pSzKeyIdTag, con CApcIfSrv &objSrv = CApcIfSrv::getInstance(); bool bModelCommOk = true; - kbd_dbms::CDbApi objDb( DB_CONN_MODEL_WRITE ); + iot_dbms::CDbApi objDb( DB_CONN_MODEL_WRITE ); QString strSql; @@ -737,19 +737,19 @@ void CThreadLocalCurve::updateModelCurrentDayRuleId(const char *pSzKeyIdTag, con { m_nLastUpdateModelAddAlmTime = m_nSteadyTimeNow; - 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_OPERATE ); //< 人工操作 - pAlmInfo->set_time_stamp( kbd_public::getUTCTimeMsec()); - pAlmInfo->set_status( kbd_service::ALM_STAT_OPT_MODEL_MODIFY ); //< 模型修改 + pAlmInfo->set_alm_type( iot_service::ALM_TYPE_OPERATE ); //< 人工操作 + pAlmInfo->set_time_stamp( iot_public::getUTCTimeMsec()); + pAlmInfo->set_status( iot_service::ALM_STAT_OPT_MODEL_MODIFY ); //< 模型修改 pAlmInfo->set_location_id( objSrv.getLocationID()); - 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( strSql.toStdString() + I18N( " 提交失败" ).str()); objSrv.addAlarm( objAddAlm ); diff --git a/product/src/application/apc_if_srv/CThreadLocalCurve.h b/product/src/application/apc_if_srv/CThreadLocalCurve.h index 3c0c3170..1250bcdd 100644 --- a/product/src/application/apc_if_srv/CThreadLocalCurve.h +++ b/product/src/application/apc_if_srv/CThreadLocalCurve.h @@ -22,7 +22,7 @@ namespace kbd_application { class CThreadLocalCurve - : private kbd_public::CTimerThreadBase + : private iot_public::CTimerThreadBase { public: CThreadLocalCurve(); @@ -95,9 +95,9 @@ private: //< 当前 UTC ms 时间 boost::uint64_t m_nUtcTimeNow; - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; - kbd_public::LOCALTIME m_stLocalTimeNow; + iot_public::LOCALTIME m_stLocalTimeNow; //< 年、周规则缓存，kye 为 type_id，一个执行周期清空一次 std::map m_mapYearWeekRuleCache; @@ -105,14 +105,14 @@ private: //< 日内数值缓存，kye 为 day_rule_id，value 为曲线当前值，一个执行周期清空一次 std::map m_mapDayValueCache; - kbd_dbms::CRdbAccess m_objRtdb_apc_curve; - kbd_dbms::CRdbAccess m_objRtdb_apc_curve_day_index; - kbd_dbms::CRdbAccess m_objRtdb_apc_curve_day_value; - kbd_dbms::CRdbAccess m_objRtdb_apc_curve_week; - kbd_dbms::CRdbAccess m_objRtdb_apc_curve_year; + iot_dbms::CRdbAccess m_objRtdb_apc_curve; + iot_dbms::CRdbAccess m_objRtdb_apc_curve_day_index; + iot_dbms::CRdbAccess m_objRtdb_apc_curve_day_value; + iot_dbms::CRdbAccess m_objRtdb_apc_curve_week; + iot_dbms::CRdbAccess m_objRtdb_apc_curve_year; //< 常驻有利于降低构造、释放开销 - kbd_idlfile::SOptSetDataPkg m_objSetAiToDp; + iot_idl::SOptSetDataPkg m_objSetAiToDp; }; diff --git a/product/src/application/app_ats_timetable/CAtsTimeTable.cpp b/product/src/application/app_ats_timetable/CAtsTimeTable.cpp index 9aa6483e..eef26a33 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTable.cpp +++ b/product/src/application/app_ats_timetable/CAtsTimeTable.cpp @@ -3,8 +3,8 @@ #include "pub_utility_api/SingleProcInstance.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; using namespace kbd_app; #define OPT_DESC_APP "app" diff --git a/product/src/application/app_ats_timetable/CAtsTimeTable.h b/product/src/application/app_ats_timetable/CAtsTimeTable.h index d4adc254..8428b69b 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTable.h +++ b/product/src/application/app_ats_timetable/CAtsTimeTable.h @@ -12,7 +12,7 @@ namespace kbd_app { - class CAtsTimeTable : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CAtsTimeTable : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CAtsTimeTable(); @@ -90,12 +90,12 @@ namespace kbd_app 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; //< 冗余管理类 CAtsTimeTableRedundantSwitchPtr m_ptrAtsTimeTableRedundantSwitchMng; //< ats时间表服务管理类 }; diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp index f262a3a8..c0f2c996 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp +++ b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.cpp @@ -1,8 +1,8 @@ #include "CAtsTimeTableRedundantSwitch.h" #include "pub_logger_api/logger.h" -kbd_app::CAtsTimeTableRedundantSwitch::CAtsTimeTableRedundantSwitch(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +kbd_app::CAtsTimeTableRedundantSwitch::CAtsTimeTableRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrAtsTimeTableThread(NULL) diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h index cbe68265..41691cb8 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h +++ b/product/src/application/app_ats_timetable/CAtsTimeTableRedundantSwitch.h @@ -10,11 +10,11 @@ namespace kbd_app { - class CAtsTimeTableRedundantSwitch : public kbd_sys::CRedundantSwitchInterface + class CAtsTimeTableRedundantSwitch : public iot_sys::CRedundantSwitchInterface { public: - CAtsTimeTableRedundantSwitch(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CAtsTimeTableRedundantSwitch(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CAtsTimeTableRedundantSwitch(); /* @@ -32,8 +32,8 @@ namespace kbd_app int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CAtsTimeTableThreadPtr m_ptrAtsTimeTableThread; //< 定时更新ats时间表线程 }; diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp b/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp index 7d6fa2c2..d17e71bc 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp +++ b/product/src/application/app_ats_timetable/CAtsTimeTableThread.cpp @@ -8,8 +8,8 @@ #include "pub_logger_api/logger.h" #include "CAtsTimeTableThread.h" -kbd_app::CAtsTimeTableThread::CAtsTimeTableThread(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("CAtsTimeTableThread", 10000), +kbd_app::CAtsTimeTableThread::CAtsTimeTableThread(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("CAtsTimeTableThread", 10000), m_stRunAppInfo(stRunAppInfo), m_pDb(NULL) { @@ -24,7 +24,7 @@ kbd_app::CAtsTimeTableThread::~CAtsTimeTableThread() /* @brief 初始化 */ int kbd_app::CAtsTimeTableThread::initialize() { - m_pDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_pDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); if ( m_pDb->open() ) { LOGINFO("初始化数据链接并打开成功"); @@ -39,7 +39,7 @@ int kbd_app::CAtsTimeTableThread::initialize() LOGINFO("UserName: [%s]", m_pDb->getCurrentDbPara().getUserName().toStdString().c_str()); // 初始化路径配置 - boost::filesystem::path cfgPath( kbd_public::CFileUtil::getPathOfCfgFile("app_ats_timetable.cfg") ); + boost::filesystem::path cfgPath( iot_public::CFileUtil::getPathOfCfgFile("app_ats_timetable.cfg") ); boost::filesystem::fstream objStream( cfgPath, std::ios_base::in ); m_sDirectoryPath = ""; objStream >> m_sDirectoryPath; diff --git a/product/src/application/app_ats_timetable/CAtsTimeTableThread.h b/product/src/application/app_ats_timetable/CAtsTimeTableThread.h index 7b8f2340..272034b2 100644 --- a/product/src/application/app_ats_timetable/CAtsTimeTableThread.h +++ b/product/src/application/app_ats_timetable/CAtsTimeTableThread.h @@ -7,10 +7,10 @@ namespace kbd_app { -class CAtsTimeTableThread : public kbd_public::CTimerThreadBase +class CAtsTimeTableThread : public iot_public::CTimerThreadBase { public: - CAtsTimeTableThread(const kbd_public::SRunAppInfo &stRunAppInfo); + CAtsTimeTableThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CAtsTimeTableThread(); /* @@ -25,9 +25,9 @@ public: int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 std::string m_sDirectoryPath; // 待处理文件夹的路径 - kbd_dbms::CDbApi* m_pDb; // 数据库接口 + iot_dbms::CDbApi* m_pDb; // 数据库接口 }; typedef boost::shared_ptr CAtsTimeTableThreadPtr; diff --git a/product/src/application/app_bas_timetable/BasicOperation.cpp b/product/src/application/app_bas_timetable/BasicOperation.cpp index fad2f518..2a908702 100644 --- a/product/src/application/app_bas_timetable/BasicOperation.cpp +++ b/product/src/application/app_bas_timetable/BasicOperation.cpp @@ -12,13 +12,13 @@ #include "AlarmMessage.pb.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_service; +using namespace iot_idl; -kbd_app::CBasicOperation::CBasicOperation(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, +kbd_app::CBasicOperation::CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng) :m_stRunAppInfo(stRunAppInfo), @@ -90,7 +90,7 @@ bool kbd_app::CBasicOperation::sendAlarm(const STimetableCmd &stCmd) int nAlmStatus = stCmd.bIsSuccess ? ALM_STAT_OPT_BAS_TT_SUCCESS : ALM_STAT_OPT_BAS_TT_FAILED; - kbd_idlfile::SAppAddAlm objAlarm; + iot_idl::SAppAddAlm objAlarm; SAlmInfoFromApp *pAlmInfo = objAlarm.add_alm_info(); pAlmInfo->set_alm_type(ALM_TYPE_OPERATE); //报警类型 pAlmInfo->set_status(nAlmStatus); //报警状态 diff --git a/product/src/application/app_bas_timetable/BasicOperation.h b/product/src/application/app_bas_timetable/BasicOperation.h index f8bbf124..de4563b7 100644 --- a/product/src/application/app_bas_timetable/BasicOperation.h +++ b/product/src/application/app_bas_timetable/BasicOperation.h @@ -17,8 +17,8 @@ namespace kbd_app class CBasicOperation { public: - CBasicOperation(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, + CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng); virtual ~CBasicOperation(); @@ -154,12 +154,12 @@ namespace kbd_app bool getLocationIdByKeyIdTag(const std::string &strKeyIdTag, int &nLocationId); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 CParamMngPtr m_ptrParamMng; //< 参数信息管理类 CTimetableMsgBusMngPtr m_ptrMsgMng; //< 消息管理类 CRtdbTableOperatePtr m_ptrTableOpt; //< 时间表相关内存表操作类 - kbd_service::CAlmApiForAppPtr m_ptrAlarmApi; //< 报警接口 + iot_service::CAlmApiForAppPtr m_ptrAlarmApi; //< 报警接口 }; typedef boost::shared_ptr CBasicOperationPtr; diff --git a/product/src/application/app_bas_timetable/DownloadTimetable.cpp b/product/src/application/app_bas_timetable/DownloadTimetable.cpp index f91e4a40..48bbd797 100644 --- a/product/src/application/app_bas_timetable/DownloadTimetable.cpp +++ b/product/src/application/app_bas_timetable/DownloadTimetable.cpp @@ -7,12 +7,12 @@ #include "ParamMng.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -// using namespace kbd_net; -// using namespace kbd_dbms; +// using namespace iot_net; +// using namespace iot_dbms; -kbd_app::CDownloadTimetable::CDownloadTimetable(const kbd_public::SRunAppInfo &stRunAppInfo, +kbd_app::CDownloadTimetable::CDownloadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng, const CBasicOperationPtr &ptrBasicOpt) diff --git a/product/src/application/app_bas_timetable/DownloadTimetable.h b/product/src/application/app_bas_timetable/DownloadTimetable.h index 39620d52..547d4088 100644 --- a/product/src/application/app_bas_timetable/DownloadTimetable.h +++ b/product/src/application/app_bas_timetable/DownloadTimetable.h @@ -16,7 +16,7 @@ namespace kbd_app class CDownloadTimetable { public: - CDownloadTimetable(const kbd_public::SRunAppInfo &stRunAppInfo, + CDownloadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng, const CBasicOperationPtr &ptrBasicOpt); @@ -119,7 +119,7 @@ namespace kbd_app bool makeDownloadMsg(const STimetableCmd &stCmd, std::string &strMsg); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 CParamMngPtr m_ptrParamMng; //< 参数信息管理类 CTimetableMsgBusMngPtr m_ptrMsgMng; //< 消息管理类 CBasicOperationPtr m_ptrBasicOpt; //< 基础操作类 diff --git a/product/src/application/app_bas_timetable/ParamMng.cpp b/product/src/application/app_bas_timetable/ParamMng.cpp index 826fef75..729f5bce 100644 --- a/product/src/application/app_bas_timetable/ParamMng.cpp +++ b/product/src/application/app_bas_timetable/ParamMng.cpp @@ -3,11 +3,11 @@ #include "pub_sysinfo_api/SysInfoApi.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -kbd_app::CParamMng::CParamMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +kbd_app::CParamMng::CParamMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrSysInfo(ptrSysInfo) { @@ -39,7 +39,7 @@ int kbd_app::CParamMng::initialize() } /* @brief 通过车站ID获取车站信息 */ -bool kbd_app::CParamMng::getLocationInfoById(const int nLocationId, kbd_public::SLocationInfo &stLocationInfo) +bool kbd_app::CParamMng::getLocationInfoById(const int nLocationId, iot_public::SLocationInfo &stLocationInfo) { BOOST_AUTO(pIter, m_mapLocationInfo.find(nLocationId)); if (pIter != m_mapLocationInfo.end()) diff --git a/product/src/application/app_bas_timetable/ParamMng.h b/product/src/application/app_bas_timetable/ParamMng.h index d4f6672b..e1bab314 100644 --- a/product/src/application/app_bas_timetable/ParamMng.h +++ b/product/src/application/app_bas_timetable/ParamMng.h @@ -13,8 +13,8 @@ namespace kbd_app class CParamMng { public: - CParamMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CParamMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CParamMng(); /* @@ -26,10 +26,10 @@ namespace kbd_app /* @brief 通过车站ID获取车站信息 @param const int nLocationId 车站ID - @param kbd_public::SLocationInfo & stLocationInfo 返回的车站信息 + @param iot_public::SLocationInfo & stLocationInfo 返回的车站信息 @return 成功返回true，失败返回false */ - bool getLocationInfoById(const int nLocationId, kbd_public::SLocationInfo &stLocationInfo); + bool getLocationInfoById(const int nLocationId, iot_public::SLocationInfo &stLocationInfo); /* @brief 通过车站ID获取控制参数信息 @@ -93,8 +93,8 @@ namespace kbd_app void clearLocationCtrlParam(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::SRunAppInfo m_stRunAppInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; LocationIdToInfoMAP m_mapLocationInfo; //< 本域的车站列表<车站ID，车站信息> LocationIdToCtrlParamMAP m_mapLocationIdToCtrlParam; //< 车站下载配置参数，每天读取一次 diff --git a/product/src/application/app_bas_timetable/ReadTimetable.cpp b/product/src/application/app_bas_timetable/ReadTimetable.cpp index fa0ff4cc..02408190 100644 --- a/product/src/application/app_bas_timetable/ReadTimetable.cpp +++ b/product/src/application/app_bas_timetable/ReadTimetable.cpp @@ -5,10 +5,10 @@ #include "ParamMng.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; -kbd_app::CReadTimetable::CReadTimetable(const kbd_public::SRunAppInfo &stRunAppInfo, +kbd_app::CReadTimetable::CReadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng, const CBasicOperationPtr &ptrBasicOpt) diff --git a/product/src/application/app_bas_timetable/ReadTimetable.h b/product/src/application/app_bas_timetable/ReadTimetable.h index f33c830a..9398a3ce 100644 --- a/product/src/application/app_bas_timetable/ReadTimetable.h +++ b/product/src/application/app_bas_timetable/ReadTimetable.h @@ -9,7 +9,7 @@ namespace kbd_app class CReadTimetable { public: - CReadTimetable(const kbd_public::SRunAppInfo &stRunAppInfo, + CReadTimetable(const iot_public::SRunAppInfo &stRunAppInfo, const CParamMngPtr &ptrParamMng, const CTimetableMsgBusMngPtr &ptrMsgMng, const CBasicOperationPtr &ptrBasicOpt); @@ -64,7 +64,7 @@ namespace kbd_app bool makeReadMsg(const STimetableCmd &stCmd, std::string &strMsg); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 CParamMngPtr m_ptrParamMng; //< 参数信息管理类 CTimetableMsgBusMngPtr m_ptrMsgMng; //< 消息管理类 CBasicOperationPtr m_ptrBasicOpt; //< 基础操作类 diff --git a/product/src/application/app_bas_timetable/TimetableCommon.h b/product/src/application/app_bas_timetable/TimetableCommon.h index 2012ef61..045b0826 100644 --- a/product/src/application/app_bas_timetable/TimetableCommon.h +++ b/product/src/application/app_bas_timetable/TimetableCommon.h @@ -151,5 +151,5 @@ namespace kbd_app typedef std::map SCustomRepMAP; //< 自定义命令的反馈缓冲区 typedef std::map SPntRepMAP; //< 通用命令的反馈缓冲区 typedef std::map LocationToTimetableCmdMAP; //< 时间表命令缓冲区<车站ID，命令> - typedef std::map LocationIdToInfoMAP; //< 本域的车站列表<车站ID，车站信息> + typedef std::map LocationIdToInfoMAP; //< 本域的车站列表<车站ID，车站信息> } diff --git a/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp b/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp index d860cde8..6fae5e5e 100644 --- a/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp +++ b/product/src/application/app_bas_timetable/TimetableMsgBusMng.cpp @@ -11,14 +11,14 @@ #include "TimetableCommon.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_net; +using namespace iot_dbms; +using namespace iot_net; -kbd_app::CTimetableMsgBusMng::CTimetableMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) +kbd_app::CTimetableMsgBusMng::CTimetableMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrSysInfo(ptrSysInfo) { @@ -85,7 +85,7 @@ int kbd_app::CTimetableMsgBusMng::initialize() } /* @brief 接收消息 */ -bool kbd_app::CTimetableMsgBusMng::recvMsg(kbd_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) +bool kbd_app::CTimetableMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) { return m_objCommunicator.recvMsg(objMsg, nTimeoutMsec); } diff --git a/product/src/application/app_bas_timetable/TimetableMsgBusMng.h b/product/src/application/app_bas_timetable/TimetableMsgBusMng.h index 6d240cd0..c0e71ed0 100644 --- a/product/src/application/app_bas_timetable/TimetableMsgBusMng.h +++ b/product/src/application/app_bas_timetable/TimetableMsgBusMng.h @@ -14,8 +14,8 @@ namespace kbd_app class CTimetableMsgBusMng { public: - CTimetableMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CTimetableMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CTimetableMsgBusMng(); /* @@ -35,11 +35,11 @@ namespace kbd_app int unsubscribeMessage(); /* @brief 接收消息 - @param kbd_net::CMbMessage & objMsg 返回的消息 + @param iot_net::CMbMessage & objMsg 返回的消息 @param int nTimeoutMsec 超时时间 @return 成功返回true，失败返回false */ - bool recvMsg(kbd_net::CMbMessage &objMsg, int nTimeoutMsec = 0); + bool recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec = 0); /* @brief 发送消息 @param const std::string & strMsg 消息内容 @@ -58,9 +58,9 @@ namespace kbd_app std::string getCommunicatorName(); private: - kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 }; typedef boost::shared_ptr CTimetableMsgBusMngPtr; diff --git a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp index 0a1b31c7..9a79ddbf 100644 --- a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp +++ b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.cpp @@ -3,12 +3,12 @@ #include "ParamMng.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_service; +using namespace iot_dbms; +using namespace iot_service; -kbd_app::CTimetableRtdbTableOperate::CTimetableRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo) +kbd_app::CTimetableRtdbTableOperate::CTimetableRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrTableMng(NULL), m_ptrDpApi(NULL) diff --git a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h index d69fc1ac..ed3f6409 100644 --- a/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h +++ b/product/src/application/app_bas_timetable/TimetableRtdbTableOperate.h @@ -20,7 +20,7 @@ namespace kbd_app class CTimetableRtdbTableOperate { public: - CTimetableRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo); + CTimetableRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CTimetableRtdbTableOperate(); /* @@ -80,14 +80,14 @@ namespace kbd_app int getModeInfo(int nLocationId, int nCraftId, int nModeId, STableModeDef &stModeInfo); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_dbms::CRdbAccessEx m_objScheduleTable; //< BAS_TIMETABLE_SCHEDULE内存表 - kbd_dbms::CRdbAccessEx m_objCtrlParamTable; //< BAS_TIMETABLE_CTRL_PARAM内存表 - kbd_dbms::CRdbAccessEx m_objTimetableDefTable; //< BAS_TIMETABLE_DEF内存表 - kbd_dbms::CRdbAccessEx m_objTimetableInfoTable; //< BAS_TIMETABLE_INFO内存表 - kbd_dbms::CRdbAccessEx m_objModeDefTable; //< BAS_TIMETABLE_INFO内存表 - kbd_dbms::CRdbTableMngPtr m_ptrTableMng; //< 测点表内存表管理类 - kbd_service::CDataProcessApiPtr m_ptrDpApi; //< 用来判断状态字是否正常 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_dbms::CRdbAccessEx m_objScheduleTable; //< BAS_TIMETABLE_SCHEDULE内存表 + iot_dbms::CRdbAccessEx m_objCtrlParamTable; //< BAS_TIMETABLE_CTRL_PARAM内存表 + iot_dbms::CRdbAccessEx m_objTimetableDefTable; //< BAS_TIMETABLE_DEF内存表 + iot_dbms::CRdbAccessEx m_objTimetableInfoTable; //< BAS_TIMETABLE_INFO内存表 + iot_dbms::CRdbAccessEx m_objModeDefTable; //< BAS_TIMETABLE_INFO内存表 + iot_dbms::CRdbTableMngPtr m_ptrTableMng; //< 测点表内存表管理类 + iot_service::CDataProcessApiPtr m_ptrDpApi; //< 用来判断状态字是否正常 }; typedef boost::shared_ptr CRtdbTableOperatePtr; diff --git a/product/src/application/app_bas_timetable/TimetableServerApp.cpp b/product/src/application/app_bas_timetable/TimetableServerApp.cpp index 2e78c3f8..ec679fdc 100644 --- a/product/src/application/app_bas_timetable/TimetableServerApp.cpp +++ b/product/src/application/app_bas_timetable/TimetableServerApp.cpp @@ -11,10 +11,10 @@ #include "TimetableCommon.h" 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; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" @@ -34,7 +34,7 @@ kbd_app::CTimetableServerApp::~CTimetableServerApp() bool kbd_app::CTimetableServerApp::start(int argc, char *argv[], int &/*nStatus*/) { - kbd_public::initI18N(".", "", ""); + iot_public::initI18N(".", "", ""); //1.解析启动参数 if (!parseCmdLine(argc, argv)) { diff --git a/product/src/application/app_bas_timetable/TimetableServerApp.h b/product/src/application/app_bas_timetable/TimetableServerApp.h index b223271b..0a07054d 100644 --- a/product/src/application/app_bas_timetable/TimetableServerApp.h +++ b/product/src/application/app_bas_timetable/TimetableServerApp.h @@ -12,7 +12,7 @@ namespace kbd_app { - class CTimetableServerApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CTimetableServerApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CTimetableServerApp(); @@ -90,12 +90,12 @@ namespace kbd_app 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; //< 冗余管理类 CPaServerMngPtr m_ptrTimetableSrvMng; //< 时间表服务管理类 }; diff --git a/product/src/application/app_bas_timetable/TimetableServerMng.cpp b/product/src/application/app_bas_timetable/TimetableServerMng.cpp index 8d6c9b21..8ac69743 100644 --- a/product/src/application/app_bas_timetable/TimetableServerMng.cpp +++ b/product/src/application/app_bas_timetable/TimetableServerMng.cpp @@ -6,9 +6,9 @@ #include "TimetableServerMng.h" #include "pub_logger_api/logger.h" -kbd_app::CTimetableServerMng::CTimetableServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +kbd_app::CTimetableServerMng::CTimetableServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrSysInfo(ptrSysInfo), m_ptrProcMng(ptrProcMng), diff --git a/product/src/application/app_bas_timetable/TimetableServerMng.h b/product/src/application/app_bas_timetable/TimetableServerMng.h index 3842d88d..1bf9e3e8 100644 --- a/product/src/application/app_bas_timetable/TimetableServerMng.h +++ b/product/src/application/app_bas_timetable/TimetableServerMng.h @@ -10,12 +10,12 @@ namespace kbd_app { - class CTimetableServerMng : public kbd_sys::CRedundantSwitchInterface + class CTimetableServerMng : public iot_sys::CRedundantSwitchInterface { public: - CTimetableServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CTimetableServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CTimetableServerMng(); /* @@ -33,9 +33,9 @@ namespace kbd_app int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CTimetableThreadPtr m_ptrTimetableThread; //< 时间表下载线程 }; diff --git a/product/src/application/app_bas_timetable/TimetableThread.cpp b/product/src/application/app_bas_timetable/TimetableThread.cpp index 1fdf3e37..4ecfa70d 100644 --- a/product/src/application/app_bas_timetable/TimetableThread.cpp +++ b/product/src/application/app_bas_timetable/TimetableThread.cpp @@ -9,14 +9,14 @@ #include "TimetableCommon.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_net; +using namespace iot_dbms; +using namespace iot_net; -kbd_app::CTimetableThread::CTimetableThread(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo) - :kbd_public::CTimerThreadBase("CTimetableThread", 0), +kbd_app::CTimetableThread::CTimetableThread(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo) + :iot_public::CTimerThreadBase("CTimetableThread", 0), m_ptrSysInfo(ptrSysInfo), m_stRunAppInfo(stRunAppInfo), m_ptrParamMng(NULL), @@ -270,7 +270,7 @@ bool kbd_app::CTimetableThread::needDownload(const STableTimetableSchedule &stSc } /* @brief 添加人工操作命令到命令缓冲区 */ -bool kbd_app::CTimetableThread::addManualCmd(const kbd_net::CMbMessage &objMsg) +bool kbd_app::CTimetableThread::addManualCmd(const iot_net::CMbMessage &objMsg) { if (objMsg.getMsgType() != MT_OPT_TIMETABLE_DOWNLOAD_DOWN && objMsg.getMsgType() != MT_OPT_TIMETABLE_READ_DOWN) @@ -316,7 +316,7 @@ bool kbd_app::CTimetableThread::addManualCmd(const kbd_net::CMbMessage &objMsg) } /* @brief 添加命令反馈到缓冲区 */ -bool kbd_app::CTimetableThread::dispatchResponse(const kbd_net::CMbMessage &objMsg) +bool kbd_app::CTimetableThread::dispatchResponse(const iot_net::CMbMessage &objMsg) { bool bRet = false; switch (objMsg.getMsgType()) @@ -334,7 +334,7 @@ bool kbd_app::CTimetableThread::dispatchResponse(const kbd_net::CMbMessage &objM return bRet; } -bool kbd_app::CTimetableThread::addCustomResponse(const kbd_net::CMbMessage &objMsg) +bool kbd_app::CTimetableThread::addCustomResponse(const iot_net::CMbMessage &objMsg) { COptCustCtrlReply objParse; SOptCustCtrlReply stRep; @@ -357,7 +357,7 @@ bool kbd_app::CTimetableThread::addCustomResponse(const kbd_net::CMbMessage &obj return true; } -bool kbd_app::CTimetableThread::addPntResponse(const kbd_net::CMbMessage &objMsg) +bool kbd_app::CTimetableThread::addPntResponse(const iot_net::CMbMessage &objMsg) { COptCtrlReply objParse; SOptCtrlReply stRep; diff --git a/product/src/application/app_bas_timetable/TimetableThread.h b/product/src/application/app_bas_timetable/TimetableThread.h index 1a5d467e..6a3f4c9e 100644 --- a/product/src/application/app_bas_timetable/TimetableThread.h +++ b/product/src/application/app_bas_timetable/TimetableThread.h @@ -15,11 +15,11 @@ namespace kbd_app { - class CTimetableThread : public kbd_public::CTimerThreadBase + class CTimetableThread : public iot_public::CTimerThreadBase { public: - CTimetableThread(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::CSysInfoInterfacePtr &ptrSysInfo); + CTimetableThread(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::CSysInfoInterfacePtr &ptrSysInfo); virtual ~CTimetableThread(); /* @@ -61,22 +61,22 @@ namespace kbd_app bool addScheduleCmd(const STableTimetableSchedule &stSchedule); /* @brief 添加命令反馈到缓冲区 - @param const kbd_net::CMbMessage & objMsg 反馈消息 + @param const iot_net::CMbMessage & objMsg 反馈消息 @return 成功返回true，失败返回false */ - bool dispatchResponse(const kbd_net::CMbMessage &objMsg); - bool addCustomResponse(const kbd_net::CMbMessage &objMsg); - bool addPntResponse(const kbd_net::CMbMessage &objMsg); + bool dispatchResponse(const iot_net::CMbMessage &objMsg); + bool addCustomResponse(const iot_net::CMbMessage &objMsg); + bool addPntResponse(const iot_net::CMbMessage &objMsg); /* @brief 添加人工操作命令到命令缓冲区 - @param const kbd_net::CMbMessage & objMsg + @param const iot_net::CMbMessage & objMsg @return 成功返回true，失败返回false */ - bool addManualCmd(const kbd_net::CMbMessage &objMsg); + bool addManualCmd(const iot_net::CMbMessage &objMsg); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 boost::gregorian::date m_readCfgDate; //< 最后一次读取配置文件的日期 boost::posix_time::ptime m_curTime; //< 当前时间,单位秒（线程每次循环获取一次） diff --git a/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp b/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp index fbc2d0cb..5bbf1010 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_delay/CAlarmDelay.cpp @@ -82,7 +82,7 @@ int CAlarmDelay::init(const SFbdModKey &stModuleKey, const std::string &) LOGERROR( "获取模块[%s]的延迟时间失败", stModuleKey.toString().c_str()); return kbdFailed; } - m_nDelayTime = kbd_public::StringToInt(sDelayTime); + m_nDelayTime = iot_public::StringToInt(sDelayTime); //5.初始化fbd告警接口指针 m_fbdAlarmCltApi = getFbdAlarmCltApi(); @@ -129,7 +129,7 @@ int CAlarmDelay::calculate() { AlarmInfoToTimePair attpair; attpair.almInfoVec = almValAndSta.m_vecValue; - attpair.nTime = kbd_public::getUTCTimeSec(); + attpair.nTime = iot_public::getUTCTimeSec(); m_almList.push_back(attpair); } } @@ -223,7 +223,7 @@ int CAlarmDelay::setAllOutputInvalid() int CAlarmDelay::handleDelay() { m_AlmInfoVec.clear(); - uint64 nCurTime = kbd_public::getUTCTimeSec(); + uint64 nCurTime = iot_public::getUTCTimeSec(); std::list::iterator it = m_almList.begin(); while (it != m_almList.end()) { if((*it).nTime + m_nDelayTime <= nCurTime) diff --git a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp index 832f7e88..f3160f34 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.cpp @@ -35,15 +35,15 @@ static const int cn_nTopoClusterTimeout_Max = 100 * 1000; //< 100s /***********************************************************************************************/ CAlarmPush::CAlarmPush() { - m_rtdbRmUserDef = new kbd_dbms::CRdbAccess(); + m_rtdbRmUserDef = new iot_dbms::CRdbAccess(); m_rtdbRmUserDef->open("base", "rm_user_def"); - m_rtdbAlarmLevelDef = new kbd_dbms::CRdbAccess(); + m_rtdbAlarmLevelDef = new iot_dbms::CRdbAccess(); m_rtdbAlarmLevelDef->open("base", "alarm_level_define"); - m_rtdbAlarmStatusDef = new kbd_dbms::CRdbAccess(); + m_rtdbAlarmStatusDef = new iot_dbms::CRdbAccess(); m_rtdbAlarmStatusDef->open("base", "alarm_status_define"); - m_rtdbRegionInfo = new kbd_dbms::CRdbAccess(); + m_rtdbRegionInfo = new iot_dbms::CRdbAccess(); m_rtdbRegionInfo->open("base", "region_info"); - m_rtdbDevGroup = new kbd_dbms::CRdbAccess(); + m_rtdbDevGroup = new iot_dbms::CRdbAccess(); m_rtdbDevGroup->open("base", "dev_group"); } @@ -145,7 +145,7 @@ int CAlarmPush::init(const SFbdModKey &stModuleKey, const std::string &) //4.加载配置是否启用了智能告警 //< 加载 intelli_alm_cfg.xml { - const std::string strFileName = kbd_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml",CN_DIR_PLATFORM); + const std::string strFileName = iot_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml",CN_DIR_PLATFORM); boost::property_tree::ptree pt; try @@ -217,7 +217,7 @@ int CAlarmPush::calculate() if ( isValidOfStatus( almValAndSta.m_nStatus )) { - uint64 nTime = kbd_public::getUTCTimeMsec(); + uint64 nTime = iot_public::getUTCTimeMsec(); SAlmPushAlmInfo almInfo; almInfo.m_nTime = nTime+m_nOutTime*2; almInfo.m_almInfoVec = almValAndSta.m_vecValue; @@ -372,7 +372,7 @@ int CAlarmPush::setAllOutputInvalid() int CAlarmPush::handlePush() { m_almInfoVec.clear(); - uint64 nCurTime = kbd_public::getUTCTimeMsec(); + uint64 nCurTime = iot_public::getUTCTimeMsec(); if(m_nIsAi == EN_PUSH_ALARM_AI) { while (!m_almInfoQueue.empty()) { @@ -416,7 +416,7 @@ int CAlarmPush::handleAiAlm(SFbdAlarmInfo &almInfo) { SFbdItlAlmInfo itlInfo; - uint64 nTime = kbd_public::getUTCTimeMsec(); + uint64 nTime = iot_public::getUTCTimeMsec(); if(m_fbdAlarmCltApi->getItlAlmByRawAlm(almInfo,itlInfo) == kbdSuccess) { std::string itluuid = itlInfo.getUuidBase64(); @@ -562,7 +562,7 @@ std::string CAlarmPush::previewRepeat(const std::string &text) return showText; } std::string numText =vecParam[1]; - int num = kbd_public::StringToInt(numText); + int num = iot_public::StringToInt(numText); std::string repeatText = text.substr(6+numText.length()); if(num > m_evts_cnt) { @@ -580,27 +580,27 @@ std::string CAlarmPush::getText(const std::string &key, int index) { if(key == "evts_cnt") { - return kbd_public::IntToString(m_evts_cnt); + return iot_public::IntToString(m_evts_cnt); } if(key == "evts_1_priority") { - return kbd_public::IntToString(m_evts_1_priority); + return iot_public::IntToString(m_evts_1_priority); } if(key == "evts_2_priority") { - return kbd_public::IntToString(m_evts_2_priority); + return iot_public::IntToString(m_evts_2_priority); } if(key == "evts_3_priority") { - return kbd_public::IntToString(m_evts_3_priority); + return iot_public::IntToString(m_evts_3_priority); } if(key == "evts_4_priority") { - return kbd_public::IntToString(m_evts_4_priority); + return iot_public::IntToString(m_evts_4_priority); } if(key == "evts_5_priority") { - return kbd_public::IntToString(m_evts_5_priority); + return iot_public::IntToString(m_evts_5_priority); } if(key == "time") { @@ -660,7 +660,7 @@ std::string CAlarmPush::timeText(int index) if(index == -1) { //返回主告警时间。 - kbd_public::LOCALTIME locTime = kbd_public::convertUTCMsecToLocalTime(m_mainEvtInfo.getTimeStamp()); + iot_public::LOCALTIME locTime = iot_public::convertUTCMsecToLocalTime(m_mainEvtInfo.getTimeStamp()); getTime(locTime,time); }else @@ -673,7 +673,7 @@ std::string CAlarmPush::timeText(int index) { return " "; } - kbd_public::LOCALTIME locTime = kbd_public::convertUTCMsecToLocalTime(timeStamp); + iot_public::LOCALTIME locTime = iot_public::convertUTCMsecToLocalTime(timeStamp); getTime(locTime,time); } return time; @@ -691,7 +691,7 @@ std::string CAlarmPush::domain_descText(int index) domainId = m_almInfoVec.at(index).getDomainId(); } - kbd_public::SDomainInfo stDomainInfo; + iot_public::SDomainInfo stDomainInfo; CFbdSysInfoApiPtr ptrSysInfo = getFbdSysInfoApi(); if ( ptrSysInfo == nullptr ) { @@ -722,7 +722,7 @@ std::string CAlarmPush::locationText(int index) locId = m_almInfoVec.at(index).getLocationId(); } - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; CFbdSysInfoApiPtr ptrSysInfo = getFbdSysInfoApi(); if ( ptrSysInfo == nullptr ) { @@ -751,7 +751,7 @@ std::string CAlarmPush::appText(int index) { appId = m_almInfoVec.at(index).getAppId(); } - kbd_public::SAppInfo stAppInfo; + iot_public::SAppInfo stAppInfo; CFbdSysInfoApiPtr ptrSysInfo = getFbdSysInfoApi(); if ( ptrSysInfo == nullptr ) { @@ -780,8 +780,8 @@ std::string CAlarmPush::priorityText(int index) priorityId = m_almInfoVec.at(index).getPriority(); } - kbd_dbms::CTableLockGuard locker(*m_rtdbAlarmLevelDef); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbAlarmLevelDef); + iot_dbms::CVarType value; m_rtdbAlarmLevelDef->getColumnValueByKey((void*)&priorityId, "priority_name", value); return value.toStdString(); } @@ -809,8 +809,8 @@ std::string CAlarmPush::alm_statusText(int index) { statusId = m_almInfoVec.at(index).getAlmStatus(); } - kbd_dbms::CTableLockGuard locker(*m_rtdbAlarmStatusDef); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbAlarmStatusDef); + iot_dbms::CVarType value; m_rtdbAlarmStatusDef->getColumnValueByKey((void*)&statusId, "display_name", value); return value.toStdString(); } @@ -827,7 +827,7 @@ std::string CAlarmPush::sub_systemText(int index) subId = m_almInfoVec.at(index).getSubSystem(); } - kbd_public::SSubsystemInfo stSubsystemInfo; + iot_public::SSubsystemInfo stSubsystemInfo; CFbdSysInfoApiPtr ptrSysInfo = getFbdSysInfoApi(); if ( ptrSysInfo == nullptr ) { @@ -855,8 +855,8 @@ std::string CAlarmPush::regionText(int index) { regionId = m_almInfoVec.at(index).getRegionId(); } - kbd_dbms::CTableLockGuard locker(*m_rtdbRegionInfo); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbRegionInfo); + iot_dbms::CVarType value; m_rtdbRegionInfo->getColumnValueByKey((void*)®ionId, "description", value); return value.toStdString(); } @@ -871,8 +871,8 @@ std::string CAlarmPush::dev_groupText(int index) { devGtag = m_almInfoVec.at(index).getDevGroupTag(); } - kbd_dbms::CTableLockGuard locker(*m_rtdbDevGroup); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbDevGroup); + iot_dbms::CVarType value; m_rtdbDevGroup->getColumnValueByKey((void*)&devGtag, "description", value); return value.toStdString(); } @@ -933,22 +933,22 @@ void CAlarmPush::makeUserInfo(std::vector &userVec) std::string CAlarmPush::queryEmail(int id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbRmUserDef); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbRmUserDef); + iot_dbms::CVarType value; m_rtdbRmUserDef->getColumnValueByKey((void*)&id, "email", value); return value.toStdString(); } std::string CAlarmPush::queryPhone(int id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbRmUserDef); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbRmUserDef); + iot_dbms::CVarType value; m_rtdbRmUserDef->getColumnValueByKey((void*)&id, "mobile_phone", value); return value.toStdString(); } -void CAlarmPush::getTime(kbd_public::LOCALTIME locTime, std::string &time) +void CAlarmPush::getTime(iot_public::LOCALTIME locTime, std::string &time) { time += std::to_string((int) (locTime.wYear)); @@ -969,7 +969,7 @@ void CAlarmPush::getTime(kbd_public::LOCALTIME locTime, std::string &time) void CAlarmPush::clearOutTimeCatch() { //清除超时的缓存 - uint64 nCurTime = kbd_public::getUTCTimeMsec(); + uint64 nCurTime = iot_public::getUTCTimeMsec(); std::map::iterator pos = m_itluuidTimeMap.begin(); while (pos != m_itluuidTimeMap.end()) { diff --git a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h index 6b31bb44..c08d3bc4 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h +++ b/product/src/application/app_fbd/fbd_module/alarm_push/CAlarmPush.h @@ -132,7 +132,7 @@ private: std::string queryPhone(int id); - void getTime( kbd_public::LOCALTIME locTime,std::string &time); + void getTime( iot_public::LOCALTIME locTime,std::string &time); void clearOutTimeCatch(); @@ -174,14 +174,14 @@ private: int m_evts_4_priority{}; int m_evts_5_priority{}; - kbd_dbms::CRdbAccess * m_rtdbRmUserDef; - kbd_dbms::CRdbAccess * m_rtdbAlarmLevelDef; - kbd_dbms::CRdbAccess * m_rtdbAlarmStatusDef; - kbd_dbms::CRdbAccess * m_rtdbRegionInfo; - kbd_dbms::CRdbAccess * m_rtdbDevGroup; + iot_dbms::CRdbAccess * m_rtdbRmUserDef; + iot_dbms::CRdbAccess * m_rtdbAlarmLevelDef; + iot_dbms::CRdbAccess * m_rtdbAlarmStatusDef; + iot_dbms::CRdbAccess * m_rtdbRegionInfo; + iot_dbms::CRdbAccess * m_rtdbDevGroup; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; CFbdAlarmCltApiPtr m_fbdAlarmCltApi = nullptr; }; BOOST_DLL_ALIAS( diff --git a/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp b/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp index f76e4a2a..859a9724 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_split/CAlarmSplit.cpp @@ -60,7 +60,7 @@ int CAlarmSplit::init(const SFbdModKey &stModuleKey, const std::string &) LOGERROR( "获取模块[%s]的拆分个数失败", stModuleKey.toString().c_str()); return kbdFailed; } - int outCount = kbd_public::StringToInt(sOutCount); + int outCount = iot_public::StringToInt(sOutCount); for(int index(0);indexgetModProperty( stModuleKey, CN_OutData, value )) { @@ -92,7 +92,7 @@ int CAlarmSplit::init(const SFbdModKey &stModuleKey, const std::string &) return kbdFailed; }else { - m_nOutputType.push_back(kbd_public::StringToInt(value)); + m_nOutputType.push_back(iot_public::StringToInt(value)); } } //5.检查 @@ -233,7 +233,7 @@ void CAlarmSplit::pushSplit(SFbdAlarmInfo &info) { if(m_nOutputType.at(index) == EN_ALARM_SPLIT_BLOCK_TIME) { - stStringOutput.m_strValue = kbd_public::LongToString(info.getTimeStamp()); + stStringOutput.m_strValue = iot_public::LongToString(info.getTimeStamp()); m_ptrDiagData->setStringValByKey( m_stOutputVec.at(index), stStringOutput ); }else if(m_nOutputType.at(index) == EN_ALARM_SPLIT_BLOCK_DOMAINID) { diff --git a/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp b/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp index 4b95da05..c3b6a4df 100644 --- a/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp +++ b/product/src/application/app_fbd/fbd_module/alarm_subscribe/CAlarmSubscribe.cpp @@ -190,7 +190,7 @@ int CAlarmSubscribe::calculate() } } - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); //< 输出 if ( m_stOutValAlarm.m_vecValue.empty()) diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp index f9bb2c4c..3fd8ce81 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CApcPdGen.cpp @@ -206,7 +206,7 @@ void CApcPdGen::doRegulate() bool bApplyRegulate = false; //< 当前时间，开机后时间 - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); //< 是否正在调节间隔时间内 const bool bInInterval = m_nLastRegTime + m_pGenGlobal->getGpMinInterval() >= nTimeNow; diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp index 79440c41..6b642767 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_gen/CGenUnit.cpp @@ -567,7 +567,7 @@ void CGenUnit::correctInputValues() void CGenUnit::refreshStateMachine() { - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); EnUnitStateCode enStateTo = m_enStateCode; @@ -1103,7 +1103,7 @@ void CGenUnit::setStateCode( const EnUnitStateCode enCode ) if ( enCode != m_enStateCode ) { m_enStateCode = enCode; - m_nStateStartTime = kbd_public::getMonotonicMsec(); + m_nStateStartTime = iot_public::getMonotonicMsec(); } } diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp index 35a0e458..76531805 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CApcPdPcs.cpp @@ -221,7 +221,7 @@ void CApcPdPcs::doRegulate() bool bApplyRegulate = false; //< 当前时间，开机后时间 - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); //< 是否正在调节间隔时间内 const bool bInInterval = m_nLastRegTime + m_pPcsGlobal->getGpMinInterval() >= nTimeNow; diff --git a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp index f3c35802..3926e2f5 100644 --- a/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp +++ b/product/src/application/app_fbd/fbd_module/apc_pd_pcs/CPcsUnit.cpp @@ -611,7 +611,7 @@ void CPcsUnit::correctInputValues() void CPcsUnit::refreshStateMachine() { - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); EnUnitStateCode enStateTo = m_enStateCode; @@ -1240,7 +1240,7 @@ void CPcsUnit::setStateCode( const EnUnitStateCode enCode ) if ( enCode != m_enStateCode ) { m_enStateCode = enCode; - m_nStateStartTime = kbd_public::getMonotonicMsec(); + m_nStateStartTime = iot_public::getMonotonicMsec(); } } diff --git a/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp b/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp index f5856b41..99aeac48 100644 --- a/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp +++ b/product/src/application/app_fbd/fbd_module/fmt_text/FmtText.cpp @@ -67,7 +67,7 @@ int CFmtText::init( const SFbdModKey &stModuleKey, const std::string & ) } // 检查输入端口个数合法性 - m_nInputNum = kbd_public::StringToInt( sInputNum ); + m_nInputNum = iot_public::StringToInt( sInputNum ); if ( m_nInputNum < CN_MinIONum || m_nInputNum > CN_MaxIONum ) //< 判断是否有效 { LOGERROR( "模块[%s]要求的输入端口个数最小=%d,最大=%d", stModuleKey.toString().c_str(), CN_MinIONum, CN_MaxIONum ); diff --git a/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp b/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp index 188a8ef1..5640ff2c 100644 --- a/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp +++ b/product/src/application/app_fbd/fbd_module/multi_map/CMultiMap.cpp @@ -58,7 +58,7 @@ int MultiMap::init(const SFbdModKey &stModuleKey, const std::string &) LOGERROR( "获取模块[%s]的第一个输入类型失败", stModuleKey.toString().c_str()); return kbdFailed; } - m_nFirstType = kbd_public::StringToInt(sFirstType); + m_nFirstType = iot_public::StringToInt(sFirstType); //2.获取输入参数 if ( kbdSuccess != m_ptrDiagData->getValKeyByModInput( stModuleKey, 1, m_stInKey1 ) || @@ -79,13 +79,13 @@ int MultiMap::init(const SFbdModKey &stModuleKey, const std::string &) LOGERROR( "模块[%s]未配置输出个数", stModuleKey.toString().c_str()); return kbdFailed; } - m_nOutputNum = kbd_public::StringToInt(sOutputNum); + m_nOutputNum = iot_public::StringToInt(sOutputNum); //4.获取输出类型 for(int index(0);indexgetModProperty( stModuleKey, CN_OutData, value )) { @@ -93,7 +93,7 @@ int MultiMap::init(const SFbdModKey &stModuleKey, const std::string &) return kbdFailed; }else { - m_outTypeVec.push_back(kbd_public::StringToInt(value)); + m_outTypeVec.push_back(iot_public::StringToInt(value)); } } //5.获取输出参数 @@ -279,7 +279,7 @@ bool MultiMap::fromMultiMapJson(const char *json) m_nRows = objDocRoot["multirows"].GetInt(); for(int index(0);index multiVec; switch (m_nFirstType) { case EN_Multi_Map_Int: - nkey = kbd_public::StringToInt(rowKey); + nkey = iot_public::StringToInt(rowKey); if(size == 0) { multiVec.push_back(multiValue); @@ -346,7 +346,7 @@ bool MultiMap::fromMultiMapJson(const char *json) } break; case EN_Multi_Map_Double: - dkey = kbd_public::StringToDouble(rowKey); + dkey = iot_public::StringToDouble(rowKey); if(size == 0) { multiVec.push_back(multiValue); diff --git a/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp b/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp index 73309124..8a77f0e0 100644 --- a/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp +++ b/product/src/application/app_fbd/fbd_module/phone_call/Call.cpp @@ -170,7 +170,7 @@ int CCall::calculate() } // 拼接参数 - m_objVsmsMsg.set_time( kbd_public::getUTCTimeMsec() ); + m_objVsmsMsg.set_time( iot_public::getUTCTimeMsec() ); m_objVsmsMsg.set_number(stRecipients.m_strValue ); m_objVsmsMsg.set_content( stContent.m_strValue); @@ -198,8 +198,8 @@ boost::shared_ptr CCall::create() int CCall::sendToPushSrv( ) { - 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(m_objVsmsMsg); msg.setSubject(CN_AppId_COMAPP,CH_PSH_APP_TO_SRV_PRTBF); diff --git a/product/src/application/app_fbd/fbd_module/phone_call/Call.h b/product/src/application/app_fbd/fbd_module/phone_call/Call.h index ea46ac2b..6c69abf3 100644 --- a/product/src/application/app_fbd/fbd_module/phone_call/Call.h +++ b/product/src/application/app_fbd/fbd_module/phone_call/Call.h @@ -48,7 +48,7 @@ private: private: CFbdDiagDataApiPtr m_ptrDiagData; // Diagram数据接口 SFbdModKey m_stModKey; // 模块标识 - kbd_net::CMbCommunicator m_objComm; // 通信器 + iot_net::CMbCommunicator m_objComm; // 通信器 //< 每次caculate获取 SFbdValueKey m_stInKeyRecipients; // 输入参数-收件人 ;分隔，结尾不要有分号 例如 15161133765;19928846021 @@ -62,7 +62,7 @@ private: std::string m_strPassword; //密码 //> init获取 - kbd_idlfile::SBBNIOT_VSMS m_objVsmsMsg; // protobuf 消息 部分内容可以init时加载 + iot_idl::SBBNIOT_VSMS m_objVsmsMsg; // protobuf 消息 部分内容可以init时加载 }; diff --git a/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp b/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp index 782dcf01..cdb597db 100644 --- a/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp +++ b/product/src/application/app_fbd/fbd_module/send_sms/Sms.cpp @@ -169,7 +169,7 @@ int CSms::calculate() } // 拼接参数 - m_objVsmsMsg.set_time( kbd_public::getUTCTimeMsec() ); + m_objVsmsMsg.set_time( iot_public::getUTCTimeMsec() ); m_objVsmsMsg.set_number(stRecipients.m_strValue ); m_objVsmsMsg.set_content( stContent.m_strValue); @@ -198,8 +198,8 @@ boost::shared_ptr CSms::create() int CSms::sendToPushSrv( ) { - 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(m_objVsmsMsg); msg.setSubject(CN_AppId_COMAPP,CH_PSH_APP_TO_SRV_PRTBF); diff --git a/product/src/application/app_fbd/fbd_module/send_sms/Sms.h b/product/src/application/app_fbd/fbd_module/send_sms/Sms.h index 7ee4b088..c5768141 100644 --- a/product/src/application/app_fbd/fbd_module/send_sms/Sms.h +++ b/product/src/application/app_fbd/fbd_module/send_sms/Sms.h @@ -48,7 +48,7 @@ private: private: CFbdDiagDataApiPtr m_ptrDiagData; // Diagram数据接口 SFbdModKey m_stModKey; // 模块标识 - kbd_net::CMbCommunicator m_objComm; // 通信器 + iot_net::CMbCommunicator m_objComm; // 通信器 //< 每次caculate获取 SFbdValueKey m_stInKeyRecipients; // 输入参数-收件人 ;分隔，结尾不要有分号 例如 15161133765;19928846021 @@ -62,7 +62,7 @@ private: std::string m_strPassword; //密码 //> init获取 - kbd_idlfile::SBBNIOT_VSMS m_objVsmsMsg; // protobuf 消息 部分内容可以init时加载 + iot_idl::SBBNIOT_VSMS m_objVsmsMsg; // protobuf 消息 部分内容可以init时加载 }; diff --git a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp index ed9d57d8..ac09af62 100644 --- a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp +++ b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.cpp @@ -97,21 +97,21 @@ int CSmtpMail::init( const SFbdModKey &stModuleKey, const std::string &/*strExtr } int nConnType = std::stoi( strConnType ); - if( !(nConnType == kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION - || nConnType == kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION - || nConnType == kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION) + if( !(nConnType == iot_idl::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION + || nConnType == iot_idl::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION + || nConnType == iot_idl::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION) ) { LOGERROR("unknown smtp connection type-[%d]",nConnType); return kbdFailed; }else { - if(nConnType == kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION){ - m_emConnType = kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION; - }else if(nConnType == kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION){ - m_emConnType = kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION; + if(nConnType == iot_idl::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION){ + m_emConnType = iot_idl::SSMTP_MAIL_enConnectionType_CT_TCP_CONNECTION; + }else if(nConnType == iot_idl::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION){ + m_emConnType = iot_idl::SSMTP_MAIL_enConnectionType_CT_SSL_CONNECTION; }else{ - m_emConnType = kbd_idlfile::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION; + m_emConnType = iot_idl::SSMTP_MAIL_enConnectionType_CT_TLS_CONNECTION; } } @@ -227,7 +227,7 @@ int CSmtpMail::calculate() } // 拼接参数 - m_objMail.set_time( kbd_public::getUTCTimeMsec() ); + m_objMail.set_time( iot_public::getUTCTimeMsec() ); m_objMail.set_recipients(stRecipients.m_strValue ); m_objMail.set_subject( stSubject.m_strValue); @@ -257,8 +257,8 @@ boost::shared_ptr CSmtpMail::create() int CSmtpMail::sendToPushSrv( ) { - 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(m_objMail); msg.setSubject(CN_AppId_COMAPP,CH_PSH_APP_TO_SRV_PRTBF); diff --git a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h index 2249c7f8..15508f24 100644 --- a/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h +++ b/product/src/application/app_fbd/fbd_module/smtp_mail/SmtpMail.h @@ -48,7 +48,7 @@ private: private: CFbdDiagDataApiPtr m_ptrDiagData; // Diagram数据接口 SFbdModKey m_stModKey; // 模块标识 - kbd_net::CMbCommunicator m_objComm; // 通信器 + iot_net::CMbCommunicator m_objComm; // 通信器 //< 每次caculate获取 SFbdValueKey m_stInKeyRecipients; // 输入参数-收件人 ;分隔多收件邮箱结尾不要有分号 例如 ganyuhang@kbdct.com;chenlu@qq.com @@ -60,13 +60,13 @@ private: //< init获取 std::string m_strSrvAddr; //服务器地址 std::string m_strPort; //smtp端口 - kbd_idlfile::SSMTP_MAIL_enConnectionType m_emConnType; //链接方式 + iot_idl::SSMTP_MAIL_enConnectionType m_emConnType; //链接方式 std::string m_strSender; //发件人 std::string m_strUsername; //用户名 std::string m_strPassword; //密码 //> init获取 - kbd_idlfile::SSMTP_MAIL m_objMail; // protobuf 消息 部分内容可以init时加载 + iot_idl::SSMTP_MAIL m_objMail; // protobuf 消息 部分内容可以init时加载 }; diff --git a/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp b/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp index c803d3b8..2da83aae 100644 --- a/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp +++ b/product/src/application/app_fbd/fbd_module/time_trigger/CTimeTrigger.cpp @@ -64,7 +64,7 @@ int TimeTrigger::init(const SFbdModKey &stModuleKey, const std::string &) return kbdFailed; } boost::posix_time::ptime curTime = boost::posix_time::second_clock::local_time(); - m_nLastTriggerTime = kbd_public::convertLocalTimeToUTC(curTime); + m_nLastTriggerTime = iot_public::convertLocalTimeToUTC(curTime); //3.计算下次触发时间 if(calcNextTime(curTime) != kbdSuccess) { @@ -126,7 +126,7 @@ int TimeTrigger::setAllOutputInvalid() int TimeTrigger::handleTrigger() { boost::posix_time::ptime curTime = boost::posix_time::second_clock::local_time(); - m_nCurTime = kbd_public::convertLocalTimeToUTC(curTime); + m_nCurTime = iot_public::convertLocalTimeToUTC(curTime); if(m_nCurTime < m_nLastTriggerTime) { //此处不打印日志，不然很多 @@ -209,18 +209,18 @@ bool TimeTrigger::parseTime(const std::string &time) { return false; } - int index0 = kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_0)); + int index0 = iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_0)); if(size == EConstOrIntervalSection)//定时或者间隔 { if( index0 == E_TIMETRIGGER_CONST) //定时 { m_nTriggerType = E_TIMETRIGGER_CONST; - m_nConstTriggerTime = kbd_public::StringToLong(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_1)); + m_nConstTriggerTime = iot_public::StringToLong(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_1)); }else if(index0 == E_TIMETRIGGER_INTERVAL)//间隔 { m_nTriggerType = E_TIMETRIGGER_INTERVAL; - m_nIntervalTime = kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_1)); + m_nIntervalTime = iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_1)); }else { LOGERROR("第一个值错误[%d],在此处只能为[%d]或[%d]",index0,E_TIMETRIGGER_CONST,E_TIMETRIGGER_PERIOD); @@ -228,10 +228,10 @@ bool TimeTrigger::parseTime(const std::string &time) } }else if(size >= EPeriodSecondSection && size <= EPeriodYearSection) { - m_nBeginTime = kbd_public::StringToLong(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_1)); - m_nEndTime = kbd_public::StringToLong(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_2)); + m_nBeginTime = iot_public::StringToLong(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_1)); + m_nEndTime = iot_public::StringToLong(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_2)); LOGDEBUG("模块[%s],BEGING：%ld,END:%ld",m_stModKey.toString().c_str(),m_nBeginTime,m_nEndTime); - int iperiod = kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_3)); + int iperiod = iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_3)); m_nTriggerType = E_TIMETRIGGER_PERIOD; switch (iperiod) { case E_TIMETRIGGER_PERIOD_SECOND://每秒触发 @@ -310,7 +310,7 @@ bool TimeTrigger::parseSecond(const std::vector &) bool TimeTrigger::parseMinute(const std::vector &vecParam) { - m_nSecond =kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_4)); + m_nSecond =iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_4)); if(m_nSecond<0 || m_nSecond >60) { LOGERROR("模块[%s]秒配置[%d]不可大于60或小于0",m_stModKey.toString().c_str(),m_nSecond); @@ -326,7 +326,7 @@ bool TimeTrigger::parseHour(const std::vector &vecParam) return false; }else { - m_nMinute =kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_5)); + m_nMinute =iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_5)); if(m_nMinute<0 || m_nMinute >60) { LOGERROR("模块[%s]分钟配置[%d]不可大于60或小于0",m_stModKey.toString().c_str(),m_nSecond); @@ -343,7 +343,7 @@ bool TimeTrigger::parseDay(const std::vector &vecParam) return false; }else { - m_nHour =kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_6)); + m_nHour =iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_6)); if(m_nHour<0 || m_nHour >23) { LOGERROR("模块[%s]小时配置[%d]不可大于23或小于0",m_stModKey.toString().c_str(),m_nHour); @@ -360,7 +360,7 @@ bool TimeTrigger::parseWeek(const std::vector &vecParam) return false; }else { - m_nWeek =kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_7)); + m_nWeek =iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_7)); if(m_nWeek<0 || m_nWeek >6) { LOGERROR("模块[%s]星期配置[%d]不可大于6或小于0",m_stModKey.toString().c_str(),m_nWeek); @@ -377,7 +377,7 @@ bool TimeTrigger::parseMonth(const std::vector &vecParam) return false; }else { - m_nDay =kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_7)); + m_nDay =iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_7)); if(m_nDay<1 || m_nDay >31) { LOGERROR("模块[%s]日期配置[%d]不可大于31或小于1",m_stModKey.toString().c_str(),m_nDay); @@ -394,7 +394,7 @@ bool TimeTrigger::parseYear(const std::vector &vecParam) return false; }else { - m_nMonth =kbd_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_8)); + m_nMonth =iot_public::StringToInt(vecParam.at(E_TIMETRIGGER_SPLIT_INDEX_8)); if(m_nMonth<1|| m_nMonth >12) { LOGERROR("模块[%s]月份配置[%d]不可大于12或小于1",m_stModKey.toString().c_str(),m_nMonth); @@ -417,7 +417,7 @@ bool TimeTrigger::parseYear(const std::vector &vecParam) void TimeTrigger::updateLastTime() { boost::posix_time::ptime curTime = boost::posix_time::second_clock::local_time(); - m_nLastTriggerTime = kbd_public::convertLocalTimeToUTC(curTime); + m_nLastTriggerTime = iot_public::convertLocalTimeToUTC(curTime); if(kbdSuccess != calcNextTime(curTime)) { LOGERROR( "模块[%s]计算下次计算时间出错",m_stModKey.toString().c_str()); @@ -507,7 +507,7 @@ int TimeTrigger::calcYear(int year) return calcYear(year+1); } - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); if(m_nNextTriggerTime <= m_nLastTriggerTime) { return calcYear(year+1); @@ -532,7 +532,7 @@ int TimeTrigger::calcMonth(int year,int month) return calcMonth(year,month+1); } } - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); if(m_nNextTriggerTime <= m_nLastTriggerTime) { if(month == 12) @@ -553,8 +553,8 @@ int TimeTrigger::calcWeek(int year, int month, int day, int week, int hour, int ptime t1(date(year,month,day),time_duration(m_nHour,m_nMinute,m_nSecond)); int nMsec = 0; - uint64 last =kbd_public::getUTCMsecFromLocalTime(year,month,day,hour,minute,second,nMsec); - uint64 now =kbd_public::getUTCMsecFromLocalTime(year,month,day,m_nHour,m_nMinute,m_nSecond,nMsec); + uint64 last =iot_public::getUTCMsecFromLocalTime(year,month,day,hour,minute,second,nMsec); + uint64 now =iot_public::getUTCMsecFromLocalTime(year,month,day,m_nHour,m_nMinute,m_nSecond,nMsec); if(now <= last) { days dd(7); @@ -571,7 +571,7 @@ int TimeTrigger::calcWeek(int year, int month, int day, int week, int hour, int t1+=dd; } } - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); return kbdSuccess; } @@ -581,12 +581,12 @@ int TimeTrigger::calcDay(int year, int month, int day) using namespace boost::posix_time; ptime t1(date(year,month,day),time_duration(m_nHour,m_nMinute,m_nSecond)); - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); if(m_nNextTriggerTime <= m_nLastTriggerTime) { days dd(1); t1+= dd; - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); return kbdSuccess; } return kbdSuccess; @@ -598,12 +598,12 @@ int TimeTrigger::calcHour(int year, int month, int day, int hour) using namespace boost::posix_time; ptime t1(date(year,month,day),time_duration(hour,m_nMinute,m_nSecond)); - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); if(m_nNextTriggerTime <= m_nLastTriggerTime) { hours hh(1); t1+= hh; - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); return kbdSuccess; } return kbdSuccess; @@ -615,12 +615,12 @@ int TimeTrigger::calcMinute(int year, int month, int day, int hour, int minute) using namespace boost::posix_time; ptime t1(date(year,month,day),time_duration(hour,minute,m_nSecond)); - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); if(m_nNextTriggerTime <= m_nLastTriggerTime) { minutes mm(1); t1+= mm; - m_nNextTriggerTime = kbd_public::convertLocalTimeToUTC(t1); + m_nNextTriggerTime = iot_public::convertLocalTimeToUTC(t1); return kbdSuccess; } return kbdSuccess; diff --git a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp index 6431a267..67c43d99 100644 --- a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp +++ b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.cpp @@ -154,9 +154,9 @@ int VideoControl::handleControl(const std::string &locTag, const std::string &ap return kbdSuccess; } - const kbd_public::SRunAppInfo &stRunAppInfo = getFbdSysInfoApi()->getCurrentRunAppInfo(); + const iot_public::SRunAppInfo &stRunAppInfo = getFbdSysInfoApi()->getCurrentRunAppInfo(); - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; CFbdSysInfoApiPtr ptrSysInfo = getFbdSysInfoApi(); if ( ptrSysInfo == nullptr ) { @@ -169,29 +169,29 @@ int VideoControl::handleControl(const std::string &locTag, const std::string &ap LOGERROR("模块[%s]获取位置信息出错[%s]!",m_stModKey.toString().c_str(),locTag.c_str()); return kbdSuccess; } - kbd_public::SAppInfo stAppInfo; + iot_public::SAppInfo stAppInfo; if(ptrSysInfo->getSysInfo().getAppInfoByName(app,stAppInfo)) { LOGERROR("模块[%s]获取应用信息出错[%s]!",m_stModKey.toString().c_str(),app.c_str()); return kbdSuccess; } - ::kbd_idlfile::SVideoControlRequest videoControlRequest; + ::iot_idl::SVideoControlRequest videoControlRequest; videoControlRequest.set_strsourcetag(m_stModKey.toString()); videoControlRequest.set_nappid(stAppInfo.nId);//接收者所在应用 videoControlRequest.set_strhostname(stRunAppInfo.strLocalNodeName); videoControlRequest.set_nifneedreturn(0); - videoControlRequest.set_ultime(kbd_public::getUTCTimeMsec()); + videoControlRequest.set_ultime(iot_public::getUTCTimeMsec()); // 添加转到预置点命令 - ::kbd_idlfile::SVideoControlQueue *stKeyValue1 = videoControlRequest.add_seqcmddata(); + ::iot_idl::SVideoControlQueue *stKeyValue1 = videoControlRequest.add_seqcmddata(); stKeyValue1->set_strkeyname(KEY_CMD_TYPE); stKeyValue1->set_strkeyvalue(CCTV_ONVIF_GOTOPRESET); // 添加摄像头标签 - ::kbd_idlfile::SVideoControlQueue *stKeyValue2 = videoControlRequest.add_seqcmddata(); + ::iot_idl::SVideoControlQueue *stKeyValue2 = videoControlRequest.add_seqcmddata(); stKeyValue2->set_strkeyname(CAMERA_TAG); stKeyValue2->set_strkeyvalue(camera); // 添加预置点标签 - ::kbd_idlfile::SVideoControlQueue *stKeyValue3 = videoControlRequest.add_seqcmddata(); + ::iot_idl::SVideoControlQueue *stKeyValue3 = videoControlRequest.add_seqcmddata(); stKeyValue3->set_strkeyname(PRESET_TAG); stKeyValue3->set_strkeyvalue(preset); @@ -203,7 +203,7 @@ int VideoControl::handleControl(const std::string &locTag, const std::string &ap LOGERROR("模块[%s]生成控制命令失败",m_stModKey.toString().c_str()); return kbdSuccess; } - kbd_net::CMbMessage objMsg( strSendBuff, stRunAppInfo.nAppId, CH_APP_TO_VIDEO_CTRL_DOWN, ::kbd_idlfile::MT_VIDEO_CONTROL_MSG_FROM_FBD ); + iot_net::CMbMessage objMsg( strSendBuff, stRunAppInfo.nAppId, CH_APP_TO_VIDEO_CTRL_DOWN, ::iot_idl::MT_VIDEO_CONTROL_MSG_FROM_FBD ); if ( !objMsg.isValid()) { LOGERROR( "模块[%s]构造CMbMessage失败",m_stModKey.toString().c_str() ); diff --git a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h index d2db21bc..e6345c69 100644 --- a/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h +++ b/product/src/application/app_fbd/fbd_module/video_control/CVideoControl.h @@ -51,7 +51,7 @@ private: SFbdModKey m_stModKey; //< 模块标识 - kbd_net::CMbCommunicator m_objCommon; + iot_net::CMbCommunicator m_objCommon; }; BOOST_DLL_ALIAS( VideoControl::create, // 要导出的函数 diff --git a/product/src/application/app_pa_server/BasicOperation.cpp b/product/src/application/app_pa_server/BasicOperation.cpp index ae26dcc0..93677cbe 100644 --- a/product/src/application/app_pa_server/BasicOperation.cpp +++ b/product/src/application/app_pa_server/BasicOperation.cpp @@ -15,12 +15,12 @@ using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_service; +using namespace iot_idl; -kbd_app::CBasicOperation::CBasicOperation(const kbd_public::SRunAppInfo &stRunAppInfo) +kbd_app::CBasicOperation::CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo), m_ptrAlarmApi(NULL) { @@ -58,7 +58,7 @@ bool kbd_app::CBasicOperation::stopAlarmSvr() /* @brief 发送报警信息 */ bool kbd_app::CBasicOperation::sendAlarm(const SConstPaCmdValue &sConstPaCmdValue,const std::string &resultStr) { - kbd_idlfile::SAppAddAlm objAlarm; + iot_idl::SAppAddAlm objAlarm; SAlmInfoFromApp *pAlmInfo = objAlarm.add_alm_info(); pAlmInfo->set_alm_type(sConstPaCmdValue.sOptAlarmInfo.nAlarmType); //报警类型 pAlmInfo->set_status(sConstPaCmdValue.sOptAlarmInfo.nAlarmStatus); //报警状态 @@ -90,7 +90,7 @@ bool kbd_app::CBasicOperation::sendAlarm(const SConstPaCmdValue &sConstPaCmdValu } bool kbd_app::CBasicOperation::sendAlarm(const std::string &resultStr,const SOptAlarmInfo &sOptAlarmInfo) { - kbd_idlfile::SAppAddAlm objAlarm; + iot_idl::SAppAddAlm objAlarm; SAlmInfoFromApp *pAlmInfo = objAlarm.add_alm_info(); pAlmInfo->set_alm_type(sOptAlarmInfo.nAlarmType); //报警类型 pAlmInfo->set_status(sOptAlarmInfo.nAlarmStatus); //报警状态 diff --git a/product/src/application/app_pa_server/BasicOperation.h b/product/src/application/app_pa_server/BasicOperation.h index 7d1c899f..8095833f 100644 --- a/product/src/application/app_pa_server/BasicOperation.h +++ b/product/src/application/app_pa_server/BasicOperation.h @@ -14,7 +14,7 @@ namespace kbd_app class CBasicOperation { public: - CBasicOperation(const kbd_public::SRunAppInfo &stRunAppInfo); + CBasicOperation(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CBasicOperation(); int initialize(); bool startAlarmSvr(); @@ -22,8 +22,8 @@ namespace kbd_app bool sendAlarm(const std::string &resultStr,const SOptAlarmInfo &sOptAlarmInfo); bool sendAlarm(const SConstPaCmdValue &sConstPaCmdValue,const std::string &resultStr); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_service::CAlmApiForAppPtr m_ptrAlarmApi; //< 报警接口 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_service::CAlmApiForAppPtr m_ptrAlarmApi; //< 报警接口 }; typedef boost::shared_ptr CBasicOperationPtr; } diff --git a/product/src/application/app_pa_server/PaMsgBusMng.cpp b/product/src/application/app_pa_server/PaMsgBusMng.cpp index cad95dea..50247211 100644 --- a/product/src/application/app_pa_server/PaMsgBusMng.cpp +++ b/product/src/application/app_pa_server/PaMsgBusMng.cpp @@ -11,13 +11,13 @@ #include "PaServerCommon.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_net; +using namespace iot_dbms; +using namespace iot_net; -kbd_app::CPaMsgBusMng::CPaMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo) +kbd_app::CPaMsgBusMng::CPaMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { @@ -84,7 +84,7 @@ int kbd_app::CPaMsgBusMng::initialize() } /* @brief 接收消息 */ -bool kbd_app::CPaMsgBusMng::recvMsg(kbd_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) +bool kbd_app::CPaMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec /*= 0*/) { return m_objCommunicator.recvMsg(objMsg, nTimeoutMsec); } diff --git a/product/src/application/app_pa_server/PaMsgBusMng.h b/product/src/application/app_pa_server/PaMsgBusMng.h index d8a42c31..1d5cfee8 100644 --- a/product/src/application/app_pa_server/PaMsgBusMng.h +++ b/product/src/application/app_pa_server/PaMsgBusMng.h @@ -11,7 +11,7 @@ namespace kbd_app class CPaMsgBusMng { public: - CPaMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo); + CPaMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CPaMsgBusMng(); /* @@ -31,11 +31,11 @@ namespace kbd_app int unsubscribeMessage(); /* @brief 接收消息 - @param kbd_net::CMbMessage & objMsg 返回的消息 + @param iot_net::CMbMessage & objMsg 返回的消息 @param int nTimeoutMsec 超时时间 @return 成功返回true，失败返回false */ - bool recvMsg(kbd_net::CMbMessage &objMsg, int nTimeoutMsec = 0); + bool recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec = 0); /* @brief 发送消息 @param const std::string & strMsg 消息内容 @@ -52,8 +52,8 @@ namespace kbd_app std::string getCommunicatorName(); private: - kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 }; typedef boost::shared_ptr CPaMsgBusMngPtr; diff --git a/product/src/application/app_pa_server/PaRtdbTableOperate.cpp b/product/src/application/app_pa_server/PaRtdbTableOperate.cpp index c5e88dbe..c81fa81b 100644 --- a/product/src/application/app_pa_server/PaRtdbTableOperate.cpp +++ b/product/src/application/app_pa_server/PaRtdbTableOperate.cpp @@ -6,11 +6,11 @@ #include "PaRtdbTableOperate.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; +using namespace iot_dbms; -kbd_app::CPaRtdbTableOperate::CPaRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo) +kbd_app::CPaRtdbTableOperate::CPaRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { } diff --git a/product/src/application/app_pa_server/PaRtdbTableOperate.h b/product/src/application/app_pa_server/PaRtdbTableOperate.h index 72363b70..3c48367a 100644 --- a/product/src/application/app_pa_server/PaRtdbTableOperate.h +++ b/product/src/application/app_pa_server/PaRtdbTableOperate.h @@ -16,7 +16,7 @@ namespace kbd_app class CPaRtdbTableOperate { public: - CPaRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo); + CPaRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CPaRtdbTableOperate(); /* @@ -70,11 +70,11 @@ namespace kbd_app int getPaOperatorId(int nUserGrpId, int &nOperatorId); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_dbms::CRdbAccessEx m_objPaAudioInfoTable; //< PA_AUDIO_INFO内存表 - kbd_dbms::CRdbAccessEx m_objPaTimedAudioTable; //< PA_TIMED_AUDIO内存表 - kbd_dbms::CRdbAccessEx m_objPaCtrlTagTable; //< PA_CTRL_TAG内存表 - kbd_dbms::CRdbAccessEx m_objPaOperatorMapTable;//< PA_OPERATOR_MAP内存表 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_dbms::CRdbAccessEx m_objPaAudioInfoTable; //< PA_AUDIO_INFO内存表 + iot_dbms::CRdbAccessEx m_objPaTimedAudioTable; //< PA_TIMED_AUDIO内存表 + iot_dbms::CRdbAccessEx m_objPaCtrlTagTable; //< PA_CTRL_TAG内存表 + iot_dbms::CRdbAccessEx m_objPaOperatorMapTable;//< PA_OPERATOR_MAP内存表 }; typedef boost::shared_ptr CPaRtdbTableOperatePtr; diff --git a/product/src/application/app_pa_server/PaServerApp.cpp b/product/src/application/app_pa_server/PaServerApp.cpp index 5ca46ebf..c47fc484 100644 --- a/product/src/application/app_pa_server/PaServerApp.cpp +++ b/product/src/application/app_pa_server/PaServerApp.cpp @@ -10,10 +10,10 @@ #include "PaServerCommon.h" 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; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" diff --git a/product/src/application/app_pa_server/PaServerApp.h b/product/src/application/app_pa_server/PaServerApp.h index 0f49314f..469a220d 100644 --- a/product/src/application/app_pa_server/PaServerApp.h +++ b/product/src/application/app_pa_server/PaServerApp.h @@ -12,7 +12,7 @@ namespace kbd_app { - class CPaServerApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CPaServerApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CPaServerApp(); @@ -90,12 +90,12 @@ namespace kbd_app 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; //< 冗余管理类 CPaServerMngPtr m_ptrPaSrvMng; //< 广播服务管理类 }; diff --git a/product/src/application/app_pa_server/PaServerMng.cpp b/product/src/application/app_pa_server/PaServerMng.cpp index 1ebe6cbd..1ff82843 100644 --- a/product/src/application/app_pa_server/PaServerMng.cpp +++ b/product/src/application/app_pa_server/PaServerMng.cpp @@ -6,8 +6,8 @@ #include "PaServerMng.h" #include "pub_logger_api/logger.h" -kbd_app::CPaServerMng::CPaServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +kbd_app::CPaServerMng::CPaServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrTimedAudioThread(NULL) diff --git a/product/src/application/app_pa_server/PaServerMng.h b/product/src/application/app_pa_server/PaServerMng.h index ce58335e..3ccb88c5 100644 --- a/product/src/application/app_pa_server/PaServerMng.h +++ b/product/src/application/app_pa_server/PaServerMng.h @@ -10,11 +10,11 @@ namespace kbd_app { - class CPaServerMng : public kbd_sys::CRedundantSwitchInterface + class CPaServerMng : public iot_sys::CRedundantSwitchInterface { public: - CPaServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CPaServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CPaServerMng(); /* @@ -32,8 +32,8 @@ namespace kbd_app int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CPaTimedAudioThreadPtr m_ptrTimedAudioThread; //< 定时广播线程 }; diff --git a/product/src/application/app_pa_server/PaTimedAudioThread.cpp b/product/src/application/app_pa_server/PaTimedAudioThread.cpp index 62df5219..c2739dd8 100644 --- a/product/src/application/app_pa_server/PaTimedAudioThread.cpp +++ b/product/src/application/app_pa_server/PaTimedAudioThread.cpp @@ -15,15 +15,15 @@ #include using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_net; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_net; +using namespace iot_service; +using namespace iot_idl; -kbd_app::CPaTimedAudioThread::CPaTimedAudioThread(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("CPaTimedAudioThread", 100), +kbd_app::CPaTimedAudioThread::CPaTimedAudioThread(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("CPaTimedAudioThread", 100), m_stRunAppInfo(stRunAppInfo), m_ptrPaTableOpt(NULL), m_ptrBasicOpt(NULL), @@ -228,7 +228,7 @@ int kbd_app::CPaTimedAudioThread::addCustCtrlAlarm(const int64 &nOptTime,const s } //处理从hmi过来的消息 -void kbd_app::CPaTimedAudioThread::processHmiMessage(const kbd_net::CMbMessage &objMsg) +void kbd_app::CPaTimedAudioThread::processHmiMessage(const iot_net::CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); string strMessage((char*)objMsg.getDataPtr(),objMsg.getDataSize()); @@ -267,7 +267,7 @@ void kbd_app::CPaTimedAudioThread::processHmiMessage(const kbd_net::CMbMessage & } } //处理从opt过来的消息 -void kbd_app::CPaTimedAudioThread::processOptMessage(const kbd_net::CMbMessage &objMsg) +void kbd_app::CPaTimedAudioThread::processOptMessage(const iot_net::CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); string strMessage((char*)objMsg.getDataPtr(),objMsg.getDataSize()); diff --git a/product/src/application/app_pa_server/PaTimedAudioThread.h b/product/src/application/app_pa_server/PaTimedAudioThread.h index ba2e6395..d8b21f14 100644 --- a/product/src/application/app_pa_server/PaTimedAudioThread.h +++ b/product/src/application/app_pa_server/PaTimedAudioThread.h @@ -14,10 +14,10 @@ #include "BasicOperation.h" namespace kbd_app { - class CPaTimedAudioThread : public kbd_public::CTimerThreadBase + class CPaTimedAudioThread : public iot_public::CTimerThreadBase { public: - CPaTimedAudioThread(const kbd_public::SRunAppInfo &stRunAppInfo); + CPaTimedAudioThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CPaTimedAudioThread(); /* @@ -51,12 +51,12 @@ namespace kbd_app * @brief processHmiMessage 处理从hmi过来的紧急广播 * @param objMsg 接收到的消息 */ - void processHmiMessage(const kbd_net::CMbMessage &objMsg); + void processHmiMessage(const iot_net::CMbMessage &objMsg); /** * @brief processOptMessage 处理从opt过来的反馈消息 * @param objMsg 接收到的消息 */ - void processOptMessage(const kbd_net::CMbMessage &objMsg); + void processOptMessage(const iot_net::CMbMessage &objMsg); /** * @brief addCustomAlarmRepMsg 添加紧急广播到缓冲队列中（map） * @param sPaCmdKey key @@ -140,12 +140,12 @@ namespace kbd_app bool getAlarmInfo(SOptAlarmInfo &sOptAlarmInfo,const std::string &name); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 CPaRtdbTableOperatePtr m_ptrPaTableOpt; //< PA相关内存表操作类 CBasicOperationPtr m_ptrBasicOpt; //基础操作类 //uint32 m_uLastTimeMsec; //< 上一次播放时间 //uint32 m_uDurationMsec; //< 语音持续时间，包括语音时间 + 间隔时间 - //kbd_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 + //iot_net::CMbCommunicator m_objCommunicator; //< 消息总线通信器 CPaMsgBusMngPtr m_ptrMsgbusMng; //消息总线管理类 SCustomRepMAP sCustomRepMAP; //储存信息，以便于收到opt反馈时能够处理紧急广播报警 SConstCustomRepMAP sConstCustomRepMAP;//储存信息，以便于收到opt反馈时能够处理定时广播报警 diff --git a/product/src/application/app_safety_day/SafetyDayApp.cpp b/product/src/application/app_safety_day/SafetyDayApp.cpp index 2c85e7fd..26dcf796 100644 --- a/product/src/application/app_safety_day/SafetyDayApp.cpp +++ b/product/src/application/app_safety_day/SafetyDayApp.cpp @@ -10,10 +10,10 @@ #include "SafetyDayCommon.h" 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; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" diff --git a/product/src/application/app_safety_day/SafetyDayApp.h b/product/src/application/app_safety_day/SafetyDayApp.h index a2944baf..6b2006d3 100644 --- a/product/src/application/app_safety_day/SafetyDayApp.h +++ b/product/src/application/app_safety_day/SafetyDayApp.h @@ -12,7 +12,7 @@ namespace kbd_app { - class CSafetyDayApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CSafetyDayApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CSafetyDayApp(); @@ -90,12 +90,12 @@ namespace kbd_app 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; //< 冗余管理类 CSafetyDayMngPtr m_ptrSafetyDayMng; //< 安全天数服务管理类 }; diff --git a/product/src/application/app_safety_day/SafetyDayMng.cpp b/product/src/application/app_safety_day/SafetyDayMng.cpp index 4754a6e3..86d3ba5c 100644 --- a/product/src/application/app_safety_day/SafetyDayMng.cpp +++ b/product/src/application/app_safety_day/SafetyDayMng.cpp @@ -6,8 +6,8 @@ #include "SafetyDayMng.h" #include "pub_logger_api/logger.h" -kbd_app::CSafetyDayMng::CSafetyDayMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +kbd_app::CSafetyDayMng::CSafetyDayMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrSafetyDayThread(NULL) diff --git a/product/src/application/app_safety_day/SafetyDayMng.h b/product/src/application/app_safety_day/SafetyDayMng.h index f4be672b..dd0adb11 100644 --- a/product/src/application/app_safety_day/SafetyDayMng.h +++ b/product/src/application/app_safety_day/SafetyDayMng.h @@ -10,11 +10,11 @@ namespace kbd_app { - class CSafetyDayMng : public kbd_sys::CRedundantSwitchInterface + class CSafetyDayMng : public iot_sys::CRedundantSwitchInterface { public: - CSafetyDayMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CSafetyDayMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CSafetyDayMng(); /* @@ -32,8 +32,8 @@ namespace kbd_app int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CSafetyDayThreadPtr m_ptrSafetyDayThread; //< 定时更新安全天数线程 }; diff --git a/product/src/application/app_safety_day/SafetyDayThread.cpp b/product/src/application/app_safety_day/SafetyDayThread.cpp index ef578aa5..eb7b4a82 100644 --- a/product/src/application/app_safety_day/SafetyDayThread.cpp +++ b/product/src/application/app_safety_day/SafetyDayThread.cpp @@ -16,13 +16,13 @@ #include using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_net; +using namespace iot_dbms; +using namespace iot_net; -kbd_app::CSafetyDayThread::CSafetyDayThread(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("CSafetyDayThread", 2000), +kbd_app::CSafetyDayThread::CSafetyDayThread(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("CSafetyDayThread", 2000), m_stRunAppInfo(stRunAppInfo) { } @@ -96,7 +96,7 @@ void kbd_app::CSafetyDayThread::updateSafetyDay() objCondition.m_value = vecSafetyDay[i].szTagName; objCondition.m_eCompare = CDbCondition::COMPARE_EQ; objCondition.m_eLogic = CDbCondition::LOGIC_AND; - kbd_dbms::CDbApi objDbWrite(DB_CONN_MODEL_WRITE); + iot_dbms::CDbApi objDbWrite(DB_CONN_MODEL_WRITE); if(objDbWrite.open()) { if(objDbWrite.update(QString::fromStdString(CN_TN_SafetyDay), listColName, listVal, objCondition)) diff --git a/product/src/application/app_safety_day/SafetyDayThread.h b/product/src/application/app_safety_day/SafetyDayThread.h index 637692dd..c8131b40 100644 --- a/product/src/application/app_safety_day/SafetyDayThread.h +++ b/product/src/application/app_safety_day/SafetyDayThread.h @@ -11,10 +11,10 @@ namespace kbd_app { - class CSafetyDayThread : public kbd_public::CTimerThreadBase + class CSafetyDayThread : public iot_public::CTimerThreadBase { public: - CSafetyDayThread(const kbd_public::SRunAppInfo &stRunAppInfo); + CSafetyDayThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CSafetyDayThread(); /* @@ -37,8 +37,8 @@ namespace kbd_app void updateSafetyDay(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_dbms::CRdbAccessEx m_objSafetyDayTable; //< safety_day内存表 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_dbms::CRdbAccessEx m_objSafetyDayTable; //< safety_day内存表 }; typedef boost::shared_ptr CSafetyDayThreadPtr; diff --git a/product/src/application/app_topo_server/CTopoServer.cpp b/product/src/application/app_topo_server/CTopoServer.cpp index cac60d01..50222864 100644 --- a/product/src/application/app_topo_server/CTopoServer.cpp +++ b/product/src/application/app_topo_server/CTopoServer.cpp @@ -12,9 +12,9 @@ using namespace std; using namespace kbd_app; -using namespace kbd_net; -using namespace kbd_sys; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_sys; +using namespace iot_public; CTopoServer::CTopoServer() { @@ -81,7 +81,7 @@ bool CTopoServer::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 CTopoServer::start(int argc, char *argv[], int &) diff --git a/product/src/application/app_topo_server/CTopoServer.h b/product/src/application/app_topo_server/CTopoServer.h index 0591f6e1..add24ee1 100644 --- a/product/src/application/app_topo_server/CTopoServer.h +++ b/product/src/application/app_topo_server/CTopoServer.h @@ -11,7 +11,7 @@ namespace kbd_app { -class CTopoServer : public kbd_public::CBaseService,kbd_sys::CProcessQuitInterface +class CTopoServer : public iot_public::CBaseService,iot_sys::CProcessQuitInterface { public: CTopoServer(); @@ -32,15 +32,15 @@ public: bool loadSeqData(); private: std::string m_strStartArgs; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; kbd_app::CRedundantSwitchPtr m_ptrRedundantSwitch; std::string m_strAppName; std::string m_strProcessName; std::string m_strInstName; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; CTopoThreadPtr m_ptrThread; }; diff --git a/product/src/application/app_topo_server/CTopoThread.cpp b/product/src/application/app_topo_server/CTopoThread.cpp index 6cd5efe9..c3b19cf5 100644 --- a/product/src/application/app_topo_server/CTopoThread.cpp +++ b/product/src/application/app_topo_server/CTopoThread.cpp @@ -4,10 +4,10 @@ #include "pub_logger_api/logger.h" #include "../../idl_files/DataProcMessage.pb.h" -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_idlfile; +using namespace iot_idl; using namespace std; #define STIME 50 //周期(ms) @@ -79,7 +79,7 @@ bool CTopoThread::init() void CTopoThread::initCommon() { m_rdbAccess = new CRdbAccessEx; - m_communicator = new kbd_net::CMbCommunicator("topo"); + m_communicator = new iot_net::CMbCommunicator("topo"); //m_communicator->addSub(0, CH_SCADA_TO_HMI_DATA_CHANGE); m_vecDomain.push_back(m_nDomainID); @@ -88,7 +88,7 @@ void CTopoThread::initCommon() //nodeInfo.getDomainID(m_vecDomain); m_rdbAccess->open("base", "sys_model_sub_system_info"); - kbd_dbms::CONDINFO stCondInfo; + iot_dbms::CONDINFO stCondInfo; CRdbQueryResult rdbResult; std::vector colunmVec; colunmVec.push_back("sub_system_id"); @@ -131,12 +131,12 @@ void CTopoThread::execute() cycCaculate(); return; int nRet = 0; - ::kbd_idlfile::SRealTimeDataPkg chgDataPkg; + ::iot_idl::SRealTimeDataPkg chgDataPkg; int nDiNum = 0; int nAiNum = 0; unsigned int msgType = 0; - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; if(m_communicator && m_communicator->recvMsg(msg, 500)) { msgType = msg.getMsgType(); @@ -150,14 +150,14 @@ void CTopoThread::execute() } int nIndex = 0; - ::kbd_idlfile::SRealTimePkgHead head = chgDataPkg.sthead(); + ::iot_idl::SRealTimePkgHead head = chgDataPkg.sthead(); nAiNum = chgDataPkg.stairtd_size(); nDiNum = chgDataPkg.stdirtd_size(); std::string strDevTag; std::string strTableName; for(nIndex = 0;nIndex < nDiNum; nIndex++)//有一个cb动作, 全部重算 { - ::kbd_idlfile::SDiRealTimeData diStru = chgDataPkg.stdirtd(nIndex); + ::iot_idl::SDiRealTimeData diStru = chgDataPkg.stdirtd(nIndex); if(diStru.nsubsystem() != m_nAppID || find(m_vecDomain.begin(), m_vecDomain.end(), diStru.nlocation()) == m_vecDomain.end()) { @@ -211,7 +211,7 @@ void CTopoThread::execute() { for(int i = 0;i < nAiNum; i++)//进线线电压变化,paint { - ::kbd_idlfile::SAiRealTimeData aiStru = chgDataPkg.stairtd(i); + ::iot_idl::SAiRealTimeData aiStru = chgDataPkg.stairtd(i); if(aiStru.nsubsystem() != m_nAppID || find(m_vecDomain.begin(), m_vecDomain.end(), aiStru.nlocation()) == m_vecDomain.end()) { continue; @@ -260,8 +260,8 @@ bool CTopoThread::loadDevType() std::vector vecDevTypeInfo; std::vector vecColunm = {"dev_type_id", "tag_name", "description"}; m_rdbAccess->open("base", "dev_type_def"); - kbd_dbms::CONDINFO stCondSub; - std::vector vecCondInfo; + iot_dbms::CONDINFO stCondSub; + std::vector vecCondInfo; stCondSub.relationop = ATTRCOND_EQU; stCondSub.conditionval = CVarType(m_nSubSystem); strcpy(stCondSub.name, "sub_system"); @@ -331,9 +331,9 @@ bool CTopoThread::loadData() //按电力专业过滤和DOMAIN过滤设备 m_rdbAccess->open("pscada", "dev_info"); - std::vector vecCondInfo; - kbd_dbms::CONDINFO stCondSub; - kbd_dbms::CONDINFO stCondDomain; + std::vector vecCondInfo; + iot_dbms::CONDINFO stCondSub; + iot_dbms::CONDINFO stCondDomain; stCondSub.relationop = ATTRCOND_EQU; stCondSub.conditionval = CVarType(m_nSubSystem); strcpy(stCondSub.name, "sub_system"); @@ -868,9 +868,9 @@ int CTopoThread::paint(bool bColor) void CTopoThread::sendChange() { std::string strContent = "topo"; - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setData(strContent); - msg.setMsgType(kbd_idlfile::MT_TOPO_QCOLOR_NOTIFY); + msg.setMsgType(iot_idl::MT_TOPO_QCOLOR_NOTIFY); msg.setSubject(m_nAppID, CH_SCADA_TO_HMI_DATA_CHANGE); if(m_communicator->sendMsgToDomain(msg, -1)) diff --git a/product/src/application/app_topo_server/CTopoThread.h b/product/src/application/app_topo_server/CTopoThread.h index 5378d672..52ec9354 100644 --- a/product/src/application/app_topo_server/CTopoThread.h +++ b/product/src/application/app_topo_server/CTopoThread.h @@ -11,7 +11,7 @@ namespace kbd_app { -class CTopoThread : public kbd_public::CTimerThreadBase +class CTopoThread : public iot_public::CTimerThreadBase { public: CTopoThread(const std::string &strName, int nDomain, int nAppID, int nLocationId); @@ -68,9 +68,9 @@ private: CDevTypeInfo m_devTypeInfo; int m_nLocation; int m_nSubSystem;//电力所在专业 - kbd_dbms::CRdbAccessEx *m_rdbAccess; - kbd_net::CMbCommunicator * m_communicator; - kbd_public::CSysInfoInterfacePtr m_sysInfo; + iot_dbms::CRdbAccessEx *m_rdbAccess; + iot_net::CMbCommunicator * m_communicator; + iot_public::CSysInfoInterfacePtr m_sysInfo; }; diff --git a/product/src/application/app_topo_server/RedundantSwitch.cpp b/product/src/application/app_topo_server/RedundantSwitch.cpp index 511f5f3a..0e283d15 100644 --- a/product/src/application/app_topo_server/RedundantSwitch.cpp +++ b/product/src/application/app_topo_server/RedundantSwitch.cpp @@ -6,9 +6,9 @@ #include "RedundantSwitch.h" using namespace kbd_app; -using namespace kbd_sys; +using namespace iot_sys; -CRedundantSwitch::CRedundantSwitch(kbd_sys::CProcMngInterfacePtr ptrProc) +CRedundantSwitch::CRedundantSwitch(iot_sys::CProcMngInterfacePtr ptrProc) { m_ptrProcManage = ptrProc; m_ptrMainWorkThread = NULL; diff --git a/product/src/application/app_topo_server/RedundantSwitch.h b/product/src/application/app_topo_server/RedundantSwitch.h index c1888141..eed2ac89 100644 --- a/product/src/application/app_topo_server/RedundantSwitch.h +++ b/product/src/application/app_topo_server/RedundantSwitch.h @@ -13,14 +13,14 @@ namespace kbd_app { class CRedundantSwitch : - public ::kbd_sys::CRedundantSwitchInterface + public ::iot_sys::CRedundantSwitchInterface { public: - CRedundantSwitch(kbd_sys::CProcMngInterfacePtr ptrProc); + CRedundantSwitch(iot_sys::CProcMngInterfacePtr ptrProc); ~CRedundantSwitch(void); private: CTopoThreadPtr m_ptrMainWorkThread; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; public: /* diff --git a/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h b/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h index 3aff2248..7641fff6 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h +++ b/product/src/application/fault_recall_srv/CFaultRecallRedunSw.h @@ -17,7 +17,7 @@ namespace kbd_application { -class CFaultRecallRedunSw : public ::kbd_sys::CRedundantSwitchInterface +class CFaultRecallRedunSw : public ::iot_sys::CRedundantSwitchInterface { public: CFaultRecallRedunSw(); diff --git a/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp b/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp index f5b856a8..6f0814bd 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp +++ b/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp @@ -58,7 +58,7 @@ CFaultRecallSrv::~CFaultRecallSrv() { CFaultRecallSrv::stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } @@ -87,7 +87,7 @@ bool CFaultRecallSrv::start(int argc, char *argv[], int& /*nStatus*/) } //< 启动日志 - kbd_public::StartLogSystem(CN_AppName_COMAPP.c_str(), g_pSzProcName); + iot_public::StartLogSystem(CN_AppName_COMAPP.c_str(), g_pSzProcName); LOGINFO("\n\n%s is now starting ...\n", g_pSzProcName); @@ -106,21 +106,21 @@ bool CFaultRecallSrv::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_COMAPP)) + if (!iot_dbms::initDbSaveApi(m_nDomainID, CN_AppId_COMAPP)) { LOGFATAL("初始化数据库历史提交API失败，程序启动失败！"); return false; } //< 时序库接口库 - if (!kbd_dbms::initTsdbApi()) + if (!iot_dbms::initTsdbApi()) { LOGFATAL("初始化时序库接口库失败，程序启动失败！"); return false; @@ -148,7 +148,7 @@ bool CFaultRecallSrv::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; @@ -157,7 +157,7 @@ bool CFaultRecallSrv::start(int argc, char *argv[], int& /*nStatus*/) objProcInfo.strProcName = g_pSzProcName; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(objProcInfo); + m_ptrProcMng = iot_sys::getProcMngInstance(objProcInfo); if (!m_ptrProcMng) { LOGFATAL("getProcMngInstance return NULL"); @@ -169,7 +169,7 @@ bool CFaultRecallSrv::start(int argc, char *argv[], int& /*nStatus*/) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(m_nDomainID, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(m_nDomainID, CN_AppId_COMAPP, m_strNodeName); if (!m_ptrRedundantMng) @@ -260,17 +260,17 @@ bool CFaultRecallSrv::stop() } //< 停止数据库历史提交API - kbd_dbms::releaseDbSaveApi(); + iot_dbms::releaseDbSaveApi(); //< 释放时序库接口库 - kbd_dbms::releaseTsdbApi(); + iot_dbms::releaseTsdbApi(); //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //< 移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -308,7 +308,7 @@ const std::string& CFaultRecallSrv::getNodeName() const bool CFaultRecallSrv::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(g_pSzProcName); + return iot_public::CSingleProcInstance::hasInstanceRunning(g_pSzProcName); } @@ -384,14 +384,14 @@ bool CFaultRecallSrv::parseCommandLine(int argc, char *argv[]) bool CFaultRecallSrv::loadSysInfo() { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if (kbd_public::createSysInfoInstance(sysInfoPtr) == false) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if (iot_public::createSysInfoInstance(sysInfoPtr) == false) { LOGERROR("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/product/src/application/fault_recall_srv/CFaultRecallSrv.h b/product/src/application/fault_recall_srv/CFaultRecallSrv.h index cfcee000..e2e806b5 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallSrv.h +++ b/product/src/application/fault_recall_srv/CFaultRecallSrv.h @@ -18,8 +18,8 @@ namespace kbd_application { class CFaultRecallSrv : - public kbd_public::CBaseService, - kbd_sys::CProcessQuitInterface + public iot_public::CBaseService, + iot_sys::CProcessQuitInterface { public: class GC @@ -74,8 +74,8 @@ private: std::string m_strNodeName; //< 本机节点名 CFaultRecallRedunSwPtr 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/product/src/application/fault_recall_srv/CHisDataMng.cpp b/product/src/application/fault_recall_srv/CHisDataMng.cpp index 41bf1ff7..9330a75f 100644 --- a/product/src/application/fault_recall_srv/CHisDataMng.cpp +++ b/product/src/application/fault_recall_srv/CHisDataMng.cpp @@ -90,12 +90,12 @@ bool CHisDataMng::init() //< 获取本域TSDB连接 if (!(m_ptrTsdbConn && m_ptrTsdbConn->pingServer())) { - m_ptrTsdbConn = kbd_dbms::getOneUseableConn(true); + m_ptrTsdbConn = iot_dbms::getOneUseableConn(true); } if (m_ptrTsdbConn) { - kbd_dbms::CDbApi objDb(DB_CONN_HIS_READ); + iot_dbms::CDbApi objDb(DB_CONN_HIS_READ); if (objDb.open()) { @@ -127,8 +127,8 @@ bool CHisDataMng::init() bool CHisDataMng::getSampleData(boost::int64_t nTime, - const kbd_service::ConstSubInfoPtrVec &vecPoints, - kbd_net::CMbMessage &objMbMsg) + const iot_service::ConstSubInfoPtrVec &vecPoints, + iot_net::CMbMessage &objMbMsg) { bool bRet = false; @@ -144,7 +144,7 @@ bool CHisDataMng::getSampleData(boost::int64_t nTime, //< 从内存填充消息，内存没有的加入了 vecToLoad for (size_t i = 0; i < vecPoints.size(); ++i) { - const kbd_service::ConstSubInfoPtr &ptrSubInfo = vecPoints[i]; + const iot_service::ConstSubInfoPtr &ptrSubInfo = vecPoints[i]; const std::string &strTabName = ptrSubInfo->tab_name(); if (strTabName == RT_ANA_TBL) @@ -204,12 +204,12 @@ bool CHisDataMng::getSampleData(boost::int64_t nTime, { //< 设置消息头 { - kbd_idlfile::SRealTimePkgHead *pHead = m_objRtdPkg.mutable_sthead(); + iot_idl::SRealTimePkgHead *pHead = m_objRtdPkg.mutable_sthead(); pHead->set_strsrctag("fault_recall_srv"); pHead->set_ntimestamp(nTime); } - objMbMsg.setMsgType(kbd_idlfile::MT_DP_CHANGE_DATA); + objMbMsg.setMsgType(iot_idl::MT_DP_CHANGE_DATA); objMbMsg.setSubject(CN_AppId_COMAPP, CH_SCADA_TO_HMI_DATA_CHANGE + CH_FAULT_RECALL_OFFSET); objMbMsg.setPara1(CFaultRecallSrv::getInstance().getDomainID()); //< 按之前dp的代码设置 if (!objMbMsg.setData(m_objRtdPkg)) @@ -229,14 +229,14 @@ bool CHisDataMng::getSampleData(boost::int64_t nTime, } -void CHisDataMng::getAlarmData(boost::int64_t nTime, kbd_net::CMbMessage &objMbMsgAlm) +void CHisDataMng::getAlarmData(boost::int64_t nTime, iot_net::CMbMessage &objMbMsgAlm) { //< 发送的最大条目数，减轻HMI压力 static const size_t nMaxCnt = 15000; //< 填充报警消息 { - kbd_idlfile::SAlmCltAddAlm objAlmFullSync; + iot_idl::SAlmCltAddAlm objAlmFullSync; BOOST_AUTO(pAlmInfoField, objAlmFullSync.mutable_alm_info()); m_objAlmToCmp.set_time_stamp(nTime); @@ -266,7 +266,7 @@ void CHisDataMng::getAlarmData(boost::int64_t nTime, kbd_net::CMbMessage &objMbM { std::string strLog; google::protobuf::TextFormat::PrintToString(objAlmFullSync, &strLog); - LOGDEBUG("getAlarmData(): kbd_idlfile::SAlmCltAddAlm == \n%s", + LOGDEBUG("getAlarmData(): iot_idl::SAlmCltAddAlm == \n%s", strLog.c_str()); } @@ -276,7 +276,7 @@ void CHisDataMng::getAlarmData(boost::int64_t nTime, kbd_net::CMbMessage &objMbM pAlmInfoField->ReleaseLast(); } - objMbMsgAlm.setMsgType(kbd_idlfile::MT_ALM_AS2AC_ALL); + objMbMsgAlm.setMsgType(iot_idl::MT_ALM_AS2AC_ALL); objMbMsgAlm.setSubject(CN_AppId_COMAPP, CH_ALM_TO_CLT_ALARM + CH_FAULT_RECALL_OFFSET); objMbMsgAlm.setPara1(CFaultRecallSrv::getInstance().getDomainID()); objMbMsgAlm.setPara2(1); //< 消息序号m_nSeqNo事故追忆中始终用1 @@ -284,7 +284,7 @@ void CHisDataMng::getAlarmData(boost::int64_t nTime, kbd_net::CMbMessage &objMbM } -bool CHisDataMng::loadMeasPointFromDB(kbd_dbms::CDbApi &objDb, +bool CHisDataMng::loadMeasPointFromDB(iot_dbms::CDbApi &objDb, const char *pszTabName, MeasPointMap &objDest) { @@ -321,7 +321,7 @@ bool CHisDataMng::loadMeasPointFromDB(kbd_dbms::CDbApi &objDb, } -bool CHisDataMng::loadAlarmFromDB(kbd_dbms::CDbApi &objDb) +bool CHisDataMng::loadAlarmFromDB(iot_dbms::CDbApi &objDb) { LOGINFO("loadAlarmFromDB(): start !"); @@ -381,7 +381,7 @@ bool CHisDataMng::loadAlarmFromDB(kbd_dbms::CDbApi &objDb) while (query.next()) { - kbd_idlfile::SAlmInfoToAlmClt *pAlmInfo = new kbd_idlfile::SAlmInfoToAlmClt(); + iot_idl::SAlmInfoToAlmClt *pAlmInfo = new iot_idl::SAlmInfoToAlmClt(); //< 填充报警消息 { @@ -390,7 +390,7 @@ bool CHisDataMng::loadAlarmFromDB(kbd_dbms::CDbApi &objDb) pAlmInfo->set_alm_type(query.value(1).toInt()); pAlmInfo->set_alm_status(query.value(2).toInt()); - pAlmInfo->set_logic_state(kbd_idlfile::ALS_ALARM); + pAlmInfo->set_logic_state(iot_idl::ALS_ALARM); pAlmInfo->set_time_stamp(query.value(3).toULongLong()); pAlmInfo->set_location_id(query.value(4).toInt()); @@ -473,7 +473,7 @@ void CHisDataMng::fillAiRtdFromMemory { const SMeasPoint &objMp = itMpMap->second; - const std::vector *pVecSp = + const std::vector *pVecSp = objMp.m_pVecSp; if (pVecSp->empty()) @@ -497,7 +497,7 @@ void CHisDataMng::fillAiRtdFromMemory //< 填充消息 { - kbd_idlfile::SAiRealTimeData *pRtd = m_objRtdPkg.add_stairtd(); + iot_idl::SAiRealTimeData *pRtd = m_objRtdPkg.add_stairtd(); pRtd->set_nlocation(objMp.m_nLocationID); pRtd->set_nsubsystem(objMp.m_nSubSystem); @@ -542,7 +542,7 @@ void CHisDataMng::fillDiRtdFromMemory { const SMeasPoint &objMp = itMpMap->second; - const std::vector *pVecSp = + const std::vector *pVecSp = objMp.m_pVecSp; if (pVecSp->empty()) @@ -566,7 +566,7 @@ void CHisDataMng::fillDiRtdFromMemory //< 填充消息 { - kbd_idlfile::SDiRealTimeData *pRtd = m_objRtdPkg.add_stdirtd(); + iot_idl::SDiRealTimeData *pRtd = m_objRtdPkg.add_stdirtd(); pRtd->set_nlocation(objMp.m_nLocationID); pRtd->set_nsubsystem(objMp.m_nSubSystem); @@ -611,7 +611,7 @@ void CHisDataMng::fillMixRtdFromMemory { const SMeasPoint &objMp = itMpMap->second; - const std::vector *pVecSp = + const std::vector *pVecSp = objMp.m_pVecSp; if (pVecSp->empty()) @@ -635,7 +635,7 @@ void CHisDataMng::fillMixRtdFromMemory //< 填充消息 { - kbd_idlfile::SMiRealTimeData *pRtd = m_objRtdPkg.add_stmirtd(); + iot_idl::SMiRealTimeData *pRtd = m_objRtdPkg.add_stmirtd(); pRtd->set_nlocation(objMp.m_nLocationID); pRtd->set_nsubsystem(objMp.m_nSubSystem); @@ -680,7 +680,7 @@ void CHisDataMng::fillAccRtdFromMemory { const SMeasPoint &objMp = itMpMap->second; - const std::vector *pVecSp = + const std::vector *pVecSp = objMp.m_pVecSp; if (pVecSp->empty()) @@ -704,7 +704,7 @@ void CHisDataMng::fillAccRtdFromMemory //< 填充消息 { - kbd_idlfile::SPiRealTimeData *pRtd = m_objRtdPkg.add_stpirtd(); + iot_idl::SPiRealTimeData *pRtd = m_objRtdPkg.add_stpirtd(); pRtd->set_nlocation(objMp.m_nLocationID); pRtd->set_nsubsystem(objMp.m_nSubSystem); @@ -727,11 +727,11 @@ void CHisDataMng::fillAccRtdFromMemory bool CHisDataMng::loadSampleFromTsdb() { - std::vector vecMpKey; - std::vector *> vecSpResult; + std::vector vecMpKey; + std::vector *> vecSpResult; { - kbd_dbms::SMeasPointKey objMpKey; + iot_dbms::SMeasPointKey objMpKey; for (size_t i = 0; i < m_vecAiToLoad.size(); ++i) { @@ -740,13 +740,13 @@ bool CHisDataMng::loadSampleFromTsdb() //< 因此 m_vecDiToLoad 可能有相同的迭代器 if (NULL == m_vecAiToLoad[i]->second.m_pVecSp) { - objMpKey.m_enType = kbd_dbms::MPT_AI; + objMpKey.m_enType = iot_dbms::MPT_AI; objMpKey.m_pszTagName = m_vecAiToLoad[i]->first.c_str(); vecMpKey.push_back(objMpKey); //< 由 m_vecAiToLoad[i]->second 释放 - std::vector *pOneMpSp = - new std::vector; + std::vector *pOneMpSp = + new std::vector; m_vecAiToLoad[i]->second.m_pVecSp = pOneMpSp; vecSpResult.push_back(pOneMpSp); @@ -757,13 +757,13 @@ bool CHisDataMng::loadSampleFromTsdb() { if (NULL == m_vecDiToLoad[i]->second.m_pVecSp) { - objMpKey.m_enType = kbd_dbms::MPT_DI; + objMpKey.m_enType = iot_dbms::MPT_DI; objMpKey.m_pszTagName = m_vecDiToLoad[i]->first.c_str(); vecMpKey.push_back(objMpKey); //< 由 m_vecDiToLoad[i]->second 释放 - std::vector *pOneMpSp = - new std::vector; + std::vector *pOneMpSp = + new std::vector; m_vecDiToLoad[i]->second.m_pVecSp = pOneMpSp; vecSpResult.push_back(pOneMpSp); @@ -774,13 +774,13 @@ bool CHisDataMng::loadSampleFromTsdb() { if (NULL == m_vecMixToLoad[i]->second.m_pVecSp) { - objMpKey.m_enType = kbd_dbms::MPT_MIX; + objMpKey.m_enType = iot_dbms::MPT_MIX; objMpKey.m_pszTagName = m_vecMixToLoad[i]->first.c_str(); vecMpKey.push_back(objMpKey); //< 由 m_vecMixToLoad[i]->second 释放 - std::vector *pOneMpSp = - new std::vector; + std::vector *pOneMpSp = + new std::vector; m_vecMixToLoad[i]->second.m_pVecSp = pOneMpSp; vecSpResult.push_back(pOneMpSp); @@ -791,13 +791,13 @@ bool CHisDataMng::loadSampleFromTsdb() { if (NULL == m_vecAccToLoad[i]->second.m_pVecSp) { - objMpKey.m_enType = kbd_dbms::MPT_ACC; + objMpKey.m_enType = iot_dbms::MPT_ACC; objMpKey.m_pszTagName = m_vecAccToLoad[i]->first.c_str(); vecMpKey.push_back(objMpKey); //< 由 m_vecAccToLoad[i]->second 释放 - std::vector *pOneMpSp = - new std::vector; + std::vector *pOneMpSp = + new std::vector; m_vecAccToLoad[i]->second.m_pVecSp = pOneMpSp; vecSpResult.push_back(pOneMpSp); @@ -810,9 +810,9 @@ bool CHisDataMng::loadSampleFromTsdb() onLoadingData(); const bool bRc = - kbd_dbms::getHisSamplePoint(*m_ptrTsdbConn, -1, vecMpKey, + iot_dbms::getHisSamplePoint(*m_ptrTsdbConn, -1, vecMpKey, m_nTimeBegin, m_nTimeEnd, - NULL,NULL,kbd_dbms::CM_NULL,0,kbd_dbms::FM_NULL_METHOD, + NULL,NULL,iot_dbms::CM_NULL,0,iot_dbms::FM_NULL_METHOD, vecSpResult, true); if (!bRc) { diff --git a/product/src/application/fault_recall_srv/CHisDataMng.h b/product/src/application/fault_recall_srv/CHisDataMng.h index 1c448c6c..9199019e 100644 --- a/product/src/application/fault_recall_srv/CHisDataMng.h +++ b/product/src/application/fault_recall_srv/CHisDataMng.h @@ -77,8 +77,8 @@ public: * 可用于发送，HMI使用这个消息来刷新时间 **********************************************************************************/ bool getSampleData(boost::int64_t nTime, - const kbd_service::ConstSubInfoPtrVec &vecPoints, - kbd_net::CMbMessage &objMbMsg); + const iot_service::ConstSubInfoPtrVec &vecPoints, + iot_net::CMbMessage &objMbMsg); /********************************************************************************** * @brief 获取告警数据 @@ -86,7 +86,7 @@ public: * @param nTime ： 输入，时间点 * objMbMsgAlm : 输出，生成的报警消息 **********************************************************************************/ - void getAlarmData(boost::int64_t nTime, kbd_net::CMbMessage &objMbMsgAlm); + void getAlarmData(boost::int64_t nTime, iot_net::CMbMessage &objMbMsgAlm); /********************************************************************************** * @brief 当调用 init() getSampleData() 函数时，若需要从数据库加载数据， @@ -111,8 +111,8 @@ private: { if (NULL != other.m_pVecSp) { - std::vector *pTemp = - new std::vector; + std::vector *pTemp = + new std::vector; *pTemp = *(other.m_pVecSp); m_pVecSp = pTemp; } @@ -125,18 +125,18 @@ private: const int m_nLocationID; const int m_nSubSystem; - const std::vector *m_pVecSp; + const std::vector *m_pVecSp; }; typedef boost::unordered::unordered_map MeasPointMap; //< 从数据库加载所有测点信息 //< 使用objDb连接，从pszTabName表中读取数据到objDest - static bool loadMeasPointFromDB(kbd_dbms::CDbApi &objDb, + static bool loadMeasPointFromDB(iot_dbms::CDbApi &objDb, const char *pszTabName, MeasPointMap &objDest); //< 从数据库加载反演时段的告警信息 - bool loadAlarmFromDB(kbd_dbms::CDbApi &objDb); + bool loadAlarmFromDB(iot_dbms::CDbApi &objDb); //< 内存中查找数据：填充到 m_objRtdPkg //< 内存中没找到： 插入到 m_vecAiToLoad @@ -157,13 +157,13 @@ private: //< 比较函数，用于 upper_bound() 查找 //< a的时间 < b的时间，返回true，否则返回false - static bool cmpSampleTime(const kbd_dbms::SUniHisSamplePoint &a, - const kbd_dbms::SUniHisSamplePoint &b) + static bool cmpSampleTime(const iot_dbms::SUniHisSamplePoint &a, + const iot_dbms::SUniHisSamplePoint &b) { return a.m_nTime < b.m_nTime; }; - static bool cmpAlmTime(const kbd_idlfile::SAlmInfoToAlmClt *a, - const kbd_idlfile::SAlmInfoToAlmClt *b) + static bool cmpAlmTime(const iot_idl::SAlmInfoToAlmClt *a, + const iot_idl::SAlmInfoToAlmClt *b) { //< 不考虑空指针 return a->time_stamp() < b->time_stamp(); @@ -178,19 +178,19 @@ private: volatile bool m_bIsInited = false; //< 时序库连接 - kbd_dbms::CTsdbConnPtr m_ptrTsdbConn; + iot_dbms::CTsdbConnPtr m_ptrTsdbConn; //< 用于使用 upper_bound() 查找时传给cmp函数的对比对象 //< 作为成员变量，避免频繁构建、析构，提高效率 - kbd_dbms::SUniHisSamplePoint m_objSpToCmp; - kbd_idlfile::SAlmInfoToAlmClt m_objAlmToCmp; + iot_dbms::SUniHisSamplePoint m_objSpToCmp; + iot_idl::SAlmInfoToAlmClt m_objAlmToCmp; //< 单次过程中，需要发送的实时数据消息 //< 作为成员变量，避免频繁构建、析构，提高效率 - kbd_idlfile::SRealTimeDataPkg m_objRtdPkg; + iot_idl::SRealTimeDataPkg m_objRtdPkg; //< 告警数据 - std::vector m_vecAlmInfo; + std::vector m_vecAlmInfo; //< 单次过程中，需要从时序库加载采样值的测点 std::vector m_vecAiToLoad; diff --git a/product/src/application/fault_recall_srv/CListenThread.cpp b/product/src/application/fault_recall_srv/CListenThread.cpp index 7fff0e97..608cc630 100644 --- a/product/src/application/fault_recall_srv/CListenThread.cpp +++ b/product/src/application/fault_recall_srv/CListenThread.cpp @@ -51,7 +51,7 @@ bool CListenThread::resumeThread() if (NULL == m_pMbComm) { - m_pMbComm = new kbd_net::CMbCommunicator(); + m_pMbComm = new iot_net::CMbCommunicator(); } //< 订阅 @@ -102,7 +102,7 @@ void CListenThread::execute() if (!m_bIsRunning) return; - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; //< 接收消息 if (m_pMbComm->recvMsg(objMbMsgRcv, 500)) @@ -297,7 +297,7 @@ void CListenThread::sendSessStateActual() objMsgSend.m_nDomainID = CFaultRecallSrv::getInstance().getDomainID(); objMsgSend.m_strSess = m_pSessThread->getName(); - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; objMbMsgSend.setMsgType(MT_FR_SESS_STATE); objMbMsgSend.setSubject(CN_AppId_COMAPP, CH_FR_CTRL_SRV_TO_HMI); objMbMsgSend.setData(objMsgSend.toJsonStr()); @@ -313,7 +313,7 @@ void CListenThread::sendSessStateReject(const char *pszSess) objMsgSend.m_nDomainID = CFaultRecallSrv::getInstance().getDomainID(); objMsgSend.m_strSess = pszSess; - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; objMbMsgSend.setMsgType(MT_FR_SESS_STATE); objMbMsgSend.setSubject(CN_AppId_COMAPP, CH_FR_CTRL_SRV_TO_HMI); objMbMsgSend.setData(objMsgSend.toJsonStr()); diff --git a/product/src/application/fault_recall_srv/CListenThread.h b/product/src/application/fault_recall_srv/CListenThread.h index 7c44e9fb..eed13aaf 100644 --- a/product/src/application/fault_recall_srv/CListenThread.h +++ b/product/src/application/fault_recall_srv/CListenThread.h @@ -25,7 +25,7 @@ namespace kbd_application { class CListenThread - : private kbd_public::CTimerThreadBase + : private iot_public::CTimerThreadBase { public: CListenThread(); @@ -58,7 +58,7 @@ private: private: volatile bool m_bIsRunning; //< 是否正在运行 - kbd_net::CMbCommunicator *m_pMbComm; //< 通讯器 + iot_net::CMbCommunicator *m_pMbComm; //< 通讯器 CSessionThread *m_pSessThread; //< 会话线程 }; diff --git a/product/src/application/fault_recall_srv/CSessionThread.cpp b/product/src/application/fault_recall_srv/CSessionThread.cpp index 00687222..2284c5c1 100644 --- a/product/src/application/fault_recall_srv/CSessionThread.cpp +++ b/product/src/application/fault_recall_srv/CSessionThread.cpp @@ -33,7 +33,7 @@ CSessionThread::CSessionThread(const char *pszSessName, m_bIsRunning(false), m_enState(EN_FR_SS_LOADING), m_enStateBackup(EN_FR_SS_PAUSE), m_nTimeInLastFrame(nTimeBegin), m_nLastFrameSendTime(0), - m_nLastHeartBeatTime(kbd_public::getMonotonicMsec()), + m_nLastHeartBeatTime(iot_public::getMonotonicMsec()), m_strName(pszSessName) { } @@ -63,7 +63,7 @@ bool CSessionThread::resumeThread() return false; } - if (!kbd_service::CDpcdaForDp::resumeThread()) + if (!iot_service::CDpcdaForDp::resumeThread()) return false; resume(); @@ -79,7 +79,7 @@ bool CSessionThread::suspendThread() { //< 先停止线程，再释放资源，防止错误 - if (!kbd_service::CDpcdaForDp::suspendThread()) + if (!iot_service::CDpcdaForDp::suspendThread()) return false; m_bIsRunning = false; @@ -119,13 +119,13 @@ EnFrSessState CSessionThread::getState() const void CSessionThread::refreshHeartBeat() { - m_nLastHeartBeatTime = kbd_public::getMonotonicMsec(); + m_nLastHeartBeatTime = iot_public::getMonotonicMsec(); } bool CSessionThread::isHeartBeatTimeout() const { //< 20s 超时 - if ((m_nLastHeartBeatTime + 20000) < kbd_public::getMonotonicMsec()) + if ((m_nLastHeartBeatTime + 20000) < iot_public::getMonotonicMsec()) { LOGWARN("isHeartBeatTimeout(): 会话超时"); return true; @@ -262,7 +262,7 @@ void CSessionThread::execute() if (bSendFrame && (nNextFrameSendTime <= - kbd_public::getMonotonicMsec())) + iot_public::getMonotonicMsec())) { sendFullFrame(nTimeInNextFrame); @@ -276,7 +276,7 @@ void CSessionThread::execute() } } -void CSessionThread::onSubtionAdded(const kbd_service::ConstSubInfoPtrVec &vecSubAdded) +void CSessionThread::onSubtionAdded(const iot_service::ConstSubInfoPtrVec &vecSubAdded) { if (!m_bIsRunning) { @@ -286,7 +286,7 @@ void CSessionThread::onSubtionAdded(const kbd_service::ConstSubInfoPtrVec &vecSu CEvent objEvent; objEvent.enType = EN_ET_ADD_SUBTION; - objEvent.ptrVecSubInfo.reset(new kbd_service::ConstSubInfoPtrVec(vecSubAdded)); + objEvent.ptrVecSubInfo.reset(new iot_service::ConstSubInfoPtrVec(vecSubAdded)); { boost::mutex::scoped_lock locker(m_mutexAll); @@ -347,7 +347,7 @@ void CSessionThread::handleEvent() LOGDEBUG("handleEvent(): EN_ET_ADD_SUBTION"); if (objEvent.ptrVecSubInfo) { - kbd_net::CMbMessage objMsgRtd; + iot_net::CMbMessage objMsgRtd; //< 只要还没有开始新的一帧，那就是上一帧的时间 if (getSampleData(m_nTimeInLastFrame, @@ -390,7 +390,7 @@ void CSessionThread::sendStateMsg() objMsgSend.m_nDomainID = CFaultRecallSrv::getInstance().getDomainID(); objMsgSend.m_strSess = m_strName; - kbd_net::CMbMessage objMbMsgSend; + iot_net::CMbMessage objMbMsgSend; objMbMsgSend.setMsgType(MT_FR_SESS_STATE); objMbMsgSend.setSubject(CN_AppId_COMAPP, CH_FR_CTRL_SRV_TO_HMI); @@ -413,16 +413,16 @@ void CSessionThread::sendFullFrame(boost::int64_t nTime) //< 测点数据 { - kbd_net::CMbMessage objMsgRtd; + iot_net::CMbMessage objMsgRtd; - kbd_service::ConstSubInfoPtrVecPtr ptrSubInfoVec = CDpcdaForDp::getSubtionOfAll(); + iot_service::ConstSubInfoPtrVecPtr ptrSubInfoVec = CDpcdaForDp::getSubtionOfAll(); if (!ptrSubInfoVec) { LOGERROR("CDpcdaForDp::getSubtionOfAll() return null !"); //< 继续发送，HMI使用这个消息来刷新时间 - ptrSubInfoVec.reset(new kbd_service::ConstSubInfoPtrVec); + ptrSubInfoVec.reset(new iot_service::ConstSubInfoPtrVec); } //< 即使失败，objMsgRtd也是合法的消息，HMI使用这个消息来刷新时间 @@ -445,14 +445,14 @@ void CSessionThread::sendFullFrame(boost::int64_t nTime) //< 告警数据 { - kbd_net::CMbMessage objMsgAlm; + iot_net::CMbMessage objMsgAlm; getAlarmData(nTime, objMsgAlm); m_objMbComm.sendMsgToDomain(objMsgAlm, -1); } m_nTimeInLastFrame = nTime; - m_nLastFrameSendTime = kbd_public::getMonotonicMsec(); + m_nLastFrameSendTime = iot_public::getMonotonicMsec(); LOGDEBUG("sendFullFrame() : end\n"); } diff --git a/product/src/application/fault_recall_srv/CSessionThread.h b/product/src/application/fault_recall_srv/CSessionThread.h index 9f5df50b..854796a6 100644 --- a/product/src/application/fault_recall_srv/CSessionThread.h +++ b/product/src/application/fault_recall_srv/CSessionThread.h @@ -24,8 +24,8 @@ namespace kbd_application { class CSessionThread - : private kbd_public::CTimerThreadBase, - kbd_service::CDpcdaForDp, CHisDataMng + : private iot_public::CTimerThreadBase, + iot_service::CDpcdaForDp, CHisDataMng { public: CSessionThread(const char *pszSessName, @@ -59,7 +59,7 @@ private: void execute()override; //< 覆盖父类 CDpcdaForDp - void onSubtionAdded(const kbd_service::ConstSubInfoPtrVec &vecSubAdded)override; + void onSubtionAdded(const iot_service::ConstSubInfoPtrVec &vecSubAdded)override; //< 覆盖父类 CHisDataMng void onLoadingData()override; @@ -87,7 +87,7 @@ private: EnFrSessState enState; boost::int64_t nTime; - kbd_service::ConstSubInfoPtrVecPtr ptrVecSubInfo; + iot_service::ConstSubInfoPtrVecPtr ptrVecSubInfo; }; private: @@ -108,7 +108,7 @@ private: //< 最后一次心跳时间，开机后ms数，用于超时 boost::int64_t m_nLastHeartBeatTime; - kbd_net::CMbCommunicator m_objMbComm; //< 通讯器 + iot_net::CMbCommunicator m_objMbComm; //< 通讯器 boost::mutex m_mutexAll; //< 保护本类中所有可能并发操作的资源 diff --git a/product/src/application/fault_recall_srv/CTriggerThread.cpp b/product/src/application/fault_recall_srv/CTriggerThread.cpp index 802b670e..2421b9c9 100644 --- a/product/src/application/fault_recall_srv/CTriggerThread.cpp +++ b/product/src/application/fault_recall_srv/CTriggerThread.cpp @@ -169,7 +169,7 @@ bool CTriggerThread::triggered(const kbd_application::CTriggerPara *param, uint6 void CTriggerThread::refreshCfg() { - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); //< 每3s刷新一次 if (m_nRefreshCfgTime + 3000 > nTimeNow) @@ -208,10 +208,10 @@ void CTriggerThread::refreshCfg() //< 已在启动线程时判断了打开实时库表 //< 若没有打开表，不会运行到此处 - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_fault_recall_cond_def); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_fault_recall_cond_def); const int nRcdCnt = m_objRtdb_fault_recall_cond_def.getRecordCount(); //< 实时库中有，但是尚未添加的触发器，则添加 @@ -288,13 +288,13 @@ void CTriggerThread::handleTriggerEvent() std::swap(queEvent, m_queTriggerEvent); } - kbd_idlfile::DbInsert objDbInsert; + iot_idl::DbInsert objDbInsert; //< 表名 objDbInsert.set_strtablename("FAULT_RECALL_RECORD"); //< 写本域和远程（中心）域 - objDbInsert.set_ensaveaction(kbd_idlfile::SA_DSS_LOCAL_REMOTE); + objDbInsert.set_ensaveaction(iot_idl::SA_DSS_LOCAL_REMOTE); //< 列名 { @@ -310,13 +310,13 @@ void CTriggerThread::handleTriggerEvent() { int nLocationID, nSubSystem, nMinutesBefore, nMinutesAfter; const char *pSzReplayFirstPic; - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; //< 已在启动线程时判断了打开实时库表 //< 若没有打开表，不会运行到此处 //< 锁表 - kbd_dbms::CTableLockGuard tableLock(m_objRtdb_fault_recall_cond_def); + iot_dbms::CTableLockGuard tableLock(m_objRtdb_fault_recall_cond_def); const int nRcdCnt = m_objRtdb_fault_recall_cond_def.getRecordCount(); while (!queEvent.empty()) @@ -393,19 +393,19 @@ void CTriggerThread::handleTriggerEvent() //< 至此，所有需要的列都已读取，可以填充消息 { - kbd_idlfile::DbValueArray *pDbRcd_temp = objDbInsert.add_msgrecord(); - kbd_idlfile::SVariable *pColValue = NULL; + iot_idl::DbValueArray *pDbRcd_temp = objDbInsert.add_msgrecord(); + iot_idl::SVariable *pColValue = NULL; //< 顺序与列名保持一致 //< 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(nLocationID); //< 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); pColValue->set_nvalue(nSubSystem); //< NAME @@ -425,7 +425,7 @@ void CTriggerThread::handleTriggerEvent() } else { - kbd_dbms::CVarType objValue; + iot_dbms::CVarType objValue; if (m_objRtdb_trigger_condition_define. getColumnValueByIndex(nRcdIndex, "description", objValue)) { @@ -443,7 +443,7 @@ void CTriggerThread::handleTriggerEvent() } 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(strDesc); } @@ -451,7 +451,7 @@ void CTriggerThread::handleTriggerEvent() { const boost::int64_t nTime = objEvent.m_nTime - nMinutesBefore * 60 * 1000; 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(nTime); } @@ -459,13 +459,13 @@ void CTriggerThread::handleTriggerEvent() { const boost::int64_t nTime = objEvent.m_nTime + nMinutesAfter * 60 * 1000; 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(nTime); } //< REPLAY_FIRST_PIC 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(pSzReplayFirstPic); } } @@ -475,7 +475,7 @@ void CTriggerThread::handleTriggerEvent() } //< 提交，接口内已判断合法性以及个数为0不提交 - kbd_dbms::saveHisData(objDbInsert); + iot_dbms::saveHisData(objDbInsert); } } //< namespace kbd_application diff --git a/product/src/application/fault_recall_srv/CTriggerThread.h b/product/src/application/fault_recall_srv/CTriggerThread.h index a8b61e88..54e8db69 100644 --- a/product/src/application/fault_recall_srv/CTriggerThread.h +++ b/product/src/application/fault_recall_srv/CTriggerThread.h @@ -23,7 +23,7 @@ namespace kbd_application { class CTriggerThread - : private kbd_public::CTimerThreadBase, + : private iot_public::CTimerThreadBase, kbd_application::CTriggerApi { public: @@ -69,8 +69,8 @@ private: boost::mutex m_mutexQue; //< m_queTriggerEvent的锁 //< 实时库访问接口 - kbd_dbms::CRdbAccess m_objRtdb_fault_recall_cond_def; - kbd_dbms::CRdbAccess m_objRtdb_trigger_condition_define; + iot_dbms::CRdbAccess m_objRtdb_fault_recall_cond_def; + iot_dbms::CRdbAccess m_objRtdb_trigger_condition_define; }; diff --git a/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp b/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp index a2cab1e8..51a52172 100644 --- a/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp +++ b/product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp @@ -30,7 +30,7 @@ int main(/*int argc, char *argv[]*/) #endif //< 启动日志 - kbd_public::StartLogSystem("default", "FrTest_JsonMsgClass"); + iot_public::StartLogSystem("default", "FrTest_JsonMsgClass"); LOGINFO("Log system OK !"); { @@ -109,7 +109,7 @@ int main(/*int argc, char *argv[]*/) } //< 停止日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp b/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp index 9e8ef4ab..0396b2f5 100644 --- a/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp +++ b/product/src/application/his_amend/his_amend_srv/CCfgParser.cpp @@ -52,7 +52,7 @@ A_COM_MNG_CFG CCfgParser::g_com_mng_cfg; bool CCfgParser::g_isValid=false; -bool CCfgParser::loadGlobal(kbd_public::CCommonConfigParse &cfg) +bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) { if( cfg.getBoolValue(CN_GLOBAL,CN_IS_ENABLED, g_global_cfg.is_enabled ) == kbdFailed){ LOGERROR( " is_enabled option parser err"); return false;} if( cfg.getBoolValue(CN_GLOBAL,CN_IS_AUTO_ENABLED, g_global_cfg.is_auto_enabled ) == kbdFailed){ LOGERROR( " is_auto_enabled option parser err"); return false;} @@ -81,7 +81,7 @@ bool CCfgParser::loadGlobal(kbd_public::CCommonConfigParse &cfg) return true; } -bool CCfgParser::loadComMng(kbd_public::CCommonConfigParse &cfg) +bool CCfgParser::loadComMng(iot_public::CCommonConfigParse &cfg) { if( cfg.getIntValue( CN_COM_MNG,CN_COM_MNG_FTP_PORT, g_com_mng_cfg.com_mng_ftp_port ) == kbdFailed) {LOGERROR( " com_mng_ftp_port option parser err"); return false;} if( cfg.getStringValue( CN_COM_MNG,CN_COM_MNG_FTP_USER, g_com_mng_cfg.com_mng_ftp_user ) == kbdFailed) {LOGERROR( " com_mng_ftp_user option parser err"); return false;} @@ -125,7 +125,7 @@ bool CCfgParser::isValid() bool CCfgParser::loadCfg(const std::string &cfgPath) { - kbd_public::CCommonConfigParse cfgP; + iot_public::CCommonConfigParse cfgP; if( cfgP.load(cfgPath) == kbdFailed) { LOGERROR("config failed to load, please check config syntax!"); diff --git a/product/src/application/his_amend/his_amend_srv/CCfgParser.h b/product/src/application/his_amend/his_amend_srv/CCfgParser.h index 9d2930b8..7809445c 100644 --- a/product/src/application/his_amend/his_amend_srv/CCfgParser.h +++ b/product/src/application/his_amend/his_amend_srv/CCfgParser.h @@ -51,10 +51,10 @@ public: static A_GLOBAL_CFG g_global_cfg; static A_COM_MNG_CFG g_com_mng_cfg; static bool isValid(); - static bool loadCfg(const std::string& cfgPath = kbd_public::CFileUtil::getPathOfCfgFile(AMEND_CFG_FILENAME)); + static bool loadCfg(const std::string& cfgPath = iot_public::CFileUtil::getPathOfCfgFile(AMEND_CFG_FILENAME)); private: - static bool loadGlobal( kbd_public::CCommonConfigParse &cfg); - static bool loadComMng( kbd_public::CCommonConfigParse &cfg); + static bool loadGlobal( iot_public::CCommonConfigParse &cfg); + static bool loadComMng( iot_public::CCommonConfigParse &cfg); static bool g_isValid; }; diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp index 7f66df13..975c7006 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp +++ b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.cpp @@ -6,7 +6,7 @@ #include "pub_utility_api/TimeUtil.h" #include "CCfgParser.h" -kbd_app::CHisAmendRdbUtility::CHisAmendRdbUtility(const kbd_public::SRunAppInfo &stRunAppInfo) +kbd_app::CHisAmendRdbUtility::CHisAmendRdbUtility(const iot_public::SRunAppInfo &stRunAppInfo) : m_stRunAppInfo(stRunAppInfo) { @@ -222,7 +222,7 @@ bool kbd_app::CHisAmendRdbUtility::getOneTask(STaskUnit &task) return false; boost::mutex::scoped_lock lock( m_objVecTaskLock ); - uint64 timeNowMsec = kbd_public::getUTCTimeMsec(); + uint64 timeNowMsec = iot_public::getUTCTimeMsec(); int target = -1; for(size_t i = 0; i < m_vecTaskUnit.size(); i++) { @@ -353,8 +353,8 @@ int kbd_app::CHisAmendRdbUtility::loadYc() vecYcColumn.push_back("res_para_int1"); - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RTU_TAG,(*m_ptrVecRtu)[rtuIdx].sTagName); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RTU_TAG,(*m_ptrVecRtu)[rtuIdx].sTagName); std::vector vecRecord; //< 查询结果 @@ -424,8 +424,8 @@ int kbd_app::CHisAmendRdbUtility::loadYm() vecYcColumn.push_back("res_para_int1"); - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RTU_TAG,(*m_ptrVecRtu)[rtuIdx].sTagName); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RTU_TAG,(*m_ptrVecRtu)[rtuIdx].sTagName); std::vector vecRecord; //< 查询结果 @@ -479,8 +479,8 @@ int kbd_app::CHisAmendRdbUtility::loadAllRtu() vecRtuColumn.push_back("rtu_addr"); vecRtuColumn.push_back("chan_no"); - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_USED,COL_VALUE_USED); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_USED,COL_VALUE_USED); std::vector vecRecord; //< 查询结果 @@ -527,10 +527,10 @@ int kbd_app::CHisAmendRdbUtility::fillAllRtuChan() { // 获取主通道的ip，并获得备用通道号id //********************************************************** - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_TAG_NAME, (*m_ptrVecRtu)[i].sChanTag); -// kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_COMM_PROP, COL_COMM_PROP_SAMPLE); -// kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_USED, COL_VALUE_USED); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_TAG_NAME, (*m_ptrVecRtu)[i].sChanTag); +// iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_COMM_PROP, COL_COMM_PROP_SAMPLE); +// iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_USED, COL_VALUE_USED); std::vector vecRecord; //< 查询结果 if(!m_tblFesChanPara.selectAllVec(vecCond,vecRecord,vecChanColumn,COL_CHAN_NO,1)){ // COL_CHAN_NO 列为升序查询 @@ -565,8 +565,8 @@ int kbd_app::CHisAmendRdbUtility::fillAllRtuChan() // if(backupChan >= 0) // { // //********************************************************** -// std::vector vecCond; -// kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_CHAN_NO, backupChan); +// std::vector vecCond; +// iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_CHAN_NO, backupChan); // std::vector vecRecord; //< 查询结果 // if(!m_tblFesChanPara.selectAllVec(vecCond,vecRecord,vecChanColumn,COL_CHAN_NO,1)){ // COL_CHAN_NO 列为升序查询 diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h index 06ee5949..a188a1cb 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendRdbUtility.h @@ -107,7 +107,7 @@ typedef boost::shared_ptr< std::vector>> vecSRuMapYmPtr; // m class CHisAmendRdbUtility final { public: - CHisAmendRdbUtility(const kbd_public::SRunAppInfo &stRunAppInfo); + CHisAmendRdbUtility(const iot_public::SRunAppInfo &stRunAppInfo); ~CHisAmendRdbUtility(); int initialize(); @@ -151,8 +151,8 @@ private: void clean(); -// kbd_dbms::CRdbAccessEx m_rdb; - kbd_public::SRunAppInfo m_stRunAppInfo; // 本应用相关运行参数 +// iot_dbms::CRdbAccessEx m_rdb; + iot_public::SRunAppInfo m_stRunAppInfo; // 本应用相关运行参数 boost::mutex m_objVecTaskLock; //用来保护任务队列 std::vector m_vecTaskUnit; // 任务队列 vecSRuMapYcPtr m_ptrVecMapRtuYc; @@ -160,10 +160,10 @@ private: boost::mutex m_objVecRtuLock; //用来保护Rtu容器 vecSRuPtr m_ptrVecRtu; - kbd_dbms::CRdbAccessEx m_tblFesChanPara; - kbd_dbms::CRdbAccessEx m_tblFesRtuPara; - kbd_dbms::CRdbAccessEx m_tblFesAccuml; - kbd_dbms::CRdbAccessEx m_tblFesAnalog; + iot_dbms::CRdbAccessEx m_tblFesChanPara; + iot_dbms::CRdbAccessEx m_tblFesRtuPara; + iot_dbms::CRdbAccessEx m_tblFesAccuml; + iot_dbms::CRdbAccessEx m_tblFesAnalog; }; diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp index 6f3c32c3..14d9b2d8 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.cpp @@ -65,7 +65,7 @@ bool kbd_app::CHisAmendSrvApp::start(int argc, char *argv[], int &nStatus) } //< 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("创建冗余管理失败"); @@ -119,7 +119,7 @@ bool kbd_app::CHisAmendSrvApp:: stop() } //< 销毁消息总线接口 - if(!kbd_net::releaseMsgBus() || !kbd_dbms::releaseTsdbApi()) + if(!iot_net::releaseMsgBus() || !iot_dbms::releaseTsdbApi()) { LOGERROR("销毁消息总线资源和TSDB失败"); return false; @@ -133,7 +133,7 @@ bool kbd_app::CHisAmendSrvApp:: stop() } //< 2.销毁日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return true; } @@ -212,18 +212,18 @@ void kbd_app::CHisAmendSrvApp::showHelp(const boost::program_options::options_de bool kbd_app::CHisAmendSrvApp::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(SERVER_PROCESSNAME); + return iot_public::CSingleProcInstance::hasInstanceRunning(SERVER_PROCESSNAME); } bool kbd_app::CHisAmendSrvApp::initLog() { - kbd_public::StartLogSystem(m_strAppName.c_str(),SERVER_PROCESSNAME.c_str()); + iot_public::StartLogSystem(m_strAppName.c_str(),SERVER_PROCESSNAME.c_str()); return true; } bool kbd_app::CHisAmendSrvApp::initMsgBusAndTsdb() { - return (kbd_net::initMsgBus(SERVER_PROCESSNAME.c_str(),m_strAppName.c_str()) && kbd_dbms::initTsdbApi()); + return (iot_net::initMsgBus(SERVER_PROCESSNAME.c_str(),m_strAppName.c_str()) && iot_dbms::initTsdbApi()); } bool kbd_app::CHisAmendSrvApp::getSystemInfo() @@ -243,7 +243,7 @@ bool kbd_app::CHisAmendSrvApp::getSystemInfo() bool kbd_app::CHisAmendSrvApp::registToProcMng() { - kbd_sys::SProcessInfoKey stProcKey; + iot_sys::SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; stProcKey.nAppId = m_stRunAppInfo.nAppId; stProcKey.strNodeName = m_stRunAppInfo.strLocalNodeName; diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h index 39a48257..3f38369a 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvApp.h @@ -14,8 +14,8 @@ namespace kbd_app{ class CHisAmendSrvApp: - public kbd_public::CBaseService, - public kbd_sys::CProcessQuitInterface + public iot_public::CBaseService, + public iot_sys::CProcessQuitInterface { public: CHisAmendSrvApp(); @@ -92,11 +92,11 @@ private: std::string m_strAppName; //应用名 - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 std::string m_strStartArgs; //保存进程启动参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //创建进程管理访问智能库指针 - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //冗余管理类 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //创建进程管理访问智能库指针 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //冗余管理类 kbd_app::CSrvMngPtr m_ptrSrvMng; //统计服务管理类 diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp index 53687b0a..938350e0 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.cpp @@ -3,7 +3,7 @@ #include "CCfgParser.h" -kbd_app::CHisAmendSrvMng::CHisAmendSrvMng(kbd_public::SRunAppInfo &stRunAppInfo, const kbd_sys::CProcMngInterfacePtr &ptrProcMng): +kbd_app::CHisAmendSrvMng::CHisAmendSrvMng(iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng): m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng) { diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h index a08f5305..4962b7d1 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendSrvMng.h @@ -15,10 +15,10 @@ namespace kbd_app { class CHisAmendSrvMng: - public kbd_sys::CRedundantSwitchInterface + public iot_sys::CRedundantSwitchInterface { public: - CHisAmendSrvMng(kbd_public::SRunAppInfo &stRunAppInfo,const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CHisAmendSrvMng(iot_public::SRunAppInfo &stRunAppInfo,const iot_sys::CProcMngInterfacePtr &ptrProcMng); ~CHisAmendSrvMng(); /** @@ -37,8 +37,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; // 进程管理访问库智能指针 CHisAmendRdbUtilityPtr m_ptrHisAmendRdbUtility; CHisAmendWrkThdPtr m_ptrHisAmendWrkThd; diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.cpp b/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.cpp index 70611770..fbe8f044 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.cpp +++ b/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.cpp @@ -9,8 +9,8 @@ #include "HisAmendMessage.pb.h" #include "MessageChannel.h" -kbd_app::CHisAmendWrkThd::CHisAmendWrkThd(const kbd_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility,kbd_public::SRunAppInfo stRunAppInfo): - kbd_public::CTimerThreadBase( "CHisAmendWrkThd", CCfgParser::g_global_cfg.work_interval ), +kbd_app::CHisAmendWrkThd::CHisAmendWrkThd(const kbd_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility,iot_public::SRunAppInfo stRunAppInfo): + iot_public::CTimerThreadBase( "CHisAmendWrkThd", CCfgParser::g_global_cfg.work_interval ), m_ptrRdbUtil(ptrHisAmendRdbUtility) { @@ -84,7 +84,7 @@ int kbd_app::CHisAmendWrkThd::initialize() return kbdFailed; } - m_ptrTsdbSaveApi = boost::make_shared(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId); + m_ptrTsdbSaveApi = boost::make_shared(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId); if (m_ptrTsdbSaveApi == NULL) { LOGERROR("CSampleProcess ::initialize(), make_shared fail!\n"); @@ -176,16 +176,16 @@ bool kbd_app::CHisAmendWrkThd::execTask(const kbd_app::STaskUnit &task) return false; } - kbd_idlfile::STssInsert stYcTssToInsert; - kbd_idlfile::STssInsert stYmTssToInsert; + iot_idl::STssInsert stYcTssToInsert; + iot_idl::STssInsert stYmTssToInsert; - stYcTssToInsert.set_save_action(kbd_idlfile::SA_TSS_LOCAL_REMOTE); + stYcTssToInsert.set_save_action(iot_idl::SA_TSS_LOCAL_REMOTE); stYcTssToInsert.set_meas_name(ANA_SAMPLE_RESULT); stYcTssToInsert.add_tag_name("tag_name"); stYcTssToInsert.add_field_name("status"); stYcTssToInsert.add_field_name("value"); - stYmTssToInsert.set_save_action(kbd_idlfile::SA_TSS_LOCAL_REMOTE); + stYmTssToInsert.set_save_action(iot_idl::SA_TSS_LOCAL_REMOTE); stYmTssToInsert.set_meas_name(ACC_SAMPLE_RESULT); stYmTssToInsert.add_tag_name("tag_name"); stYmTssToInsert.add_field_name("status"); @@ -221,16 +221,16 @@ bool kbd_app::CHisAmendWrkThd::execTask(const kbd_app::STaskUnit &task) void kbd_app::CHisAmendWrkThd::sendTaskMsg(const kbd_app::STaskUnit &task, bool result) { - kbd_idlfile::TASK_FINISH task_fi; + iot_idl::TASK_FINISH task_fi; task_fi.set_rtu_idx(task.nRtuIdx); task_fi.set_start_time(task.nStartTime); task_fi.set_end_time(task.nEndTime); if(result) - task_fi.set_task_result(kbd_idlfile::TASK_FINISH::enTaskResult::TASK_FINISH_enTaskResult_TR_SUCCESS); + task_fi.set_task_result(iot_idl::TASK_FINISH::enTaskResult::TASK_FINISH_enTaskResult_TR_SUCCESS); else - task_fi.set_task_result(kbd_idlfile::TASK_FINISH::enTaskResult::TASK_FINISH_enTaskResult_TR_FAILED); + task_fi.set_task_result(iot_idl::TASK_FINISH::enTaskResult::TASK_FINISH_enTaskResult_TR_FAILED); - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setData(task_fi); msg.setSubject(4,CH_AMEND_SRV_TO_APP_PRTBF); @@ -611,7 +611,7 @@ bool kbd_app::CHisAmendWrkThd::getLocalIp(std::set &setLocalIp) return true; } -bool kbd_app::CHisAmendWrkThd::parseHisData(CFtpStreamReader &ftpStrmReader, const std::string &path, const kbd_app::STaskUnit &task, const std::map &mapPointInfo, kbd_idlfile::STssInsert &stYcTssToInsert, EnPointType pointType) +bool kbd_app::CHisAmendWrkThd::parseHisData(CFtpStreamReader &ftpStrmReader, const std::string &path, const kbd_app::STaskUnit &task, const std::map &mapPointInfo, iot_idl::STssInsert &stYcTssToInsert, EnPointType pointType) { int64 curStart,curEnd; @@ -677,7 +677,7 @@ bool kbd_app::CHisAmendWrkThd::parseHisData(CFtpStreamReader &ftpStrmReader, con return true; } -bool kbd_app::CHisAmendWrkThd::parseYcFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYc, kbd_idlfile::STssInsert &stYcTssToInsert) +bool kbd_app::CHisAmendWrkThd::parseYcFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYc, iot_idl::STssInsert &stYcTssToInsert) { std::string filetext = fileStream.str(); @@ -730,18 +730,18 @@ bool kbd_app::CHisAmendWrkThd::parseYcFile(int64 startTime, int64 endTime, int n LOGTRACE("yc id:[%d],datetime[%s],tag_name:[%s],sample_val:[%d],parseNo:[%d],sTime:[%s]",id,UTCMSectoString(dataTime).c_str(),tag_name.c_str(),nVal,(int)i,sTime.c_str()); //<==================== 构造时序库点 - kbd_idlfile::STsdbPoint *pPoint = stYcTssToInsert.add_point(); + iot_idl::STsdbPoint *pPoint = stYcTssToInsert.add_point(); // 时标 pPoint->set_time_stamp(dataTime); // tag pPoint->add_tag_val(tag_name); // field status - kbd_idlfile::SVariable *pVarStatus= pPoint->add_field_val(); - pVarStatus->set_edatatype(kbd_idlfile::CN_DATATYPE_INT64); + iot_idl::SVariable *pVarStatus= pPoint->add_field_val(); + pVarStatus->set_edatatype(iot_idl::CN_DATATYPE_INT64); pVarStatus->set_lvalue(nStatus); // field value - kbd_idlfile::SVariable *pVarValue= pPoint->add_field_val(); - pVarValue->set_edatatype(kbd_idlfile::CN_DATATYPE_DOUBLE); + iot_idl::SVariable *pVarValue= pPoint->add_field_val(); + pVarValue->set_edatatype(iot_idl::CN_DATATYPE_DOUBLE); pVarValue->set_dvalue(calcVal); //>==================== 构造时序库点 @@ -749,7 +749,7 @@ bool kbd_app::CHisAmendWrkThd::parseYcFile(int64 startTime, int64 endTime, int n return true; } -bool kbd_app::CHisAmendWrkThd::parseYmFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYm, kbd_idlfile::STssInsert &stTssToInsert) +bool kbd_app::CHisAmendWrkThd::parseYmFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYm, iot_idl::STssInsert &stTssToInsert) { std::string filetext = fileStream.str(); @@ -798,18 +798,18 @@ bool kbd_app::CHisAmendWrkThd::parseYmFile(int64 startTime, int64 endTime, int n //<==================== 构造时序库点 - kbd_idlfile::STsdbPoint *pPoint = stTssToInsert.add_point(); + iot_idl::STsdbPoint *pPoint = stTssToInsert.add_point(); // 时标 pPoint->set_time_stamp(dataTime); // tag pPoint->add_tag_val(tag_name); // field status - kbd_idlfile::SVariable *pVarStatus= pPoint->add_field_val(); - pVarStatus->set_edatatype(kbd_idlfile::CN_DATATYPE_INT64); + iot_idl::SVariable *pVarStatus= pPoint->add_field_val(); + pVarStatus->set_edatatype(iot_idl::CN_DATATYPE_INT64); pVarStatus->set_lvalue(nStatus); // field value - kbd_idlfile::SVariable *pVarValue= pPoint->add_field_val(); - pVarValue->set_edatatype(kbd_idlfile::CN_DATATYPE_DOUBLE); + iot_idl::SVariable *pVarValue= pPoint->add_field_val(); + pVarValue->set_edatatype(iot_idl::CN_DATATYPE_DOUBLE); pVarValue->set_dvalue(calcVal); //>==================== 构造时序库点 @@ -817,7 +817,7 @@ bool kbd_app::CHisAmendWrkThd::parseYmFile(int64 startTime, int64 endTime, int n return true; } -bool kbd_app::CHisAmendWrkThd::writeToTsdb(const kbd_app::STaskUnit &/*task*/, const kbd_idlfile::STssInsert &stTssToInsert) +bool kbd_app::CHisAmendWrkThd::writeToTsdb(const kbd_app::STaskUnit &/*task*/, const iot_idl::STssInsert &stTssToInsert) { // TODO 删除区间的值 diff --git a/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h b/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h index de30f274..8acd794e 100644 --- a/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h +++ b/product/src/application/his_amend/his_amend_srv/HisAmendWrkThd.h @@ -49,10 +49,10 @@ char RecordTime[4]; namespace kbd_app { -class CHisAmendWrkThd final : public kbd_public::CTimerThreadBase +class CHisAmendWrkThd final : public iot_public::CTimerThreadBase { public: - explicit CHisAmendWrkThd(const CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility, kbd_public::SRunAppInfo stRunAppInfo); + explicit CHisAmendWrkThd(const CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility, iot_public::SRunAppInfo stRunAppInfo); ~CHisAmendWrkThd() override; void execute() override; int initialize(); @@ -82,7 +82,7 @@ private: const std::string &path, const STaskUnit&task, const std::map &mapPointInfo, - kbd_idlfile::STssInsert &stYcTssToInsert, + iot_idl::STssInsert &stYcTssToInsert, EnPointType pointType); bool parseYcFile(int64 startTime, @@ -90,16 +90,16 @@ private: int nRtuIdx, std::stringstream &fileStream, const std::map &mapYc, - kbd_idlfile::STssInsert &stTssToInsert); + iot_idl::STssInsert &stTssToInsert); bool parseYmFile(int64 startTime, int64 endTime, int nRtuIdx, std::stringstream &fileStream, const std::map &mapYm, - kbd_idlfile::STssInsert &stTssToInsert); + iot_idl::STssInsert &stTssToInsert); bool writeToTsdb( const STaskUnit&task, - const kbd_idlfile::STssInsert &stTssToInsert); + const iot_idl::STssInsert &stTssToInsert); //>=====================解析数据并写入数据接口=========================== @@ -107,9 +107,9 @@ private: vecSRuMapYmPtr m_ptrRtu2SYm; // Rtu 序号对应规约参数1映射ym CHisAmendRdbUtilityPtr m_ptrRdbUtil; - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_dbms::CTsdbSaveApiPtr m_ptrTsdbSaveApi; - kbd_net::CMbCommunicator m_objComm; //< 通信器 + iot_public::SRunAppInfo m_stRunAppInfo; + iot_dbms::CTsdbSaveApiPtr m_ptrTsdbSaveApi; + iot_net::CMbCommunicator m_objComm; //< 通信器 }; diff --git a/product/src/application/his_amend/his_amend_srv/RdbTable.h b/product/src/application/his_amend/his_amend_srv/RdbTable.h index 57e83a2d..3c66f962 100644 --- a/product/src/application/his_amend/his_amend_srv/RdbTable.h +++ b/product/src/application/his_amend/his_amend_srv/RdbTable.h @@ -1,7 +1,7 @@ #ifndef STATINSTDEFTABLE_H #define STATINSTDEFTABLE_H -namespace kbd_service { +namespace iot_service { typedef struct _SSTAT_INST_DEF { @@ -276,7 +276,7 @@ typedef struct _SSTAT_TEMPLATE_RET }SStatTemplateRet; -} // namespace kbd_service +} // namespace iot_service #endif // STATINSTDEFTABLE_H diff --git a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp index b5abe320..1331c30a 100644 --- a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp +++ b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.cpp @@ -6,7 +6,7 @@ kbd_app::CRecvMsgThread::CRecvMsgThread(const kbd_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility): - kbd_public::CTimerThreadBase( "CRtuStatMontThd", CCfgParser::g_global_cfg.check_interval ), + iot_public::CTimerThreadBase( "CRtuStatMontThd", CCfgParser::g_global_cfg.check_interval ), m_ptrRdbUtil(ptrHisAmendRdbUtility) { @@ -21,7 +21,7 @@ kbd_app::CRecvMsgThread::~CRecvMsgThread() void kbd_app::CRecvMsgThread::execute() { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; while( m_objCommunicator.recvMsg( msg ) ) { if ( msg.getChannelID() != CH_AMEND_APP_TO_SRV_PRTBF) @@ -29,7 +29,7 @@ void kbd_app::CRecvMsgThread::execute() continue; } - kbd_idlfile::ADD_TASK objData; + iot_idl::ADD_TASK objData; if(!objData.ParseFromArray(msg.getDataPtr(),static_cast( msg.getDataSize() ) ) ) { continue; @@ -74,7 +74,7 @@ int kbd_app::CRecvMsgThread::subscribeMessage() int kbd_app::CRecvMsgThread::unsubscribeMessage() { - std::vector vecSub = m_objCommunicator.getMySub(); + std::vector vecSub = m_objCommunicator.getMySub(); for ( size_t i = 0; i < vecSub.size(); ++i ) { if ( !m_objCommunicator.delSub( vecSub[i].getAppID(), vecSub[i].getChannelID())) @@ -85,7 +85,7 @@ int kbd_app::CRecvMsgThread::unsubscribeMessage() } /* @brief 清空消息总线中的数据 */ - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while ( m_objCommunicator.recvMsg( objMsg, 0 )) { } diff --git a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h index aeea964a..4b0bf184 100644 --- a/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h +++ b/product/src/application/his_amend/his_amend_srv/RecvMsgThread.h @@ -8,7 +8,7 @@ namespace kbd_app { -class CRecvMsgThread final : public kbd_public::CTimerThreadBase +class CRecvMsgThread final : public iot_public::CTimerThreadBase { public: explicit CRecvMsgThread(const CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility); @@ -35,7 +35,7 @@ private: private: - kbd_net::CMbCommunicator m_objCommunicator; //< 通信器 + iot_net::CMbCommunicator m_objCommunicator; //< 通信器 CHisAmendRdbUtilityPtr m_ptrRdbUtil; }; diff --git a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp index 4d4f423e..461eaf7d 100644 --- a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp +++ b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.cpp @@ -7,7 +7,7 @@ #include #include -const std::string g_curdir = kbd_public::CFileUtil::getCurModuleDir() ; +const std::string g_curdir = iot_public::CFileUtil::getCurModuleDir() ; const std::string g_cache_path = g_curdir + "../../data/cache/his_amend_srv/his_amend_srv.dat"; const std::string g_cache_tmp_path = g_curdir + "../../data/cache/his_amend_srv/his_amend_srv.tmp"; @@ -15,10 +15,10 @@ const std::string g_cache_tmp_path = g_curdir + "../../data/cache/his_amend_srv/ using namespace std; kbd_app::CRtuStatMontThd::CRtuStatMontThd(const kbd_app::CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility): - kbd_public::CTimerThreadBase( "CRtuStatMontThd", CCfgParser::g_global_cfg.check_interval ), + iot_public::CTimerThreadBase( "CRtuStatMontThd", CCfgParser::g_global_cfg.check_interval ), m_ptrRdbUtil(ptrHisAmendRdbUtility) { - if( !kbd_public::CFileUtil::createMultiDir(g_curdir + "../../data/cache/his_amend_srv") ) + if( !iot_public::CFileUtil::createMultiDir(g_curdir + "../../data/cache/his_amend_srv") ) { LOGERROR("cannot create cache dir"); } @@ -60,7 +60,7 @@ void kbd_app::CRtuStatMontThd::execute() LOGERROR( "cannot get RtuState,TagName:[%s]",m_ptrRdbUtil->getRtuTag(i).c_str()); continue; } - nCurTime = kbd_public::getUTCTimeMsec(); + nCurTime = iot_public::getUTCTimeMsec(); // 状态不一致，开始计算 if(nRdbState != nLastState){ // 如果通讯正常了，则进入状态计算 @@ -234,7 +234,7 @@ bool kbd_app::CRtuStatMontThd::loadCache() } - int64 nCurTime = kbd_public::getUTCTimeMsec(); + int64 nCurTime = iot_public::getUTCTimeMsec(); if(vecInit[j] == 0 // 没有初始化跳过 || vecLastState[j] != CN_FesChanRun// 通道不在正常运行的跳过 || vecLastTime[j] >= nCurTime // 最后正常时间大于等于现在的跳过 diff --git a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h index 5f96a203..07575a5e 100644 --- a/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h +++ b/product/src/application/his_amend/his_amend_srv/RtuStatMontThd.h @@ -12,7 +12,7 @@ namespace kbd_app { -class CRtuStatMontThd final : public kbd_public::CTimerThreadBase +class CRtuStatMontThd final : public iot_public::CTimerThreadBase { public: explicit CRtuStatMontThd(const CHisAmendRdbUtilityPtr &ptrHisAmendRdbUtility); diff --git a/product/src/application/his_amend/his_amend_studio/main.cpp b/product/src/application/his_amend/his_amend_studio/main.cpp index 2fa5709d..defe69c4 100644 --- a/product/src/application/his_amend/his_amend_studio/main.cpp +++ b/product/src/application/his_amend/his_amend_studio/main.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) kbd_common::doQtAppGlobalSet(); QApplication a(argc, argv); - kbd_net::initMsgBus("his_amend_studio",""); + iot_net::initMsgBus("his_amend_studio",""); 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/product/src/application/his_amend/his_amend_studio/mainwindow.cpp b/product/src/application/his_amend/his_amend_studio/mainwindow.cpp index 28063dd7..b91cc637 100644 --- a/product/src/application/his_amend/his_amend_studio/mainwindow.cpp +++ b/product/src/application/his_amend/his_amend_studio/mainwindow.cpp @@ -38,7 +38,7 @@ MainWindow::~MainWindow() bool MainWindow::loadAllRtu() { - kbd_dbms::CRdbAccessEx m_tblFesRtuPara; + iot_dbms::CRdbAccessEx m_tblFesRtuPara; if(!m_tblFesRtuPara.open(4,TBL_RTU_PARA)) { QMessageBox::information(this,tr("提醒"),tr("读取内存库失败")); @@ -56,12 +56,12 @@ bool MainWindow::loadAllRtu() vecRtuColumn.push_back("rtu_addr"); vecRtuColumn.push_back("chan_no"); - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_USED,COL_VALUE_USED); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_USED,COL_VALUE_USED); std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_tblFesRtuPara); + iot_dbms::CTableLockGuard tableLock(m_tblFesRtuPara); if(!m_tblFesRtuPara.selectAllVec(vecCond,vecRecord,vecRtuColumn,COL_RTU_NO,1)){ // COL_RTU_NO 列为升序查询 QMessageBox::information(this,tr("提醒"),tr("未查询到数据")); @@ -86,12 +86,12 @@ bool MainWindow::loadAllRtu() void MainWindow::on_pushButton_clicked() { - kbd_idlfile::ADD_TASK task; + iot_idl::ADD_TASK task; task.set_rtu_idx(ui->comboBox->currentData().toInt()); task.set_start_time(ui->dt_start->dateTime().toMSecsSinceEpoch()); task.set_end_time(ui->dt_end->dateTime().toMSecsSinceEpoch()); - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setData(task); msg.setSubject(4,CH_AMEND_APP_TO_SRV_PRTBF); @@ -110,7 +110,7 @@ void MainWindow::addMsg(QString msg) void MainWindow::handleMsg() { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; while( m_objComm.recvMsg( msg ) ) { if ( msg.getChannelID() != CH_AMEND_SRV_TO_APP_PRTBF) @@ -118,7 +118,7 @@ void MainWindow::handleMsg() continue; } - kbd_idlfile::TASK_FINISH objData; + iot_idl::TASK_FINISH objData; if(!objData.ParseFromArray(msg.getDataPtr(),static_cast( msg.getDataSize() ) ) ) { continue; @@ -128,7 +128,7 @@ void MainWindow::handleMsg() msg += QString( m_vecRtu.at(objData.rtu_idx()).sDesc.c_str()) + ":" +m_vecRtu.at(objData.rtu_idx()).sTagName.c_str(); msg += tr("从") + QDateTime::fromMSecsSinceEpoch(objData.start_time()).toString(); msg += tr("到") + QDateTime::fromMSecsSinceEpoch(objData.end_time()).toString(); - msg += objData.task_result() == kbd_idlfile::TASK_FINISH::enTaskResult::TASK_FINISH_enTaskResult_TR_SUCCESS ?tr("成功"):tr("失败"); + msg += objData.task_result() == iot_idl::TASK_FINISH::enTaskResult::TASK_FINISH_enTaskResult_TR_SUCCESS ?tr("成功"):tr("失败"); addMsg(msg); } } diff --git a/product/src/application/his_amend/his_amend_studio/mainwindow.h b/product/src/application/his_amend/his_amend_studio/mainwindow.h index 6cbe5bbc..e971d008 100644 --- a/product/src/application/his_amend/his_amend_studio/mainwindow.h +++ b/product/src/application/his_amend/his_amend_studio/mainwindow.h @@ -41,7 +41,7 @@ private: std::vector m_vecRtu; bool loadAllRtu(); - kbd_net::CMbCommunicator m_objComm; //< 通信器 + iot_net::CMbCommunicator m_objComm; //< 通信器 }; diff --git a/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp b/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp index 31850af4..fa9456ab 100644 --- a/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp +++ b/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.cpp @@ -6,7 +6,7 @@ HTTPClient_ezjcMsgManger::HTTPClient_ezjcMsgManger() m_pDpSub(NULL) { curl_global_init(CURL_GLOBAL_DEFAULT); - m_pDpSub = new kbd_service::CDpcdaForApp(); + m_pDpSub = new iot_service::CDpcdaForApp(); if(m_pDpSub->initGlobalThread()){ LOGINFO("初始化全局成功"); } @@ -102,7 +102,7 @@ void HTTPClient_ezjcMsgManger::execute() m_first=true; if(m_pComm==nullptr) { - m_pComm = new kbd_net::CMbCommunicator(); + m_pComm = new iot_net::CMbCommunicator(); int nRet = kbdSuccess; if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { @@ -116,11 +116,11 @@ void HTTPClient_ezjcMsgManger::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 ); } @@ -171,7 +171,7 @@ void HTTPClient_ezjcMsgManger::onCommun() int nRet = kbdSuccess; if(m_pComm==nullptr) { - m_pComm = new kbd_net::CMbCommunicator(); + m_pComm = new iot_net::CMbCommunicator(); if( m_pComm->addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE) ) { LOGINFO( "订阅通道:%d成功", CH_SCADA_TO_HMI_DATA_CHANGE ); @@ -185,7 +185,7 @@ void HTTPClient_ezjcMsgManger::onCommun() } if(m_pDpSub == nullptr) { - m_pDpSub = new kbd_service::CDpcdaForApp(); + m_pDpSub = new iot_service::CDpcdaForApp(); initKbdService(); } @@ -193,7 +193,7 @@ void HTTPClient_ezjcMsgManger::onCommun() bool HTTPClient_ezjcMsgManger::initDevroup() { - kbd_dbms::CDbApi *m_pObjDbInterface = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi *m_pObjDbInterface = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pObjDbInterface->open()) { LOGERROR("数据库接口打开失败"); @@ -418,10 +418,10 @@ void HTTPClient_ezjcMsgManger::initKbdService() } } -void HTTPClient_ezjcMsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg) +void HTTPClient_ezjcMsgManger::dealMsgFromNetMsgBus(const iot_net::CMbMessage& objMsg) { // 反序列化 - kbd_idlfile::SRealTimeDataPkg objPkg; + iot_idl::SRealTimeDataPkg objPkg; QVector DistributionUpdateDevGroup; QVector MeterUpdateDevGroup; QVector ProtectorUpdateDevGroup; @@ -438,7 +438,7 @@ void HTTPClient_ezjcMsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& o for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); @@ -498,7 +498,7 @@ void HTTPClient_ezjcMsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& o for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); @@ -534,7 +534,7 @@ void HTTPClient_ezjcMsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& o for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); @@ -571,7 +571,7 @@ void HTTPClient_ezjcMsgManger::dealMsgFromNetMsgBus(const kbd_net::CMbMessage& o for ( int i=0; i::iterator P_Point=m_pointInfo.find(obj.strtagname()); diff --git a/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.h b/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.h index aae1fe75..5a4b2a6d 100644 --- a/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.h +++ b/product/src/application/httpClient_ezjc/HTTPClient_ezjcMsgManger.h @@ -31,11 +31,11 @@ private: bool initDevroup(); //初始化所有设备组信息 bool initCurrentGroup(); //初始化需要发送的设备组信息 void initKbdService(); //订阅需要的测点 - void dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg); + void dealMsgFromNetMsgBus(const iot_net::CMbMessage& objMsg); void initHttpClient();//建立客户端 void initSignalSlot(); private: - kbd_net::CMbCommunicator* m_pComm; + iot_net::CMbCommunicator* m_pComm; QString m_systemName; QMap> m_currentDevGroup; // QMap allDevGroup; @@ -44,7 +44,7 @@ private: QMap m_pointInfo; QVector m_allDevGorup; QVector m_point; - kbd_service::CDpcdaForApp* m_pDpSub;// 订阅服务接口 + iot_service::CDpcdaForApp* m_pDpSub;// 订阅服务接口 qint64 lastUpateTime; bool m_first=false;//确认是否第一次启动 }; diff --git a/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp b/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp index 08f6b74f..73618595 100644 --- a/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp +++ b/product/src/application/httpClient_ezjc/HttpClient_ezjc.cpp @@ -12,19 +12,19 @@ HttpClient_ezjc::HttpClient_ezjc() HttpClient_ezjc::~HttpClient_ezjc() { stop(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); } bool HttpClient_ezjc::start(int argc, char *argv[], int &nStatus) { assert( !m_ptrRedunSw ); //< NULL - kbd_public::CSysInfoInterfacePtr ptrSysInfo; + iot_public::CSysInfoInterfacePtr ptrSysInfo; EnRunModel enRunModel = RM_NORMAL; std::string strAppName = CN_AppName_COMAPP; //< 启动日志 - kbd_public::StartLogSystem( strAppName.c_str(), EZ_NYGK_PROC_NAME ); - if ( kbd_public::createSysInfoInstance(ptrSysInfo) == false ) + iot_public::StartLogSystem( strAppName.c_str(), EZ_NYGK_PROC_NAME ); + if ( iot_public::createSysInfoInstance(ptrSysInfo) == false ) { LOGFATAL( "createSysInfoInstance() return false !" ); return false; @@ -53,7 +53,7 @@ bool HttpClient_ezjc::start(int argc, char *argv[], int &nStatus) } //< 消息总线 - if ( !kbd_net::initMsgBus( EZ_NYGK_PROC_NAME, "", true )) + if ( !iot_net::initMsgBus( EZ_NYGK_PROC_NAME, "", true )) { LOGFATAL( "消息总线初始化失败，程序启动失败！" ); return false; @@ -81,13 +81,13 @@ bool HttpClient_ezjc::start(int argc, char *argv[], int &nStatus) strStartArgs += argv[i]; } - kbd_sys::SProcessInfoKey objProcInfo; + iot_sys::SProcessInfoKey objProcInfo; objProcInfo.nAppId = m_stRunAppInfo.nAppId; objProcInfo.nDomainId = m_stRunAppInfo.nDomainId; objProcInfo.strNodeName = m_stRunAppInfo.strLocalNodeName; objProcInfo.strProcName = EZ_NYGK_PROC_NAME; objProcInfo.strProcParam = strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance( objProcInfo ); + m_ptrProcMng = iot_sys::getProcMngInstance( objProcInfo ); if ( !m_ptrProcMng ) { LOGFATAL( "getProcMngInstance return NULL" ); @@ -98,7 +98,7 @@ bool HttpClient_ezjc::start(int argc, char *argv[], int &nStatus) //< 冗余管理 { - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance( m_stRunAppInfo.nDomainId, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance( m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId, m_stRunAppInfo.strLocalNodeName ); @@ -189,11 +189,11 @@ bool HttpClient_ezjc::stop() } //< 停止消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 //移到析构函数中，防止日志库停止后，又写日志，从而使log4cplus提示找不到logger - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); return true; } @@ -216,7 +216,7 @@ int HttpClient_ezjc::updateProcInfo(bool bActive, bool bMaster, bool bSlave) bool HttpClient_ezjc::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning( EZ_NYGK_PROC_NAME ); + return iot_public::CSingleProcInstance::hasInstanceRunning( EZ_NYGK_PROC_NAME ); } bool HttpClient_ezjc::parseCommandLine( int argc, char *argv[], EnRunModel &enRunModel, std::string &strAppName ) diff --git a/product/src/application/httpClient_ezjc/HttpClient_ezjc.h b/product/src/application/httpClient_ezjc/HttpClient_ezjc.h index 57214788..054b2d59 100644 --- a/product/src/application/httpClient_ezjc/HttpClient_ezjc.h +++ b/product/src/application/httpClient_ezjc/HttpClient_ezjc.h @@ -19,7 +19,7 @@ enum EnRunModel RM_NO_PROC_MNG_MASTER, //< 不注册进程管理、冗余管理，主机模式 RM_NO_PROC_MNG_SLAVE, //< 不注册进程管理、冗余管理，备机模式 }; -class HttpClient_ezjc final:public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class HttpClient_ezjc final:public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: HttpClient_ezjc(); @@ -40,10 +40,10 @@ private: CWebSrvRedunSwPtr m_ptrRedunSw; private: - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; //< 运行参数 - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; bool parseCommandLine( int argc, char *argv[], EnRunModel &enRunModel, std::string &strAppName); bool isAlreadyRunning(); }; diff --git a/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp b/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp index 016330df..643c83dd 100644 --- a/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp +++ b/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.cpp @@ -378,8 +378,8 @@ return true; int HttpClient_ezjcDataProThread::readConfigForGenerate() { - kbd_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(kbd_public::CFileUtil::getPathOfCfgFile("httpClient_ezjc.xml"))) + iot_public::CCommonConfigParse objCfgParse; + if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("httpClient_ezjc.xml"))) { LOGERROR("加载HTTP转发配置文件失败"); return kbdFailed; diff --git a/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.h b/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.h index 7b78a8cf..f2eefe84 100644 --- a/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.h +++ b/product/src/application/httpClient_ezjc/HttpClient_ezjcDataProThread.h @@ -11,7 +11,7 @@ #include "pub_logger_api/logger.h" #include using namespace std; -using namespace kbd_public; +using namespace iot_public; typedef struct aa { string tag_name; @@ -81,7 +81,7 @@ private: // bool initDevroup(); //初始化所有设备组信息 // bool initCurrentGroup(); //初始化需要发送的设备组信息 // void initKbdService(); //订阅需要的测点 -// void dealMsgFromNetMsgBus(const kbd_net::CMbMessage& objMsg); +// void dealMsgFromNetMsgBus(const iot_net::CMbMessage& objMsg); // bool initDbInterface(); //连接数据库 bool httpPost(const std::string &strPostFields); int readConfigForGenerate(); @@ -97,10 +97,10 @@ private: -// kbd_net::CMbCommunicator* m_pComm; +// iot_net::CMbCommunicator* m_pComm; // QString systemName; -// kbd_dbms::CDbApi *m_pObjDbInterface; -// kbd_service::CDpcdaForApp* m_pDpSub;// 订阅服务接口 +// iot_dbms::CDbApi *m_pObjDbInterface; +// iot_service::CDpcdaForApp* m_pDpSub;// 订阅服务接口 }; #endif // HTTPCLIENT_EZJCDATAPROTHREAD_H diff --git a/product/src/application/httpClient_ezjc/WebSrvRedunSw.h b/product/src/application/httpClient_ezjc/WebSrvRedunSw.h index d414be1e..0ed0449b 100644 --- a/product/src/application/httpClient_ezjc/WebSrvRedunSw.h +++ b/product/src/application/httpClient_ezjc/WebSrvRedunSw.h @@ -14,7 +14,7 @@ namespace ezjc_server { class HttpClient_ezjc; -class CWebSrvRedunSw final : public ::kbd_sys::CRedundantSwitchInterface +class CWebSrvRedunSw final : public ::iot_sys::CRedundantSwitchInterface { public: explicit CWebSrvRedunSw(HttpClient_ezjc *pParent ); diff --git a/product/src/application/idong_srv_api/CCfgParser.cpp b/product/src/application/idong_srv_api/CCfgParser.cpp index 81908828..f95ead38 100644 --- a/product/src/application/idong_srv_api/CCfgParser.cpp +++ b/product/src/application/idong_srv_api/CCfgParser.cpp @@ -25,7 +25,7 @@ A_GLOBAL_CFG CCfgParser::g_global_cfg; bool CCfgParser::g_isValid=false; -bool CCfgParser::loadGlobal(kbd_public::CCommonConfigParse &cfg) +bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) { if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == kbdFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == kbdFailed){ LOGERROR( " default_user option parser err"); return false;} @@ -51,7 +51,7 @@ bool CCfgParser::isValid() bool CCfgParser::loadCfg(const std::string &cfgPath) { - kbd_public::CCommonConfigParse cfgP; + iot_public::CCommonConfigParse cfgP; if( cfgP.load(cfgPath) == kbdFailed) { LOGERROR("config failed to load, please check config syntax!"); diff --git a/product/src/application/idong_srv_api/CCfgParser.h b/product/src/application/idong_srv_api/CCfgParser.h index 84357f1b..d50bd704 100644 --- a/product/src/application/idong_srv_api/CCfgParser.h +++ b/product/src/application/idong_srv_api/CCfgParser.h @@ -31,9 +31,9 @@ class CCfgParser public: static A_GLOBAL_CFG g_global_cfg; static bool isValid(); - static bool loadCfg(const std::string& cfgPath = kbd_public::CFileUtil::getPathOfCfgFile(IDONG_CFG_FILENAME)); + static bool loadCfg(const std::string& cfgPath = iot_public::CFileUtil::getPathOfCfgFile(IDONG_CFG_FILENAME)); private: - static bool loadGlobal( kbd_public::CCommonConfigParse &cfg); + static bool loadGlobal( iot_public::CCommonConfigParse &cfg); static bool g_isValid; }; diff --git a/product/src/application/idong_srv_api/CIDongSrvApi.cpp b/product/src/application/idong_srv_api/CIDongSrvApi.cpp index 6b4d9eaa..b51109ee 100644 --- a/product/src/application/idong_srv_api/CIDongSrvApi.cpp +++ b/product/src/application/idong_srv_api/CIDongSrvApi.cpp @@ -36,7 +36,7 @@ const char* CN_GET_TASK_GRP = "获取作业组"; CIDongSrvApi::CIDongSrvApi() { m_curl = curl_easy_init(); - m_dbApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_dbApi = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_dbApi->open(); if(!CCfgParser::loadCfg()) { LOGERROR("iDongOpsWidget parse error"); return ;} else{ LOGINFO("iDongOpsWidget parse succeed"); } if(!parseSiteMap()){ LOGERROR("SiteMap parse error"); } diff --git a/product/src/application/idong_task_link/MainWindow.cpp b/product/src/application/idong_task_link/MainWindow.cpp index 8dcdb001..2d5e5a79 100644 --- a/product/src/application/idong_task_link/MainWindow.cpp +++ b/product/src/application/idong_task_link/MainWindow.cpp @@ -34,7 +34,7 @@ MainWindow::~MainWindow() void MainWindow::initDb() { - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { qDebug()<<"打开失败"; diff --git a/product/src/application/idong_task_link/MainWindow.h b/product/src/application/idong_task_link/MainWindow.h index 76ea38dd..b1eed0d1 100644 --- a/product/src/application/idong_task_link/MainWindow.h +++ b/product/src/application/idong_task_link/MainWindow.h @@ -93,7 +93,7 @@ private slots: private: - kbd_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pReadDb; BackTableModel *m_backAiModel; BackTableModel *m_backDiModel; diff --git a/product/src/application/idong_task_link/main.cpp b/product/src/application/idong_task_link/main.cpp index c284d2fa..5d12f948 100644 --- a/product/src/application/idong_task_link/main.cpp +++ b/product/src/application/idong_task_link/main.cpp @@ -11,13 +11,13 @@ int main(int argc, char *argv[]) { kbd_common::doQtAppGlobalSet(); - kbd_public::StartLogSystem(CN_AppName_PUBLIC.c_str(),g_pSzProcName); + iot_public::StartLogSystem(CN_AppName_PUBLIC.c_str(),g_pSzProcName); QApplication a(argc, argv); MainWindow w; w.show(); int result = a.exec(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return result; } diff --git a/product/src/application/linkage_server/CActionMsgSender.cpp b/product/src/application/linkage_server/CActionMsgSender.cpp index c9c4c0e4..bde1cb4e 100644 --- a/product/src/application/linkage_server/CActionMsgSender.cpp +++ b/product/src/application/linkage_server/CActionMsgSender.cpp @@ -213,7 +213,7 @@ bool CActionMsgSender::parseExecuteData(StdStringList& strList, const std::strin ENLcsActionType CActionMsgSender::parseActionType(const std::string& strType) const { - using namespace kbd_idlfile; + using namespace iot_idl; if (strType == (ACTION_TYPE_DO_CTRL)) { return enumLcs_Action_DO; diff --git a/product/src/application/linkage_server/CActionNodeAnalysis.cpp b/product/src/application/linkage_server/CActionNodeAnalysis.cpp index 6e31f6d0..81e8733b 100644 --- a/product/src/application/linkage_server/CActionNodeAnalysis.cpp +++ b/product/src/application/linkage_server/CActionNodeAnalysis.cpp @@ -23,7 +23,7 @@ // hint_ctrl*提示信息*主机名*组名 // CActionNodeAnalysis::CActionNodeAnalysis( - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, const CModuleMbComm& mb) : m_stAppInfo(appInfo), m_objMb(mb),m_bIsCreateAlarm(false) { @@ -34,7 +34,7 @@ CActionNodeAnalysis::CActionNodeAnalysis( % m_stAppInfo.strLocalNodeName).str(); loadConfig(); - if (kbd_public::createSysInfoInstance(m_sysInfoPtr) == false) + if (iot_public::createSysInfoInstance(m_sysInfoPtr) == false) { return; } @@ -155,16 +155,16 @@ bool CActionNodeAnalysis::ctreatePush( std::string& request, const SActionMsgData& actionData) const { - uint64 curTime = kbd_public::getUTCTimeSec(); + uint64 curTime = iot_public::getUTCTimeSec(); std::string subSystemDesc; std::string locationDesc; - kbd_public::SSubsystemInfo subInfo; + iot_public::SSubsystemInfo subInfo; if( m_sysInfoPtr->getSubsystemInfoById(actionData.subSystemId,subInfo) == kbdSuccess) { subSystemDesc = subInfo.strDesc; } - kbd_public::SLocationInfo locationInfo; + iot_public::SLocationInfo locationInfo; if(m_sysInfoPtr->getLocationInfoById(actionData.locationId,locationInfo) == kbdSuccess) { locationDesc = locationInfo.strDesc; @@ -261,15 +261,15 @@ bool CActionNodeAnalysis::ctreateReqHead(SOptReqHead& head, head.strCommName = m_objMb.getOptSdCommName(); head.nUserID = actor.user_id; head.nUserGroupID = actor.user_grounp_id; - head.nOptTime = kbd_public::getUTCTimeMsec(); + head.nOptTime = iot_public::getUTCTimeMsec(); return true; } bool CActionNodeAnalysis::loadConfig() { - kbd_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(kbd_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + iot_public::CCommonConfigParse configParse; + if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; @@ -429,7 +429,7 @@ CActionNodeAnalysis::ctreatePisQueue(std::vector& queue, % actionData.dataList.at(3) ).str(); - using namespace kbd_public; + using namespace iot_public; int nDuration = boost::lexical_cast (actionData.dataList.at(5)); int64 startTime = getUTCTimeSec(); diff --git a/product/src/application/linkage_server/CActionNodeAnalysis.h b/product/src/application/linkage_server/CActionNodeAnalysis.h index f0ad86f1..5b8c8e5a 100644 --- a/product/src/application/linkage_server/CActionNodeAnalysis.h +++ b/product/src/application/linkage_server/CActionNodeAnalysis.h @@ -20,7 +20,7 @@ class CNodeFunc; class CNodeAction; class CModuleMbComm; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; typedef std::vector < std::string > StdStringList; //动作消息的需要的相关数据 @@ -40,7 +40,7 @@ struct SActionMsgData class CActionNodeAnalysis { public: - CActionNodeAnalysis(const kbd_public::SRunAppInfo& appInfo, + CActionNodeAnalysis(const iot_public::SRunAppInfo& appInfo, const CModuleMbComm& mb); ~CActionNodeAnalysis(); @@ -90,8 +90,8 @@ private: const SActionMsgData& actionData) const; bool loadConfig(); private: - kbd_public::CSysInfoInterfacePtr m_sysInfoPtr; - const kbd_public::SRunAppInfo& m_stAppInfo; + iot_public::CSysInfoInterfacePtr m_sysInfoPtr; + const iot_public::SRunAppInfo& m_stAppInfo; const CModuleMbComm& m_objMb; std::string m_strInstName; bool m_bIsCreateAlarm;//是否让opt产生报警 diff --git a/product/src/application/linkage_server/CAppService.cpp b/product/src/application/linkage_server/CAppService.cpp index d6c03e79..8ca696d9 100644 --- a/product/src/application/linkage_server/CAppService.cpp +++ b/product/src/application/linkage_server/CAppService.cpp @@ -32,7 +32,7 @@ int CAppService::redundantSwitch(bool bMaster, bool bSlave) return 0; } -bool CAppService::initService(const kbd_public::SRunAppInfo& info, +bool CAppService::initService(const iot_public::SRunAppInfo& info, const std::string& param) { if (!getProcessInfo(info, param)) @@ -55,11 +55,11 @@ bool CAppService::initService(const kbd_public::SRunAppInfo& info, } bool CAppService::getProcessInfo( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param) { - using namespace kbd_public; - using namespace kbd_sys; + using namespace iot_public; + using namespace iot_sys; using namespace boost; SProcessInfoKey processInfo; processInfo.nAppId = info.nAppId; @@ -82,10 +82,10 @@ bool CAppService::getProcessInfo( return true; } -bool CAppService::getRedundantMngInstance(const kbd_public::SRunAppInfo& info) +bool CAppService::getRedundantMngInstance(const iot_public::SRunAppInfo& info) { m_ptrRedundantMng = - kbd_sys::getRedundantMngInstance( + iot_sys::getRedundantMngInstance( info.nDomainId, info.nAppId, info.strLocalNodeName); @@ -125,7 +125,7 @@ bool CAppService::quitService() bool CAppService::isAlreadyRunning(const std::string &strAppName) { - if (kbd_public::CSingleProcInstance:: + if (iot_public::CSingleProcInstance:: hasInstanceRunning(getInstanceName(strAppName))) { LOGERROR("已经有一个实例正在运行!"); diff --git a/product/src/application/linkage_server/CAppService.h b/product/src/application/linkage_server/CAppService.h index 0b565b1b..840736fe 100644 --- a/product/src/application/linkage_server/CAppService.h +++ b/product/src/application/linkage_server/CAppService.h @@ -12,7 +12,7 @@ #include "CLinkProcessQuit.h" #include "PredifineForLinkageServer.h" -class CAppService : public kbd_public::CBaseService +class CAppService : public iot_public::CBaseService { public: CAppService(); @@ -23,21 +23,21 @@ public: protected: bool initService( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param); bool quitService(); bool isAlreadyRunning(const std::string &strAppName);//判断是否是 唯一运行程序 private: bool getProcessInfo( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param);//获取进程管理对象 bool getRedundantMngInstance( - const kbd_public::SRunAppInfo& info);//获取冗余管理对象 + const iot_public::SRunAppInfo& info);//获取冗余管理对象 private: bool m_bMaster; bool m_bSlave; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng;//冗余管理 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng;//进程管理 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng;//冗余管理 + iot_sys::CProcMngInterfacePtr m_ptrProcMng;//进程管理 CLinkRedundantPtr m_ptrLinkRedundant;//冗余操作 CLinkProcessQuitPtr m_ptrLinkProcessQuit;//进程退出 diff --git a/product/src/application/linkage_server/CAppServiceThread.cpp b/product/src/application/linkage_server/CAppServiceThread.cpp index ebcf2848..2d92a146 100644 --- a/product/src/application/linkage_server/CAppServiceThread.cpp +++ b/product/src/application/linkage_server/CAppServiceThread.cpp @@ -3,7 +3,7 @@ #include "PredifineForLinkageServer.h" CAppServiceThread::CAppServiceThread( - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, const std::string& threadName) : CTimerThreadBase(threadName, 500, 0), m_stAppInfo(appInfo) diff --git a/product/src/application/linkage_server/CAppServiceThread.h b/product/src/application/linkage_server/CAppServiceThread.h index ca16bc09..7014b62c 100644 --- a/product/src/application/linkage_server/CAppServiceThread.h +++ b/product/src/application/linkage_server/CAppServiceThread.h @@ -7,15 +7,15 @@ #include "pub_utility_api/TimerThreadBase.h" #include "pub_sysinfo_api/SysInfoApi.h" -class CAppServiceThread : public kbd_public::CTimerThreadBase +class CAppServiceThread : public iot_public::CTimerThreadBase { public: CAppServiceThread( - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, const std::string& threadName); virtual ~CAppServiceThread(); protected: - const kbd_public::SRunAppInfo& m_stAppInfo; + const iot_public::SRunAppInfo& m_stAppInfo; }; diff --git a/product/src/application/linkage_server/CCheckFuncCondition.cpp b/product/src/application/linkage_server/CCheckFuncCondition.cpp index bd4dbb14..24e55597 100644 --- a/product/src/application/linkage_server/CCheckFuncCondition.cpp +++ b/product/src/application/linkage_server/CCheckFuncCondition.cpp @@ -15,7 +15,7 @@ CCheckFuncCondition::CCheckFuncCondition(CNodeAction& actionNode,const std::str // m_conditionInfo = "station1.COMAPP.link_running.ceshi.func.value == 1" // "&& station1.digital.station1.G02_jgxh.DI1.value == 1"; - if(!kbd_public::createSysInfoInstance(m_sysInfoPtr)) + if(!iot_public::createSysInfoInstance(m_sysInfoPtr)) { LOGERROR("获取系统配置配置失败!"); } @@ -161,7 +161,7 @@ bool CCheckFuncCondition::analysisInfoOneKey(const std::string &oneStr, info.subSystem = boost::trim_copy(strList.at(1)); info.tableName = boost::trim_copy(strList.at(2)); - kbd_public::SSubsystemInfo subSysInfo; + iot_public::SSubsystemInfo subSysInfo; if(m_sysInfoPtr->getSubsystemInfoByName(info.subSystem,subSysInfo) == kbdSuccess) { info.appId = subSysInfo.nAppId; @@ -173,7 +173,7 @@ bool CCheckFuncCondition::analysisInfoOneKey(const std::string &oneStr, return false; } - kbd_public::SLocationInfo locationInfo; + iot_public::SLocationInfo locationInfo; if(m_sysInfoPtr->getLocationInfoByName(info.location,locationInfo) == kbdSuccess) { info.domainId = locationInfo.nDomainId; @@ -292,18 +292,18 @@ std::string CCheckFuncCondition::checkCondit(const SFuncConditionInfo &info) bool CCheckFuncCondition::queryNetValue(const SFuncConditionInfo &stInfo, int& value) { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; - kbd_dbms::CRdbNetApi netApi; + iot_dbms::CRdbNetApi netApi; netApi.connect(stInfo.domainId,stInfo.appId); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename(stInfo.tableName); std::string *pColName = msgQuery.add_strselectcolnamearr(); *pColName = stInfo.colName; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondOr); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("tag_name"); @@ -311,7 +311,7 @@ bool CCheckFuncCondition::queryNetValue(const SFuncConditionInfo &stInfo, int& v pCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(stInfo.tagName); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if(!netApi.query(msgQuery,retMsg)) { LOGERROR("查询失败 [%s]", stInfo.tagName.c_str()); diff --git a/product/src/application/linkage_server/CCheckFuncCondition.h b/product/src/application/linkage_server/CCheckFuncCondition.h index 92811d09..872a1959 100644 --- a/product/src/application/linkage_server/CCheckFuncCondition.h +++ b/product/src/application/linkage_server/CCheckFuncCondition.h @@ -31,7 +31,7 @@ private: std::string m_conditionInfo; CNodeAction& m_actionNode; std::vector m_cdtInfoVec; - kbd_public::CSysInfoInterfacePtr m_sysInfoPtr; + iot_public::CSysInfoInterfacePtr m_sysInfoPtr; }; #endif // CCHECKFUNCCONDITION_H diff --git a/product/src/application/linkage_server/CDbSaveCtrl.cpp b/product/src/application/linkage_server/CDbSaveCtrl.cpp index 08d7b601..7071c042 100644 --- a/product/src/application/linkage_server/CDbSaveCtrl.cpp +++ b/product/src/application/linkage_server/CDbSaveCtrl.cpp @@ -13,19 +13,19 @@ CDbSaveCtrl::~CDbSaveCtrl() bool CDbSaveCtrl::initDbSave(int domainId,int appID) { - return kbd_dbms::initDbSaveApi(domainId,appID); + return iot_dbms::initDbSaveApi(domainId,appID); } void CDbSaveCtrl::releaseDbSave() { - kbd_dbms::releaseDbSaveApi(); + iot_dbms::releaseDbSaveApi(); } bool CDbSaveCtrl::updateActionEvent(const SLinkageActionEvent &info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbUpdate objUpdate; objUpdate.set_strtablename("linkage_action_event"); objUpdate.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -146,8 +146,8 @@ bool CDbSaveCtrl::updateActionEvent(const SLinkageActionEvent &info) bool CDbSaveCtrl::updateLinkFuncHistory(const SLinkageFunctionHistory &info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbUpdate objUpdate; objUpdate.set_strtablename("linkage_function_history"); objUpdate.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -231,8 +231,8 @@ bool CDbSaveCtrl::updateLinkFuncHistory(const SLinkageFunctionHistory &info) bool CDbSaveCtrl::updateLinkHistory(const SLinkageHistory &info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbUpdate objUpdate; objUpdate.set_strtablename("linkage_history"); objUpdate.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -328,8 +328,8 @@ bool CDbSaveCtrl::updateLinkHistory(const SLinkageHistory &info) bool CDbSaveCtrl::addActionEvent(const SLinkageActionEvent& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbInsert objInsert; objInsert.set_strtablename("linkage_action_event"); objInsert.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -427,8 +427,8 @@ bool CDbSaveCtrl::addActionEvent(const SLinkageActionEvent& info) bool CDbSaveCtrl::addLinkFuncHistory(const SLinkageFunctionHistory &info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbInsert objInsert; objInsert.set_strtablename("linkage_function_history"); objInsert.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -495,8 +495,8 @@ bool CDbSaveCtrl::addLinkFuncHistory(const SLinkageFunctionHistory &info) bool CDbSaveCtrl::addLinkHistory(const SLinkageHistory& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbInsert objInsert; objInsert.set_strtablename("linkage_history"); objInsert.set_ensaveaction(SA_DSS_LOCAL_REMOTE); diff --git a/product/src/application/linkage_server/CHmiMessageAnalysis.cpp b/product/src/application/linkage_server/CHmiMessageAnalysis.cpp index 416e390f..03326248 100644 --- a/product/src/application/linkage_server/CHmiMessageAnalysis.cpp +++ b/product/src/application/linkage_server/CHmiMessageAnalysis.cpp @@ -6,10 +6,10 @@ #include "CNodeLink.h" #include "CRecoverNode.h" -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; CHmiMessageAnalysis::CHmiMessageAnalysis( - const kbd_public::SRunAppInfo& appInfo) + const iot_public::SRunAppInfo& appInfo) :m_stAppInfo(appInfo) { } diff --git a/product/src/application/linkage_server/CHmiMessageAnalysis.h b/product/src/application/linkage_server/CHmiMessageAnalysis.h index 6bfb3415..761bb208 100644 --- a/product/src/application/linkage_server/CHmiMessageAnalysis.h +++ b/product/src/application/linkage_server/CHmiMessageAnalysis.h @@ -15,11 +15,11 @@ class CNodeLink; class CNodeFunc; class CNodeAction; class CRecoverNode; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; class CHmiMessageAnalysis { public: - CHmiMessageAnalysis(const kbd_public::SRunAppInfo& appInfo); + CHmiMessageAnalysis(const iot_public::SRunAppInfo& appInfo); ~CHmiMessageAnalysis(); static bool analysisUiRequestMessageAck( @@ -93,5 +93,5 @@ private: ExecuteStatusParameter* pParam, const SActionErrorInfo& erroInfo); private: - const kbd_public::SRunAppInfo& m_stAppInfo; + const iot_public::SRunAppInfo& m_stAppInfo; }; diff --git a/product/src/application/linkage_server/CLinkProcessQuit.h b/product/src/application/linkage_server/CLinkProcessQuit.h index d28880bd..47ac4dd6 100644 --- a/product/src/application/linkage_server/CLinkProcessQuit.h +++ b/product/src/application/linkage_server/CLinkProcessQuit.h @@ -8,7 +8,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" class CAppService; -class CLinkProcessQuit : public kbd_sys::CProcessQuitInterface +class CLinkProcessQuit : public iot_sys::CProcessQuitInterface { public: CLinkProcessQuit(CAppService* service); diff --git a/product/src/application/linkage_server/CLinkRedundant.h b/product/src/application/linkage_server/CLinkRedundant.h index e81d2dff..6a8d842d 100644 --- a/product/src/application/linkage_server/CLinkRedundant.h +++ b/product/src/application/linkage_server/CLinkRedundant.h @@ -8,7 +8,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" class CAppService; -class CLinkRedundant : public kbd_sys::CRedundantSwitchInterface +class CLinkRedundant : public iot_sys::CRedundantSwitchInterface { public: CLinkRedundant(CAppService* service); diff --git a/product/src/application/linkage_server/CLinkageService.cpp b/product/src/application/linkage_server/CLinkageService.cpp index 02074566..dc335571 100644 --- a/product/src/application/linkage_server/CLinkageService.cpp +++ b/product/src/application/linkage_server/CLinkageService.cpp @@ -115,9 +115,9 @@ bool CLinkageService::start(int argc, char *argv[], int &) return false; } - kbd_public::StartLogSystem(appName.c_str(),LINKAGE_PROCESSNAME.c_str()); + iot_public::StartLogSystem(appName.c_str(),LINKAGE_PROCESSNAME.c_str()); - kbd_public::initI18N("linkage_server/translate","linkage_server"); + iot_public::initI18N("linkage_server/translate","linkage_server"); if (!getAppInfo(appName, m_stRunAppInfo)) { @@ -159,17 +159,17 @@ bool CLinkageService::stop() deleteThread(); CDbSaveCtrl::releaseDbSave(); CAppService::quitService(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return true; } bool CLinkageService::getAppInfo( const std::string &strAppName, - kbd_public::SRunAppInfo & info) const + iot_public::SRunAppInfo & info) const { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if (kbd_public::createSysInfoInstance(sysInfoPtr) == false) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if (iot_public::createSysInfoInstance(sysInfoPtr) == false) { return false; } @@ -185,7 +185,7 @@ bool CLinkageService::getAppInfo( bool CLinkageService::initMsgBus() { - bool bRet = kbd_net::initMsgBus(LINKAGE_PROCESSNAME.c_str(), + bool bRet = iot_net::initMsgBus(LINKAGE_PROCESSNAME.c_str(), getInstanceName(m_stRunAppInfo.strAppName).c_str()); if (!bRet) { diff --git a/product/src/application/linkage_server/CLinkageService.h b/product/src/application/linkage_server/CLinkageService.h index c22415bf..8c9e4614 100644 --- a/product/src/application/linkage_server/CLinkageService.h +++ b/product/src/application/linkage_server/CLinkageService.h @@ -37,7 +37,7 @@ private: //获取app信息 bool getAppInfo( const std::string &strAppName, - kbd_public::SRunAppInfo & info) const; + iot_public::SRunAppInfo & info) const; bool initMsgBus();//初始化总线 bool creatThread();//创建执行线程 @@ -49,7 +49,7 @@ private: //测试线程 boost::shared_ptr m_ptrTestThread; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; //服务主线程 CLinkageServiceThreadPtr m_ptrServiceThread; diff --git a/product/src/application/linkage_server/CLinkageServiceThread.cpp b/product/src/application/linkage_server/CLinkageServiceThread.cpp index 963b8238..ebe27cba 100644 --- a/product/src/application/linkage_server/CLinkageServiceThread.cpp +++ b/product/src/application/linkage_server/CLinkageServiceThread.cpp @@ -10,7 +10,7 @@ #include "CNodeIterator.h" CLinkageServiceThread::CLinkageServiceThread( - const kbd_public::SRunAppInfo& stAppInfo) : + const iot_public::SRunAppInfo& stAppInfo) : CAppServiceThread(stAppInfo, "linkage_server thread"), m_objMbComm(stAppInfo), m_objRdbAccess(), @@ -127,7 +127,7 @@ void CLinkageServiceThread::semiAutoRequest() void CLinkageServiceThread::timerSendUiRequest(int seconds) { - int64 new_time = kbd_public::getUTCTimeSec(); + int64 new_time = iot_public::getUTCTimeSec(); static int64 old_time = new_time; int64 outTime = new_time - old_time; if (outTime > (int64)seconds)//seconds秒请求一次 @@ -196,8 +196,8 @@ void CLinkageServiceThread::stopLinkByModify() bool CLinkageServiceThread::loadConfig() { - kbd_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(kbd_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + iot_public::CCommonConfigParse configParse; + if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; diff --git a/product/src/application/linkage_server/CLinkageServiceThread.h b/product/src/application/linkage_server/CLinkageServiceThread.h index e32e04f5..ccad69f0 100644 --- a/product/src/application/linkage_server/CLinkageServiceThread.h +++ b/product/src/application/linkage_server/CLinkageServiceThread.h @@ -20,7 +20,7 @@ class CLinkageServiceThread { public: CLinkageServiceThread( - const kbd_public::SRunAppInfo& stAppInfo); + const iot_public::SRunAppInfo& stAppInfo); ~CLinkageServiceThread(); void execute(); diff --git a/product/src/application/linkage_server/CMethodAction.cpp b/product/src/application/linkage_server/CMethodAction.cpp index 08fca26a..e456dd9a 100644 --- a/product/src/application/linkage_server/CMethodAction.cpp +++ b/product/src/application/linkage_server/CMethodAction.cpp @@ -62,13 +62,13 @@ bool CMethodAction::execute() //初始化节点状态 m_objAction.resetBeginStart(); - uint64 startTime = kbd_public::getUTCTimeSec(); + uint64 startTime = iot_public::getUTCTimeSec(); m_objAction.setStartTime(startTime); //开始执行 bool bRet = startExecuteNode(); - uint64 stopTime = kbd_public::getUTCTimeSec(); + uint64 stopTime = iot_public::getUTCTimeSec(); m_objAction.setStopTime(stopTime); updateActionEvent();//一个动作结束后 才记录 diff --git a/product/src/application/linkage_server/CMethodFailedAction.cpp b/product/src/application/linkage_server/CMethodFailedAction.cpp index 4a96355a..d6fb4d61 100644 --- a/product/src/application/linkage_server/CMethodFailedAction.cpp +++ b/product/src/application/linkage_server/CMethodFailedAction.cpp @@ -125,7 +125,7 @@ bool CMethodFailedAction::doFailedUi( //1 先重置人工干预 结果 m_objAction.resetUiResult(); - uint64 endTime = kbd_public::getUTCTimeSec() + (2*24*60*60);//2天 + uint64 endTime = iot_public::getUTCTimeSec() + (2*24*60*60);//2天 SOpResultUi sResult; if (!timeToSendUIRequest( @@ -265,7 +265,7 @@ bool CMethodFailedAction::timeToSendUIRequest( bool bRet = false; while(!bRet) { - uint64 curTime = kbd_public::getUTCTimeSec(); + uint64 curTime = iot_public::getUTCTimeSec(); if(curTime > endTime) { break; @@ -317,8 +317,8 @@ std::string CMethodFailedAction::failStrageStr(ACTION_FAILED_STRAGE type) bool CMethodFailedAction::loadConfig() { - kbd_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(kbd_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + iot_public::CCommonConfigParse configParse; + if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; diff --git a/product/src/application/linkage_server/CMethodFunc.cpp b/product/src/application/linkage_server/CMethodFunc.cpp index 0cf0ff1b..363f6e4f 100644 --- a/product/src/application/linkage_server/CMethodFunc.cpp +++ b/product/src/application/linkage_server/CMethodFunc.cpp @@ -30,7 +30,7 @@ bool CMethodFunc::execute() m_objFunc.description().c_str(), m_objFunc.isAsync() ? "并行" : "串行"); - uint64 startTime = kbd_public::getUTCTimeSec(); + uint64 startTime = iot_public::getUTCTimeSec(); m_objFunc.setStartTime(startTime); bool bRet = executeChilds(); @@ -189,7 +189,7 @@ bool CMethodFunc::delayAction(CNodeAction& action) { using namespace boost::posix_time; using namespace boost::this_thread; - int64 startTime = kbd_public::getUTCTimeSec(); + int64 startTime = iot_public::getUTCTimeSec(); int64 endTime = startTime; int delayTime = action.delayTime(); @@ -202,7 +202,7 @@ bool CMethodFunc::delayAction(CNodeAction& action) } sleep(milliseconds(200)); - endTime = kbd_public::getUTCTimeSec(); + endTime = iot_public::getUTCTimeSec(); } //为了避免 delayTime 为 0 没有时间处理 暂停和 终止事件 diff --git a/product/src/application/linkage_server/CMethodLink.cpp b/product/src/application/linkage_server/CMethodLink.cpp index f3c99d1e..ecf950b3 100644 --- a/product/src/application/linkage_server/CMethodLink.cpp +++ b/product/src/application/linkage_server/CMethodLink.cpp @@ -30,7 +30,7 @@ bool CMethodLink::execute() m_objLink.description().c_str() ); - uint64 startTime = kbd_public::getUTCTimeSec(); + uint64 startTime = iot_public::getUTCTimeSec(); m_objLink.setStartTime(startTime); addLinkHistory(); diff --git a/product/src/application/linkage_server/CMethodRecoverAction.cpp b/product/src/application/linkage_server/CMethodRecoverAction.cpp index ca907000..09e9bd9f 100644 --- a/product/src/application/linkage_server/CMethodRecoverAction.cpp +++ b/product/src/application/linkage_server/CMethodRecoverAction.cpp @@ -98,7 +98,7 @@ bool CMethodRecoverAction::recoverFailedState() enumCode_ERRO_ACTION_RECOVER, I18N("动作执行恢复流程失败!"))); - uint64 stopTime = kbd_public::getUTCTimeSec(); + uint64 stopTime = iot_public::getUTCTimeSec(); m_objAction.setStopTime(stopTime); updateActionEvent();//一个动作结束后 才记录 diff --git a/product/src/application/linkage_server/CMethodRecoverFunc.cpp b/product/src/application/linkage_server/CMethodRecoverFunc.cpp index 6fbc99b8..23977446 100644 --- a/product/src/application/linkage_server/CMethodRecoverFunc.cpp +++ b/product/src/application/linkage_server/CMethodRecoverFunc.cpp @@ -36,7 +36,7 @@ bool CMethodRecoverFunc::execute() if (startTime == 0) { //有可能功能 强制退出的时候 时间没有记录 - startTime = kbd_public::getUTCTimeSec(); + startTime = iot_public::getUTCTimeSec(); LOGERROR("恢复功能节点, 开始执行时间异常为 0,容错处理!"); } diff --git a/product/src/application/linkage_server/CMethodRecoverLink.cpp b/product/src/application/linkage_server/CMethodRecoverLink.cpp index c1a36c56..e22afb2b 100644 --- a/product/src/application/linkage_server/CMethodRecoverLink.cpp +++ b/product/src/application/linkage_server/CMethodRecoverLink.cpp @@ -32,7 +32,7 @@ bool CMethodRecoverLink::execute() uint64 startTime = m_objRecover.startTime(); if (startTime == 0) { - startTime = kbd_public::getUTCTimeSec(); + startTime = iot_public::getUTCTimeSec(); } m_objLink.setStartTime(startTime); diff --git a/product/src/application/linkage_server/CModuleAlarmCreater.cpp b/product/src/application/linkage_server/CModuleAlarmCreater.cpp index bf8d1f58..56f6e63e 100644 --- a/product/src/application/linkage_server/CModuleAlarmCreater.cpp +++ b/product/src/application/linkage_server/CModuleAlarmCreater.cpp @@ -28,14 +28,14 @@ CModuleAlarmCreater::~CModuleAlarmCreater() bool CModuleAlarmCreater::linkTrigged(CNodeLink& link) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(link, *pFromApp, kbd_service::ALM_STAT_OPT_LKG_TRIGGERED); + createHead(link, *pFromApp, iot_service::ALM_STAT_OPT_LKG_TRIGGERED); createTriggedKeyWord(link, *pFromApp); createLinkKeyWord(link, *pFromApp); @@ -50,14 +50,14 @@ bool CModuleAlarmCreater::linkTrigged(CNodeLink& link) bool CModuleAlarmCreater::linkCtrl(CNodeLink& link,const SHmiOpInfo& op) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(link, *pFromApp, kbd_service::ALM_STAT_OPT_LKG_CTRL); + createHead(link, *pFromApp, iot_service::ALM_STAT_OPT_LKG_CTRL); createHmiOpKeyWord(op.eResult, *pFromApp); createLinkKeyWord(link, *pFromApp); createActorKeyWord(op.actor, *pFromApp); @@ -73,14 +73,14 @@ bool CModuleAlarmCreater::linkCtrl(CNodeLink& link,const SHmiOpInfo& op) bool CModuleAlarmCreater::linkCtrl(CNodeAction &action, const SOpResultUi &op) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(action.getNodeLink(), *pFromApp, kbd_service::ALM_STAT_OPT_LKG_CTRL); + createHead(action.getNodeLink(), *pFromApp, iot_service::ALM_STAT_OPT_LKG_CTRL); createUiOpKeyWord(op.eResult, *pFromApp); createLinkKeyWord(action, *pFromApp); createActionDescKeyWord(action, *pFromApp); @@ -97,14 +97,14 @@ bool CModuleAlarmCreater::linkCtrl(CNodeAction &action, const SOpResultUi &op) bool CModuleAlarmCreater::linkStart(CNodeLink& link) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(link, *pFromApp, kbd_service::ALM_STAT_OPT_LKG_START); + createHead(link, *pFromApp, iot_service::ALM_STAT_OPT_LKG_START); createLinkKeyWord(link, *pFromApp); createOpKeyWord(I18N("开始"), *pFromApp); createActorKeyWord(link.getLinkActor(), *pFromApp); @@ -120,14 +120,14 @@ bool CModuleAlarmCreater::linkStart(CNodeLink& link) bool CModuleAlarmCreater::linkStop(CNodeLink& link) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(link, *pFromApp, kbd_service::ALM_STAT_OPT_LKG_STOP); + createHead(link, *pFromApp, iot_service::ALM_STAT_OPT_LKG_STOP); createLinkKeyWord(link, *pFromApp); createOpKeyWord(I18N("结束"), *pFromApp); std::string retStr = link.getStateStr() + " " + getExecSkipDesc(link); @@ -145,7 +145,7 @@ bool CModuleAlarmCreater::linkStop(CNodeLink& link) bool CModuleAlarmCreater::actionExecute(CNodeAction& action) { - using namespace kbd_idlfile; + using namespace iot_idl; CNodeLink& link = action.getNodeLink(); @@ -154,7 +154,7 @@ bool CModuleAlarmCreater::actionExecute(CNodeAction& action) SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(link, *pFromApp, kbd_service::ALM_STAT_OPT_LKG_ACTION_NOTPOINT); + createHead(link, *pFromApp, iot_service::ALM_STAT_OPT_LKG_ACTION_NOTPOINT); createLinkKeyWord(link, *pFromApp); createActionDescKeyWord(action, *pFromApp); createResultKeyWord(action.getStateStr(), *pFromApp); @@ -200,124 +200,124 @@ std::string CModuleAlarmCreater::getExecSkipDesc(CNodeLink &link) void CModuleAlarmCreater::createHead( CNodeLink& link, - kbd_idlfile::SAlmInfoFromApp& fromApp, + iot_idl::SAlmInfoFromApp& fromApp, int status) { - using namespace kbd_idlfile; - fromApp.set_alm_type(kbd_service::ALM_TYPE_OPERATE); - fromApp.set_time_stamp(kbd_public::getUTCTimeMsec()); + using namespace iot_idl; + fromApp.set_alm_type(iot_service::ALM_TYPE_OPERATE); + fromApp.set_time_stamp(iot_public::getUTCTimeMsec()); fromApp.set_location_id(link.location()); fromApp.set_status(status); fromApp.set_alm_style(enAlmStyle::AS_EVENT_ONLY); fromApp.set_region_id(-1); } -void CModuleAlarmCreater::createTriggedKeyWord(CNodeLink& link, kbd_idlfile::SAlmInfoFromApp& fromApp) +void CModuleAlarmCreater::createTriggedKeyWord(CNodeLink& link, iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_TRIG_CONDTION); + pKeyword->set_id(iot_service::ALM_KEY_TRIG_CONDTION); pKeyword->set_value(link.getTriggerName()); } -void CModuleAlarmCreater::createLinkKeyWord(CNodeLink& link, kbd_idlfile::SAlmInfoFromApp& fromApp) +void CModuleAlarmCreater::createLinkKeyWord(CNodeLink& link, iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_LINKAGE_NAME); + pKeyword->set_id(iot_service::ALM_KEY_LINKAGE_NAME); pKeyword->set_value(link.nodeName()); pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_LINKAGE_TYPE); + pKeyword->set_id(iot_service::ALM_KEY_LINKAGE_TYPE); pKeyword->set_value(link.getLinkTypeStr()); pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_LINKAGE_DESC); + pKeyword->set_id(iot_service::ALM_KEY_LINKAGE_DESC); pKeyword->set_value(link.description()); } -void CModuleAlarmCreater::createLinkKeyWord(CNodeAction &action, kbd_idlfile::SAlmInfoFromApp &fromApp) +void CModuleAlarmCreater::createLinkKeyWord(CNodeAction &action, iot_idl::SAlmInfoFromApp &fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_LINKAGE_NAME); + pKeyword->set_id(iot_service::ALM_KEY_LINKAGE_NAME); pKeyword->set_value(action.nodeName()); pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_LINKAGE_DESC); + pKeyword->set_id(iot_service::ALM_KEY_LINKAGE_DESC); pKeyword->set_value(action.description()); } void CModuleAlarmCreater::createHmiOpKeyWord(ELinkage_HmiOpType op, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { createOpKeyWord(COpResultHmi::getOpStr(op), fromApp); } void CModuleAlarmCreater::createUiOpKeyWord(UI_OP_RESULT_TYPE op, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { createOpKeyWord(COpResultUi::UiOpTypeStr(op), fromApp); } void CModuleAlarmCreater::createOpKeyWord(const std::string& op, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_LINKAGE_ACT); + pKeyword->set_id(iot_service::ALM_KEY_LINKAGE_ACT); pKeyword->set_value(op); } void CModuleAlarmCreater::createActorKeyWord(const SNodeLinkActor& actor, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_OPTERATOR); + pKeyword->set_id(iot_service::ALM_KEY_OPTERATOR); pKeyword->set_value(actor.user_name); pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_OPT_HOST); + pKeyword->set_id(iot_service::ALM_KEY_OPT_HOST); pKeyword->set_value(actor.host_name); } void CModuleAlarmCreater::createResultKeyWord(const std::string& state, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_RTN_RESULT); + pKeyword->set_id(iot_service::ALM_KEY_RTN_RESULT); pKeyword->set_value(state); } void CModuleAlarmCreater::createActionDescKeyWord(CNodeAction& action, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_LINKAGE_ACT); + pKeyword->set_id(iot_service::ALM_KEY_LINKAGE_ACT); pKeyword->set_value(action.description()); } diff --git a/product/src/application/linkage_server/CModuleAlarmCreater.h b/product/src/application/linkage_server/CModuleAlarmCreater.h index be3965df..9100241a 100644 --- a/product/src/application/linkage_server/CModuleAlarmCreater.h +++ b/product/src/application/linkage_server/CModuleAlarmCreater.h @@ -41,54 +41,54 @@ private: void createHead( CNodeLink& link, - kbd_idlfile::SAlmInfoFromApp& fromApp, + iot_idl::SAlmInfoFromApp& fromApp, int status); void createTriggedKeyWord(CNodeLink& link, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createLinkKeyWord( CNodeLink& link, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createLinkKeyWord( CNodeAction& action, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createHmiOpKeyWord( ELinkage_HmiOpType op, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createUiOpKeyWord( UI_OP_RESULT_TYPE op, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createOpKeyWord( const std::string& op, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createActorKeyWord( const SNodeLinkActor& actor, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createResultKeyWord( const std::string& state, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createActionDescKeyWord( CNodeAction& action, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void afterSleep(); private: - kbd_service::CAlmApiForApp m_objAlmApi; + iot_service::CAlmApiForApp m_objAlmApi; }; diff --git a/product/src/application/linkage_server/CModuleExecuteMngr.cpp b/product/src/application/linkage_server/CModuleExecuteMngr.cpp index 5c03cb63..1a66f9ad 100644 --- a/product/src/application/linkage_server/CModuleExecuteMngr.cpp +++ b/product/src/application/linkage_server/CModuleExecuteMngr.cpp @@ -51,7 +51,7 @@ void CModuleExecuteMngr::recoverExecuter( void CModuleExecuteMngr::closeFinish(CModuleTrigger& trigger) { - uint64 curTime = kbd_public::getUTCTimeSec(); + uint64 curTime = iot_public::getUTCTimeSec(); LinkMap::iterator iter = m_mapPro.begin(); diff --git a/product/src/application/linkage_server/CModuleMbComm.cpp b/product/src/application/linkage_server/CModuleMbComm.cpp index d5950455..865b2ba1 100644 --- a/product/src/application/linkage_server/CModuleMbComm.cpp +++ b/product/src/application/linkage_server/CModuleMbComm.cpp @@ -10,7 +10,7 @@ #include "CRecoverNode.h" CModuleMbComm::CModuleMbComm( - const kbd_public::SRunAppInfo& appInfo) + const iot_public::SRunAppInfo& appInfo) :kbd_application::CLinkageForServerApi(appInfo.nAppId), m_objActionAnalysis(appInfo, *this), m_objHmiMsgAnalysis(appInfo), diff --git a/product/src/application/linkage_server/CModuleMbComm.h b/product/src/application/linkage_server/CModuleMbComm.h index 1a702934..53229f19 100644 --- a/product/src/application/linkage_server/CModuleMbComm.h +++ b/product/src/application/linkage_server/CModuleMbComm.h @@ -17,13 +17,13 @@ class CNodeLink; class CNodeFunc; class CNodeAction; class CRecoverNode; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; class CModuleMbComm : public kbd_application::CLinkageForServerApi { public: - CModuleMbComm(const kbd_public::SRunAppInfo& appInfo); + CModuleMbComm(const iot_public::SRunAppInfo& appInfo); ~CModuleMbComm(); const CActionNodeAnalysis& getActionNodeAnalysis() const; diff --git a/product/src/application/linkage_server/CModuleMsgDeal.cpp b/product/src/application/linkage_server/CModuleMsgDeal.cpp index 0e6255e9..1acb52b2 100644 --- a/product/src/application/linkage_server/CModuleMsgDeal.cpp +++ b/product/src/application/linkage_server/CModuleMsgDeal.cpp @@ -345,7 +345,7 @@ bool CModuleMsgDeal::dealHmiLinkOperateStart( { CNodeLinkTriggerInfo triggeinfo; - triggeinfo.setTriggerTime(kbd_public::getUTCTimeSec()); + triggeinfo.setTriggerTime(iot_public::getUTCTimeSec()); triggeinfo.setTriggered(true); linkNode->setTriggerInfo(triggeinfo);//触发时间 } diff --git a/product/src/application/linkage_server/CModuleNodeMngr.cpp b/product/src/application/linkage_server/CModuleNodeMngr.cpp index 7a96cd6d..970813db 100644 --- a/product/src/application/linkage_server/CModuleNodeMngr.cpp +++ b/product/src/application/linkage_server/CModuleNodeMngr.cpp @@ -13,7 +13,7 @@ CModuleNodeMngr::CModuleNodeMngr(int domain) : m_nDomain(domain), m_bIsModifyModel(true) { - kbd_public::createSysInfoInstance(m_objSysinf); + iot_public::createSysInfoInstance(m_objSysinf); } CModuleNodeMngr::~CModuleNodeMngr() @@ -137,7 +137,7 @@ bool CModuleNodeMngr::recreateDbModel(CSqlDbCtrl& dbctrl) void CModuleNodeMngr::createLinkNodeModel() { - kbd_public::SLocationInfo locationInfo; + iot_public::SLocationInfo locationInfo; LOGINFO("创建数据表结构!"); SLinkDefineInfoIterator linkDefineIter(m_objDbContainer); while (linkDefineIter.hasNext()) @@ -182,8 +182,8 @@ void CModuleNodeMngr::createFuncNodeModel(CNodeLink& parent, const std::string& void CModuleNodeMngr::createActionNodeModel(CNodeFunc& parent, const std::string& funcName) { - kbd_public::SLocationInfo locationInfo; - kbd_public::SAppInfo stAppInfo; + iot_public::SLocationInfo locationInfo; + iot_public::SAppInfo stAppInfo; SNodeActionParam actionParam; diff --git a/product/src/application/linkage_server/CModuleNodeMngr.h b/product/src/application/linkage_server/CModuleNodeMngr.h index c6579e43..037ce6e7 100644 --- a/product/src/application/linkage_server/CModuleNodeMngr.h +++ b/product/src/application/linkage_server/CModuleNodeMngr.h @@ -71,7 +71,7 @@ protected: private: CLinkageDbContainer m_objDbContainer;//数据结构模型容器 const int m_nDomain;//域id - kbd_public::CSysInfoInterfacePtr m_objSysinf; + iot_public::CSysInfoInterfacePtr m_objSysinf; bool m_bIsModifyModel; }; diff --git a/product/src/application/linkage_server/CModuleTrigger.cpp b/product/src/application/linkage_server/CModuleTrigger.cpp index 155e2fb3..bf25bd3d 100644 --- a/product/src/application/linkage_server/CModuleTrigger.cpp +++ b/product/src/application/linkage_server/CModuleTrigger.cpp @@ -187,6 +187,6 @@ void CModuleTrigger::ignoreBeforeTime( void CModuleTrigger::ignoreBeforeTime(const CNodeLink& link) { - int64 curTime = kbd_public::getUTCTimeSec(); + int64 curTime = iot_public::getUTCTimeSec(); ignoreBeforeTime(link, curTime); } diff --git a/product/src/application/linkage_server/CRdbLinkRunningAccess.cpp b/product/src/application/linkage_server/CRdbLinkRunningAccess.cpp index 81979131..bfb9317f 100644 --- a/product/src/application/linkage_server/CRdbLinkRunningAccess.cpp +++ b/product/src/application/linkage_server/CRdbLinkRunningAccess.cpp @@ -45,7 +45,7 @@ bool CRdbLinkRunningAccess::remapRunningTable(CRecoverNodeContainer& info) return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector selColnumn; selColnumn.push_back(std::string("linkage_name")); @@ -109,7 +109,7 @@ bool CRdbLinkRunningAccess::updateRecord( BOOST_ASSERT(record.timeflag != 0); - using namespace kbd_dbms; + using namespace iot_dbms; std::vector updColumn; CRdbPublic::addUpColumnInfo(updColumn, "node_desc", record.node_desc); CRdbPublic::addUpColumnInfo(updColumn, "action_no", record.action_no); @@ -162,7 +162,7 @@ bool CRdbLinkRunningAccess::addRecord(const SLinkageRunning& record) BOOST_ASSERT(record.timeflag != 0); - using namespace kbd_dbms; + using namespace iot_dbms; if (crt_ex.addRecordEX(record)) { return true; } @@ -179,7 +179,7 @@ bool CRdbLinkRunningAccess::updateRecordOnlyState(const SLinkageRunning& record) return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector updColumn; CRdbPublic::addUpColumnInfo(updColumn, "status", record.status); @@ -205,7 +205,7 @@ bool CRdbLinkRunningAccess::deleteRecord(const std::string& link) return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfop; CRdbPublic::addCondInfo(condInfop, "linkage_name", link); @@ -220,7 +220,7 @@ bool CRdbLinkRunningAccess::deleteAllRecord() return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfop; return crt_ex.remove(condInfop); diff --git a/product/src/application/linkage_server/CRdbLinkRunningAccess.h b/product/src/application/linkage_server/CRdbLinkRunningAccess.h index 659e4d68..cdadeb8d 100644 --- a/product/src/application/linkage_server/CRdbLinkRunningAccess.h +++ b/product/src/application/linkage_server/CRdbLinkRunningAccess.h @@ -49,7 +49,7 @@ protected: virtual void lockTable(); virtual void unLockTable(); private: - kbd_dbms::CRdbAccessEx crt_ex; + iot_dbms::CRdbAccessEx crt_ex; boost::mutex m_muLock; }; diff --git a/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp b/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp index e3dd74e8..5a143b45 100644 --- a/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp +++ b/product/src/application/linkage_server/CRdbLinkSettingAccess.cpp @@ -3,7 +3,7 @@ CRdbLinkSettingAccess::CRdbLinkSettingAccess() { - kbd_public::createSysInfoInstance(m_objSysinf); + iot_public::createSysInfoInstance(m_objSysinf); } CRdbLinkSettingAccess::~CRdbLinkSettingAccess() @@ -48,7 +48,7 @@ bool CRdbLinkSettingAccess::readSettingTable(int domain, return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector selColnumn; selColnumn.push_back(std::string("name")); @@ -64,7 +64,7 @@ bool CRdbLinkSettingAccess::readSettingTable(int domain, return false; } - kbd_public::SLocationInfo locationInfo; + iot_public::SLocationInfo locationInfo; std::vector< SRdbLinkageSetting >::iterator iter = vecResult.begin(); for(; iter!=vecResult.end(); ++iter) { diff --git a/product/src/application/linkage_server/CRdbLinkSettingAccess.h b/product/src/application/linkage_server/CRdbLinkSettingAccess.h index b890e7f3..2c2ce610 100644 --- a/product/src/application/linkage_server/CRdbLinkSettingAccess.h +++ b/product/src/application/linkage_server/CRdbLinkSettingAccess.h @@ -27,6 +27,6 @@ public: bool readSettingTable(int domain, std::vector< SRdbLinkageSetting >& retVecResult); private: - kbd_dbms::CRdbAccessEx crt_ex; - kbd_public::CSysInfoInterfacePtr m_objSysinf; + iot_dbms::CRdbAccessEx crt_ex; + iot_public::CSysInfoInterfacePtr m_objSysinf; }; diff --git a/product/src/application/linkage_server/CSqlDbCtrl.cpp b/product/src/application/linkage_server/CSqlDbCtrl.cpp index 83a2a8ea..6b847787 100644 --- a/product/src/application/linkage_server/CSqlDbCtrl.cpp +++ b/product/src/application/linkage_server/CSqlDbCtrl.cpp @@ -4,7 +4,7 @@ #include "boost/assert.hpp" #include "CSqlDbCtrl.h" -using namespace kbd_dbms; +using namespace iot_dbms; CSqlDbCtrl::CSqlDbCtrl(): m_objLocalDbConn(DB_CONN_MODEL_READ) { diff --git a/product/src/application/linkage_server/CSqlDbCtrl.h b/product/src/application/linkage_server/CSqlDbCtrl.h index d592aa96..f200b77a 100644 --- a/product/src/application/linkage_server/CSqlDbCtrl.h +++ b/product/src/application/linkage_server/CSqlDbCtrl.h @@ -10,7 +10,7 @@ #include "CRecoverNodeContainer.h" #include "db_api_ex/CDbApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; class CSqlDbCtrl { public: diff --git a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp index 158d1a1d..0ec487c0 100644 --- a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp +++ b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp @@ -5,7 +5,7 @@ #include "CLinkageForHmiApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; kbd_application::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl( int appid, @@ -56,7 +56,7 @@ void CLinkageForHmiApiImpl::afterSuspend() } void CLinkageForHmiApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; if (!m_objRecvLinkCMb.recvMsg(m_objRecvMsg,500)) { return; @@ -66,10 +66,10 @@ void CLinkageForHmiApiImpl::execute() } bool CLinkageForHmiApiImpl::recvMsgLink( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; if (msg.getMsgType() != MT_LINKAGE_CTRL_HMI_UP) { @@ -143,7 +143,7 @@ bool CLinkageForHmiApiImpl::recvMsgLink( return false; } -bool CLinkageForHmiApiImpl::sendToLink(kbd_net::CMbMessage& msg, int domain) +bool CLinkageForHmiApiImpl::sendToLink(iot_net::CMbMessage& msg, int domain) { LOGINFO("sendMsgToDomain domain[%d] appid[%d] msgType[%d] Subject[%d]", domain, @@ -160,7 +160,7 @@ bool CLinkageForHmiApiImpl::linkOperateRequest( LinkOperateMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumLinkOperateMessage); objMessage.setData(msg.SerializeAsString()); return sendToLink(objMessage, domain); @@ -170,7 +170,7 @@ bool CLinkageForHmiApiImpl::userInterveneResponse( UiRequestMessageAck& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumUiRequestMessageAck); objMessage.setData(msg.SerializeAsString()); return sendToLink(objMessage, domain); diff --git a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h index 34a2a8c6..9480d9e1 100644 --- a/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h +++ b/product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h @@ -7,10 +7,10 @@ #include "application/linkage_server_api/CLinkageForHmiApi.h" namespace kbd_application { - using namespace kbd_idlfile::linkage; + using namespace iot_idl::linkage; class CLinkageForHmiApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CLinkageForHmiApiImpl(int appid, CLinkageForHmiApi* api); @@ -47,16 +47,16 @@ namespace kbd_application { bool handleLinkStateChange( StatusChangeMessage& msg); - bool sendToLink(kbd_net::CMbMessage& msg, int domain); + bool sendToLink(iot_net::CMbMessage& msg, int domain); - bool recvMsgLink(kbd_net::CMbMessage& msg); + bool recvMsgLink(iot_net::CMbMessage& msg); private: const int m_nServerAppId; CLinkageForHmiApi* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendLinkCMb;//发送 linkage - kbd_net::CMbCommunicator m_objRecvLinkCMb;//接收 linkage + iot_net::CMbCommunicator m_objSendLinkCMb;//发送 linkage + iot_net::CMbCommunicator m_objRecvLinkCMb;//接收 linkage }; } diff --git a/product/src/application/linkage_server_api/CLinkageForServerApi.cpp b/product/src/application/linkage_server_api/CLinkageForServerApi.cpp index fb34b4bc..06116f4d 100644 --- a/product/src/application/linkage_server_api/CLinkageForServerApi.cpp +++ b/product/src/application/linkage_server_api/CLinkageForServerApi.cpp @@ -3,7 +3,7 @@ #include "CLinkageForServerApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; CLinkageForServerApi::CLinkageForServerApi(int appid) { diff --git a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp index 86388071..bf3a1d09 100644 --- a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp +++ b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp @@ -6,7 +6,7 @@ #include "CLinkageForServerApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; CLinkageForServerApiImpl::CLinkageForServerApiImpl( int appid, @@ -74,7 +74,7 @@ void CLinkageForServerApiImpl::afterSuspend() } bool CLinkageForServerApiImpl::recvOptMsg( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { @@ -128,7 +128,7 @@ bool CLinkageForServerApiImpl::recvOptMsg( } bool CLinkageForServerApiImpl::sendToHmiDomain( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, int domain) { LOGINFO("sendToHmiDomain domain[%d] appid[%d] msgType[%d] Subject[%d]", @@ -143,7 +143,7 @@ bool CLinkageForServerApiImpl::sendToHmiDomain( } bool CLinkageForServerApiImpl::sendToHmiHost( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, const std::string& hostName) { LOGINFO("sendToHmiHost hostName[%s] appid[%d] msgType[%d] Subject[%d]", @@ -158,7 +158,7 @@ bool CLinkageForServerApiImpl::sendToHmiHost( } bool CLinkageForServerApiImpl::sendToOpt( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, int domain, int appid, int msgType) @@ -175,11 +175,11 @@ bool CLinkageForServerApiImpl::sendToOpt( } bool CLinkageForServerApiImpl::recvHmiMsg( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; if (msg.getMsgType() != MT_LINKAGE_CTRL_HMI_DOWN) { LOGERROR("在CH_HMI_TO_LINK_CTRL_DOWN 这个通道中收到 其他类型的消息:[%d]", @@ -231,7 +231,7 @@ bool CLinkageForServerApiImpl::recvHmiMsg( void CLinkageForServerApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; if (m_objRecvHmiCMb.recvMsg(m_objRecvMsg,500)) { recvHmiMsg(m_objRecvMsg); @@ -247,7 +247,7 @@ bool CLinkageForServerApiImpl::linkStateChange( const StatusChangeMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumStatusMessage); objMessage.setData(msg.SerializeAsString()); @@ -258,7 +258,7 @@ bool CLinkageForServerApiImpl::linkStartRequest( const LinkStartRequestMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumLinkStartRequestMessage); objMessage.setData(msg.SerializeAsString()); return sendToHmiDomain(objMessage, domain); @@ -268,7 +268,7 @@ bool CLinkageForServerApiImpl::userInterveneRequest( const UiRequestMessage& msg, const bool &isSendToHost) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumUiRequestMessage); objMessage.setData(msg.SerializeAsString()); const ActorParameter& actor @@ -293,7 +293,7 @@ bool CLinkageForServerApiImpl::optCtrlRequest( { int domain = msg.stHead.nDstDomainID; COptCtrlRequest ctrl; - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; try { objMessage.setData(ctrl.generate(msg)); @@ -316,7 +316,7 @@ bool CLinkageForServerApiImpl::optCtrlRequest( { int domain = msg.stHead.nDstDomainID; COptCustCtrlRequest ctrl; - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; try { objMessage.setData(ctrl.generate(msg)); @@ -356,7 +356,7 @@ bool CLinkageForServerApiImpl::linkOperateResponse( const LinkOperateMessageAck& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumLinkOperateMessageAck); objMessage.setData(msg.SerializeAsString()); @@ -384,7 +384,7 @@ bool CLinkageForServerApiImpl::sendCtrlToHostMsg(const std::string& host,const s MT_LINKAGE_ACTION_UP, CH_LINK_TO_HMI_CTRL_UP); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumActionToHmiMessage); objMessage.setData(msg); diff --git a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h index 1fad20ca..47e02128 100644 --- a/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h +++ b/product/src/application/linkage_server_api/CLinkageForServerApiImpl.h @@ -9,9 +9,9 @@ namespace kbd_application { - using namespace kbd_idlfile::linkage; + using namespace iot_idl::linkage; class CLinkageForServerApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CLinkageForServerApiImpl(int appid, CLinkageForServerApi* api); @@ -74,27 +74,27 @@ namespace kbd_application bool handleUserInterveneResponse( const UiRequestMessageAck& msg); - bool recvHmiMsg(kbd_net::CMbMessage& msg); - bool recvOptMsg(kbd_net::CMbMessage& msg); + bool recvHmiMsg(iot_net::CMbMessage& msg); + bool recvOptMsg(iot_net::CMbMessage& msg); bool sendToHmiDomain( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, int domain); bool sendToOpt( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, int domain, int appid, int msgType); - bool sendToHmiHost(kbd_net::CMbMessage& msg, + bool sendToHmiHost(iot_net::CMbMessage& msg, const std::string& hostName); private: CLinkageForServerApi* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendHmiCMb;//发送 hmi - kbd_net::CMbCommunicator m_objRecvHmiCMb;//接收 hmi - kbd_net::CMbCommunicator m_objSendOptCMb;//发送 opt - kbd_net::CMbCommunicator m_objRecvOptCMb;//接收 opt + iot_net::CMbCommunicator m_objSendHmiCMb;//发送 hmi + iot_net::CMbCommunicator m_objRecvHmiCMb;//接收 hmi + iot_net::CMbCommunicator m_objSendOptCMb;//发送 opt + iot_net::CMbCommunicator m_objRecvOptCMb;//接收 opt const int m_nServerAppid; diff --git a/product/src/application/opc_server/opc_server/LightOpcOpt.cpp b/product/src/application/opc_server/opc_server/LightOpcOpt.cpp index 1c9635c5..8a153bcf 100644 --- a/product/src/application/opc_server/opc_server/LightOpcOpt.cpp +++ b/product/src/application/opc_server/opc_server/LightOpcOpt.cpp @@ -1,7 +1,7 @@ #include "LightOpcOpt.h" #include "opcdefine.h" #include "lightopc.h" -using namespace kbd_service; +using namespace iot_service; static void a_server_finished(void *arg, loService *b, loClient *c) { diff --git a/product/src/application/opc_server/opc_server/LightOpcOpt.h b/product/src/application/opc_server/opc_server/LightOpcOpt.h index c7d5f996..13ae9ab7 100644 --- a/product/src/application/opc_server/opc_server/LightOpcOpt.h +++ b/product/src/application/opc_server/opc_server/LightOpcOpt.h @@ -17,7 +17,7 @@ #include "opcdefine.h" #include "OpcServerCommon.h" -using namespace kbd_service; +using namespace iot_service; class LightOpcOpt { public: diff --git a/product/src/application/opc_server/opc_server/OpcDataCache.h b/product/src/application/opc_server/opc_server/OpcDataCache.h index 5278f8d4..f4edf5ba 100644 --- a/product/src/application/opc_server/opc_server/OpcDataCache.h +++ b/product/src/application/opc_server/opc_server/OpcDataCache.h @@ -7,7 +7,7 @@ #include "service/common/CommonDefine.h" #include "lightopc.h" -namespace kbd_service { +namespace iot_service { typedef struct _SCachePointInfo { @@ -34,5 +34,5 @@ typedef struct _SCachePointInfo } }SCachePointInfo,*PSCachePointInfo; -}//namespace kbd_service +}//namespace iot_service #endif // OPCDATACACHE_H diff --git a/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp b/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp index 1a9cb4cc..4f9a62ef 100644 --- a/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp +++ b/product/src/application/opc_server/opc_server/OpcMsgBusMng.cpp @@ -11,27 +11,27 @@ using namespace std; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_net; -kbd_service::OpcMsgBusMng::OpcMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo) +iot_service::OpcMsgBusMng::OpcMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { } -kbd_service::OpcMsgBusMng::~OpcMsgBusMng() +iot_service::OpcMsgBusMng::~OpcMsgBusMng() { } -int kbd_service::OpcMsgBusMng::initialize() +int iot_service::OpcMsgBusMng::initialize() { return kbdSuccess; } -int kbd_service::OpcMsgBusMng::sub(int nChanNo) +int iot_service::OpcMsgBusMng::sub(int nChanNo) { if(!m_common.addSub(m_stRunAppInfo.nAppId,nChanNo)) { @@ -45,7 +45,7 @@ int kbd_service::OpcMsgBusMng::sub(int nChanNo) return kbdSuccess; } -int kbd_service::OpcMsgBusMng::unsub(int nChanNo) +int iot_service::OpcMsgBusMng::unsub(int nChanNo) { if(!m_common.delSub(m_stRunAppInfo.nAppId,nChanNo)) { @@ -60,7 +60,7 @@ int kbd_service::OpcMsgBusMng::unsub(int nChanNo) return kbdSuccess; } -bool kbd_service::OpcMsgBusMng::recvMsg(kbd_net::CMbMessage &objMsg, int nTimeoutMsec) +bool iot_service::OpcMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec) { return m_common.recvMsg(objMsg,nTimeoutMsec); } @@ -84,7 +84,7 @@ bool OpcMsgBusMng::replyMsg(CMbMessage &msgSrc, int nMessageType, int nChannel, return true; } -std::string kbd_service::OpcMsgBusMng::getCommunicatorName() +std::string iot_service::OpcMsgBusMng::getCommunicatorName() { return m_common.getName(); } diff --git a/product/src/application/opc_server/opc_server/OpcMsgBusMng.h b/product/src/application/opc_server/opc_server/OpcMsgBusMng.h index c39b7ae6..86f1dcd0 100644 --- a/product/src/application/opc_server/opc_server/OpcMsgBusMng.h +++ b/product/src/application/opc_server/opc_server/OpcMsgBusMng.h @@ -10,26 +10,26 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "net_msg_bus_api/CMbCommunicator.h" #include "rdb_api/CRdbAccessEx.h" -namespace kbd_service { +namespace iot_service { class OpcMsgBusMng { public: - OpcMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo); + OpcMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~OpcMsgBusMng(); int initialize(); int sub(int nChanNo); int unsub(int nChanNo); - bool recvMsg(kbd_net::CMbMessage &objMsg,int nTimeoutMsec = 0); - bool replyMsg(kbd_net::CMbMessage &msgSrc, int nMessageType, int nChannel, std::string strMessage); + bool recvMsg(iot_net::CMbMessage &objMsg,int nTimeoutMsec = 0); + bool replyMsg(iot_net::CMbMessage &msgSrc, int nMessageType, int nChannel, std::string strMessage); std::string getCommunicatorName(); private: - kbd_net::CMbCommunicator m_common; //消息总线通讯器 - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_net::CMbCommunicator m_common; //消息总线通讯器 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 }; typedef boost::shared_ptr OpcMsgBusMngPtr; -}//namespace kbd_service +}//namespace iot_service #endif // OPCMSGBUSMNG_H diff --git a/product/src/application/opc_server/opc_server/OpcRtdbTable.h b/product/src/application/opc_server/opc_server/OpcRtdbTable.h index 9ccecf2f..7c97e0fe 100644 --- a/product/src/application/opc_server/opc_server/OpcRtdbTable.h +++ b/product/src/application/opc_server/opc_server/OpcRtdbTable.h @@ -10,7 +10,7 @@ #include "string" #include "DataType.h" #include "boost/atomic.hpp" -namespace kbd_service { +namespace iot_service { const std::string CN_TN_AI = "analog"; const std::string CN_TN_DI = "digital"; const std::string CN_TN_PI = "accuml"; @@ -99,5 +99,5 @@ typedef struct _STableGroupInfo char szGroupDesc[128]; }STableGroupInfo,*PSTableGroupInfo; -}//namespace kbd_service +}//namespace iot_service #endif // OPCRTDBTABLE_H diff --git a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp index a6e57c1f..3b482ebb 100644 --- a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp +++ b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.cpp @@ -8,11 +8,11 @@ #include "OpcServerCommon.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; -kbd_service::OpcRtdbTableOperate::OpcRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo) +iot_service::OpcRtdbTableOperate::OpcRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { @@ -50,7 +50,7 @@ OpcRtdbTableOperate::~OpcRtdbTableOperate() } } -int kbd_service::OpcRtdbTableOperate::initialize() +int iot_service::OpcRtdbTableOperate::initialize() { if(!m_objAnalogTable.open(m_stRunAppInfo.nAppId,CN_TN_AI.c_str())) { diff --git a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h index b427a3b7..be89a2a5 100644 --- a/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h +++ b/product/src/application/opc_server/opc_server/OpcRtdbTableOperate.h @@ -10,11 +10,11 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "rdb_api/CRdbAccessEx.h" #include "OpcRtdbTable.h" -namespace kbd_service { +namespace iot_service { class OpcRtdbTableOperate { public: - OpcRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo); + OpcRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~OpcRtdbTableOperate(); /** * @brief initialize 初始化 @@ -40,18 +40,18 @@ public: int getOptPoint(std::vector &opcInfoVec); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 - kbd_dbms::CRdbAccessEx m_objAnalogTable; - kbd_dbms::CRdbAccessEx m_objDigitalTable; - kbd_dbms::CRdbAccessEx m_objAccumlTable; - kbd_dbms::CRdbAccessEx m_objMixTable; - kbd_dbms::CRdbAccessEx m_objGroupTable; + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_dbms::CRdbAccessEx m_objAnalogTable; + iot_dbms::CRdbAccessEx m_objDigitalTable; + iot_dbms::CRdbAccessEx m_objAccumlTable; + iot_dbms::CRdbAccessEx m_objMixTable; + iot_dbms::CRdbAccessEx m_objGroupTable; - kbd_dbms::CRdbAccessEx m_objOpcVersionTable; - kbd_dbms::CRdbAccessEx m_objOpcInfoTable; + iot_dbms::CRdbAccessEx m_objOpcVersionTable; + iot_dbms::CRdbAccessEx m_objOpcInfoTable; }; typedef boost::shared_ptr OpcRtdbTableOperatePtr; -}// namespace kbd_service +}// namespace iot_service #endif // OPCRTDBTABLEOPERATE_H diff --git a/product/src/application/opc_server/opc_server/OpcServerApp.cpp b/product/src/application/opc_server/opc_server/OpcServerApp.cpp index 474b8b1e..9ba76ff1 100644 --- a/product/src/application/opc_server/opc_server/OpcServerApp.cpp +++ b/product/src/application/opc_server/opc_server/OpcServerApp.cpp @@ -13,15 +13,15 @@ using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_service; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_service; +using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -kbd_service::OpcServerApp::OpcServerApp() +iot_service::OpcServerApp::OpcServerApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -30,12 +30,12 @@ kbd_service::OpcServerApp::OpcServerApp() } -kbd_service::OpcServerApp::~OpcServerApp() +iot_service::OpcServerApp::~OpcServerApp() { OpcServerApp::stop(); } -bool kbd_service::OpcServerApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_service::OpcServerApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if(!parseCmdLine(argc,argv)) @@ -93,7 +93,7 @@ bool kbd_service::OpcServerApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_service::OpcServerApp::stop() +bool iot_service::OpcServerApp::stop() { //9.更新当前进程冗余状态 if(m_ptrProcMng != NULL) @@ -120,7 +120,7 @@ bool kbd_service::OpcServerApp::stop() return true; } -int kbd_service::OpcServerApp::toQuit() +int iot_service::OpcServerApp::toQuit() { if(m_ptrProcMng != NULL) { @@ -130,7 +130,7 @@ int kbd_service::OpcServerApp::toQuit() return kbdSuccess; } -bool kbd_service::OpcServerApp::parseCmdLine(int argc, char *argv[]) +bool iot_service::OpcServerApp::parseCmdLine(int argc, char *argv[]) { //拼接启动参数，用于向进程管理注册 for(int i = 1; i(m_stRunAppInfo); if(m_ptrOpcServerThread == NULL) diff --git a/product/src/application/opc_server/opc_server/OpcServerMng.h b/product/src/application/opc_server/opc_server/OpcServerMng.h index 1b6f8cc9..75a2d709 100644 --- a/product/src/application/opc_server/opc_server/OpcServerMng.h +++ b/product/src/application/opc_server/opc_server/OpcServerMng.h @@ -12,12 +12,12 @@ #include "sys_proc_mng_api/ProcMngInterface.h" #include "OpcServerThread.h" #include "OpcToolsThread.h" -namespace kbd_service { -class OpcServerMng:public kbd_sys::CRedundantSwitchInterface +namespace iot_service { +class OpcServerMng:public iot_sys::CRedundantSwitchInterface { public: - OpcServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + OpcServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~OpcServerMng(); /** @@ -33,13 +33,13 @@ public: */ int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 OpcServerThreadPtr m_ptrOpcServerThread; //opc主线程 OpcToolsThreadPtr m_ptrOpcToolsThread; //opc服务和opc tools 交互线程 }; typedef boost::shared_ptr OpcServerMngPtr; -}//namespace kbd_service +}//namespace iot_service #endif // OPCSERVERMNG_H diff --git a/product/src/application/opc_server/opc_server/OpcServerThread.cpp b/product/src/application/opc_server/opc_server/OpcServerThread.cpp index 217e5e9d..50fffc5f 100644 --- a/product/src/application/opc_server/opc_server/OpcServerThread.cpp +++ b/product/src/application/opc_server/opc_server/OpcServerThread.cpp @@ -19,13 +19,13 @@ #include "pub_utility_api/CommonConfigParse.h" using namespace std; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_net; -kbd_service::OpcServerThread::OpcServerThread(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("OpcServerThread", 1000), +iot_service::OpcServerThread::OpcServerThread(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("OpcServerThread", 1000), m_stRunAppInfo(stRunAppInfo), m_nVersion(0), m_nAiPeriod(5), @@ -38,7 +38,7 @@ kbd_service::OpcServerThread::OpcServerThread(const kbd_public::SRunAppInfo &stR } -kbd_service::OpcServerThread::~OpcServerThread() +iot_service::OpcServerThread::~OpcServerThread() { clean(); m_opt.stopServer(); @@ -46,7 +46,7 @@ kbd_service::OpcServerThread::~OpcServerThread() m_ptrOpcTableOpt.reset(); } -int kbd_service::OpcServerThread::initialize() +int iot_service::OpcServerThread::initialize() { //1.初始化内存表操作类 m_ptrOpcTableOpt = boost::make_shared(m_stRunAppInfo); @@ -118,19 +118,19 @@ int OpcServerThread::beforeExecute() return kbdSuccess; } -int kbd_service::OpcServerThread::setMaster() +int iot_service::OpcServerThread::setMaster() { return kbdSuccess; } -int kbd_service::OpcServerThread::setSlave() +int iot_service::OpcServerThread::setSlave() { return kbdSuccess; } -void kbd_service::OpcServerThread::execute() +void iot_service::OpcServerThread::execute() { // 定时读取version int version = -1; @@ -146,38 +146,38 @@ void kbd_service::OpcServerThread::execute() m_opt.updateTag(m_DiTagPtrMap); } - uint64 nTime = kbd_public::getUTCTimeSec(); + uint64 nTime = iot_public::getUTCTimeSec(); //更新模拟量 if(nTime-m_nAiPeriod >m_nAiLastUpdateTime) { readAiData(); m_opt.updateTag(m_AiTagPtrMap); - m_nAiLastUpdateTime = kbd_public::getUTCTimeSec(); + m_nAiLastUpdateTime = iot_public::getUTCTimeSec(); } - nTime = kbd_public::getUTCTimeSec(); + nTime = iot_public::getUTCTimeSec(); //更新累积量 if(nTime-m_nPiPeriod >m_nPiLastUpdateTime) { readPiData(); m_opt.updateTag(m_PiTagPtrMap); - m_nPiLastUpdateTime = kbd_public::getUTCTimeSec(); + m_nPiLastUpdateTime = iot_public::getUTCTimeSec(); } - nTime = kbd_public::getUTCTimeSec(); + nTime = iot_public::getUTCTimeSec(); //更新混合量 if(nTime-m_nMiPeriod >m_nMiLastUpdateTime) { readMiData(); m_opt.updateTag(m_MiTagPtrMap); - m_nMiLastUpdateTime = kbd_public::getUTCTimeSec(); + m_nMiLastUpdateTime = iot_public::getUTCTimeSec(); } } -bool kbd_service::OpcServerThread::initOpcServer() +bool iot_service::OpcServerThread::initOpcServer() { if (!m_opt.isStart()) { @@ -208,7 +208,7 @@ bool kbd_service::OpcServerThread::initOpcServer() int OpcServerThread::loadTimeConfig() { CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(kbd_public::CFileUtil::getPathOfCfgFile(CN_Config_Opc))) + if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile(CN_Config_Opc))) { LOGERROR("加载配置文件:%s失败", CN_Config_Opc.c_str()); return kbdFailed; @@ -421,7 +421,7 @@ void OpcServerThread::readAndUpdateAi(vector &keyVec) void OpcServerThread::updateAiData(vector &infoVec) { std::string strTagName=""; - kbd_dbms::CVarType value; + iot_dbms::CVarType value; int status=0; for(int index(0);index &keyVec) void OpcServerThread::updateDiData(vector &infoVec) { std::string strTagName=""; - kbd_dbms::CVarType value; + iot_dbms::CVarType value; int status=0; for(int index(0);index &keyVec) void OpcServerThread::updatePiData(vector &infoVec) { std::string strTagName=""; - kbd_dbms::CVarType value; + iot_dbms::CVarType value; int status=0; for(int index(0);index &keyVec) void OpcServerThread::updateMiData(vector &infoVec) { std::string strTagName=""; - kbd_dbms::CVarType value; + iot_dbms::CVarType value; int status=0; for(int index(0);indexdwHighDateTime = (DWORD)(ll >> 32); } -void kbd_service::OpcServerThread::fileTimeToTime_t(time_t* t, FILETIME ft) +void iot_service::OpcServerThread::fileTimeToTime_t(time_t* t, FILETIME ft) { ULARGE_INTEGER ui; ui.LowPart = ft.dwLowDateTime; diff --git a/product/src/application/opc_server/opc_server/OpcServerThread.h b/product/src/application/opc_server/opc_server/OpcServerThread.h index 6c724900..abf09efb 100644 --- a/product/src/application/opc_server/opc_server/OpcServerThread.h +++ b/product/src/application/opc_server/opc_server/OpcServerThread.h @@ -19,16 +19,16 @@ #include "OpcServerCommon.h" #include "LightOpcOpt.h" -namespace kbd_service { +namespace iot_service { -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; using namespace std; class OpcServerThread :public CTimerThreadBase { public: - OpcServerThread(const kbd_public::SRunAppInfo &stRunAppInfo); + OpcServerThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~OpcServerThread(); /** * @brief initialize 初始化 @@ -106,7 +106,7 @@ public: private: int checkStatus(const int status,const int table); CacheInfoPtr updateData(const int type, - const string &pointTag,kbd_dbms::CVarType &value,int status); + const string &pointTag,iot_dbms::CVarType &value,int status); CacheInfoPtr findCacheInfo(int nType, const std::string& keyIdTag); @@ -132,7 +132,7 @@ public: TagPtrMap m_MiNewTagPtrMap; private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 OpcRtdbTableOperatePtr m_ptrOpcTableOpt; //内存表操作类 CDataProcessApiPtr m_ptrDataProcApi; @@ -165,7 +165,7 @@ private: uint64 m_nMiLastUpdateTime; }; typedef boost::shared_ptr OpcServerThreadPtr; -}//namespace kbd_service +}//namespace iot_service #endif // OPCSERVERTHREAD_H diff --git a/product/src/application/opc_server/opc_server/OpcToolsThread.cpp b/product/src/application/opc_server/opc_server/OpcToolsThread.cpp index b17c35fa..d90f2c73 100644 --- a/product/src/application/opc_server/opc_server/OpcToolsThread.cpp +++ b/product/src/application/opc_server/opc_server/OpcToolsThread.cpp @@ -13,27 +13,27 @@ #include "service/common/CommonDefine.h" using namespace std; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_net; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_net; +using namespace iot_service; +using namespace iot_idl; -kbd_service::OpcToolsThread::OpcToolsThread(const kbd_public::SRunAppInfo &stRunAppInfo, kbd_service::OpcServerThreadPtr opcThread) - :kbd_public::CTimerThreadBase("OpcToolsThread",50), +iot_service::OpcToolsThread::OpcToolsThread(const iot_public::SRunAppInfo &stRunAppInfo, iot_service::OpcServerThreadPtr opcThread) + :iot_public::CTimerThreadBase("OpcToolsThread",50), m_stRunAppInfo(stRunAppInfo), m_opcThread(opcThread) { } -kbd_service::OpcToolsThread::~OpcToolsThread() +iot_service::OpcToolsThread::~OpcToolsThread() { } -int kbd_service::OpcToolsThread::initialize() +int iot_service::OpcToolsThread::initialize() { m_ptrMsgbusMng = boost::make_shared(m_stRunAppInfo); if(m_ptrMsgbusMng == NULL) @@ -49,24 +49,24 @@ int kbd_service::OpcToolsThread::initialize() return kbdSuccess; } -int kbd_service::OpcToolsThread::setMaster() +int iot_service::OpcToolsThread::setMaster() { m_ptrMsgbusMng->sub(CH_OPCTOOLS_TO_OPC_REQUEST); return kbdSuccess; } -int kbd_service::OpcToolsThread::setSlave() +int iot_service::OpcToolsThread::setSlave() { m_ptrMsgbusMng->unsub(CH_OPCTOOLS_TO_OPC_REQUEST); return kbdSuccess; } -void kbd_service::OpcToolsThread::execute() +void iot_service::OpcToolsThread::execute() { dealMsg(); } -void kbd_service::OpcToolsThread::dealMsg() +void iot_service::OpcToolsThread::dealMsg() { CMbMessage objRecvMsg; if(m_ptrMsgbusMng->recvMsg(objRecvMsg,100)) @@ -86,7 +86,7 @@ void OpcToolsThread::dealRequest(CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); switch (nMessageType) { - case kbd_idlfile::MT_TOOLS_REQUEST_POINT_DATA: + case iot_idl::MT_TOOLS_REQUEST_POINT_DATA: requestPointInfoMsg(objMsg); break; default: @@ -97,7 +97,7 @@ void OpcToolsThread::dealRequest(CMbMessage &objMsg) void OpcToolsThread::requestPointInfoMsg(CMbMessage &objMsg) { LOGDEBUG("接收到点信息请求"); - ::kbd_idlfile::RequestPointInfo requestPoint; + ::iot_idl::RequestPointInfo requestPoint; if(requestPoint.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize()) == true) { //解析发送point给 opc tools @@ -105,7 +105,7 @@ void OpcToolsThread::requestPointInfoMsg(CMbMessage &objMsg) createPointMsg(requestPoint); m_stReplyPoint.set_strhostname(requestPoint.strhostname()); - m_stReplyPoint.set_ntime(kbd_public::getUTCTimeMsec()); + m_stReplyPoint.set_ntime(iot_public::getUTCTimeMsec()); m_stReplyPoint.set_ndomainid(m_stRunAppInfo.nDomainId); m_stReplyPoint.set_nsubsystemid(m_stRunAppInfo.nAppId); m_stReplyPoint.SerializeToString(&strSendBuff); diff --git a/product/src/application/opc_server/opc_server/OpcToolsThread.h b/product/src/application/opc_server/opc_server/OpcToolsThread.h index c5bd5304..50e3b240 100644 --- a/product/src/application/opc_server/opc_server/OpcToolsThread.h +++ b/product/src/application/opc_server/opc_server/OpcToolsThread.h @@ -12,13 +12,13 @@ #include "OpcMsgBusMng.h" #include "OpcMessage.pb.h" -namespace kbd_service { +namespace iot_service { -using namespace kbd_public; +using namespace iot_public; class OpcToolsThread:public CTimerThreadBase { public: - OpcToolsThread(const kbd_public::SRunAppInfo &stRunAppInfo,OpcServerThreadPtr opcThread); + OpcToolsThread(const iot_public::SRunAppInfo &stRunAppInfo,OpcServerThreadPtr opcThread); virtual ~OpcToolsThread(); /** * @brief initialize 初始化 @@ -40,18 +40,18 @@ public: */ virtual void execute(); void dealMsg(); - void dealRequest(kbd_net::CMbMessage &objMsg); - void requestPointInfoMsg(kbd_net::CMbMessage &objMsg); - void createPointMsg(kbd_idlfile::RequestPointInfo &requestPoint); + void dealRequest(iot_net::CMbMessage &objMsg); + void requestPointInfoMsg(iot_net::CMbMessage &objMsg); + void createPointMsg(iot_idl::RequestPointInfo &requestPoint); void createAiMsg(const std::string &strGroupTag); void createDiMsg(const std::string &strGroupTag); void createPiMsg(const std::string &strGroupTag); void createMiMsg(const std::string &strGroupTag); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 OpcServerThreadPtr m_opcThread; OpcMsgBusMngPtr m_ptrMsgbusMng; //消息总线管理类 - kbd_idlfile::ReplyPointInfo m_stReplyPoint; + iot_idl::ReplyPointInfo m_stReplyPoint; }; typedef boost::shared_ptr OpcToolsThreadPtr; diff --git a/product/src/application/opc_server/opc_server/main.cpp b/product/src/application/opc_server/opc_server/main.cpp index 22f537e8..2caa9782 100644 --- a/product/src/application/opc_server/opc_server/main.cpp +++ b/product/src/application/opc_server/opc_server/main.cpp @@ -11,7 +11,7 @@ using namespace std; int main(int argc, char *argv[]) { //system("Pause"); - kbd_service::OpcServerApp objApp; + iot_service::OpcServerApp objApp; return objApp.main(argc,argv); } diff --git a/product/src/application/qtts_kbd_iflytek/test/iflytek_tts_sdk_test/main.cpp b/product/src/application/qtts_kbd_iflytek/test/iflytek_tts_sdk_test/main.cpp index d3f0d6e6..57294d4e 100644 --- a/product/src/application/qtts_kbd_iflytek/test/iflytek_tts_sdk_test/main.cpp +++ b/product/src/application/qtts_kbd_iflytek/test/iflytek_tts_sdk_test/main.cpp @@ -152,7 +152,7 @@ int main() { //登录参数,appid与msc库绑定,不能随意改动 std::string strLoginPara = "appid = 5f8ed9ed, work_dir = "; - strLoginPara += kbd_public::CFileUtil::getCurModuleDir(); + strLoginPara += iot_public::CFileUtil::getCurModuleDir(); strLoginPara += "/../../log/iflytek/"; printf( "登录参数:\n%s\n", strLoginPara.c_str()); @@ -172,11 +172,11 @@ int main() // std::string strSessPara = "engine_type = local, voice_name=xiaofeng, text_encoding = UTF8"; strSessPara += ", tts_res_path = fo|"; - strSessPara += kbd_public::CFileUtil::getCurModuleDir() + "/iflytek/msc/res/tts/xiaoyan.jet"; + strSessPara += iot_public::CFileUtil::getCurModuleDir() + "/iflytek/msc/res/tts/xiaoyan.jet"; // strSessPara += ";fo|"; -// strSessPara += kbd_public::CFileUtil::getCurModuleDir() + "/iflytek/msc/res/tts/xiaofeng.jet"; +// strSessPara += iot_public::CFileUtil::getCurModuleDir() + "/iflytek/msc/res/tts/xiaofeng.jet"; strSessPara += ";fo|"; - strSessPara += kbd_public::CFileUtil::getCurModuleDir() + "/iflytek/msc/res/tts/common.jet"; + strSessPara += iot_public::CFileUtil::getCurModuleDir() + "/iflytek/msc/res/tts/common.jet"; strSessPara += ", sample_rate = 16000, speed = 50, volume = 50, pitch = 50, rdn = 2"; diff --git a/product/src/application/sequence_server/CActionNodeAnalysis.cpp b/product/src/application/sequence_server/CActionNodeAnalysis.cpp index a4d31a1d..6d16ed85 100644 --- a/product/src/application/sequence_server/CActionNodeAnalysis.cpp +++ b/product/src/application/sequence_server/CActionNodeAnalysis.cpp @@ -9,7 +9,7 @@ #include "CNodeFunc.h" #include "CNodeSeq.h" -CActionNodeAnalysis::CActionNodeAnalysis(const kbd_public::SRunAppInfo& appInfo) +CActionNodeAnalysis::CActionNodeAnalysis(const iot_public::SRunAppInfo& appInfo) : m_stAppInfo(appInfo),m_bIsCreateAlarm(false) { boost::format formater("[%s]-[%s]-[%s]"); @@ -64,7 +64,7 @@ void CActionNodeAnalysis::ctreateReqHead( //head.strCommName = m_stAppInfo.c; head.nUserID = actor.user_id; head.nUserGroupID = actor.user_grounp_id; - head.nOptTime = kbd_public::getUTCTimeMsec(); + head.nOptTime = iot_public::getUTCTimeMsec(); } void CActionNodeAnalysis::ctreateReqQueue( @@ -85,8 +85,8 @@ void CActionNodeAnalysis::ctreateReqQueue( bool CActionNodeAnalysis::loadConfig() { - kbd_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(kbd_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + iot_public::CCommonConfigParse configParse; + if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; diff --git a/product/src/application/sequence_server/CActionNodeAnalysis.h b/product/src/application/sequence_server/CActionNodeAnalysis.h index 42e97cf6..b0431cf5 100644 --- a/product/src/application/sequence_server/CActionNodeAnalysis.h +++ b/product/src/application/sequence_server/CActionNodeAnalysis.h @@ -20,7 +20,7 @@ class CNodeAction; class CActionNodeAnalysis { public: - CActionNodeAnalysis(const kbd_public::SRunAppInfo& appInfo); + CActionNodeAnalysis(const iot_public::SRunAppInfo& appInfo); ~CActionNodeAnalysis(); bool checkRecvHead(const SOptCtrlReply& msg); @@ -39,7 +39,7 @@ private: bool loadConfig(); private: - const kbd_public::SRunAppInfo& m_stAppInfo; + const iot_public::SRunAppInfo& m_stAppInfo; std::string m_strInstName; bool m_bIsCreateAlarm;////是否让opt产生报警 }; diff --git a/product/src/application/sequence_server/CAppService.cpp b/product/src/application/sequence_server/CAppService.cpp index 98ee3525..8f81fe69 100644 --- a/product/src/application/sequence_server/CAppService.cpp +++ b/product/src/application/sequence_server/CAppService.cpp @@ -32,7 +32,7 @@ int CAppService::redundantSwitch(bool bMaster, bool bSlave) return 0; } -bool CAppService::initService(const kbd_public::SRunAppInfo& info, +bool CAppService::initService(const iot_public::SRunAppInfo& info, const std::string& param) { if (!getProcessInfo(info, param)) @@ -55,11 +55,11 @@ bool CAppService::initService(const kbd_public::SRunAppInfo& info, } bool CAppService::getProcessInfo( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param) { - using namespace kbd_public; - using namespace kbd_sys; + using namespace iot_public; + using namespace iot_sys; using namespace boost; SProcessInfoKey processInfo; processInfo.nAppId = info.nAppId; @@ -82,10 +82,10 @@ bool CAppService::getProcessInfo( return true; } -bool CAppService::getRedundantMngInstance(const kbd_public::SRunAppInfo& info) +bool CAppService::getRedundantMngInstance(const iot_public::SRunAppInfo& info) { m_ptrRedundantMng = - kbd_sys::getRedundantMngInstance( + iot_sys::getRedundantMngInstance( info.nDomainId, info.nAppId, info.strLocalNodeName); @@ -125,7 +125,7 @@ bool CAppService::quitService() bool CAppService::isAlreadyRunning(const std::string &strAppName) { - if (kbd_public::CSingleProcInstance:: + if (iot_public::CSingleProcInstance:: hasInstanceRunning(getInstanceName(strAppName))) { LOGERROR("已经有一个实例正在运行!"); diff --git a/product/src/application/sequence_server/CAppService.h b/product/src/application/sequence_server/CAppService.h index 730951fb..853e203e 100644 --- a/product/src/application/sequence_server/CAppService.h +++ b/product/src/application/sequence_server/CAppService.h @@ -12,7 +12,7 @@ #include "CSeqProcessQuit.h" #include "PredifineForSeqServer.h" -class CAppService : public kbd_public::CBaseService +class CAppService : public iot_public::CBaseService { public: CAppService(); @@ -23,21 +23,21 @@ public: protected: bool initService( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param); bool quitService(); bool isAlreadyRunning(const std::string &strAppName);//判断是否是 唯一运行程序 private: bool getProcessInfo( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param);//获取进程管理对象 bool getRedundantMngInstance( - const kbd_public::SRunAppInfo& info);//获取冗余管理对象 + const iot_public::SRunAppInfo& info);//获取冗余管理对象 private: bool m_bMaster; bool m_bSlave; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng;//冗余管理 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng;//进程管理 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng;//冗余管理 + iot_sys::CProcMngInterfacePtr m_ptrProcMng;//进程管理 CSeqRedundantPtr m_ptrSeqRedundant;//冗余操作 CSeqProcessQuitPtr m_ptrSeqProcessQuit;//进程退出 diff --git a/product/src/application/sequence_server/CAppServiceThread.cpp b/product/src/application/sequence_server/CAppServiceThread.cpp index 08484a87..67d37c66 100644 --- a/product/src/application/sequence_server/CAppServiceThread.cpp +++ b/product/src/application/sequence_server/CAppServiceThread.cpp @@ -3,7 +3,7 @@ #include "PredifineForSeqServer.h" CAppServiceThread::CAppServiceThread( - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, const std::string& threadName) : CTimerThreadBase(threadName, 500, 0), m_stAppInfo(appInfo) diff --git a/product/src/application/sequence_server/CAppServiceThread.h b/product/src/application/sequence_server/CAppServiceThread.h index bd08bddb..46a2bd7f 100644 --- a/product/src/application/sequence_server/CAppServiceThread.h +++ b/product/src/application/sequence_server/CAppServiceThread.h @@ -2,15 +2,15 @@ #include "pub_utility_api/TimerThreadBase.h" #include "pub_sysinfo_api/SysInfoApi.h" -class CAppServiceThread : public kbd_public::CTimerThreadBase +class CAppServiceThread : public iot_public::CTimerThreadBase { public: CAppServiceThread( - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, const std::string& threadName); virtual ~CAppServiceThread(); protected: - const kbd_public::SRunAppInfo& m_stAppInfo; + const iot_public::SRunAppInfo& m_stAppInfo; }; diff --git a/product/src/application/sequence_server/CDbSaveCtrl.cpp b/product/src/application/sequence_server/CDbSaveCtrl.cpp index 67291c02..4e7f34dc 100644 --- a/product/src/application/sequence_server/CDbSaveCtrl.cpp +++ b/product/src/application/sequence_server/CDbSaveCtrl.cpp @@ -13,19 +13,19 @@ CDbSaveCtrl::~CDbSaveCtrl() bool CDbSaveCtrl::initDbSave(int domainId,int appID) { - return kbd_dbms::initDbSaveApi(domainId,appID); + return iot_dbms::initDbSaveApi(domainId,appID); } void CDbSaveCtrl::releaseDbSave() { - kbd_dbms::releaseDbSaveApi(); + iot_dbms::releaseDbSaveApi(); } bool CDbSaveCtrl::updateActionEvent(const SSeqCtrlActionEvent& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbUpdate objUpdate; objUpdate.set_strtablename("sequence_action_event"); objUpdate.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -146,8 +146,8 @@ bool CDbSaveCtrl::updateActionEvent(const SSeqCtrlActionEvent& info) bool CDbSaveCtrl::updateSeqFuncHistory(const SSeqFunctionHistory& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbUpdate objUpdate; objUpdate.set_strtablename("sequence_function_history"); objUpdate.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -231,8 +231,8 @@ bool CDbSaveCtrl::updateSeqFuncHistory(const SSeqFunctionHistory& info) bool CDbSaveCtrl::updateSeqHistory(const SSeqHistory& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbUpdate objUpdate; objUpdate.set_strtablename("sequence_history"); objUpdate.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -328,8 +328,8 @@ bool CDbSaveCtrl::updateSeqHistory(const SSeqHistory& info) bool CDbSaveCtrl::addActionEvent(const SSeqCtrlActionEvent& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbInsert objInsert; objInsert.set_strtablename("sequence_action_event"); objInsert.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -426,8 +426,8 @@ bool CDbSaveCtrl::addActionEvent(const SSeqCtrlActionEvent& info) bool CDbSaveCtrl::addSeqFuncHistory(const SSeqFunctionHistory& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbInsert objInsert; objInsert.set_strtablename("sequence_function_history"); objInsert.set_ensaveaction(SA_DSS_LOCAL_REMOTE); @@ -494,8 +494,8 @@ bool CDbSaveCtrl::addSeqFuncHistory(const SSeqFunctionHistory& info) bool CDbSaveCtrl::addSeqHistory(const SSeqHistory& info) { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbInsert objInsert; objInsert.set_strtablename("sequence_history"); objInsert.set_ensaveaction(SA_DSS_LOCAL_REMOTE); diff --git a/product/src/application/sequence_server/CHmiMessageAnalysis.cpp b/product/src/application/sequence_server/CHmiMessageAnalysis.cpp index b280c6e4..c85a8b28 100644 --- a/product/src/application/sequence_server/CHmiMessageAnalysis.cpp +++ b/product/src/application/sequence_server/CHmiMessageAnalysis.cpp @@ -7,7 +7,7 @@ #include "CRecoverNode.h" CHmiMessageAnalysis::CHmiMessageAnalysis( - const kbd_public::SRunAppInfo& appInfo) + const iot_public::SRunAppInfo& appInfo) :m_stAppInfo(appInfo) { } diff --git a/product/src/application/sequence_server/CHmiMessageAnalysis.h b/product/src/application/sequence_server/CHmiMessageAnalysis.h index 0ba27d04..d1e01739 100644 --- a/product/src/application/sequence_server/CHmiMessageAnalysis.h +++ b/product/src/application/sequence_server/CHmiMessageAnalysis.h @@ -10,12 +10,12 @@ class CNodeSeq; class CNodeFunc; class CNodeAction; class CRecoverNode; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; class CHmiMessageAnalysis { public: - CHmiMessageAnalysis(const kbd_public::SRunAppInfo& appInfo); + CHmiMessageAnalysis(const iot_public::SRunAppInfo& appInfo); ~CHmiMessageAnalysis(); static bool analysisUiRequestMessageAck( @@ -88,5 +88,5 @@ private: ExecuteStatusParameter* pParam, const SActionErrorInfo& erroInfo); private: - const kbd_public::SRunAppInfo& m_stAppInfo; + const iot_public::SRunAppInfo& m_stAppInfo; }; diff --git a/product/src/application/sequence_server/CMbCommunicateInfo.cpp b/product/src/application/sequence_server/CMbCommunicateInfo.cpp index a7f12368..75caf239 100644 --- a/product/src/application/sequence_server/CMbCommunicateInfo.cpp +++ b/product/src/application/sequence_server/CMbCommunicateInfo.cpp @@ -8,7 +8,7 @@ #include "CRecoverNode.h" CMbCommunicateInfo::CMbCommunicateInfo( - const kbd_public::SRunAppInfo& appInfo) + const iot_public::SRunAppInfo& appInfo) :kbd_application::CSeqForServerApi(appInfo.nAppId), m_objActionAnalysis(appInfo), m_objHmiMsgAnalysis(appInfo), diff --git a/product/src/application/sequence_server/CMbCommunicateInfo.h b/product/src/application/sequence_server/CMbCommunicateInfo.h index d6b2e4c3..c0a0f968 100644 --- a/product/src/application/sequence_server/CMbCommunicateInfo.h +++ b/product/src/application/sequence_server/CMbCommunicateInfo.h @@ -17,13 +17,13 @@ class CNodeSeq; class CNodeFunc; class CNodeAction; class CRecoverNode; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; class CMbCommunicateInfo : public kbd_application::CSeqForServerApi { public: - CMbCommunicateInfo(const kbd_public::SRunAppInfo& appInfo); + CMbCommunicateInfo(const iot_public::SRunAppInfo& appInfo); ~CMbCommunicateInfo(); //发送动作执行 diff --git a/product/src/application/sequence_server/CMethodAction.cpp b/product/src/application/sequence_server/CMethodAction.cpp index ebe01729..8a5eaa27 100644 --- a/product/src/application/sequence_server/CMethodAction.cpp +++ b/product/src/application/sequence_server/CMethodAction.cpp @@ -40,7 +40,7 @@ bool CMethodAction::execute() m_objAction.getNodeFunc().description().c_str(), m_objAction.description().c_str()); - m_nStartTime = kbd_public::getUTCTimeSec(); + m_nStartTime = iot_public::getUTCTimeSec(); //初始化节点状态 m_objAction.resetBeginStart(); @@ -48,7 +48,7 @@ bool CMethodAction::execute() //开始执行 bool bRet = startExecuteNode(); - m_nStopTime = kbd_public::getUTCTimeSec(); + m_nStopTime = iot_public::getUTCTimeSec(); updateActionEvent();//一个动作结束后 才记录 alarmEvent(); diff --git a/product/src/application/sequence_server/CMethodAction.h b/product/src/application/sequence_server/CMethodAction.h index c742f618..9081b396 100644 --- a/product/src/application/sequence_server/CMethodAction.h +++ b/product/src/application/sequence_server/CMethodAction.h @@ -15,7 +15,7 @@ class CNodeSeq; class CNodeFunc; class CNodeAction; class CRecoverNode; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; class CMethodAction : public CMethod { diff --git a/product/src/application/sequence_server/CMethodFailedAction.cpp b/product/src/application/sequence_server/CMethodFailedAction.cpp index f9aa97b4..e96715ed 100644 --- a/product/src/application/sequence_server/CMethodFailedAction.cpp +++ b/product/src/application/sequence_server/CMethodFailedAction.cpp @@ -116,7 +116,7 @@ bool CMethodFailedAction::doFailedUi( //1 先重置人工干预 结果 m_objAction.resetUiResult(); - uint64 endTime = kbd_public::getUTCTimeSec() + (2*24*60*60);//2天 + uint64 endTime = iot_public::getUTCTimeSec() + (2*24*60*60);//2天 SOpResultUi sResult; if (!timeToSendUIRequest( endTime, @@ -256,7 +256,7 @@ bool CMethodFailedAction::timeToSendUIRequest( bool bRet = false; while(!bRet) { - uint64 curTime = kbd_public::getUTCTimeSec(); + uint64 curTime = iot_public::getUTCTimeSec(); if(curTime > endTime) { break; @@ -311,8 +311,8 @@ std::string CMethodFailedAction::failStrageStr(ACTION_FAILED_STRAGE type) bool CMethodFailedAction::loadConfig() { - kbd_public::CCommonConfigParse configParse; - if (kbdSuccess != configParse.load(kbd_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) + iot_public::CCommonConfigParse configParse; + if (kbdSuccess != configParse.load(iot_public::CFileUtil::getPathOfCfgFile("proc_param_cfg.xml"))) { LOGERROR("加载配置文件proc_param_cfg.xml失败"); return false; diff --git a/product/src/application/sequence_server/CMethodFailedAction.h b/product/src/application/sequence_server/CMethodFailedAction.h index 5b205a41..2a86baae 100644 --- a/product/src/application/sequence_server/CMethodFailedAction.h +++ b/product/src/application/sequence_server/CMethodFailedAction.h @@ -13,7 +13,7 @@ class CNodeSeq; class CNodeFunc; class CNodeAction; class CMethodAction; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; class CMethodFailedAction { diff --git a/product/src/application/sequence_server/CMethodFunc.cpp b/product/src/application/sequence_server/CMethodFunc.cpp index bd708273..18433a8f 100644 --- a/product/src/application/sequence_server/CMethodFunc.cpp +++ b/product/src/application/sequence_server/CMethodFunc.cpp @@ -30,7 +30,7 @@ bool CMethodFunc::execute() m_objFunc.description().c_str(), m_objFunc.isAsync() ? "并行" : "串行"); - m_nStartTime = kbd_public::getUTCTimeSec(); + m_nStartTime = iot_public::getUTCTimeSec(); bool bRet = executeChilds(); @@ -213,7 +213,7 @@ bool CMethodFunc::delayAction(CNodeAction& action) using namespace boost::posix_time; using namespace boost::this_thread; - int64 startTime = kbd_public::getUTCTimeSec(); + int64 startTime = iot_public::getUTCTimeSec(); int64 endTime = startTime; int delayTime = action.delayTime(); @@ -225,7 +225,7 @@ bool CMethodFunc::delayAction(CNodeAction& action) } sleep(milliseconds(200)); - endTime = kbd_public::getUTCTimeSec(); + endTime = iot_public::getUTCTimeSec(); } //为了避免 delayTime 为 0 没有时间处理 暂停和 终止事件 diff --git a/product/src/application/sequence_server/CMethodRecoverAction.cpp b/product/src/application/sequence_server/CMethodRecoverAction.cpp index 9245aabc..8b4af442 100644 --- a/product/src/application/sequence_server/CMethodRecoverAction.cpp +++ b/product/src/application/sequence_server/CMethodRecoverAction.cpp @@ -96,7 +96,7 @@ bool CMethodRecoverAction::recoverFailedState() enumCode_ERRO_ACTION_RECOVER, I18N("动作执行恢复流程失败!"))); - m_nStopTime = kbd_public::getUTCTimeSec(); + m_nStopTime = iot_public::getUTCTimeSec(); updateActionEvent();//一个动作结束后 才记录 diff --git a/product/src/application/sequence_server/CMethodRecoverFunc.cpp b/product/src/application/sequence_server/CMethodRecoverFunc.cpp index ee42942c..9b9c1401 100644 --- a/product/src/application/sequence_server/CMethodRecoverFunc.cpp +++ b/product/src/application/sequence_server/CMethodRecoverFunc.cpp @@ -36,7 +36,7 @@ bool CMethodRecoverFunc::execute() if (m_nStartTime == 0) { //有可能功能 强制退出的时候 时间没有记录 - m_nStartTime = kbd_public::getUTCTimeSec(); + m_nStartTime = iot_public::getUTCTimeSec(); LOGERROR("恢复功能节点, 开始执行时间异常为 0,容错处理!"); } diff --git a/product/src/application/sequence_server/CMethodRecoverSeq.cpp b/product/src/application/sequence_server/CMethodRecoverSeq.cpp index 6cf54f0a..904b201a 100644 --- a/product/src/application/sequence_server/CMethodRecoverSeq.cpp +++ b/product/src/application/sequence_server/CMethodRecoverSeq.cpp @@ -34,7 +34,7 @@ bool CMethodRecoverSeq::execute() uint64 nStartTime = m_objRecover.startTime(); if (nStartTime == 0) { - nStartTime = kbd_public::getUTCTimeSec(); + nStartTime = iot_public::getUTCTimeSec(); } m_objSeq.setStartTime(nStartTime); diff --git a/product/src/application/sequence_server/CMethodSeq.cpp b/product/src/application/sequence_server/CMethodSeq.cpp index 604a04a1..66a04683 100644 --- a/product/src/application/sequence_server/CMethodSeq.cpp +++ b/product/src/application/sequence_server/CMethodSeq.cpp @@ -30,7 +30,7 @@ bool CMethodSeq::execute() m_objSeq.description().c_str() ); - m_objSeq.setStartTime(kbd_public::getUTCTimeSec()); + m_objSeq.setStartTime(iot_public::getUTCTimeSec()); addSeqHistory(); diff --git a/product/src/application/sequence_server/CModuleAlarmCreater.cpp b/product/src/application/sequence_server/CModuleAlarmCreater.cpp index d8ae2403..f764a627 100644 --- a/product/src/application/sequence_server/CModuleAlarmCreater.cpp +++ b/product/src/application/sequence_server/CModuleAlarmCreater.cpp @@ -29,14 +29,14 @@ CModuleAlarmCreater::~CModuleAlarmCreater() bool CModuleAlarmCreater::seqCtrl(CNodeSeq& seq,const SHmiOpInfo& op) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(seq, *pFromApp, kbd_service::ALM_STAT_OPT_SEQ_CTRL); + createHead(seq, *pFromApp, iot_service::ALM_STAT_OPT_SEQ_CTRL); createHmiOpKeyWord(op.eResult, *pFromApp); createSeqKeyWord(seq, *pFromApp); createActorKeyWord(op.actor, *pFromApp); @@ -52,14 +52,14 @@ bool CModuleAlarmCreater::seqCtrl(CNodeSeq& seq,const SHmiOpInfo& op) bool CModuleAlarmCreater::seqCtrl(CNodeAction& action,const SOpResultUi& op) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(action.getNodeSeq(), *pFromApp, kbd_service::ALM_STAT_OPT_SEQ_CTRL); + createHead(action.getNodeSeq(), *pFromApp, iot_service::ALM_STAT_OPT_SEQ_CTRL); createUiOpKeyWord(op.eResult, *pFromApp); createSeqKeyWord(action, *pFromApp); createActionDescKeyWord(action, *pFromApp); @@ -76,14 +76,14 @@ bool CModuleAlarmCreater::seqCtrl(CNodeAction& action,const SOpResultUi& op) bool CModuleAlarmCreater::seqStart(CNodeSeq& seq) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(seq, *pFromApp, kbd_service::ALM_STAT_OPT_SEQ_START); + createHead(seq, *pFromApp, iot_service::ALM_STAT_OPT_SEQ_START); createSeqKeyWord(seq, *pFromApp); createOpKeyWord(I18N("开始"), *pFromApp); createActorKeyWord(seq.getSeqActor(), *pFromApp); @@ -99,14 +99,14 @@ bool CModuleAlarmCreater::seqStart(CNodeSeq& seq) bool CModuleAlarmCreater::seqStop(CNodeSeq& seq) { - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddAlm objAlarm; SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(seq, *pFromApp, kbd_service::ALM_STAT_OPT_SEQ_STOP); + createHead(seq, *pFromApp, iot_service::ALM_STAT_OPT_SEQ_STOP); createSeqKeyWord(seq, *pFromApp); createOpKeyWord(I18N("结束"), *pFromApp); std::string retStr = seq.getStateStr() + " " + getExecSkipDesc(seq); @@ -124,7 +124,7 @@ bool CModuleAlarmCreater::seqStop(CNodeSeq& seq) bool CModuleAlarmCreater::actionExecute(CNodeAction& action) { - using namespace kbd_idlfile; + using namespace iot_idl; CNodeSeq& seq = action.getNodeSeq(); @@ -133,7 +133,7 @@ bool CModuleAlarmCreater::actionExecute(CNodeAction& action) SAlmInfoFromApp* pFromApp = objAlarm.add_alm_info(); BOOST_ASSERT(pFromApp); - createHead(seq, *pFromApp, kbd_service::ALM_STAT_OPT_SEQ_ACTION_POINT); + createHead(seq, *pFromApp, iot_service::ALM_STAT_OPT_SEQ_ACTION_POINT); createSeqKeyWord(seq, *pFromApp); createActionDescKeyWord(action, *pFromApp); createResultKeyWord(action.getStateStr(), *pFromApp); @@ -179,110 +179,110 @@ std::string CModuleAlarmCreater::getExecSkipDesc(CNodeSeq &seq) void CModuleAlarmCreater::createHead( CNodeSeq& seq, - kbd_idlfile::SAlmInfoFromApp& fromApp, + iot_idl::SAlmInfoFromApp& fromApp, int status) { - using namespace kbd_idlfile; - fromApp.set_alm_type(kbd_service::ALM_TYPE_OPERATE); - fromApp.set_time_stamp(kbd_public::getUTCTimeMsec()); + using namespace iot_idl; + fromApp.set_alm_type(iot_service::ALM_TYPE_OPERATE); + fromApp.set_time_stamp(iot_public::getUTCTimeMsec()); fromApp.set_location_id(seq.locationId()); fromApp.set_status(status); fromApp.set_alm_style(enAlmStyle::AS_EVENT_ONLY); fromApp.set_region_id(-1); } -void CModuleAlarmCreater::createSeqKeyWord(CNodeSeq& seq, kbd_idlfile::SAlmInfoFromApp& fromApp) +void CModuleAlarmCreater::createSeqKeyWord(CNodeSeq& seq, iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_SEQ_CTRL_NAME); + pKeyword->set_id(iot_service::ALM_KEY_SEQ_CTRL_NAME); pKeyword->set_value(seq.nodeName()); pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_SEQ_CTRL_DESC); + pKeyword->set_id(iot_service::ALM_KEY_SEQ_CTRL_DESC); pKeyword->set_value(seq.description()); } void CModuleAlarmCreater::createSeqKeyWord(CNodeAction &action, - kbd_idlfile::SAlmInfoFromApp &fromApp) + iot_idl::SAlmInfoFromApp &fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_SEQ_CTRL_NAME); + pKeyword->set_id(iot_service::ALM_KEY_SEQ_CTRL_NAME); pKeyword->set_value(action.nodeName()); pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_SEQ_CTRL_DESC); + pKeyword->set_id(iot_service::ALM_KEY_SEQ_CTRL_DESC); pKeyword->set_value(action.description()); } void CModuleAlarmCreater::createHmiOpKeyWord(ESeqCtrl_HmiOpType op, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { createOpKeyWord(COpResultHmi::getOpStr(op), fromApp); } void CModuleAlarmCreater::createUiOpKeyWord(UI_OP_RESULT_TYPE op, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { createOpKeyWord(COpResultUi::UiOpTypeStr(op), fromApp); } void CModuleAlarmCreater::createOpKeyWord(const std::string& op, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_SEQ_CTRL_ACT); + pKeyword->set_id(iot_service::ALM_KEY_SEQ_CTRL_ACT); pKeyword->set_value(op); } void CModuleAlarmCreater::createActorKeyWord(const SNodeSeqActor& actor, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_OPTERATOR); + pKeyword->set_id(iot_service::ALM_KEY_OPTERATOR); pKeyword->set_value(actor.user_name); pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_OPT_HOST); + pKeyword->set_id(iot_service::ALM_KEY_OPT_HOST); pKeyword->set_value(actor.host_name); } void CModuleAlarmCreater::createResultKeyWord(const std::string& state, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_RTN_RESULT); + pKeyword->set_id(iot_service::ALM_KEY_RTN_RESULT); pKeyword->set_value(state); } void CModuleAlarmCreater::createActionDescKeyWord(CNodeAction& action, - kbd_idlfile::SAlmInfoFromApp& fromApp) + iot_idl::SAlmInfoFromApp& fromApp) { - using namespace kbd_idlfile; + using namespace iot_idl; SAlmKeyword* pKeyword = NULL; pKeyword = fromApp.add_alm_keyword(); - pKeyword->set_id(kbd_service::ALM_KEY_SEQ_CTRL_ACT); + pKeyword->set_id(iot_service::ALM_KEY_SEQ_CTRL_ACT); pKeyword->set_value(action.description()); } diff --git a/product/src/application/sequence_server/CModuleAlarmCreater.h b/product/src/application/sequence_server/CModuleAlarmCreater.h index defa1756..dc6ab1b4 100644 --- a/product/src/application/sequence_server/CModuleAlarmCreater.h +++ b/product/src/application/sequence_server/CModuleAlarmCreater.h @@ -38,50 +38,50 @@ private: void createHead( CNodeSeq& seq, - kbd_idlfile::SAlmInfoFromApp& fromApp, + iot_idl::SAlmInfoFromApp& fromApp, int status); void createSeqKeyWord( CNodeSeq& seq, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createSeqKeyWord( CNodeAction& action, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createHmiOpKeyWord( ESeqCtrl_HmiOpType op, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createUiOpKeyWord( UI_OP_RESULT_TYPE op, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createOpKeyWord( const std::string& op, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createActorKeyWord( const SNodeSeqActor& actor, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createResultKeyWord( const std::string& state, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void createActionDescKeyWord( CNodeAction& action, - kbd_idlfile::SAlmInfoFromApp& fromApp + iot_idl::SAlmInfoFromApp& fromApp ); void afterSleep(); private: - kbd_service::CAlmApiForApp m_objAlmApi; + iot_service::CAlmApiForApp m_objAlmApi; }; diff --git a/product/src/application/sequence_server/CModuleExecuteMngr.cpp b/product/src/application/sequence_server/CModuleExecuteMngr.cpp index a9e301d7..46e9815f 100644 --- a/product/src/application/sequence_server/CModuleExecuteMngr.cpp +++ b/product/src/application/sequence_server/CModuleExecuteMngr.cpp @@ -95,7 +95,7 @@ bool CModuleExecuteMngr::createExecuter( seq.setAlarmCreater(&m_objAlarm); seq.setSeqActor(actor); - seq.setStartTime(kbd_public::getUTCTimeSec()); + seq.setStartTime(iot_public::getUTCTimeSec()); CSeqExecuteThread* pProc = new CSeqExecuteThread(seq, seq.description()); diff --git a/product/src/application/sequence_server/CModuleNodeMngr.cpp b/product/src/application/sequence_server/CModuleNodeMngr.cpp index 8d18f0e3..2def741c 100644 --- a/product/src/application/sequence_server/CModuleNodeMngr.cpp +++ b/product/src/application/sequence_server/CModuleNodeMngr.cpp @@ -11,7 +11,7 @@ CModuleNodeMngr::CModuleNodeMngr(int domain) : m_nDomain(domain), m_bIsModifyModel(true) { - kbd_public::createSysInfoInstance(m_ptrSysInfoInterface); + iot_public::createSysInfoInstance(m_ptrSysInfoInterface); } CModuleNodeMngr::~CModuleNodeMngr() @@ -98,7 +98,7 @@ bool CModuleNodeMngr::recreateDbModel(CSqlDbCtrl* dbctrl) void CModuleNodeMngr::createSeqNodeModel() { - kbd_public::SLocationInfo locationInfo; + iot_public::SLocationInfo locationInfo; LOGINFO("创建数据表结构!"); SSeqDefineInfoIterator seqDefineIter(m_objDbContainer); @@ -143,8 +143,8 @@ void CModuleNodeMngr::createFuncNodeModel(CNodeSeq* pParent, const std::string& void CModuleNodeMngr::createActionNodeModel(CNodeFunc* pParent, const std::string& funcName) { - kbd_public::SLocationInfo locationInfo; - kbd_public::SAppInfo stAppInfo; + iot_public::SLocationInfo locationInfo; + iot_public::SAppInfo stAppInfo; SFuncInfoIterator funInfoIter(m_objDbContainer, funcName); while (funInfoIter.hasNext()) diff --git a/product/src/application/sequence_server/CModuleNodeMngr.h b/product/src/application/sequence_server/CModuleNodeMngr.h index 0ac62a7c..e7469e76 100644 --- a/product/src/application/sequence_server/CModuleNodeMngr.h +++ b/product/src/application/sequence_server/CModuleNodeMngr.h @@ -44,6 +44,6 @@ protected: private: CSeqDbContainer m_objDbContainer;//数据结构模型容器 int m_nDomain;//域id - kbd_public::CSysInfoInterfacePtr m_ptrSysInfoInterface; + iot_public::CSysInfoInterfacePtr m_ptrSysInfoInterface; bool m_bIsModifyModel; }; diff --git a/product/src/application/sequence_server/CRdbSeqRunningAccess.cpp b/product/src/application/sequence_server/CRdbSeqRunningAccess.cpp index e9e8ed6c..9fdad43c 100644 --- a/product/src/application/sequence_server/CRdbSeqRunningAccess.cpp +++ b/product/src/application/sequence_server/CRdbSeqRunningAccess.cpp @@ -39,7 +39,7 @@ bool CRdbSeqRunningAccess::remapRunningTable(CRecoverNodeContainer& info) return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector selColnumn; selColnumn.push_back(std::string("seq_name")); @@ -103,7 +103,7 @@ bool CRdbSeqRunningAccess::updateRecord( BOOST_ASSERT(record.timeflag != 0); - using namespace kbd_dbms; + using namespace iot_dbms; std::vector updColumn; CRdbPublic::addUpColumnInfo(updColumn, "node_desc", record.node_desc); CRdbPublic::addUpColumnInfo(updColumn, "action_no", record.action_no); @@ -156,7 +156,7 @@ bool CRdbSeqRunningAccess::addSeqRunningRecord(const SSeqCtrlRunning& record) BOOST_ASSERT(record.timeflag != 0); - using namespace kbd_dbms; + using namespace iot_dbms; if (crt_ex.addRecordEX(record)) { return true; } @@ -173,7 +173,7 @@ bool CRdbSeqRunningAccess::updateRecordOnlyState(const SSeqCtrlRunning& record) return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector updColumn; CRdbPublic::addUpColumnInfo(updColumn, "status", record.status); @@ -199,7 +199,7 @@ bool CRdbSeqRunningAccess::deleteOneRecord(const std::string& seq) return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfop; CRdbPublic::addCondInfo(condInfop, "seq_name", seq); @@ -214,7 +214,7 @@ bool CRdbSeqRunningAccess::deleteAllRecord() return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfop; return crt_ex.remove(condInfop); diff --git a/product/src/application/sequence_server/CRdbSeqRunningAccess.h b/product/src/application/sequence_server/CRdbSeqRunningAccess.h index f5292c3b..41dc1ad0 100644 --- a/product/src/application/sequence_server/CRdbSeqRunningAccess.h +++ b/product/src/application/sequence_server/CRdbSeqRunningAccess.h @@ -46,7 +46,7 @@ protected: virtual void lockTable(); virtual void unLockTable(); private: - kbd_dbms::CRdbAccessEx crt_ex; + iot_dbms::CRdbAccessEx crt_ex; boost::mutex m_muLock; }; diff --git a/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp b/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp index 5c4a9274..4d208bf6 100644 --- a/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp +++ b/product/src/application/sequence_server/CRdbSeqSettingAccess.cpp @@ -3,7 +3,7 @@ CRdbSeqSettingAccess::CRdbSeqSettingAccess() { - kbd_public::createSysInfoInstance(m_ptrSysInfoInterface); + iot_public::createSysInfoInstance(m_ptrSysInfoInterface); } CRdbSeqSettingAccess::~CRdbSeqSettingAccess() @@ -41,7 +41,7 @@ bool CRdbSeqSettingAccess::readSettingTable(int domain, return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector selColnumn; selColnumn.push_back(std::string("name")); @@ -57,7 +57,7 @@ bool CRdbSeqSettingAccess::readSettingTable(int domain, return false; } - kbd_public::SLocationInfo locationInfo; + iot_public::SLocationInfo locationInfo; std::vector< SRdbSequenceSetting >::iterator iter = vecResult.begin(); for(; iter!=vecResult.end(); ++iter) { diff --git a/product/src/application/sequence_server/CRdbSeqSettingAccess.h b/product/src/application/sequence_server/CRdbSeqSettingAccess.h index 216608eb..08ddc22c 100644 --- a/product/src/application/sequence_server/CRdbSeqSettingAccess.h +++ b/product/src/application/sequence_server/CRdbSeqSettingAccess.h @@ -28,6 +28,6 @@ public: bool readSettingTable(int domain, std::vector< SRdbSequenceSetting >& retVecResult); private: - kbd_dbms::CRdbAccessEx crt_ex; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfoInterface; + iot_dbms::CRdbAccessEx crt_ex; + iot_public::CSysInfoInterfacePtr m_ptrSysInfoInterface; }; diff --git a/product/src/application/sequence_server/CSeqCtrlService.cpp b/product/src/application/sequence_server/CSeqCtrlService.cpp index c55689b9..ce4d89b4 100644 --- a/product/src/application/sequence_server/CSeqCtrlService.cpp +++ b/product/src/application/sequence_server/CSeqCtrlService.cpp @@ -115,9 +115,9 @@ bool CSeqCtrlService::start(int argc, char *argv[], int &/*nStatus*/) return false; } - kbd_public::StartLogSystem(appName.c_str(), SEQUENCE_PROCESSNAME.c_str()); + iot_public::StartLogSystem(appName.c_str(), SEQUENCE_PROCESSNAME.c_str()); - kbd_public::initI18N("sequence_server/translate","sequence_server"); + iot_public::initI18N("sequence_server/translate","sequence_server"); if (!getAppInfo(appName, m_stRunAppInfo)) { @@ -158,17 +158,17 @@ bool CSeqCtrlService::stop() deleteThread(); CDbSaveCtrl::releaseDbSave(); CAppService::quitService(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return true; } bool CSeqCtrlService::getAppInfo( const std::string &strAppName, - kbd_public::SRunAppInfo & info) + iot_public::SRunAppInfo & info) { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if (kbd_public::createSysInfoInstance(sysInfoPtr) == false) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if (iot_public::createSysInfoInstance(sysInfoPtr) == false) { return false; } @@ -184,7 +184,7 @@ bool CSeqCtrlService::getAppInfo( bool CSeqCtrlService::initMsgBus() { - if (!kbd_net::initMsgBus(SEQUENCE_PROCESSNAME.c_str(), + if (!iot_net::initMsgBus(SEQUENCE_PROCESSNAME.c_str(), getInstanceName(m_stRunAppInfo.strAppName).c_str())) { LOGERROR("初始化消息总线失败"); diff --git a/product/src/application/sequence_server/CSeqCtrlService.h b/product/src/application/sequence_server/CSeqCtrlService.h index 74f08a7d..b3573e44 100644 --- a/product/src/application/sequence_server/CSeqCtrlService.h +++ b/product/src/application/sequence_server/CSeqCtrlService.h @@ -39,7 +39,7 @@ private: bool getAppInfo( const std::string &strAppName, - kbd_public::SRunAppInfo & info); + iot_public::SRunAppInfo & info); bool initMsgBus();//初始化总线 bool creatThread();//创建执行线程 bool deleteThread();//删除主线程 @@ -49,7 +49,7 @@ private: private: boost::shared_ptr m_ptrTestThread; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; CSeqCtrlServiceThreadPtr m_ptrSeqCtrlServiceThread;//服务主线程 std::string m_strStartArgs; diff --git a/product/src/application/sequence_server/CSeqProcessQuit.h b/product/src/application/sequence_server/CSeqProcessQuit.h index 8443e55b..bcae270d 100644 --- a/product/src/application/sequence_server/CSeqProcessQuit.h +++ b/product/src/application/sequence_server/CSeqProcessQuit.h @@ -3,7 +3,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" class CAppService; -class CSeqProcessQuit : public kbd_sys::CProcessQuitInterface +class CSeqProcessQuit : public iot_sys::CProcessQuitInterface { public: CSeqProcessQuit(CAppService* service); diff --git a/product/src/application/sequence_server/CSeqRedundant.h b/product/src/application/sequence_server/CSeqRedundant.h index e2b59950..f1eeddee 100644 --- a/product/src/application/sequence_server/CSeqRedundant.h +++ b/product/src/application/sequence_server/CSeqRedundant.h @@ -3,7 +3,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" class CAppService; -class CSeqRedundant : public kbd_sys::CRedundantSwitchInterface +class CSeqRedundant : public iot_sys::CRedundantSwitchInterface { public: CSeqRedundant(CAppService* service); diff --git a/product/src/application/sequence_server/CSeqServiceThread.cpp b/product/src/application/sequence_server/CSeqServiceThread.cpp index 77e42cf2..cfa04e9e 100644 --- a/product/src/application/sequence_server/CSeqServiceThread.cpp +++ b/product/src/application/sequence_server/CSeqServiceThread.cpp @@ -9,7 +9,7 @@ #include CSeqServiceThread::CSeqServiceThread( - const kbd_public::SRunAppInfo& stAppInfo) : + const iot_public::SRunAppInfo& stAppInfo) : CAppServiceThread(stAppInfo, "sequence_server thread"), m_objMbInfo(stAppInfo), m_objDbAccess(), diff --git a/product/src/application/sequence_server/CSeqServiceThread.h b/product/src/application/sequence_server/CSeqServiceThread.h index 021d922c..13ea9b93 100644 --- a/product/src/application/sequence_server/CSeqServiceThread.h +++ b/product/src/application/sequence_server/CSeqServiceThread.h @@ -22,7 +22,7 @@ class CSeqServiceThread : public CAppServiceThread { public: - CSeqServiceThread(const kbd_public::SRunAppInfo& stAppInfo); + CSeqServiceThread(const iot_public::SRunAppInfo& stAppInfo); ~CSeqServiceThread(); void execute(); diff --git a/product/src/application/sequence_server/CSqlDbCtrl.cpp b/product/src/application/sequence_server/CSqlDbCtrl.cpp index aaf39673..5c75def2 100644 --- a/product/src/application/sequence_server/CSqlDbCtrl.cpp +++ b/product/src/application/sequence_server/CSqlDbCtrl.cpp @@ -4,7 +4,7 @@ #include "boost/assert.hpp" #include "CSqlDbCtrl.h" -using namespace kbd_dbms; +using namespace iot_dbms; CSqlDbCtrl::CSqlDbCtrl(): m_objLocalDbConn(DB_CONN_MODEL_READ) { diff --git a/product/src/application/sequence_server/CSqlDbCtrl.h b/product/src/application/sequence_server/CSqlDbCtrl.h index ca01c731..74b05ed1 100644 --- a/product/src/application/sequence_server/CSqlDbCtrl.h +++ b/product/src/application/sequence_server/CSqlDbCtrl.h @@ -9,7 +9,7 @@ #include "db_api_ex/CDbApi.h" #include "CSeqDbContainer.h" #include "CRecoverNodeContainer.h" -using namespace kbd_dbms; +using namespace iot_dbms; class CSqlDbCtrl { public: diff --git a/product/src/application/sequence_server_api/CSeqForHmiApi.cpp b/product/src/application/sequence_server_api/CSeqForHmiApi.cpp index 915c2ece..b415d555 100644 --- a/product/src/application/sequence_server_api/CSeqForHmiApi.cpp +++ b/product/src/application/sequence_server_api/CSeqForHmiApi.cpp @@ -2,7 +2,7 @@ #include "CSeqForHmiApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; CSeqForHmiApi::CSeqForHmiApi(int appid) { m_pImpl = new CSeqForHmiApiImpl(appid, this); diff --git a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp index 4390d9a9..a1bf619e 100644 --- a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp +++ b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp @@ -5,7 +5,7 @@ #include "CSeqForHmiApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; kbd_application::CSeqForHmiApiImpl::CSeqForHmiApiImpl( int appid, CSeqForHmiApi* api) : @@ -55,7 +55,7 @@ void CSeqForHmiApiImpl::afterSuspend() } void CSeqForHmiApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; if (!m_objRecvSeqCMb.recvMsg(m_objRecvMsg,500)) { return; @@ -65,10 +65,10 @@ void CSeqForHmiApiImpl::execute() } bool CSeqForHmiApiImpl::recvMsgSeq( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; if (msg.getMsgType() != MT_SEQAGE_CTRL_HMI_UP) { @@ -130,7 +130,7 @@ bool CSeqForHmiApiImpl::recvMsgSeq( return false; } -bool CSeqForHmiApiImpl::sendToSeq(kbd_net::CMbMessage& msg, int domain) +bool CSeqForHmiApiImpl::sendToSeq(iot_net::CMbMessage& msg, int domain) { LOGINFO("sendMsgToDomain domain[%d] appid[%d] msgType[%d] Subject[%d]", domain, @@ -147,7 +147,7 @@ bool CSeqForHmiApiImpl::seqOperateRequest( SeqOperateMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumSeqOperateMessage); objMessage.setData(msg.SerializeAsString()); return sendToSeq(objMessage, domain); @@ -157,7 +157,7 @@ bool CSeqForHmiApiImpl::userInterveneResponse( UiRequestMessageAck& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumUiRequestMessageAck); objMessage.setData(msg.SerializeAsString()); return sendToSeq(objMessage, domain); diff --git a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h index 46ca32f0..54148288 100644 --- a/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h +++ b/product/src/application/sequence_server_api/CSeqForHmiApiImpl.h @@ -7,9 +7,9 @@ #include "application/sequence_server_api/CSeqForHmiApi.h" namespace kbd_application { - using namespace kbd_idlfile::sequence; + using namespace iot_idl::sequence; class CSeqForHmiApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CSeqForHmiApiImpl(int appid, CSeqForHmiApi* api); @@ -43,15 +43,15 @@ namespace kbd_application { bool handleSeqStateChange( StatusChangeMessage& msg); - bool sendToSeq(kbd_net::CMbMessage& msg, int domain); + bool sendToSeq(iot_net::CMbMessage& msg, int domain); - bool recvMsgSeq(kbd_net::CMbMessage& msg); + bool recvMsgSeq(iot_net::CMbMessage& msg); private: CSeqForHmiApi* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendSeqCMb;//发送 sequence - kbd_net::CMbCommunicator m_objRecvSeqCMb;//接收 sequence + iot_net::CMbCommunicator m_objSendSeqCMb;//发送 sequence + iot_net::CMbCommunicator m_objRecvSeqCMb;//接收 sequence const int m_nServerAppid; }; diff --git a/product/src/application/sequence_server_api/CSeqForServerApi.cpp b/product/src/application/sequence_server_api/CSeqForServerApi.cpp index 432b8fe6..27cee765 100644 --- a/product/src/application/sequence_server_api/CSeqForServerApi.cpp +++ b/product/src/application/sequence_server_api/CSeqForServerApi.cpp @@ -3,7 +3,7 @@ #include "CSeqForServerApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; CSeqForServerApi::CSeqForServerApi(int appid) { diff --git a/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp b/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp index 44e6a73b..d319d57d 100644 --- a/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp +++ b/product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp @@ -5,7 +5,7 @@ #include "CSeqForServerApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; CSeqForServerApiImpl::CSeqForServerApiImpl( int appid, @@ -72,7 +72,7 @@ void CSeqForServerApiImpl::afterSuspend() } bool CSeqForServerApiImpl::recvOptMsg( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { if (m_objRecvMsg.getMsgType() != MT_OPT_AUTO_CTRL_UP) @@ -106,7 +106,7 @@ bool CSeqForServerApiImpl::recvOptMsg( } bool CSeqForServerApiImpl::sendToHmiDomain( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, int domain) { LOGINFO("sendToHmiDomain domain[%d] appid[%d] msgType[%d] Subject[%d]", @@ -121,7 +121,7 @@ bool CSeqForServerApiImpl::sendToHmiDomain( } bool CSeqForServerApiImpl::sendToHmiHost( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, const std::string& hostName) { LOGINFO("sendToHmiHost hostName[%s] appid[%d] msgType[%d] Subject[%d]", @@ -136,7 +136,7 @@ bool CSeqForServerApiImpl::sendToHmiHost( } bool CSeqForServerApiImpl::sendToOpt( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, int domain, int appid) { LOGINFO("sendToOpt domain[%d] appid[%d] msgType[%d] Subject[%d]", @@ -151,10 +151,10 @@ bool CSeqForServerApiImpl::sendToOpt( } bool CSeqForServerApiImpl::recvHmiMsg( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; if (msg.getMsgType() != MT_SEQAGE_CTRL_HMI_DOWN) { LOGERROR("在CH_HMI_TO_SEQ_CTRL_DOWN 这个通道中收到 其他类型的消息:[%d]", @@ -206,7 +206,7 @@ bool CSeqForServerApiImpl::recvHmiMsg( void CSeqForServerApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; if (m_objRecvHmiCMb.recvMsg(m_objRecvMsg,500)) { recvHmiMsg(m_objRecvMsg); @@ -222,7 +222,7 @@ bool CSeqForServerApiImpl::seqStateChange( StatusChangeMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumStatusMessage); objMessage.setData(msg.SerializeAsString()); return sendToHmiDomain(objMessage, domain); @@ -232,7 +232,7 @@ bool CSeqForServerApiImpl::userInterveneRequest( UiRequestMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumUiRequestMessage); objMessage.setData(msg.SerializeAsString()); const ::ActorParameter& actor @@ -258,7 +258,7 @@ bool CSeqForServerApiImpl::optCtrlRequest( int domain = msg.stHead.nDstDomainID; msg.stHead.strCommName = m_objSendOptCMb.getName(); COptCtrlRequest ctrl; - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setData(ctrl.generate(msg)); return sendToOpt(objMessage, @@ -282,7 +282,7 @@ bool CSeqForServerApiImpl::seqOperateResponse( SeqOperateMessageAck& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumSeqOperateMessageAck); objMessage.setData(msg.SerializeAsString()); diff --git a/product/src/application/sequence_server_api/CSeqForServerApiImpl.h b/product/src/application/sequence_server_api/CSeqForServerApiImpl.h index 82a65103..1340f397 100644 --- a/product/src/application/sequence_server_api/CSeqForServerApiImpl.h +++ b/product/src/application/sequence_server_api/CSeqForServerApiImpl.h @@ -8,10 +8,10 @@ #include "application/sequence_server_api/CSeqForServerApi.h" namespace kbd_application { - using namespace kbd_idlfile::sequence; + using namespace iot_idl::sequence; class CSeqForServerApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CSeqForServerApiImpl(int appid, CSeqForServerApi* api); @@ -55,24 +55,24 @@ namespace kbd_application { bool handleUserInterveneResponse( UiRequestMessageAck& msg); - bool recvHmiMsg(kbd_net::CMbMessage& msg); - bool recvOptMsg(kbd_net::CMbMessage& msg); + bool recvHmiMsg(iot_net::CMbMessage& msg); + bool recvOptMsg(iot_net::CMbMessage& msg); bool sendToHmiDomain( - kbd_net::CMbMessage& msg, + iot_net::CMbMessage& msg, int domain); - bool sendToOpt(kbd_net::CMbMessage& msg, + bool sendToOpt(iot_net::CMbMessage& msg, int domain, int appid); - bool sendToHmiHost(kbd_net::CMbMessage& msg, + bool sendToHmiHost(iot_net::CMbMessage& msg, const std::string& hostName); private: CSeqForServerApi* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendHmiCMb;//发送 hmi - kbd_net::CMbCommunicator m_objRecvHmiCMb;//接收 hmi - kbd_net::CMbCommunicator m_objSendOptCMb;//发送 opt - kbd_net::CMbCommunicator m_objRecvOptCMb;//接收 opt + iot_net::CMbCommunicator m_objSendHmiCMb;//发送 hmi + iot_net::CMbCommunicator m_objRecvHmiCMb;//接收 hmi + iot_net::CMbCommunicator m_objSendOptCMb;//发送 opt + iot_net::CMbCommunicator m_objRecvOptCMb;//接收 opt const int m_nServerAppid; }; diff --git a/product/src/application/trigger_api/CDotNode.cpp b/product/src/application/trigger_api/CDotNode.cpp index efb384d3..1f9c3268 100644 --- a/product/src/application/trigger_api/CDotNode.cpp +++ b/product/src/application/trigger_api/CDotNode.cpp @@ -9,7 +9,7 @@ using namespace kbd_application; -using namespace kbd_service; +using namespace iot_service; CDotNode::CDotNode(const STableInfo& tableInfo) : m_objTableInfo(tableInfo) diff --git a/product/src/application/trigger_api/CDotValue.h b/product/src/application/trigger_api/CDotValue.h index 2c997b60..0464aea5 100644 --- a/product/src/application/trigger_api/CDotValue.h +++ b/product/src/application/trigger_api/CDotValue.h @@ -11,7 +11,7 @@ namespace kbd_application { - typedef kbd_public::LuaVariantType DotValueType; + typedef iot_public::LuaVariantType DotValueType; //点值 class CDotValue diff --git a/product/src/application/trigger_api/CRdbAccessMngr.h b/product/src/application/trigger_api/CRdbAccessMngr.h index fdbf07f0..27de2cf3 100644 --- a/product/src/application/trigger_api/CRdbAccessMngr.h +++ b/product/src/application/trigger_api/CRdbAccessMngr.h @@ -16,7 +16,7 @@ namespace kbd_application { using namespace std; - using namespace kbd_dbms; + using namespace iot_dbms; class CRdbAccessMngr { diff --git a/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp b/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp index a0645245..b993b3fd 100644 --- a/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp +++ b/product/src/application/trigger_api/CRdbAccessMngrInterface.cpp @@ -72,7 +72,7 @@ bool CRdbAccessMngrInterface::queryPeriodDefine( return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfo; CRdbPublic::addCondInfo(condInfo, "tag_name", TagName); @@ -116,7 +116,7 @@ bool CRdbAccessMngrInterface::queryTimerDefine( return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfo; CRdbPublic::addCondInfo(condInfo, "tag_name", TagName); @@ -158,7 +158,7 @@ bool CRdbAccessMngrInterface::queryFuncDefine( return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfo; CRdbPublic::addCondInfo(condInfo, "func_name", funcName); @@ -201,7 +201,7 @@ bool CRdbAccessMngrInterface::queryConditionDefine( return false; } - using namespace kbd_dbms; + using namespace iot_dbms; std::vector condInfo; CRdbPublic::addCondInfo(condInfo, "tag_name", TagName); diff --git a/product/src/application/trigger_api/CRdbAccessMngrInterface.h b/product/src/application/trigger_api/CRdbAccessMngrInterface.h index bd3e0daf..1e7753e9 100644 --- a/product/src/application/trigger_api/CRdbAccessMngrInterface.h +++ b/product/src/application/trigger_api/CRdbAccessMngrInterface.h @@ -11,7 +11,7 @@ namespace kbd_application { using namespace std; - using namespace kbd_dbms; + using namespace iot_dbms; class CRdbAccessMngrInterface : public CRdbAccessMngr { diff --git a/product/src/application/trigger_api/CRdbNetBase.h b/product/src/application/trigger_api/CRdbNetBase.h index 7cd42edf..b7971c00 100644 --- a/product/src/application/trigger_api/CRdbNetBase.h +++ b/product/src/application/trigger_api/CRdbNetBase.h @@ -5,7 +5,7 @@ namespace kbd_application { - using namespace kbd_dbms; + using namespace iot_dbms; class CRdbNetBase { public: @@ -13,12 +13,12 @@ namespace kbd_application { virtual ~CRdbNetBase(); virtual void connect(int nDomainID, int nAppID) = 0; - virtual bool query(kbd_idlfile::RdbQuery& objQuery, - kbd_idlfile::RdbRet& objRet, + virtual bool query(iot_idl::RdbQuery& objQuery, + iot_idl::RdbRet& objRet, bool asyn = false) = 0; virtual bool getRet( - kbd_idlfile::RdbRet* const objRet) = 0; + iot_idl::RdbRet* const objRet) = 0; virtual bool lock(const std::string& tablename) = 0; virtual bool unLock(const std::string& tablename) = 0; diff --git a/product/src/application/trigger_api/CRdbNetInterface.cpp b/product/src/application/trigger_api/CRdbNetInterface.cpp index 7a199647..bcc979fb 100644 --- a/product/src/application/trigger_api/CRdbNetInterface.cpp +++ b/product/src/application/trigger_api/CRdbNetInterface.cpp @@ -17,15 +17,15 @@ void CRdbNetInterface::connect(int nDomainID, int nAppID) } bool CRdbNetInterface::query( - kbd_idlfile::RdbQuery& objQuery, - kbd_idlfile::RdbRet& objRet, + iot_idl::RdbQuery& objQuery, + iot_idl::RdbRet& objRet, bool asyn /*= false*/) { return m_objCRdbNetApi.query(objQuery, objRet, asyn); } bool CRdbNetInterface::getRet( - kbd_idlfile::RdbRet* const objRet) + iot_idl::RdbRet* const objRet) { return m_objCRdbNetApi.getRet(objRet); } diff --git a/product/src/application/trigger_api/CRdbNetInterface.h b/product/src/application/trigger_api/CRdbNetInterface.h index b65427e3..55f58d9c 100644 --- a/product/src/application/trigger_api/CRdbNetInterface.h +++ b/product/src/application/trigger_api/CRdbNetInterface.h @@ -9,12 +9,12 @@ namespace kbd_application { ~CRdbNetInterface(); void connect(int nDomainID, int nAppID); - bool query(kbd_idlfile::RdbQuery& objQuery, - kbd_idlfile::RdbRet& objRet, + bool query(iot_idl::RdbQuery& objQuery, + iot_idl::RdbRet& objRet, bool asyn = false); bool getRet( - kbd_idlfile::RdbRet* const objRet); + iot_idl::RdbRet* const objRet); bool lock(const std::string& tablename); bool unLock(const std::string& tablename); diff --git a/product/src/application/trigger_api/CRdbNetThread.cpp b/product/src/application/trigger_api/CRdbNetThread.cpp index 60241374..746291dc 100644 --- a/product/src/application/trigger_api/CRdbNetThread.cpp +++ b/product/src/application/trigger_api/CRdbNetThread.cpp @@ -65,13 +65,13 @@ void CRdbNetThread::execute() bool CRdbNetThread::queryDotTable() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; try { std::string tagName("tag_name"); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename(m_tableInfo.tableName); std::string *pColName = msgQuery.add_strselectcolnamearr(); *pColName = tagName; @@ -85,7 +85,7 @@ bool CRdbNetThread::queryDotTable() DotInfoMap::iterator dotListIter = m_dotList.begin(); for (; dotListIter != m_dotList.end(); ++dotListIter) { - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondOr); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname(tagName); @@ -98,7 +98,7 @@ bool CRdbNetThread::queryDotTable() m_rdbNet.connect(m_tableInfo.domainId, m_tableInfo.appId); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (!m_rdbNet.query(msgQuery, retMsg,false)) { LOGERROR("query failed table:[%s] domain[%d] loacation[%d] appid[%d] subsystem[%d] ", @@ -121,11 +121,11 @@ bool CRdbNetThread::queryDotTable() } bool CRdbNetThread::queryDotTableRet( - kbd_idlfile::RdbRet& retMsg) + iot_idl::RdbRet& retMsg) { std::string& tableName = m_tableInfo.tableName; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; bool bRet = false; std::string keyTag; diff --git a/product/src/application/trigger_api/CRdbNetThread.h b/product/src/application/trigger_api/CRdbNetThread.h index 83594db3..b440ad56 100644 --- a/product/src/application/trigger_api/CRdbNetThread.h +++ b/product/src/application/trigger_api/CRdbNetThread.h @@ -10,12 +10,12 @@ namespace kbd_application { - using namespace kbd_dbms; - using namespace kbd_service; + using namespace iot_dbms; + using namespace iot_service; class CDotTableMngr; - class CRdbNetThread : public kbd_public::CTimerThreadBase + class CRdbNetThread : public iot_public::CTimerThreadBase { public: CRdbNetThread( @@ -33,7 +33,7 @@ namespace kbd_application { //接收点表查询回复 bool queryDotTableRet( - kbd_idlfile::RdbRet& retMsg); + iot_idl::RdbRet& retMsg); private: CDataProcessApiPtr m_ptrDpApi; diff --git a/product/src/application/trigger_api/CTagAnalysiser.cpp b/product/src/application/trigger_api/CTagAnalysiser.cpp index d1a3009f..082aaa8d 100644 --- a/product/src/application/trigger_api/CTagAnalysiser.cpp +++ b/product/src/application/trigger_api/CTagAnalysiser.cpp @@ -6,11 +6,11 @@ #include "service/data_process_api/DataProcessApi.h" using namespace kbd_application; -using namespace kbd_service; +using namespace iot_service; CTagAnalysiser::CTagAnalysiser() { - kbd_public::createSysInfoInstance(m_objSysinf); + iot_public::createSysInfoInstance(m_objSysinf); } CTagAnalysiser::~CTagAnalysiser() @@ -24,7 +24,7 @@ CTagAnalysiser::~CTagAnalysiser() STableInfo* CTagAnalysiser::analysisTagName(const std::string& tagName) { - using namespace kbd_public; + using namespace iot_public; try { if (!m_objSysinf) diff --git a/product/src/application/trigger_api/CTagAnalysiser.h b/product/src/application/trigger_api/CTagAnalysiser.h index 1da98879..d197441d 100644 --- a/product/src/application/trigger_api/CTagAnalysiser.h +++ b/product/src/application/trigger_api/CTagAnalysiser.h @@ -16,7 +16,7 @@ namespace kbd_application { STableInfo* analysisTagName(const std::string& tagName); private: - kbd_public::CSysInfoInterfacePtr m_objSysinf; + iot_public::CSysInfoInterfacePtr m_objSysinf; }; } diff --git a/product/src/application/trigger_api/CTestRdbNet.cpp b/product/src/application/trigger_api/CTestRdbNet.cpp index 6ab2fa0d..38b9dc33 100644 --- a/product/src/application/trigger_api/CTestRdbNet.cpp +++ b/product/src/application/trigger_api/CTestRdbNet.cpp @@ -20,8 +20,8 @@ void CTestRdbNet::connect(int nDomainID, int nAppID) } bool CTestRdbNet::query( - kbd_idlfile::RdbQuery& objQuery, - kbd_idlfile::RdbRet& objRet, bool asyn /*= false*/) + iot_idl::RdbQuery& objQuery, + iot_idl::RdbRet& objRet, bool asyn /*= false*/) { boost::ignore_unused(objQuery); boost::ignore_unused(objRet); @@ -29,7 +29,7 @@ bool CTestRdbNet::query( return true; } -bool CTestRdbNet::getRet(kbd_idlfile::RdbRet * const objRet) +bool CTestRdbNet::getRet(iot_idl::RdbRet * const objRet) { boost::ignore_unused(objRet); return false; diff --git a/product/src/application/trigger_api/CTestRdbNet.h b/product/src/application/trigger_api/CTestRdbNet.h index ac79acce..5768a2bb 100644 --- a/product/src/application/trigger_api/CTestRdbNet.h +++ b/product/src/application/trigger_api/CTestRdbNet.h @@ -11,11 +11,11 @@ namespace kbd_application { ~CTestRdbNet(); void connect(int nDomainID, int nAppID); - bool query(kbd_idlfile::RdbQuery& objQuery, - kbd_idlfile::RdbRet& objRet, + bool query(iot_idl::RdbQuery& objQuery, + iot_idl::RdbRet& objRet, bool asyn = false); bool getRet( - kbd_idlfile::RdbRet* const objRet); + iot_idl::RdbRet* const objRet); bool lock(const std::string& tablename); bool unLock(const std::string& tablename); diff --git a/product/src/application/trigger_api/CTriggerApiImpl.cpp b/product/src/application/trigger_api/CTriggerApiImpl.cpp index 9add8b4c..9ceb0d30 100644 --- a/product/src/application/trigger_api/CTriggerApiImpl.cpp +++ b/product/src/application/trigger_api/CTriggerApiImpl.cpp @@ -102,8 +102,8 @@ CTriggerNode* CTriggerApiImpl::findNode(const CTriggerPara* param) void CTriggerApiImpl::execute() { //把当前执行时间先取出来,避免定时错误 - uint64 curExeTime = (uint64)kbd_public::getUTCTimeSec(); - uint64 curElapseTime = (uint64)kbd_public::getMonotonicMsec() / 1000; + uint64 curExeTime = (uint64)iot_public::getUTCTimeSec(); + uint64 curElapseTime = (uint64)iot_public::getMonotonicMsec() / 1000; m_rdbAccess.openRdb(m_nAppId); diff --git a/product/src/application/trigger_api/CTriggerApiImpl.h b/product/src/application/trigger_api/CTriggerApiImpl.h index 3bb51ff5..aa09f2bc 100644 --- a/product/src/application/trigger_api/CTriggerApiImpl.h +++ b/product/src/application/trigger_api/CTriggerApiImpl.h @@ -26,7 +26,7 @@ namespace kbd_application { }; class CTriggerApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CTriggerApiImpl(const STriggerInitParam& param); diff --git a/product/src/application/trigger_api/CTriggerNode.cpp b/product/src/application/trigger_api/CTriggerNode.cpp index bfa7bb3c..4d483deb 100644 --- a/product/src/application/trigger_api/CTriggerNode.cpp +++ b/product/src/application/trigger_api/CTriggerNode.cpp @@ -25,8 +25,8 @@ uint64 CTriggerNode::getLastTgRealExeTime(uint64 curExeTime, uint64 curElapseTim { if (curExeTime == 0 && curElapseTime == 0) { - curExeTime = (uint64)kbd_public::getUTCTimeSec(); - curElapseTime = (uint64)kbd_public::getMonotonicMsec() / 1000; + curExeTime = (uint64)iot_public::getUTCTimeSec(); + curElapseTime = (uint64)iot_public::getMonotonicMsec() / 1000; } return curExeTime - (curElapseTime - m_nLastTgElapseTime); } @@ -87,8 +87,8 @@ CTriggerPara::TRIGGER_TYPE CTriggerNode::getTriggerType() const void CTriggerNode::setIgnoreTime(uint64 time) { - uint64 curExeTime = (uint64)kbd_public::getUTCTimeSec(); - uint64 curElapseTime = (uint64)kbd_public::getMonotonicMsec() / 1000; + uint64 curExeTime = (uint64)iot_public::getUTCTimeSec(); + uint64 curElapseTime = (uint64)iot_public::getMonotonicMsec() / 1000; m_ignoreElapseTime = curElapseTime - (curExeTime-time); } diff --git a/product/src/application/trigger_api/CTriggerNodeCondition.cpp b/product/src/application/trigger_api/CTriggerNodeCondition.cpp index 6b575f36..126d212e 100644 --- a/product/src/application/trigger_api/CTriggerNodeCondition.cpp +++ b/product/src/application/trigger_api/CTriggerNodeCondition.cpp @@ -213,7 +213,7 @@ bool CTriggerNodeCondition::triggerChange( //bRet == true,n==1; CTriggerNodeCondition::NODE_STATE CTriggerNodeCondition::getCurNodeState() { - using namespace kbd_public; + using namespace iot_public; try { CLuaEngineInterface objLua; diff --git a/product/src/application/trigger_api/CTriggerNodePeriod.cpp b/product/src/application/trigger_api/CTriggerNodePeriod.cpp index 3c18f52a..8e426059 100644 --- a/product/src/application/trigger_api/CTriggerNodePeriod.cpp +++ b/product/src/application/trigger_api/CTriggerNodePeriod.cpp @@ -101,7 +101,7 @@ void CTriggerNodePeriod::parseTime( int& nMinute, int& second) { - using namespace kbd_public; + using namespace iot_public; LOCALTIME ltExeTime = convertUTCSecToLocalTime(exeTime); nYear = ltExeTime.wYear; diff --git a/product/src/application/video_server/VideoMsgBusMng.cpp b/product/src/application/video_server/VideoMsgBusMng.cpp index 409300c1..2c52a3a7 100644 --- a/product/src/application/video_server/VideoMsgBusMng.cpp +++ b/product/src/application/video_server/VideoMsgBusMng.cpp @@ -4,11 +4,11 @@ #include "VideoCommon.h" #include "pub_logger_api/logger.h" using namespace std; -using namespace kbd_public; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_net; using namespace kbd_application; -VideoMsgBusMng::VideoMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo) +VideoMsgBusMng::VideoMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { @@ -58,7 +58,7 @@ int VideoMsgBusMng::unsub() return kbdSuccess; } -bool VideoMsgBusMng::recvMsg(kbd_net::CMbMessage &objMsg, int nTimeoutMsec) +bool VideoMsgBusMng::recvMsg(iot_net::CMbMessage &objMsg, int nTimeoutMsec) { return m_objCommon.recvMsg(objMsg,nTimeoutMsec); } diff --git a/product/src/application/video_server/VideoMsgBusMng.h b/product/src/application/video_server/VideoMsgBusMng.h index 0b0bc3d8..094b2051 100644 --- a/product/src/application/video_server/VideoMsgBusMng.h +++ b/product/src/application/video_server/VideoMsgBusMng.h @@ -10,17 +10,17 @@ namespace kbd_application class VideoMsgBusMng { public: - VideoMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo); + VideoMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~VideoMsgBusMng(); int initialize(); int sub(); int unsub(); - bool recvMsg(kbd_net::CMbMessage &objMsg,int nTimeoutMsec = 0); - bool replyMsg(kbd_net::CMbMessage &msgSend, const kbd_net::CMbMessage &msgSrc); + bool recvMsg(iot_net::CMbMessage &objMsg,int nTimeoutMsec = 0); + bool replyMsg(iot_net::CMbMessage &msgSend, const iot_net::CMbMessage &msgSrc); std::string getCommunicatorName(); private: - kbd_net::CMbCommunicator m_objCommon; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_net::CMbCommunicator m_objCommon; + iot_public::SRunAppInfo m_stRunAppInfo; }; typedef boost::shared_ptr VAMsgBusMngPtr; } diff --git a/product/src/application/video_server/VideoMsgRecvThread.cpp b/product/src/application/video_server/VideoMsgRecvThread.cpp index 9d58fe60..383a1dbd 100644 --- a/product/src/application/video_server/VideoMsgRecvThread.cpp +++ b/product/src/application/video_server/VideoMsgRecvThread.cpp @@ -2,11 +2,11 @@ #include "VideoCommon.h" #include "pub_logger_api/logger.h" using namespace kbd_application; -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_public; -VideoMsgRecvThread::VideoMsgRecvThread(kbd_public::SRunAppInfo stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue): +VideoMsgRecvThread::VideoMsgRecvThread(iot_public::SRunAppInfo stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue): CTimerThreadBase("VideoOnvifDataThread",5) { m_ptrPacketQueue = ptrPacketQueue ; @@ -92,7 +92,7 @@ void VideoMsgRecvThread::processMessage(const CMbMessage &objMsg) void VideoMsgRecvThread::processFbdCtl(const CMbMessage &objMsg) { - ::kbd_idlfile::SVideoControlRequest pkg; + ::iot_idl::SVideoControlRequest pkg; if(pkg.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { if(pkg.nappid() == m_stRunAppInfo.nAppId) @@ -104,7 +104,7 @@ void VideoMsgRecvThread::processFbdCtl(const CMbMessage &objMsg) void VideoMsgRecvThread::processOtherCtl(const CMbMessage &objMsg) { - ::kbd_idlfile::SVideoControlRequest pkg; + ::iot_idl::SVideoControlRequest pkg; if(pkg.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { if(pkg.nappid() == m_stRunAppInfo.nAppId) @@ -116,7 +116,7 @@ void VideoMsgRecvThread::processOtherCtl(const CMbMessage &objMsg) void VideoMsgRecvThread::processHmiCtl(const CMbMessage &objMsg) { - ::kbd_idlfile::SVideoControlRequest pkg; + ::iot_idl::SVideoControlRequest pkg; if(pkg.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { if(pkg.nappid() == m_stRunAppInfo.nAppId) diff --git a/product/src/application/video_server/VideoMsgRecvThread.h b/product/src/application/video_server/VideoMsgRecvThread.h index c19b695e..5fa28239 100644 --- a/product/src/application/video_server/VideoMsgRecvThread.h +++ b/product/src/application/video_server/VideoMsgRecvThread.h @@ -10,13 +10,13 @@ #include "VideoControlMessage.pb.h" namespace kbd_application { -class VideoMsgRecvThread : public kbd_public::CTimerThreadBase +class VideoMsgRecvThread : public iot_public::CTimerThreadBase { public: - VideoMsgRecvThread(kbd_public::SRunAppInfo stRunAppInfo,VideoPacketQueuePtr ptrPacketQueue); + VideoMsgRecvThread(iot_public::SRunAppInfo stRunAppInfo,VideoPacketQueuePtr ptrPacketQueue); virtual ~VideoMsgRecvThread(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; kbd_application::VAMsgBusMngPtr m_ptrVAMsgbusMng; VideoPacketQueuePtr m_ptrPacketQueue; //消息缓存类 public: @@ -34,11 +34,11 @@ public: @brief 业务处理函数，必须继承实现自己的业务逻辑 */ virtual void execute() ; - void processMessage(const kbd_net::CMbMessage &objMsg); - void processHmiCtl(const kbd_net::CMbMessage &objMsg); - void processFbdCtl(const kbd_net::CMbMessage &objMsg); - void processOtherCtl(const kbd_net::CMbMessage &objMsg); - void deal(kbd_idlfile::SVideoControlRequest &pkg); + void processMessage(const iot_net::CMbMessage &objMsg); + void processHmiCtl(const iot_net::CMbMessage &objMsg); + void processFbdCtl(const iot_net::CMbMessage &objMsg); + void processOtherCtl(const iot_net::CMbMessage &objMsg); + void deal(iot_idl::SVideoControlRequest &pkg); }; typedef boost::shared_ptr VideoMsgRecvThreadPtr; } diff --git a/product/src/application/video_server/VideoOnvifDataThread.cpp b/product/src/application/video_server/VideoOnvifDataThread.cpp index bc155874..524992a1 100644 --- a/product/src/application/video_server/VideoOnvifDataThread.cpp +++ b/product/src/application/video_server/VideoOnvifDataThread.cpp @@ -4,7 +4,7 @@ #include "VideoCommon.h" #include "../include/application/OnvifLibs/onvif.h" using namespace kbd_application; -using namespace kbd_public; +using namespace iot_public; kbd_application::VideoOnvifDataThread::VideoOnvifDataThread(SRunAppInfo stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue): CTimerThreadBase("VideoMsgRecvThread",2000) { @@ -46,7 +46,7 @@ void VideoOnvifDataThread::afterResume() void VideoOnvifDataThread::execute() { - int64 nTime64 =kbd_public::getUTCTimeSec(); + int64 nTime64 =iot_public::getUTCTimeSec(); if(nTime64-m_nTime64 > LOAD_RDBDATA_TIME) { loadCameraInfo(); @@ -57,7 +57,7 @@ void VideoOnvifDataThread::execute() void VideoOnvifDataThread::loadCameraInfo() { - m_nTime64 = kbd_public::getUTCTimeSec(); + m_nTime64 = iot_public::getUTCTimeSec(); if(kbdSuccess != m_ptrRtdbOpt->getVideoCameraInfoAllRecord(m_vecCameraInfo)) { LOGERROR("获取内存库摄像机信息失败!"); diff --git a/product/src/application/video_server/VideoOnvifDataThread.h b/product/src/application/video_server/VideoOnvifDataThread.h index fbd683d1..ef031334 100644 --- a/product/src/application/video_server/VideoOnvifDataThread.h +++ b/product/src/application/video_server/VideoOnvifDataThread.h @@ -7,13 +7,13 @@ #include "VideoRtdbTableOpt.h" namespace kbd_application { -class VideoOnvifDataThread : public kbd_public::CTimerThreadBase +class VideoOnvifDataThread : public iot_public::CTimerThreadBase { public: - VideoOnvifDataThread(kbd_public::SRunAppInfo stRunAppInfo,VideoPacketQueuePtr ptrPacketQueue); + VideoOnvifDataThread(iot_public::SRunAppInfo stRunAppInfo,VideoPacketQueuePtr ptrPacketQueue); virtual ~VideoOnvifDataThread(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; VideoPacketQueuePtr m_ptrPacketQueue; //消息缓存类 VideoRtdbTableOptPtr m_ptrRtdbOpt; public: diff --git a/product/src/application/video_server/VideoOrientationTable.h b/product/src/application/video_server/VideoOrientationTable.h index 30355464..5594d469 100644 --- a/product/src/application/video_server/VideoOrientationTable.h +++ b/product/src/application/video_server/VideoOrientationTable.h @@ -24,5 +24,5 @@ namespace kbd_application } }STableOrientation,*PSTableOrientation; -} //namespace kbd_service +} //namespace iot_service #endif // VIDEOORIENTATIONTABLE_H diff --git a/product/src/application/video_server/VideoPacketQueue.cpp b/product/src/application/video_server/VideoPacketQueue.cpp index ef4fa34b..b5d243dc 100644 --- a/product/src/application/video_server/VideoPacketQueue.cpp +++ b/product/src/application/video_server/VideoPacketQueue.cpp @@ -2,7 +2,7 @@ #include "pub_logger_api/logger.h" #include "VideoCommon.h" using namespace kbd_application; -using namespace kbd_public; +using namespace iot_public; VideoPacketQueue::VideoPacketQueue() { m_deqFbdAndOtherPkg.clear(); @@ -15,12 +15,12 @@ VideoPacketQueue::~VideoPacketQueue() m_deqHmiPkg.clear(); } -void VideoPacketQueue::addHmiCmdPkg(const kbd_net::CMbMessage &objMsg) +void VideoPacketQueue::addHmiCmdPkg(const iot_net::CMbMessage &objMsg) { m_deqHmiPkg.push_back(objMsg); } -void VideoPacketQueue::addFbdOrOtherCmdPkg(const kbd_net::CMbMessage objCmd) +void VideoPacketQueue::addFbdOrOtherCmdPkg(const iot_net::CMbMessage objCmd) { boost::mutex::scoped_lock lock(m_objMutex); if(m_deqFbdAndOtherPkg.size()>VIDEO_CTRL_MESS_MAX) @@ -31,7 +31,7 @@ void VideoPacketQueue::addFbdOrOtherCmdPkg(const kbd_net::CMbMessage objCmd) m_deqFbdAndOtherPkg.push_back(objCmd); } -bool VideoPacketQueue::getCmdPkg(std::deque &queCmdPkg) +bool VideoPacketQueue::getCmdPkg(std::deque &queCmdPkg) { queCmdPkg.clear(); if(!m_deqHmiPkg.empty()) diff --git a/product/src/application/video_server/VideoPacketQueue.h b/product/src/application/video_server/VideoPacketQueue.h index 41adcec5..86916b12 100644 --- a/product/src/application/video_server/VideoPacketQueue.h +++ b/product/src/application/video_server/VideoPacketQueue.h @@ -17,16 +17,16 @@ public: private: boost::mutex m_objMutex; boost::mutex m_objOnvif; - std::deque m_deqFbdAndOtherPkg; - std::deque m_deqHmiPkg; + std::deque m_deqFbdAndOtherPkg; + std::deque m_deqHmiPkg; std::map m_ipIfUsedMap; //此ip是否可用 std::map m_ipCameraMap; //ip和摄像头映射 std::map m_ipAddrMap; std::map m_ipProfileTokenMap; public: - void addHmiCmdPkg(const kbd_net::CMbMessage &objMsg); - void addFbdOrOtherCmdPkg(const kbd_net::CMbMessage objCmd); - bool getCmdPkg(std::deque &queFesCustCmdPkg); + void addHmiCmdPkg(const iot_net::CMbMessage &objMsg); + void addFbdOrOtherCmdPkg(const iot_net::CMbMessage objCmd); + bool getCmdPkg(std::deque &queFesCustCmdPkg); void addOnvifParam(const STableCameraInfo &st,const XAddr &addr,const std::string& profileToken); void delOnvifParam(const STableCameraInfo &st); diff --git a/product/src/application/video_server/VideoRtdbTableOpt.cpp b/product/src/application/video_server/VideoRtdbTableOpt.cpp index abe082e9..1d5ba628 100644 --- a/product/src/application/video_server/VideoRtdbTableOpt.cpp +++ b/product/src/application/video_server/VideoRtdbTableOpt.cpp @@ -1,8 +1,8 @@ #include "VideoRtdbTableOpt.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; kbd_application::VideoRtdbTableOpt::VideoRtdbTableOpt(const SRunAppInfo &stRunAppInfo): m_stRunAppInfo(stRunAppInfo) diff --git a/product/src/application/video_server/VideoRtdbTableOpt.h b/product/src/application/video_server/VideoRtdbTableOpt.h index 32b1d835..9c6eabc3 100644 --- a/product/src/application/video_server/VideoRtdbTableOpt.h +++ b/product/src/application/video_server/VideoRtdbTableOpt.h @@ -9,7 +9,7 @@ namespace kbd_application { class VideoRtdbTableOpt { public: - VideoRtdbTableOpt(const kbd_public::SRunAppInfo &stRunAppInfo); + VideoRtdbTableOpt(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~VideoRtdbTableOpt(); int initialize(); @@ -18,9 +18,9 @@ public: int getOrientationByTag(STableOrientation &vecOrientation,std::string strOrientationTag); int getVideoOrientationAllRecord(std::vector &vecOrientation); private: - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_dbms::CRdbAccessEx m_objCameraTable; - kbd_dbms::CRdbAccessEx m_objOrientationTable; + iot_public::SRunAppInfo m_stRunAppInfo; + iot_dbms::CRdbAccessEx m_objCameraTable; + iot_dbms::CRdbAccessEx m_objOrientationTable; }; typedef boost::shared_ptr VideoRtdbTableOptPtr; } diff --git a/product/src/application/video_server/VideoServerApp.cpp b/product/src/application/video_server/VideoServerApp.cpp index 62b797e6..c7edb846 100644 --- a/product/src/application/video_server/VideoServerApp.cpp +++ b/product/src/application/video_server/VideoServerApp.cpp @@ -5,10 +5,10 @@ #include "VideoCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; using namespace kbd_application; -using namespace kbd_net; +using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" diff --git a/product/src/application/video_server/VideoServerApp.h b/product/src/application/video_server/VideoServerApp.h index b84bbc8a..d6444272 100644 --- a/product/src/application/video_server/VideoServerApp.h +++ b/product/src/application/video_server/VideoServerApp.h @@ -8,7 +8,7 @@ #include "VideoServerMng.h" namespace kbd_application { -class VideoServerApp : public kbd_public::CBaseService,public kbd_sys::CProcessQuitInterface +class VideoServerApp : public iot_public::CBaseService,public iot_sys::CProcessQuitInterface { public: VideoServerApp(); @@ -28,12 +28,12 @@ private: private: std::string m_strUniqueName; //标识名 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; //冗余管理类 VideoServerMngPtr m_ptrVSMng; //视频报警服务管理类 }; } diff --git a/product/src/application/video_server/VideoServerMng.cpp b/product/src/application/video_server/VideoServerMng.cpp index a6b0cf6a..8050ae72 100644 --- a/product/src/application/video_server/VideoServerMng.cpp +++ b/product/src/application/video_server/VideoServerMng.cpp @@ -2,7 +2,7 @@ using namespace kbd_application; -VideoServerMng::VideoServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +VideoServerMng::VideoServerMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrVAServerThread(NULL) diff --git a/product/src/application/video_server/VideoServerMng.h b/product/src/application/video_server/VideoServerMng.h index a73d3a5b..86e4607a 100644 --- a/product/src/application/video_server/VideoServerMng.h +++ b/product/src/application/video_server/VideoServerMng.h @@ -11,17 +11,17 @@ #include "VideoOnvifDataThread.h" namespace kbd_application { -class VideoServerMng : public kbd_sys::CRedundantSwitchInterface +class VideoServerMng : public iot_sys::CRedundantSwitchInterface { public: - VideoServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + VideoServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); ~VideoServerMng(); virtual int redundantSwitch(bool bMaster, bool bSlave); int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 VideoMsgRecvThreadPtr m_ptrMsgThread; VideoOnvifDataThreadPtr m_ptrOnvifDataThread; //onvif 摄像头信息获取线程 VideoPacketQueuePtr m_ptrMsgQueue; diff --git a/product/src/application/video_server/VideoServerThread.cpp b/product/src/application/video_server/VideoServerThread.cpp index fe0953e7..485f65cb 100644 --- a/product/src/application/video_server/VideoServerThread.cpp +++ b/product/src/application/video_server/VideoServerThread.cpp @@ -7,13 +7,13 @@ #include "pub_logger_api/logger.h" #include "VideoCommon.h" #include "../include/application/OnvifLibs/onvif.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; using namespace kbd_application; -VideoServerThread::VideoServerThread(const kbd_public::SRunAppInfo &stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue) - :kbd_public::CTimerThreadBase("VideoServerThread",20), +VideoServerThread::VideoServerThread(const iot_public::SRunAppInfo &stRunAppInfo, VideoPacketQueuePtr ptrPacketQueue) + :iot_public::CTimerThreadBase("VideoServerThread",20), m_stRunAppInfo(stRunAppInfo), m_ptrVAMsgbusMng(NULL) { @@ -71,15 +71,15 @@ void VideoServerThread::execute() void VideoServerThread::reject() { - std::deque deqCmdPkg; - uint64 nTime = kbd_public::getUTCTimeMsec(); + std::deque deqCmdPkg; + uint64 nTime = iot_public::getUTCTimeMsec(); if(m_ptrPacketQueue->getCmdPkg(deqCmdPkg)) { m_ptrPacketQueue->getOnvifParam(m_ipIfUsedMap,m_ipCameraMap,m_ipAddrMap,m_ipProfileTokenMap); - std::deque::iterator it =deqCmdPkg.begin(); + std::deque::iterator it =deqCmdPkg.begin(); for( ;it!=deqCmdPkg.end();++it) { - ::kbd_idlfile::SVideoControlRequest pkg; + ::iot_idl::SVideoControlRequest pkg; if(pkg.ParseFromArray((*it).getDataPtr(),(int)(*it).getDataSize())) { if(nTime-pkg.ultime() > 1*60*1000) @@ -186,7 +186,7 @@ void VideoServerThread::dealMove(const SVideoControlRequest &cmdPkg, const CMbMe } -void VideoServerThread::dealStop(const ::kbd_idlfile::SVideoControlRequest &cmdPkg, const kbd_net::CMbMessage &) +void VideoServerThread::dealStop(const ::iot_idl::SVideoControlRequest &cmdPkg, const iot_net::CMbMessage &) { LOGDEBUG("dealStop()"); int nresult = 0; @@ -312,22 +312,22 @@ void VideoServerThread::dealGotoPreset(const SVideoControlRequest &cmdPkg, const } } -void VideoServerThread::VideoSendMess(const kbd_net::CMbMessage &cmdMsg, int nresult, std::string &strretresult) +void VideoServerThread::VideoSendMess(const iot_net::CMbMessage &cmdMsg, int nresult, std::string &strretresult) { - ::kbd_idlfile::SVideoControlResponse videoControlResponse; + ::iot_idl::SVideoControlResponse videoControlResponse; std::string respStr; videoControlResponse.set_strsourcetag(CN_ProcName_VideoServer); videoControlResponse.set_nissuccess(nresult); videoControlResponse.set_content(strretresult); - videoControlResponse.set_ultime(kbd_public::getUTCTimeMsec()); + videoControlResponse.set_ultime(iot_public::getUTCTimeMsec()); videoControlResponse.SerializeToString(&respStr); if (respStr.empty()) { LOGERROR("生成控制命令失败"); } - kbd_net::CMbMessage objMsg( respStr, m_stRunAppInfo.nAppId, CH_VIDEO_CTRL_TO_APP_UP, ::kbd_idlfile::MT_VIDEO_CONTROL_MSG_RESPONSE); + iot_net::CMbMessage objMsg( respStr, m_stRunAppInfo.nAppId, CH_VIDEO_CTRL_TO_APP_UP, ::iot_idl::MT_VIDEO_CONTROL_MSG_RESPONSE); if ( !objMsg.isValid()) { LOGERROR( "构造CMbMessage失败" ); diff --git a/product/src/application/video_server/VideoServerThread.h b/product/src/application/video_server/VideoServerThread.h index 26390a49..9988e206 100644 --- a/product/src/application/video_server/VideoServerThread.h +++ b/product/src/application/video_server/VideoServerThread.h @@ -11,10 +11,10 @@ #include "VideoPacketQueue.h" namespace kbd_application { -class VideoServerThread : public kbd_public::CTimerThreadBase +class VideoServerThread : public iot_public::CTimerThreadBase { public: - VideoServerThread(const kbd_public::SRunAppInfo &stRunAppInfo,VideoPacketQueuePtr ptrPacketQueue); + VideoServerThread(const iot_public::SRunAppInfo &stRunAppInfo,VideoPacketQueuePtr ptrPacketQueue); virtual ~VideoServerThread(); int initialize(); /* @@ -30,14 +30,14 @@ public: */ virtual void execute(); void reject(); - void deal(const ::kbd_idlfile::SVideoControlRequest &pkg,const kbd_net::CMbMessage &cmdMsg); - void dealMove(const ::kbd_idlfile::SVideoControlRequest &cmdPkg, const kbd_net::CMbMessage &); - void dealStop(const ::kbd_idlfile::SVideoControlRequest &cmdPkg,const kbd_net::CMbMessage &); - void dealGotoPreset(const ::kbd_idlfile::SVideoControlRequest &cmdPkg,const kbd_net::CMbMessage &); + void deal(const ::iot_idl::SVideoControlRequest &pkg,const iot_net::CMbMessage &cmdMsg); + void dealMove(const ::iot_idl::SVideoControlRequest &cmdPkg, const iot_net::CMbMessage &); + void dealStop(const ::iot_idl::SVideoControlRequest &cmdPkg,const iot_net::CMbMessage &); + void dealGotoPreset(const ::iot_idl::SVideoControlRequest &cmdPkg,const iot_net::CMbMessage &); - void VideoSendMess(const kbd_net::CMbMessage &cmdMsg, int nresult, std::string &strretresult); + void VideoSendMess(const iot_net::CMbMessage &cmdMsg, int nresult, std::string &strretresult); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 VAMsgBusMngPtr m_ptrVAMsgbusMng; VideoRtdbTableOptPtr m_ptrRtdbOpt; STableCameraInfo m_cameraInfo; diff --git a/product/src/application/wave_record_server/wave_recordApp.cpp b/product/src/application/wave_record_server/wave_recordApp.cpp index 51ef3782..1f2736e7 100644 --- a/product/src/application/wave_record_server/wave_recordApp.cpp +++ b/product/src/application/wave_record_server/wave_recordApp.cpp @@ -10,10 +10,10 @@ #include "wave_recordCommon.h" 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; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" diff --git a/product/src/application/wave_record_server/wave_recordApp.h b/product/src/application/wave_record_server/wave_recordApp.h index 252ebafb..38317f56 100644 --- a/product/src/application/wave_record_server/wave_recordApp.h +++ b/product/src/application/wave_record_server/wave_recordApp.h @@ -12,7 +12,7 @@ namespace kbd_app { - class CWave_recordApp : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface + class CWave_recordApp : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CWave_recordApp(); @@ -90,12 +90,12 @@ namespace kbd_app 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; //< 冗余管理类 CWareRecordPtr m_ptrSafetyDayMng; //< 安全天数服务管理类 }; diff --git a/product/src/application/wave_record_server/wave_recordMng.cpp b/product/src/application/wave_record_server/wave_recordMng.cpp index c0b13724..6a2cfc21 100644 --- a/product/src/application/wave_record_server/wave_recordMng.cpp +++ b/product/src/application/wave_record_server/wave_recordMng.cpp @@ -6,8 +6,8 @@ #include "wave_recordMng.h" #include "pub_logger_api/logger.h" -kbd_app::CWareRecprdMng::CWareRecprdMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +kbd_app::CWareRecprdMng::CWareRecprdMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrThread(NULL) diff --git a/product/src/application/wave_record_server/wave_recordMng.h b/product/src/application/wave_record_server/wave_recordMng.h index b8108ca4..dce37a99 100644 --- a/product/src/application/wave_record_server/wave_recordMng.h +++ b/product/src/application/wave_record_server/wave_recordMng.h @@ -10,11 +10,11 @@ namespace kbd_app { - class CWareRecprdMng : public kbd_sys::CRedundantSwitchInterface + class CWareRecprdMng : public iot_sys::CRedundantSwitchInterface { public: - CWareRecprdMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CWareRecprdMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CWareRecprdMng(); /* @@ -32,8 +32,8 @@ namespace kbd_app int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //< 进程管理访问库智能指针 CThreadPtr m_ptrThread; //< 定时更新安全天数线程 }; diff --git a/product/src/application/wave_record_server/wave_recordThread.cpp b/product/src/application/wave_record_server/wave_recordThread.cpp index bef679ad..705c3d09 100644 --- a/product/src/application/wave_record_server/wave_recordThread.cpp +++ b/product/src/application/wave_record_server/wave_recordThread.cpp @@ -21,19 +21,19 @@ -using namespace kbd_public; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_sys; using namespace std; -using namespace kbd_public; +using namespace iot_public; using namespace kbd_app; -using namespace kbd_dbms; -using namespace kbd_net; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_net; +using namespace iot_public; -kbd_app::CWareThread::CWareThread(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("CWareThread", 2000), +kbd_app::CWareThread::CWareThread(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("CWareThread", 2000), m_stRunAppInfo(stRunAppInfo) //m_ptrModelCommit(NULL) { @@ -93,7 +93,7 @@ void kbd_app::CWareThread::updateWare() QFile::remove(file); } //文件同步 - kbd_sys::FilesyncApi fileyncApi; + iot_sys::FilesyncApi fileyncApi; int index = lbFile.m_cfg.indexOf("/data/rec/"); if(index >0) diff --git a/product/src/application/wave_record_server/wave_recordThread.h b/product/src/application/wave_record_server/wave_recordThread.h index 98de64e9..0cbd3ca5 100644 --- a/product/src/application/wave_record_server/wave_recordThread.h +++ b/product/src/application/wave_record_server/wave_recordThread.h @@ -13,10 +13,10 @@ namespace kbd_app { - class CWareThread : public kbd_public::CTimerThreadBase + class CWareThread : public iot_public::CTimerThreadBase { public: - CWareThread(const kbd_public::SRunAppInfo &stRunAppInfo); + CWareThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CWareThread(); /* @@ -39,9 +39,9 @@ namespace kbd_app void updateWare(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 - //kbd_dbms::CRdbModelUpdatePtr m_ptrModelCommit; //< 模型提交 - //kbd_dbms::CRdbAccessEx m_objSafetyDayTable; //< safety_day内存表 + iot_public::SRunAppInfo m_stRunAppInfo; //< 本应用相关运行参数 + //iot_dbms::CRdbModelUpdatePtr m_ptrModelCommit; //< 模型提交 + //iot_dbms::CRdbAccessEx m_objSafetyDayTable; //< safety_day内存表 QFileInfoList getFileList(const QString &path); }; diff --git a/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp b/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp index 01bd502b..96fc1b64 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.cpp @@ -8,8 +8,8 @@ #include "almsendcommon.h" #include "boost/algorithm/string.hpp" -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; using namespace std; CXmAlmConfigThread::CXmAlmConfigThread() @@ -22,7 +22,7 @@ CXmAlmConfigThread::~CXmAlmConfigThread() } -int kbd_service::CXmAlmConfigThread::initialize() +int iot_service::CXmAlmConfigThread::initialize() { if(readConfig() == kbdFailed) { @@ -33,14 +33,14 @@ int kbd_service::CXmAlmConfigThread::initialize() } /** - * @brief kbd_service::CXmAlmConfigThread::readConfig + * @brief iot_service::CXmAlmConfigThread::readConfig * 读取两个配置文件 * @return */ -int kbd_service::CXmAlmConfigThread::readConfig() +int iot_service::CXmAlmConfigThread::readConfig() { - kbd_public::CCommonConfigParse objCfgParse; + iot_public::CCommonConfigParse objCfgParse; if(kbdSuccess != objCfgParse.load(CN_Alm_Send_Path,CN_Alm_Send_Config_File)) { LOGERROR("加载URL配置文件失败"); @@ -105,14 +105,14 @@ int kbd_service::CXmAlmConfigThread::readConfig() } /** - * @brief kbd_service::CXmAlmConfigThread::filterAlm + * @brief iot_service::CXmAlmConfigThread::filterAlm * 过滤告警 * @param locationName * @param devName * @param pointName * @return */ -bool kbd_service::CXmAlmConfigThread::filterAlm(const std::string &locationName, const std::string &devName, const std::string &pointName) +bool iot_service::CXmAlmConfigThread::filterAlm(const std::string &locationName, const std::string &devName, const std::string &pointName) { if(m_vecFileterTag.empty()) //如果没有填写过滤条件，就认为不做过滤，都返回true。这里可能有点奇怪 { @@ -129,12 +129,12 @@ bool kbd_service::CXmAlmConfigThread::filterAlm(const std::string &locationName, } /** - * @brief kbd_service::CXmAlmConfigThread::filterIp + * @brief iot_service::CXmAlmConfigThread::filterIp * 过滤ip * @param ip * @return */ -int kbd_service::CXmAlmConfigThread::filterIp(const std::string &ip) +int iot_service::CXmAlmConfigThread::filterIp(const std::string &ip) { if (m_vecFileterIp.empty()) //如果没有填写过滤条件，就认为不做过滤，都返回true。这里可能有点奇怪 { diff --git a/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.h b/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.h index fae04e62..dd69bb84 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.h +++ b/product/src/application/xm_alarm_send_server/CXmAlmConfigThread.h @@ -8,7 +8,7 @@ #include #include -namespace kbd_service{ +namespace iot_service{ class CXmAlmConfigThread { public: diff --git a/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp b/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp index 5177f02c..5aa6188b 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.cpp @@ -7,8 +7,8 @@ boost::mutex mut_rcv; -kbd_service::CXmAlmRcvThread::CXmAlmRcvThread(CXmAlmConfigThreadPtr ptrAlmConfigThread,std::vector *vecAlmSendThreadPtr): - kbd_service::CAlmApiForAlmClt(false), +iot_service::CXmAlmRcvThread::CXmAlmRcvThread(CXmAlmConfigThreadPtr ptrAlmConfigThread,std::vector *vecAlmSendThreadPtr): + iot_service::CAlmApiForAlmClt(false), m_ptrAlmConfigThread(ptrAlmConfigThread) { LOGDEBUG("CXmAlmRcvThread进入"); @@ -16,25 +16,25 @@ kbd_service::CXmAlmRcvThread::CXmAlmRcvThread(CXmAlmConfigThreadPtr ptrAlmConfig m_vecAlmSendThreadPtr = vecAlmSendThreadPtr; } -kbd_service::CXmAlmRcvThread::~CXmAlmRcvThread() +iot_service::CXmAlmRcvThread::~CXmAlmRcvThread() { LOGDEBUG("CXmAlmRcvThread::~CXmAlmRcvThread() 退出"); } -int kbd_service::CXmAlmRcvThread::initialize() +int iot_service::CXmAlmRcvThread::initialize() { return kbdSuccess; } //全同步的直接不处理 -void kbd_service::CXmAlmRcvThread::handleAllAlmMsg(int nDomainID, kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void iot_service::CXmAlmRcvThread::handleAllAlmMsg(int nDomainID, iot_idl::SAlmCltAddAlm &objAllAlm) { return; } -void kbd_service::CXmAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) +void iot_service::CXmAlmRcvThread::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) { int alm_size = objAddAlm.alm_info_size(); @@ -47,7 +47,7 @@ void kbd_service::CXmAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &o for(int i = 0; i < alm_size;++i) { - const ::kbd_idlfile::SAlmInfoToAlmClt & almCtlAlmInfo = objAddAlm.alm_info(i); + const ::iot_idl::SAlmInfoToAlmClt & almCtlAlmInfo = objAddAlm.alm_info(i); if(!almCtlAlmInfo.has_key_id_tag()) //根据key_id_tag对报警做过滤，如果没有key_id_tag，直接不要了 { continue; @@ -105,7 +105,7 @@ void kbd_service::CXmAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &o appIdTableKey = boost::join(appTableVec,":"); if(m_pMapAppTableToRdt.end() == m_pMapAppTableToRdt.find(appIdTableKey)) //如果这个应用下这个表未被打开 { - kbd_dbms::CRdbAccess * pRdbAccess = new kbd_dbms::CRdbAccess(); + iot_dbms::CRdbAccess * pRdbAccess = new iot_dbms::CRdbAccess(); if(pRdbAccess->open(appId,tableName.c_str())) //如果打开成功，就把这个表加入到map中 { m_pMapAppTableToRdt.insert({appIdTableKey,pRdbAccess}); @@ -116,7 +116,7 @@ void kbd_service::CXmAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &o continue; } } - kbd_dbms::CVarType var; + iot_dbms::CVarType var; vecDevTag = {vecKeyIdTagSplit[1],vecKeyIdTagSplit[2]}; //例如：qy1.dlq_a06 std::string devTag = boost::join(vecDevTag,"."); @@ -139,7 +139,7 @@ void kbd_service::CXmAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &o LOGDEBUG("收到告警，告警编号：%d", almInfoItem.alarmNo); } - for(std::map::iterator it = m_pMapAppTableToRdt.begin();m_pMapAppTableToRdt.end() != it ; ++it) + for(std::map::iterator it = m_pMapAppTableToRdt.begin();m_pMapAppTableToRdt.end() != it ; ++it) { if(NULL != it->second) { @@ -155,20 +155,20 @@ void kbd_service::CXmAlmRcvThread::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &o //这里的确认，删除均不做处理 -void kbd_service::CXmAlmRcvThread::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +void iot_service::CXmAlmRcvThread::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) { return; } //这里的确认，删除均不做处理 -void kbd_service::CXmAlmRcvThread::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +void iot_service::CXmAlmRcvThread::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) { return; } -void kbd_service::CXmAlmRcvThread::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objReleaseAlm) +void iot_service::CXmAlmRcvThread::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objReleaseAlm) { return; } @@ -176,9 +176,9 @@ void kbd_service::CXmAlmRcvThread::handleReleaseAlmMsg(kbd_idlfile::SAlmCltRelea -void kbd_service::CXmAlmRcvThread::convertUin64ToString(almTime* stAlmTime, const uint64 &time) +void iot_service::CXmAlmRcvThread::convertUin64ToString(almTime* stAlmTime, const uint64 &time) { - kbd_public::LOCALTIME locationTime = kbd_public::convertUTCMsecToLocalTime(time); + iot_public::LOCALTIME locationTime = iot_public::convertUTCMsecToLocalTime(time); //year std::string year = std::to_string(locationTime.wYear); stAlmTime->year = atoi(year.data()); diff --git a/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.h b/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.h index 61d6ea50..1d95d400 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.h +++ b/product/src/application/xm_alarm_send_server/CXmAlmRcvThread.h @@ -13,9 +13,9 @@ #include "CXmAlmConfigThread.h" #include -namespace kbd_service { +namespace iot_service { - class CXmAlmRcvThread : public kbd_service::CAlmApiForAlmClt + class CXmAlmRcvThread : public iot_service::CAlmApiForAlmClt { public: @@ -24,19 +24,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) ; void convertUin64ToString(almTime* stAlmTime,const uint64 &time); @@ -46,7 +46,7 @@ namespace kbd_service { int m_nAlmNo; //记录的最大报警ID //这个map的key是使用appId和表名使用冒号拼接的，例如 5:digital - std::map m_pMapAppTableToRdt; //不同的应用和表分别打开一个事实库指针 + std::map m_pMapAppTableToRdt; //不同的应用和表分别打开一个事实库指针 std::queue m_queueAlmInfo; //存储增加的报警信息queue std::vector *m_vecAlmSendThreadPtr; diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp b/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp index e03bbf2d..b437c3f0 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendApp.cpp @@ -11,7 +11,7 @@ #define OPT_DESC_HELP "help" -kbd_service::CXmAlmSendApp::CXmAlmSendApp(): +iot_service::CXmAlmSendApp::CXmAlmSendApp(): m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundantMng(NULL), @@ -20,12 +20,12 @@ kbd_service::CXmAlmSendApp::CXmAlmSendApp(): } -kbd_service::CXmAlmSendApp::~CXmAlmSendApp() +iot_service::CXmAlmSendApp::~CXmAlmSendApp() { stop(); } -bool kbd_service::CXmAlmSendApp::start(int argc, char *argv[], int &nStatus) +bool iot_service::CXmAlmSendApp::start(int argc, char *argv[], int &nStatus) { std::cout << "start" << std::endl; //1.解析启动参数 @@ -60,7 +60,7 @@ bool kbd_service::CXmAlmSendApp::start(int argc, char *argv[], int &nStatus) return false; } //6.创建冗余管理 - m_ptrRedundantMng = kbd_sys::getRedundantMngInstance(m_stRunAppInfo.nDomainId, + m_ptrRedundantMng = iot_sys::getRedundantMngInstance(m_stRunAppInfo.nDomainId, m_stRunAppInfo.nAppId, m_stRunAppInfo.strLocalNodeName); if(NULL == m_ptrRedundantMng) @@ -93,7 +93,7 @@ bool kbd_service::CXmAlmSendApp::start(int argc, char *argv[], int &nStatus) return true; } -bool kbd_service::CXmAlmSendApp::stop() +bool iot_service::CXmAlmSendApp::stop() { LOGINFO("stop"); //9.更新当前进程冗余状态 @@ -125,12 +125,12 @@ bool kbd_service::CXmAlmSendApp::stop() //3.检查重复启动 //2.销毁日志系统 LOGINFO("stop success3！"); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); //1.检查启动参数 return true; } -int kbd_service::CXmAlmSendApp::toQuit() +int iot_service::CXmAlmSendApp::toQuit() { LOGERROR("to Quit"); if(NULL != m_ptrProcMng) @@ -142,7 +142,7 @@ int kbd_service::CXmAlmSendApp::toQuit() return kbdSuccess; } -bool kbd_service::CXmAlmSendApp::parseCmdLine(int argc, char *argv[]) +bool iot_service::CXmAlmSendApp::parseCmdLine(int argc, char *argv[]) { //拼接参数 for(int i = 1; i < argc ; ++i) @@ -190,29 +190,29 @@ bool kbd_service::CXmAlmSendApp::parseCmdLine(int argc, char *argv[]) return true; } -void kbd_service::CXmAlmSendApp::showHelp(const boost::program_options::options_description &objDesc) +void iot_service::CXmAlmSendApp::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_AlmSendServer << "[-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_service::CXmAlmSendApp::isAlreadyRunning() +bool iot_service::CXmAlmSendApp::isAlreadyRunning() { m_strUniqueName.clear(); m_strUniqueName = CN_ProcName_AlmSendServer; m_strUniqueName += m_strStartArgs; - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strUniqueName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strUniqueName); } -bool kbd_service::CXmAlmSendApp::initLog() +bool iot_service::CXmAlmSendApp::initLog() { - kbd_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_AlmSendServer.c_str()); + iot_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_AlmSendServer.c_str()); return true; } -bool kbd_service::CXmAlmSendApp::getSystemInfo() +bool iot_service::CXmAlmSendApp::getSystemInfo() { - if(!kbd_public::createSysInfoInstance(m_ptrSysInfo)) + if(!iot_public::createSysInfoInstance(m_ptrSysInfo)) { LOGERROR("创建系统信息访问库失败"); return false; @@ -225,16 +225,16 @@ bool kbd_service::CXmAlmSendApp::getSystemInfo() return true; } -bool kbd_service::CXmAlmSendApp::registerToProcMng() +bool iot_service::CXmAlmSendApp::registerToProcMng() { - kbd_sys::SProcessInfoKey stProcKey; + iot_sys::SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; stProcKey.nAppId = m_stRunAppInfo.nAppId; stProcKey.strNodeName = m_stRunAppInfo.strLocalNodeName; stProcKey.strProcName = CN_ProcName_AlmSendServer; stProcKey.strProcParam = m_strStartArgs; - m_ptrProcMng = kbd_sys::getProcMngInstance(stProcKey); + m_ptrProcMng = iot_sys::getProcMngInstance(stProcKey); if(NULL == m_ptrProcMng) { LOGERROR("创建进程管理访问库失败"); @@ -248,9 +248,9 @@ bool kbd_service::CXmAlmSendApp::registerToProcMng() return true; } -bool kbd_service::CXmAlmSendApp::initialize() +bool iot_service::CXmAlmSendApp::initialize() { - if(!kbd_net::initMsgBus(CN_ProcName_AlmSendServer.c_str(),m_strUniqueName.c_str())) + if(!iot_net::initMsgBus(CN_ProcName_AlmSendServer.c_str(),m_strUniqueName.c_str())) { LOGERROR("初始化消息总线失败"); return false; @@ -270,14 +270,14 @@ bool kbd_service::CXmAlmSendApp::initialize() return true; } -bool kbd_service::CXmAlmSendApp::clean() +bool iot_service::CXmAlmSendApp::clean() { if (NULL != m_ptrAlmSendMng) { m_ptrAlmSendMng.reset(); } - if(!kbd_net::releaseMsgBus()) + if(!iot_net::releaseMsgBus()) { LOGERROR("销毁消息总线资源失败"); return false; diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendApp.h b/product/src/application/xm_alarm_send_server/CXmAlmSendApp.h index 62a3fdd3..06b2411a 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendApp.h +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendApp.h @@ -10,12 +10,12 @@ #include "boost/program_options.hpp" #include "CXmAlmSendMng.h" -namespace kbd_service { +namespace iot_service { - class CXmAlmSendApp : public kbd_public::CBaseService,public kbd_sys::CProcessQuitInterface + class CXmAlmSendApp : public iot_public::CBaseService,public iot_sys::CProcessQuitInterface { public: CXmAlmSendApp(); @@ -94,12 +94,12 @@ namespace kbd_service { private: std::string m_strUniqueName; 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_ptrRedundantMng; + iot_public::SNodeInfo m_stLocalNodeInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; CXmAlmSendMngPtr m_ptrAlmSendMng; }; diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp index c6896be1..21b431f7 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.cpp @@ -1,8 +1,8 @@ #include "CXmAlmSendMng.h" #include "pub_logger_api/logger.h" -kbd_service::CXmAlmSendMng::CXmAlmSendMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng): +iot_service::CXmAlmSendMng::CXmAlmSendMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng): m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrAlmRcvThread(NULL), @@ -11,7 +11,7 @@ kbd_service::CXmAlmSendMng::CXmAlmSendMng(const kbd_public::SRunAppInfo &stRunAp } -kbd_service::CXmAlmSendMng::~CXmAlmSendMng() +iot_service::CXmAlmSendMng::~CXmAlmSendMng() { LOGINFO("管理类析构"); @@ -34,7 +34,7 @@ kbd_service::CXmAlmSendMng::~CXmAlmSendMng() LOGINFO("管理类析构2"); } -int kbd_service::CXmAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_service::CXmAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) { LOGINFO("接收到冗余切换指令.Master=[%d],Slave=[%d]",bMaster,bSlave); @@ -61,7 +61,7 @@ int kbd_service::CXmAlmSendMng::redundantSwitch(bool bMaster, bool bSlave) return kbdSuccess; } -int kbd_service::CXmAlmSendMng::initialize() +int iot_service::CXmAlmSendMng::initialize() { m_ptrAlmConfigThread = boost::make_shared(); if(NULL == m_ptrAlmConfigThread) diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h index 19300265..c1aa6b75 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendMng.h @@ -10,11 +10,11 @@ #include "CXmAlmSocketThread.h" -namespace kbd_service { - class CXmAlmSendMng:public kbd_sys::CRedundantSwitchInterface +namespace iot_service { + class CXmAlmSendMng:public iot_sys::CRedundantSwitchInterface { public: - CXmAlmSendMng(const kbd_public::SRunAppInfo &stRunAppInfo,const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CXmAlmSendMng(const iot_public::SRunAppInfo &stRunAppInfo,const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CXmAlmSendMng(); @@ -26,8 +26,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; //进程管理访问库智能指针 CXmAlmRcvThreadPtr m_ptrAlmRcvThread; //报警接收的智能指针 CXmAlmSocketThreadPtr m_ptrAlmSocketThread; //报警socket的智能指 diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp b/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp index e9915d97..8dc40095 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp +++ b/product/src/application/xm_alarm_send_server/CXmAlmSendThread.cpp @@ -2,11 +2,11 @@ #include "pub_logger_api/logger.h" #include -kbd_service::CXmAlmSendThread::CXmAlmSendThread(CXmAlmConfigThreadPtr ptrAlmConfigThread, +iot_service::CXmAlmSendThread::CXmAlmSendThread(CXmAlmConfigThreadPtr ptrAlmConfigThread, std::vector *acceptSocketVec, SOCKET theSocket, char *recvIp): - kbd_public::CTimerThreadBase("AlmSendThread",500), + iot_public::CTimerThreadBase("AlmSendThread",500), m_ptrAlmConfigThread(ptrAlmConfigThread), m_socket(theSocket) { @@ -30,7 +30,7 @@ kbd_service::CXmAlmSendThread::CXmAlmSendThread(CXmAlmConfigThreadPtr ptrAlmConf } } -kbd_service::CXmAlmSendThread::~CXmAlmSendThread() +iot_service::CXmAlmSendThread::~CXmAlmSendThread() { free(m_TxBuf.pData); free(m_RxBuf.pData); @@ -43,7 +43,7 @@ kbd_service::CXmAlmSendThread::~CXmAlmSendThread() LOGDEBUG("~CXmAlmSendThread()"); } -void kbd_service::CXmAlmSendThread::execute() +void iot_service::CXmAlmSendThread::execute() { if(NULL != m_ptrAlmConfigThread) { @@ -52,12 +52,12 @@ void kbd_service::CXmAlmSendThread::execute() } } -int kbd_service::CXmAlmSendThread::initialize() +int iot_service::CXmAlmSendThread::initialize() { return kbdSuccess; } -void kbd_service::CXmAlmSendThread::socketProcess() +void iot_service::CXmAlmSendThread::socketProcess() { QDateTime dt = QDateTime::currentDateTime(); if(m_lastRecvTime != 0) @@ -75,7 +75,7 @@ void kbd_service::CXmAlmSendThread::socketProcess() TxData(); } -void kbd_service::CXmAlmSendThread::RxData() +void iot_service::CXmAlmSendThread::RxData() { int rtn, len; fd_set fdrSet; @@ -141,14 +141,14 @@ void kbd_service::CXmAlmSendThread::RxData() } /** - * @brief kbd_service::CXmAlmSendThread::WriteRxBufData + * @brief iot_service::CXmAlmSendThread::WriteRxBufData * * 写入接收缓冲区数据 * @param num 写入长度 * @param pData 写入数据区 * @return 实际写入数据长度 */ -int kbd_service::CXmAlmSendThread::WriteRxBufData(int num, byte *pData) +int iot_service::CXmAlmSendThread::WriteRxBufData(int num, byte *pData) { int tempLen = 0; @@ -183,14 +183,14 @@ int kbd_service::CXmAlmSendThread::WriteRxBufData(int num, byte *pData) } /** - * @brief kbd_service::CXmAlmSendThread::WriteTxBufData + * @brief iot_service::CXmAlmSendThread::WriteTxBufData * * 写入通道发送缓冲区数据 * @param num 写入长度 * @param pData 写入数据区 * @return 实际写入的长度 */ -int kbd_service::CXmAlmSendThread::WriteTxBufData(int num, byte *pData) +int iot_service::CXmAlmSendThread::WriteTxBufData(int num, byte *pData) { int tempLen = 0; @@ -224,7 +224,7 @@ int kbd_service::CXmAlmSendThread::WriteTxBufData(int num, byte *pData) return num; } -void kbd_service::CXmAlmSendThread::TxData() +void iot_service::CXmAlmSendThread::TxData() { int rtn, len; fd_set fdwSet; @@ -296,20 +296,20 @@ void kbd_service::CXmAlmSendThread::TxData() * 删除已读取通道发送缓冲区数据 * @param num 删除读取长度 */ -void kbd_service::CXmAlmSendThread::deleteReadTxBufData(int num) +void iot_service::CXmAlmSendThread::deleteReadTxBufData(int num) { m_TxBuf.Readx = (m_TxBuf.Readx+num)%m_ptrAlmConfigThread->m_maxTxSize; } /** - * @brief kbd_service::CXmAlmSendThread::ReadTxBufData + * @brief iot_service::CXmAlmSendThread::ReadTxBufData * * 读取发送缓冲区数据 * @param num 读取长度 * @param pData 读取数据区 * @return 实际读取的长度 */ -int kbd_service::CXmAlmSendThread::ReadTxBufData(int num, byte *pData) +int iot_service::CXmAlmSendThread::ReadTxBufData(int num, byte *pData) { int len,tempLen; @@ -342,7 +342,7 @@ int kbd_service::CXmAlmSendThread::ReadTxBufData(int num, byte *pData) * 读取通道接收缓冲区长度 * @return 收缓冲区长度 */ -int kbd_service::CXmAlmSendThread::GetRxBufSize() +int iot_service::CXmAlmSendThread::GetRxBufSize() { int len; @@ -350,7 +350,7 @@ int kbd_service::CXmAlmSendThread::GetRxBufSize() return len; } -void kbd_service::CXmAlmSendThread::alarmProcess() +void iot_service::CXmAlmSendThread::alarmProcess() { if (m_socket != INVALID_SOCKET) @@ -370,7 +370,7 @@ void kbd_service::CXmAlmSendThread::alarmProcess() } } -int kbd_service::CXmAlmSendThread::recvNetData() +int iot_service::CXmAlmSendThread::recvNetData() { int recvLen, ExpectLen; @@ -407,7 +407,7 @@ int kbd_service::CXmAlmSendThread::recvNetData() * 删除已读取通道接收缓冲区数据 * @param num 删除读取长度 */ -void kbd_service::CXmAlmSendThread::deleteReadRxBufData(int num) +void iot_service::CXmAlmSendThread::deleteReadRxBufData(int num) { m_RxBuf.Readx = (m_RxBuf.Readx+num)%m_ptrAlmConfigThread->m_maxRxSize; } @@ -420,7 +420,7 @@ void kbd_service::CXmAlmSendThread::deleteReadRxBufData(int num) * @param pData 读取数据区 * @return 实际读取数据长度 */ -int kbd_service::CXmAlmSendThread::ReadRxBufData(int num, uint8 *pData) +int iot_service::CXmAlmSendThread::ReadRxBufData(int num, uint8 *pData) { int len,tempLen; @@ -448,10 +448,10 @@ int kbd_service::CXmAlmSendThread::ReadRxBufData(int num, uint8 *pData) } /** - * @brief kbd_service::CXmAlmSendThread::recvDataProcess + * @brief iot_service::CXmAlmSendThread::recvDataProcess * 接收客户端数据 */ -void kbd_service::CXmAlmSendThread::recvDataProcess(uint8 *data) +void iot_service::CXmAlmSendThread::recvDataProcess(uint8 *data) { switch(data[0]) { @@ -469,11 +469,11 @@ void kbd_service::CXmAlmSendThread::recvDataProcess(uint8 *data) } /** - * @brief kbd_service::CXmAlmSendThread::sendCommonCmd + * @brief iot_service::CXmAlmSendThread::sendCommonCmd * 发送公共格式的命令 * @param type 发送类型 */ -void kbd_service::CXmAlmSendThread::sendCommonCmd(uint8 type) +void iot_service::CXmAlmSendThread::sendCommonCmd(uint8 type) { uint8 data[128]; int write = 0; @@ -489,11 +489,11 @@ void kbd_service::CXmAlmSendThread::sendCommonCmd(uint8 type) /** - * @brief kbd_service::CXmAlmSendThread::rcvAlarmConfirme + * @brief iot_service::CXmAlmSendThread::rcvAlarmConfirme * 接收处理告警确认 * @param data */ -void kbd_service::CXmAlmSendThread::rcvAlarmConfirme(uint8 *data) +void iot_service::CXmAlmSendThread::rcvAlarmConfirme(uint8 *data) { int alarmConfirmNo = (data[4]<<8)+data[5]; if(alarmConfirmNo == m_currentSendAlmNo) @@ -505,11 +505,11 @@ void kbd_service::CXmAlmSendThread::rcvAlarmConfirme(uint8 *data) } /** - * @brief kbd_service::CXmAlmSendThread::sendAlarmOverCmd + * @brief iot_service::CXmAlmSendThread::sendAlarmOverCmd * 上报告警结束 * @param data */ -void kbd_service::CXmAlmSendThread::sendAlarmOverCmd() +void iot_service::CXmAlmSendThread::sendAlarmOverCmd() { uint8 data[128]; int write = 0; @@ -524,10 +524,10 @@ void kbd_service::CXmAlmSendThread::sendAlarmOverCmd() } /** - * @brief kbd_service::CXmAlmRcvThread::sendAlarmMsgCmd + * @brief iot_service::CXmAlmRcvThread::sendAlarmMsgCmd * 上传报警信息命令 */ -void kbd_service::CXmAlmSendThread::sendAlarmMsgCmd(stAlmInfo almInfoElem) +void iot_service::CXmAlmSendThread::sendAlarmMsgCmd(stAlmInfo almInfoElem) { uint8 data[128]; int write = 0; @@ -585,10 +585,10 @@ void kbd_service::CXmAlmSendThread::sendAlarmMsgCmd(stAlmInfo almInfoElem) } /** - * @brief kbd_service::CXmAlmRcvThread::sumCheck + * @brief iot_service::CXmAlmRcvThread::sumCheck * 校验和 */ -byte kbd_service::CXmAlmSendThread::sumCheck(uint8 *data,int size) +byte iot_service::CXmAlmSendThread::sumCheck(uint8 *data,int size) { int count = 0; for(int i=0;i *vecAlmSendThreadPtr) : - kbd_public::CTimerThreadBase("AlmSocketThread", 500), +iot_service::CXmAlmSocketThread::CXmAlmSocketThread(CXmAlmConfigThreadPtr ptrAlmConfigThread,std::vector *vecAlmSendThreadPtr) : + iot_public::CTimerThreadBase("AlmSocketThread", 500), m_ptrAlmConfigThread(ptrAlmConfigThread) { m_vecAlmSendThreadPtr = vecAlmSendThreadPtr; m_ServerSocket = 0 ; } -kbd_service::CXmAlmSocketThread::~CXmAlmSocketThread() +iot_service::CXmAlmSocketThread::~CXmAlmSocketThread() { if (m_ServerSocket != INVALID_SOCKET) { @@ -23,13 +23,13 @@ kbd_service::CXmAlmSocketThread::~CXmAlmSocketThread() (*m_vecAlmSendThreadPtr).clear(); } -void kbd_service::CXmAlmSocketThread::execute() +void iot_service::CXmAlmSocketThread::execute() { ServerAccept(); checkSocket(); } -void kbd_service::CXmAlmSocketThread::checkSocket() +void iot_service::CXmAlmSocketThread::checkSocket() { boost::mutex::scoped_lock lock(mut_socket); int i = 0; @@ -47,7 +47,7 @@ void kbd_service::CXmAlmSocketThread::checkSocket() } -int kbd_service::CXmAlmSocketThread::initialize() +int iot_service::CXmAlmSocketThread::initialize() { m_ServerSocket = INVALID_SOCKET; @@ -66,7 +66,7 @@ int kbd_service::CXmAlmSocketThread::initialize() * Windows系统下网络库初始化 * @return */ -bool kbd_service::CXmAlmSocketThread::initWinsock() +bool iot_service::CXmAlmSocketThread::initWinsock() { #ifdef WIN32 WSADATA wsdata; @@ -83,10 +83,10 @@ bool kbd_service::CXmAlmSocketThread::initWinsock() } /** - * @brief kbd_service::CXmAlmSocketThread::initServerSock + * @brief iot_service::CXmAlmSocketThread::initServerSock * 初始化服务端对象 */ -void kbd_service::CXmAlmSocketThread::initServerSock() +void iot_service::CXmAlmSocketThread::initServerSock() { int rtn; sockaddr_in sin; @@ -167,11 +167,11 @@ void kbd_service::CXmAlmSocketThread::initServerSock() /** - * @brief kbd_service::CXmAlmSocketThread::ServerSockAccept + * @brief iot_service::CXmAlmSocketThread::ServerSockAccept * 服务端接收连接 * @return */ -int kbd_service::CXmAlmSocketThread::ServerAccept() +int iot_service::CXmAlmSocketThread::ServerAccept() { int connfd = -1; /*connect socket*/ sockaddr_in fsin; @@ -221,11 +221,11 @@ int kbd_service::CXmAlmSocketThread::ServerAccept() } /** - * @brief kbd_service::CXmAlmRcvThread::TcpClose + * @brief iot_service::CXmAlmRcvThread::TcpClose * 关闭指定socket * @param Socket */ -void kbd_service::CXmAlmSocketThread::TcpClose(SOCKET Socket) +void iot_service::CXmAlmSocketThread::TcpClose(SOCKET Socket) { LOGDEBUG("TcpClose(%d) ", Socket); if (Socket != INVALID_SOCKET) @@ -238,7 +238,7 @@ void kbd_service::CXmAlmSocketThread::TcpClose(SOCKET Socket) * @brief CXmAlmSocketThread::AccepClientIpConnect * 在配置的IP中指定连接 */ -void kbd_service::CXmAlmSocketThread::AccepClientIpConnect(char *recIp,int sockfd) +void iot_service::CXmAlmSocketThread::AccepClientIpConnect(char *recIp,int sockfd) { boost::mutex::scoped_lock lock(mut_socket); int index = m_ptrAlmConfigThread->filterIp(recIp); @@ -264,10 +264,10 @@ void kbd_service::CXmAlmSocketThread::AccepClientIpConnect(char *recIp,int sockf } /** - * @brief kbd_service::CXmAlmSocketThread::ApplDisaconnect + * @brief iot_service::CXmAlmSocketThread::ApplDisaconnect * 断开所有连接 */ -void kbd_service::CXmAlmSocketThread::ApplDisaconnect() +void iot_service::CXmAlmSocketThread::ApplDisaconnect() { m_AcceptSocketVec.clear(); (*m_vecAlmSendThreadPtr).clear(); diff --git a/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.h b/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.h index 668997d9..bc9d85c5 100644 --- a/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.h +++ b/product/src/application/xm_alarm_send_server/CXmAlmSocketThread.h @@ -4,10 +4,10 @@ #include "pub_utility_api/TimerThreadBase.h" #include "CXmAlmSendThread.h" -namespace kbd_service { +namespace iot_service { #define MAXCLIENTSIZE 5 - class CXmAlmSocketThread : public kbd_public::CTimerThreadBase + class CXmAlmSocketThread : public iot_public::CTimerThreadBase { public: diff --git a/product/src/application/xm_alarm_send_server/almsendcommon.h b/product/src/application/xm_alarm_send_server/almsendcommon.h index 5b390485..7382428e 100644 --- a/product/src/application/xm_alarm_send_server/almsendcommon.h +++ b/product/src/application/xm_alarm_send_server/almsendcommon.h @@ -1,7 +1,7 @@ #ifndef ALMSENDCOMMON_H #define ALMSENDCOMMON_H #include -namespace kbd_service +namespace iot_service { const std::string CN_ProcName_AlmSendServer = "xm_alarm_send_server"; //进程名 diff --git a/product/src/application/xm_alarm_send_server/datastructdef.h b/product/src/application/xm_alarm_send_server/datastructdef.h index 8cdd1062..c15effb8 100644 --- a/product/src/application/xm_alarm_send_server/datastructdef.h +++ b/product/src/application/xm_alarm_send_server/datastructdef.h @@ -2,7 +2,7 @@ #define DATASTRUCTDEF_H #include -namespace kbd_service { +namespace iot_service { typedef struct almTime { diff --git a/product/src/application/xm_alarm_send_server/main.cpp b/product/src/application/xm_alarm_send_server/main.cpp index 1db53259..d19248c7 100644 --- a/product/src/application/xm_alarm_send_server/main.cpp +++ b/product/src/application/xm_alarm_send_server/main.cpp @@ -4,6 +4,6 @@ using namespace std; int main(int argc,char *argv[]) { - kbd_service::CXmAlmSendApp appObj; + iot_service::CXmAlmSendApp appObj; return appObj.main(argc,argv); } diff --git a/product/src/dbms/db_save_cloud_platform/CDbSaveRedundant.cpp b/product/src/dbms/db_save_cloud_platform/CDbSaveRedundant.cpp index 48fa0a26..77960b62 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveRedundant.cpp +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/CDbSaveRedundant.h b/product/src/dbms/db_save_cloud_platform/CDbSaveRedundant.h index 06f0efb7..70a210ab 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveRedundant.h +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp b/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp index afbd9580..2223e20b 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp +++ b/product/src/dbms/db_save_cloud_platform/CDbSaveService.cpp @@ -14,7 +14,7 @@ #define DATA_SAVE_PROCESSNAME "db_save_cloud_platform" -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(), DATA_SAVE_PROCESSNAME ); + iot_public::StartLogSystem( CN_AppName_PUBLIC.c_str(), DATA_SAVE_PROCESSNAME ); 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/product/src/dbms/db_save_cloud_platform/CDbSaveService.h b/product/src/dbms/db_save_cloud_platform/CDbSaveService.h index 8a32fceb..4f3c9b12 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveService.h +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp index d72bcd64..f30d391a 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp +++ b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.cpp @@ -12,7 +12,7 @@ #define DATA_SAVE_CFG_FILE "db_save_cloud_platform.xml" -namespace kbd_dbms +namespace iot_dbms { CDbSaveServiceThread::CDbSaveServiceThread( int nDomainID ) @@ -43,7 +43,7 @@ bool CDbSaveServiceThread::init() CDbPara objDbParaTemp; //< 初始化 m_vecDbSaveThread { - const std::string strFileName = kbd_public::CFileUtil::getPathOfCfgFile(DATA_SAVE_CFG_FILE); + const std::string strFileName = iot_public::CFileUtil::getPathOfCfgFile(DATA_SAVE_CFG_FILE); std::vector> vecOtherDbInfo; try { @@ -137,7 +137,7 @@ void CDbSaveServiceThread::execute() return; } - kbd_net::CMbMessage objMbMsgRcv; + iot_net::CMbMessage objMbMsgRcv; for ( int i = 0; i < 200; ++i ) { @@ -150,7 +150,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", @@ -172,8 +172,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()); @@ -184,7 +184,7 @@ void CDbSaveServiceThread::handleOneMbMsg( const kbd_net::CMbMessage &objMbMsgRc } */ - const boost::int64_t nTimeNow = kbd_public::getMonotonicMsec(); + const boost::int64_t nTimeNow = iot_public::getMonotonicMsec(); //< 1小时清理一次 m_mapAppStatus if ( m_nLastCleanAppStatusTime + 3600000 < nTimeNow ) @@ -239,13 +239,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 ) { @@ -255,9 +255,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 ) { @@ -267,9 +267,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 ) @@ -280,9 +280,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 ) { @@ -292,9 +292,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 ) @@ -318,15 +318,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; @@ -372,4 +372,4 @@ int CDbSaveServiceThread::redundantSwitch( bool bMaster, bool bSlave ) return kbdSuccess; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.h b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.h index a80f6179..47cd514f 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceThread.h +++ b/product/src/dbms/db_save_cloud_platform/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,17 +32,17 @@ 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_vecDbSaveThread; boost::unordered::unordered_map m_mapAppStatus; //< key为通讯器名UUID }; typedef boost::shared_ptr CDbSaveServiceThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.cpp b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.cpp index a5fd6bd6..b62164ef 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.cpp +++ b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.cpp @@ -8,11 +8,11 @@ #include "CDbSaveServiceWorkThread.h" #include "ConvertForOtherDatabase.h" -using namespace kbd_idlfile; +using namespace iot_idl; //< todo 本地缓存文件管理需完善，可用SQLite作为本地缓存 -namespace kbd_dbms +namespace iot_dbms { //< 20 ms 执行一次，死锁超时 24小时 @@ -39,7 +39,7 @@ void CDbSaveServiceWorkThread::execute() if ( openDb()) { bool bIsEnd = false; - kbd_idlfile::DbRequest oRequest; + iot_idl::DbRequest oRequest; while ( getMsg( oRequest, bIsEnd )) { @@ -139,7 +139,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 ); @@ -147,7 +147,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 )) @@ -165,7 +165,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( "获取全路径失败." ); @@ -187,9 +187,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; @@ -249,7 +249,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()) { @@ -296,7 +296,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()) { @@ -340,7 +340,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()) { @@ -402,7 +402,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()) { @@ -437,7 +437,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()) { @@ -490,4 +490,4 @@ bool CDbSaveServiceWorkThread::dealRemoveMulti( const kbd_idlfile::DbRemoveMulti return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.h b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.h index 8cfd7bea..4621f840 100644 --- a/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.h +++ b/product/src/dbms/db_save_cloud_platform/CDbSaveServiceWorkThread.h @@ -11,12 +11,12 @@ #include "PredefineForDbSaveServer.h" #include "ConvertForOtherDatabase.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, @@ -31,15 +31,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: @@ -63,4 +63,4 @@ private: typedef boost::shared_ptr CDbSaveServiceWorkThreadPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/db_save_cloud_platform/CIStreamFile.cpp b/product/src/dbms/db_save_cloud_platform/CIStreamFile.cpp index a98b7c12..1d8b2c4a 100644 --- a/product/src/dbms/db_save_cloud_platform/CIStreamFile.cpp +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/CIStreamFile.h b/product/src/dbms/db_save_cloud_platform/CIStreamFile.h index 956d70fc..7d7dffed 100644 --- a/product/src/dbms/db_save_cloud_platform/CIStreamFile.h +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/COStreamFile.cpp b/product/src/dbms/db_save_cloud_platform/COStreamFile.cpp index 2ca1666a..c37f854a 100644 --- a/product/src/dbms/db_save_cloud_platform/COStreamFile.cpp +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/COStreamFile.h b/product/src/dbms/db_save_cloud_platform/COStreamFile.h index 67d3a9c9..3f534c5b 100644 --- a/product/src/dbms/db_save_cloud_platform/COStreamFile.h +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.cpp b/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.cpp index acb6bfbe..2bd9cf5f 100644 --- a/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.cpp +++ b/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.cpp @@ -2,7 +2,7 @@ #include "ConvertForOtherDatabase.h" #include "pub_logger_api/logger.h" -namespace kbd_dbms +namespace iot_dbms { ConvertForCloudPlatform::ConvertForCloudPlatform() @@ -202,4 +202,4 @@ bool ConvertForCloudPlatform::dealCondition(QList &condList) return true; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.h b/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.h index 2cfde3c9..0217d439 100644 --- a/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.h +++ b/product/src/dbms/db_save_cloud_platform/ConvertForOtherDatabase.h @@ -6,7 +6,7 @@ #include #include "db_base_api/CDbCondition.h" -namespace kbd_dbms +namespace iot_dbms { const std::string CN_Iscs_His_Table = "his_event"; @@ -34,6 +34,6 @@ private: typedef boost::shared_ptr ConvertForCloudPlatformPtr; -} //< namespace kbd_dbms +} //< namespace iot_dbms #endif // CONVERTFOROTHERDATABASE_H diff --git a/product/src/dbms/db_save_cloud_platform/DbSaveCommon.h b/product/src/dbms/db_save_cloud_platform/DbSaveCommon.h index 2a09e7d9..3484387c 100644 --- a/product/src/dbms/db_save_cloud_platform/DbSaveCommon.h +++ b/product/src/dbms/db_save_cloud_platform/DbSaveCommon.h @@ -11,7 +11,7 @@ const uint64 cn_check_mask = 0x90EB90EB00000000; #define DATA_DIRECTORY "../../data/cache/db_save_cloud_platform_cache/" #endif -namespace kbd_dbms +namespace iot_dbms { -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/db_save_cloud_platform/PredefineForDbSaveServer.cpp b/product/src/dbms/db_save_cloud_platform/PredefineForDbSaveServer.cpp index 4efebc0e..57b36134 100644 --- a/product/src/dbms/db_save_cloud_platform/PredefineForDbSaveServer.cpp +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/PredefineForDbSaveServer.h b/product/src/dbms/db_save_cloud_platform/PredefineForDbSaveServer.h index db70563e..24e5bae7 100644 --- a/product/src/dbms/db_save_cloud_platform/PredefineForDbSaveServer.h +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/db_save_cloud_platform/main.cpp b/product/src/dbms/db_save_cloud_platform/main.cpp index 78e2b5ae..217e8af0 100644 --- a/product/src/dbms/db_save_cloud_platform/main.cpp +++ b/product/src/dbms/db_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/CFrontThread.cpp b/product/src/dbms/tsdb_save_cloud_platform/CFrontThread.cpp index bc223a0c..38fecab9 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CFrontThread.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/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) @@ -192,8 +192,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()); @@ -205,7 +205,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; @@ -256,7 +256,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()) { @@ -349,15 +349,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; @@ -369,5 +369,5 @@ void CFrontThread::handleOneMbMsg() CNodeMng::getInstance().pushSaveStr(ptrStrInsert, bToLocal, bToRemote); } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/tsdb_save_cloud_platform/CFrontThread.h b/product/src/dbms/tsdb_save_cloud_platform/CFrontThread.h index 05a845af..58034926 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CFrontThread.h +++ b/product/src/dbms/tsdb_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp index 400557b4..72cbd084 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.cpp @@ -18,7 +18,7 @@ #define TSDB_SAVE_CFG_FILE "tsdb_save_cloud_platform.xml" -namespace kbd_dbms +namespace iot_dbms { static CNodeMng *g_pNodeMng = NULL; @@ -72,8 +72,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; @@ -81,7 +81,7 @@ bool CNodeMng::init() //< 获取本机域ID和主机名 { - kbd_public::SNodeInfo stLocalNodeInfo; + iot_public::SNodeInfo stLocalNodeInfo; if (kbdSuccess != ptrSysInfo->getLocalNodeInfo(stLocalNodeInfo)) { LOGERROR("getLocalNodeInfo() failed !"); @@ -94,7 +94,7 @@ bool CNodeMng::init() //< 初始化 m_vecNodeThreads { - const std::string strFileName = kbd_public::CFileUtil::getPathOfCfgFile(TSDB_SAVE_CFG_FILE); + const std::string strFileName = iot_public::CFileUtil::getPathOfCfgFile(TSDB_SAVE_CFG_FILE); std::vector> vecOtherDbInfo; try { @@ -217,5 +217,5 @@ void CNodeMng::pushSaveStr(StdStringPtr ptrStrSave, bool bToLocal, bool bToRemot } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.h b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.h index 63eee925..354808b8 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.h +++ b/product/src/dbms/tsdb_save_cloud_platform/CNodeMng.h @@ -14,7 +14,7 @@ #include "CNodeThread.h" #include "TsdbSaveCommon.h" -namespace kbd_dbms +namespace iot_dbms { class CNodeThread; @@ -68,5 +68,5 @@ private: std::vector m_vecNodeThreads; }; -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/tsdb_save_cloud_platform/CNodeThread.cpp b/product/src/dbms/tsdb_save_cloud_platform/CNodeThread.cpp index 547b864e..7750c132 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CNodeThread.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/CNodeThread.h b/product/src/dbms/tsdb_save_cloud_platform/CNodeThread.h index a4f02aed..d0fdd54f 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CNodeThread.h +++ b/product/src/dbms/tsdb_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.cpp b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.cpp index 346f78dc..6938beb8 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.h b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.h index 105e8c49..39c258e6 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveRedunSw.h +++ b/product/src/dbms/tsdb_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp index 1f0c790f..e2773d16 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.cpp @@ -23,7 +23,7 @@ #define TSDB_SAVE_CLOUDPLAT_SRV_PROC_NAME "tsdb_save_cloud_platform" -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_CLOUDPLAT_SRV_PROC_NAME); + iot_public::StartLogSystem(CN_AppName_PUBLIC.c_str(), TSDB_SAVE_CLOUDPLAT_SRV_PROC_NAME); //< 判断是否已启动 if (isAlreadyRunning()) @@ -63,7 +63,7 @@ bool CTsdbSaveSrv::start(int argc, char *argv[], int& /*nStatus*/) } //< 消息总线 - if (!kbd_net::initMsgBus(TSDB_SAVE_CLOUDPLAT_SRV_PROC_NAME, "", true)) + if (!iot_net::initMsgBus(TSDB_SAVE_CLOUDPLAT_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_CLOUDPLAT_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_CLOUDPLAT_SRV_PROC_NAME); + return iot_public::CSingleProcInstance::hasInstanceRunning(TSDB_SAVE_CLOUDPLAT_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/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.h b/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.h index 8e64cc26..5def67db 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/CTsdbSaveSrv.h +++ b/product/src/dbms/tsdb_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/Main.cpp b/product/src/dbms/tsdb_save_cloud_platform/Main.cpp index f3fbdac5..28ca3064 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/Main.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/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/product/src/dbms/tsdb_save_cloud_platform/TsdbSaveCommon.cpp b/product/src/dbms/tsdb_save_cloud_platform/TsdbSaveCommon.cpp index 4831d08e..83dc3b52 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/TsdbSaveCommon.cpp +++ b/product/src/dbms/tsdb_save_cloud_platform/TsdbSaveCommon.cpp @@ -36,38 +36,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: @@ -149,5 +149,5 @@ std::string toCloudPlatTagName(const std::string &strTable, const std::string &s return strOutput; } -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/dbms/tsdb_save_cloud_platform/TsdbSaveCommon.h b/product/src/dbms/tsdb_save_cloud_platform/TsdbSaveCommon.h index a37fe33f..92b63958 100644 --- a/product/src/dbms/tsdb_save_cloud_platform/TsdbSaveCommon.h +++ b/product/src/dbms/tsdb_save_cloud_platform/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 @@ -45,11 +45,11 @@ namespace kbd_dbms #define DIG_MIDVALUE_CLOUD "2" //< 云平台DI测点中间值 #define MIX_MIDVALUE_CLOUD "3" //< 云平台MIX测点中间值 -std::string toInfluxString(const kbd_idlfile::SVariable &objInput); +std::string toInfluxString(const iot_idl::SVariable &objInput); std::string toCloudPlatTable(const std::string &strTable); std::string toCloudPlatTagName(const std::string &strTable, const std::string &strTagName); -} //< namespace kbd_dbms +} //< namespace iot_dbms diff --git a/product/src/example/CheckIfShield/MainWindow.cpp b/product/src/example/CheckIfShield/MainWindow.cpp index cd92752e..9d50e9ff 100644 --- a/product/src/example/CheckIfShield/MainWindow.cpp +++ b/product/src/example/CheckIfShield/MainWindow.cpp @@ -64,14 +64,14 @@ bool MainWindow::check(const QString &tag) bool MainWindow::getShieldId(const QString &tag, int &shieldId) { - kbd_dbms::CONDINFO condinfo; + iot_dbms::CONDINFO condinfo; strcpy( condinfo.name, "shield_object" ); condinfo.conditionval = tag.toStdString(); condinfo.relationop = ATTRCOND_EQU; condinfo.logicalop = ATTRCOND_AND; - kbd_dbms::CTableLockGuard tableLock(m_objOptShieldObj); + iot_dbms::CTableLockGuard tableLock(m_objOptShieldObj); std::vector vecTableColumn; if(m_objOptShieldObj.selectOneCondition(condinfo,vecTableColumn)) { @@ -91,13 +91,13 @@ bool MainWindow::getShieldId(const QString &tag, int &shieldId) bool MainWindow::getShieldTime(int &timeId) { - kbd_dbms::CONDINFO condinfo; + iot_dbms::CONDINFO condinfo; strcpy( condinfo.name, "shield_id" ); condinfo.conditionval = timeId; condinfo.relationop = ATTRCOND_EQU; condinfo.logicalop = ATTRCOND_AND; - kbd_dbms::CTableLockGuard tableLock(m_objOptShieldInfo); + iot_dbms::CTableLockGuard tableLock(m_objOptShieldInfo); std::vector vecTableColumn; if(m_objOptShieldInfo.selectOneCondition(condinfo,vecTableColumn)) { @@ -161,13 +161,13 @@ bool MainWindow::getShieldTime(int &timeId) */ bool MainWindow::getShield(const int &timeId) { - kbd_dbms::CONDINFO condinfo; + iot_dbms::CONDINFO condinfo; strcpy( condinfo.name, "time_id" ); condinfo.conditionval = timeId; condinfo.relationop = ATTRCOND_EQU; condinfo.logicalop = ATTRCOND_AND; - kbd_dbms::CTableLockGuard tableLock(m_objOptShieldTime); + iot_dbms::CTableLockGuard tableLock(m_objOptShieldTime); std::vector vecTableColumn; if(!m_objOptShieldTime.selectOneCondition(condinfo,vecTableColumn)) diff --git a/product/src/example/CheckIfShield/MainWindow.h b/product/src/example/CheckIfShield/MainWindow.h index 3dbe01e8..a29e134b 100644 --- a/product/src/example/CheckIfShield/MainWindow.h +++ b/product/src/example/CheckIfShield/MainWindow.h @@ -35,9 +35,9 @@ private: int getWeekNum(QString &week); private: Ui::MainWindow *ui; - kbd_dbms::CRdbAccessEx m_objOptShieldTime; - kbd_dbms::CRdbAccessEx m_objOptShieldInfo; - kbd_dbms::CRdbAccessEx m_objOptShieldObj; + iot_dbms::CRdbAccessEx m_objOptShieldTime; + iot_dbms::CRdbAccessEx m_objOptShieldInfo; + iot_dbms::CRdbAccessEx m_objOptShieldObj; }; #endif // MAINWINDOW_H diff --git a/product/src/example/create_alarm/CCreateAlarm.cpp b/product/src/example/create_alarm/CCreateAlarm.cpp index a4d7f899..8c46bd89 100644 --- a/product/src/example/create_alarm/CCreateAlarm.cpp +++ b/product/src/example/create_alarm/CCreateAlarm.cpp @@ -5,11 +5,11 @@ #include "rdb_api/CRdbAccessEx.h" #include -using namespace kbd_public; -using namespace kbd_net; -using namespace kbd_dbms; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_net; +using namespace iot_dbms; +using namespace iot_service; +using namespace iot_idl; CCreateAlarm::CCreateAlarm(QWidget *parent) : QWidget(parent), diff --git a/product/src/example/create_alarm/CCreateAlarm.h b/product/src/example/create_alarm/CCreateAlarm.h index 83fd8994..1b2282c4 100644 --- a/product/src/example/create_alarm/CCreateAlarm.h +++ b/product/src/example/create_alarm/CCreateAlarm.h @@ -28,7 +28,7 @@ public slots: private: Ui::CCreateAlarm *ui; - kbd_service::CAlmApiForApp* m_pAlarmApi; // 告警服务接口 + iot_service::CAlmApiForApp* m_pAlarmApi; // 告警服务接口 }; #endif // CCREATEALARM_H diff --git a/product/src/example/daemon_debug_helper/AppMng.cpp b/product/src/example/daemon_debug_helper/AppMng.cpp index 844a6af4..4a91246f 100644 --- a/product/src/example/daemon_debug_helper/AppMng.cpp +++ b/product/src/example/daemon_debug_helper/AppMng.cpp @@ -8,11 +8,11 @@ #include "Common.h" -//namespace kbd_dbms{ +//namespace iot_dbms{ //struct RSQL_UPD_COLUMN //{ // char updcolname[RDB_COLUMN_NAME_LEN] = { 0 }; -// kbd_dbms::CVarType updvalue; +// iot_dbms::CVarType updvalue; //public: // RSQL_UPD_COLUMN() // { @@ -28,7 +28,7 @@ AppMng::AppMng() bool AppMng::init() { - if (!kbd_public::createSysInfoInstance(m_ptrSysInfo)) + if (!iot_public::createSysInfoInstance(m_ptrSysInfo)) { std::cerr<< "fail to create sys_node_info" << std::endl; return false; @@ -69,7 +69,7 @@ bool AppMng::init() bool AppMng::startDaemonProcess(int nAppId, const std::string &strAppName, const SProcessInfo &stProcInfo) { - std::string strModulePath = kbd_public::CFileUtil::getCurModuleDir(); + std::string strModulePath = iot_public::CFileUtil::getCurModuleDir(); if (strModulePath.empty()) { std::cerr<< "fail to get proc dir" << std::endl; @@ -84,7 +84,7 @@ bool AppMng::startDaemonProcess(int nAppId, const std::string &strAppName, const // strArgs += " " + stProcInfo.strProcParam; // } - if (!kbd_public::CProcUtil::startProcess(strModulePath, stProcInfo.strProcName, strArgs, false, true)) + if (!iot_public::CProcUtil::startProcess(strModulePath, stProcInfo.strProcName, strArgs, false, true)) { std::cerr << "fail to start process" << std::endl; return false; @@ -127,7 +127,7 @@ bool AppMng::stopDaemonProcess(int nAppId, const std::string &strAppName, const bool AppMng::checkProcessResult(int nAppId, const SProcessInfo &stProcInfo) { - using namespace kbd_sys; + using namespace iot_sys; /* @brief 内存库服务启动成功前，打开表会失败 */ for (int i = 0; i < 1800; ++i) { @@ -142,16 +142,16 @@ bool AppMng::checkProcessResult(int nAppId, const SProcessInfo &stProcInfo) else { /* @brief 表已打开，查看进程是否已经启动成功 */ - std::vector vecCondInfo; - kbd_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_DOMAIN_ID, m_stLocalNodeInfo.nDomainId, ATTRCOND_EQU, ATTRCOND_AND); - kbd_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_APP_ID, nAppId, ATTRCOND_EQU, ATTRCOND_AND); - kbd_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_NODE_NAME, m_stLocalNodeInfo.strName, ATTRCOND_EQU, ATTRCOND_AND); - kbd_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName, ATTRCOND_EQU, ATTRCOND_AND); - kbd_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_STARTUP, 1, ATTRCOND_EQU, ATTRCOND_AND); + std::vector vecCondInfo; + iot_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_DOMAIN_ID, m_stLocalNodeInfo.nDomainId, ATTRCOND_EQU, ATTRCOND_AND); + iot_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_APP_ID, nAppId, ATTRCOND_EQU, ATTRCOND_AND); + iot_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_NODE_NAME, m_stLocalNodeInfo.strName, ATTRCOND_EQU, ATTRCOND_AND); + iot_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName, ATTRCOND_EQU, ATTRCOND_AND); + iot_dbms::CRdbPublic::addCondInfo(vecCondInfo, RUN_PROC_COL_STARTUP, 1, ATTRCOND_EQU, ATTRCOND_AND); { - kbd_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); - kbd_dbms::CRdbQueryResult objResult; + iot_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); + iot_dbms::CRdbQueryResult objResult; if (!m_objRunProcInfoTable.select(vecCondInfo, objResult, RUN_PROC_COL_STARTUP)) { std::cerr << "fail to query the process start state"; @@ -186,25 +186,25 @@ bool AppMng::isProcessRunning(int nAppId, const std::string &strAppName, const S // strArgs += " " + stProcInfo.strProcParam; // } - return kbd_public::CProcUtil::isProcRunning(stProcInfo.strProcName, strArgs); + return iot_public::CProcUtil::isProcRunning(stProcInfo.strProcName, strArgs); } bool AppMng::resetProcessStartFlag(int nAppId, const SProcessInfo &stProcInfo) { - std::vector vecCol; - kbd_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_PROC_ID, -1); - kbd_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_STARTUP, 0); - kbd_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_TO_QUIT, 0); - kbd_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_QUIT, 0); - kbd_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_REGIST, 0); + std::vector vecCol; + iot_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_PROC_ID, -1); + iot_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_STARTUP, 0); + iot_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_TO_QUIT, 0); + iot_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_QUIT, 0); + iot_dbms::CRdbPublic::addUpColumnInfo(vecCol, RUN_PROC_COL_REGIST, 0); - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_APP_ID, nAppId); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_NODE_NAME, m_strNodeName); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_APP_ID, nAppId); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_NODE_NAME, m_strNodeName); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName); - using namespace kbd_sys; + using namespace iot_sys; if (!m_objRunProcInfoTable.isOpen()) { @@ -215,7 +215,7 @@ bool AppMng::resetProcessStartFlag(int nAppId, const SProcessInfo &stProcInfo) } } - kbd_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); + iot_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); if (!m_objRunProcInfoTable.update(vecCol, vecCond)) { std::cerr << "fail to update record" << std::endl; @@ -228,9 +228,9 @@ bool AppMng::resetProcessStartFlag(int nAppId, const SProcessInfo &stProcInfo) bool AppMng::getLocalInfo(int &nDomainId, std::string &strNodeName) { - using namespace kbd_dbms; - using namespace kbd_public; - using namespace kbd_sys; + using namespace iot_dbms; + using namespace iot_public; + using namespace iot_sys; using namespace std; /* @brief 根据sys_run_proc_info获取本机部署的应用信息 */ CRdbAccessEx objRunProcInfoTable; @@ -282,14 +282,14 @@ bool AppMng::getLocalInfo(int &nDomainId, std::string &strNodeName) /* @brief 设置进程退出标识 */ bool AppMng::setProcessToQuit(int nAppId, const SProcessInfo &stProcInfo) { - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_APP_ID, nAppId); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_NODE_NAME, m_strNodeName); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_APP_ID, nAppId); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_NODE_NAME, m_strNodeName); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName); - kbd_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); - using namespace kbd_sys; + iot_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); + using namespace iot_sys; if (!m_objRunProcInfoTable.isOpen()) { @@ -313,18 +313,18 @@ bool AppMng::setProcessToQuit(int nAppId, const SProcessInfo &stProcInfo) /* @brief 等待进程退出 */ bool AppMng::waitProcessQuit(int nAppId, const SProcessInfo &stProcInfo) { - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_APP_ID, nAppId); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_NODE_NAME, m_strNodeName); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_QUIT, 1); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_DOMAIN_ID, m_nDomainId); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_APP_ID, nAppId); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_NODE_NAME, m_strNodeName); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_PROC_NAME, stProcInfo.strProcName); + iot_dbms::CRdbPublic::addCondInfo(vecCond, RUN_PROC_COL_QUIT, 1); for (int i = 0; i < 1800; ++i) { { - kbd_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); - kbd_dbms::CRdbQueryResult objResult; + iot_dbms::CTableLockGuard objTableLock(m_objRunProcInfoTable); + iot_dbms::CRdbQueryResult objResult; if (!m_objRunProcInfoTable.select(vecCond, objResult, RUN_PROC_COL_QUIT)) { std::cerr << "fail to query record" << std::endl; diff --git a/product/src/example/daemon_debug_helper/AppMng.h b/product/src/example/daemon_debug_helper/AppMng.h index 61b54bc8..cb148041 100644 --- a/product/src/example/daemon_debug_helper/AppMng.h +++ b/product/src/example/daemon_debug_helper/AppMng.h @@ -34,9 +34,9 @@ private: bool waitProcessQuit(int nAppId, const SProcessInfo &stProcInfo); bool resetProcessStartFlag(int nAppId, const SProcessInfo &stProcInfo); bool getLocalInfo(int &nDomainId, std::string &strNodeName); - kbd_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 进程信息表 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问 - kbd_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 + iot_dbms::CRdbAccessEx m_objRunProcInfoTable; //< 进程信息表 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //< 系统信息访问 + iot_public::SNodeInfo m_stLocalNodeInfo; //< 本机节点信息 int m_nDomainId; //< 本机所属域 std::string m_strNodeName; //< 本机节点名 diff --git a/product/src/example/dbms_test/AccessTest/TestCRtdbLocalTable.cpp b/product/src/example/dbms_test/AccessTest/TestCRtdbLocalTable.cpp index b95da4bd..e91ad0aa 100644 --- a/product/src/example/dbms_test/AccessTest/TestCRtdbLocalTable.cpp +++ b/product/src/example/dbms_test/AccessTest/TestCRtdbLocalTable.cpp @@ -2,7 +2,7 @@ int testRtdbLocalTable() { - using namespace kbd_dbms; + using namespace iot_dbms; CRdbLocalTable rdbtable; int ret = rdbtable.OpenTable("SCADA", "DIGITAL"); if(ret != RDB_OK) diff --git a/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp b/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp index 8dbe6c53..555e40c7 100644 --- a/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp +++ b/product/src/example/dbms_test/AccessTest/testCQDbInterface.cpp @@ -2,7 +2,7 @@ #include using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; int main() { diff --git a/product/src/example/dbms_test/AccessTest/testCRTdbSpeedyQuery.cpp b/product/src/example/dbms_test/AccessTest/testCRTdbSpeedyQuery.cpp index 953f08a0..b72204f0 100644 --- a/product/src/example/dbms_test/AccessTest/testCRTdbSpeedyQuery.cpp +++ b/product/src/example/dbms_test/AccessTest/testCRTdbSpeedyQuery.cpp @@ -4,7 +4,7 @@ //使用主键快速查询 void testCrtdbSpeedyQuery(){ -using namespace kbd_dbms; +using namespace iot_dbms; CRdbSpeedyQuery speedyQuery("pscada"); //应用名 diff --git a/product/src/example/dbms_test/AccessTest/testCRtdbAccess.cpp b/product/src/example/dbms_test/AccessTest/testCRtdbAccess.cpp index 25cb2f01..3e7c38e3 100644 --- a/product/src/example/dbms_test/AccessTest/testCRtdbAccess.cpp +++ b/product/src/example/dbms_test/AccessTest/testCRtdbAccess.cpp @@ -4,8 +4,8 @@ #include #include -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; int main() { diff --git a/product/src/example/dbms_test/AccessTest/testcrtdbsql.cpp b/product/src/example/dbms_test/AccessTest/testcrtdbsql.cpp index 6ebcfcb5..be174657 100644 --- a/product/src/example/dbms_test/AccessTest/testcrtdbsql.cpp +++ b/product/src/example/dbms_test/AccessTest/testcrtdbsql.cpp @@ -3,7 +3,7 @@ #define CODE_MAX_LEN 32 int testcrtdbsql(){ - using namespace kbd_dbms; + using namespace iot_dbms; CRdbSQL rdbsql; rdbsql.updatetable("PSCADA", "DIGITAL"); char codeValue[CODE_MAX_LEN] = ""; diff --git a/product/src/example/dbms_test/db_api_ex_test/main.cpp b/product/src/example/dbms_test/db_api_ex_test/main.cpp index f285cca4..a274e84f 100644 --- a/product/src/example/dbms_test/db_api_ex_test/main.cpp +++ b/product/src/example/dbms_test/db_api_ex_test/main.cpp @@ -7,8 +7,8 @@ #include #include -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; void createTable( ) { diff --git a/product/src/example/dbms_test/db_model_server_test/main.cpp b/product/src/example/dbms_test/db_model_server_test/main.cpp index 493f1f40..841a81e4 100644 --- a/product/src/example/dbms_test/db_model_server_test/main.cpp +++ b/product/src/example/dbms_test/db_model_server_test/main.cpp @@ -21,19 +21,19 @@ void testTransaction(); void testTransactionAsyn(); using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", ""); - kbd_net::initMsgBus("HMI", "TEST"); + iot_public::StartLogSystem("", ""); + iot_net::initMsgBus("HMI", "TEST"); std::cout << "Test rtdb_net_api." << std::endl; std::cout << "test start." << std::endl; testNoTransaction(); // testTransaction(); // testTransactionAsyn(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); // getchar(); return 0; } diff --git a/product/src/example/dbms_test/db_save_test/main.cpp b/product/src/example/dbms_test/db_save_test/main.cpp index c8b68ca1..6dd25ae6 100644 --- a/product/src/example/dbms_test/db_save_test/main.cpp +++ b/product/src/example/dbms_test/db_save_test/main.cpp @@ -17,23 +17,23 @@ void testinsert(); int main() { using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; std::cout << "msg count:" << CN_msg_count << " " << "records per msg " << CN_record_per_msg << std::endl; - kbd_public::StartLogSystem("", ""); - kbd_net::initMsgBus("db_save", "test"); + iot_public::StartLogSystem("", ""); + iot_net::initMsgBus("db_save", "test"); initDbSaveApi(CN_AppId_BASE); testMultiRemove(); getchar(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 1; } void testMultiRemove(){ using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; DbRemoveMulti objRemoveMulti; objRemoveMulti.set_strtablename("HIS_EVENT_SYSTEM"); objRemoveMulti.set_bsave2center(CN_bool_save_to_center); @@ -52,8 +52,8 @@ void testMultiRemove(){ void testinsert(){ using namespace std; - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; for (int i=0; i mapTableName;// tableName->systemFlag // boost::property_tree::ptree pt; -// //std::string strFileName = boost::str(boost::format("%s/../../common/database/initscript/iscs6000_table_struct.xml") % kbd_public::CFileUtil::getCurModuleDir().c_str()); +// //std::string strFileName = boost::str(boost::format("%s/../../common/database/initscript/iscs6000_table_struct.xml") % iot_public::CFileUtil::getCurModuleDir().c_str()); // std::string strFileName = "/root/ISCS6000/ISCS6000_HOME/common/database/initscript/iscs6000_table_struct.xml"; // try // { diff --git a/product/src/example/dbms_test/rdb_changedata_api_test/rdb_changedata_api_test.cpp b/product/src/example/dbms_test/rdb_changedata_api_test/rdb_changedata_api_test.cpp index 83983eba..ec338d9d 100644 --- a/product/src/example/dbms_test/rdb_changedata_api_test/rdb_changedata_api_test.cpp +++ b/product/src/example/dbms_test/rdb_changedata_api_test/rdb_changedata_api_test.cpp @@ -53,7 +53,7 @@ test07::test07() } void test07::recvChangeData(const std::vector& vPointInfo, - const std::vector& vVar) + const std::vector& vVar) { qDebug()<& vPointInfo, - const std::vector& vVar ); + const std::vector& vVar ); void dealInvalidPoint( const std::vector& vPointInfo ); }; diff --git a/product/src/example/dbms_test/rdb_lock_test/main.cpp b/product/src/example/dbms_test/rdb_lock_test/main.cpp index dcad7785..05a7e1bb 100644 --- a/product/src/example/dbms_test/rdb_lock_test/main.cpp +++ b/product/src/example/dbms_test/rdb_lock_test/main.cpp @@ -105,7 +105,7 @@ int DeleteShm(int shmkey) int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", ""); + iot_public::StartLogSystem("", ""); std::cout << "Test rtdb_net_api." << std::endl; std::cout << "Test start." << std::endl; @@ -141,6 +141,6 @@ int main(int argc, char *argv[]) if(flag){ DeleteShm(CN_nShmKey); } - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/example/dbms_test/rdb_net_api_test/main.cpp b/product/src/example/dbms_test/rdb_net_api_test/main.cpp index b4edd5d9..083ac1ad 100644 --- a/product/src/example/dbms_test/rdb_net_api_test/main.cpp +++ b/product/src/example/dbms_test/rdb_net_api_test/main.cpp @@ -32,8 +32,8 @@ void testAsynRemove(); int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", ""); - kbd_net::initMsgBus("HMI", "TEST"); + iot_public::StartLogSystem("", ""); + iot_net::initMsgBus("HMI", "TEST"); // testAsynInsert(); // testAsynRemove(); // testInsert(); @@ -42,20 +42,20 @@ int main(int argc, char *argv[]) // testQuery(); // testQueryByKey(); testQueryTotal(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } void testQueryTotal() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(1, 4); bool bRet = false; - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; std::vector vecColumn; vecColumn.push_back( "tag_name" ); vecColumn.push_back( "description" ); @@ -75,13 +75,13 @@ void testQueryTotal() void testQueryByKey() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(1, 4); bool bRet = false; - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; char cTag[64] = "qy1.jgxh_a06Gcopy1312Gcopy559.QL1"; std::string sKey = "qy1.jgxh_a06Gcopy1312Gcopy559.QL1"; std::vector vecKey; @@ -109,8 +109,8 @@ void testQueryByKey() void testAsynInsert() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(2, 4); @@ -127,7 +127,7 @@ void testAsynInsert() std::cout << "Lock ret：" << objLockRet.ret() << "err msg： " << objLockRet.strerr() << std::endl; std::cout << "sleep cout:" << sleepCount << std::endl; - kbd_idlfile::RdbInsert msgInsert; + iot_idl::RdbInsert msgInsert; char tmpValue[128] = {0}; msgInsert.set_strtablename("accuml"); msgInsert.add_strcolumnname("tag_name"); @@ -183,18 +183,18 @@ void testAsynInsert() void testAsynRemove() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(2, 4); bool bRet = objNetApi.lock("accuml", true); - kbd_idlfile::RdbRemove msgRemove; + iot_idl::RdbRemove msgRemove; msgRemove.set_strtablename("accuml"); char tmpValue[128] = { 0 }; for (int i = 0; i < 2; ++i) { - kbd_idlfile::RdbCondition *pCondition = msgRemove.add_msgcondtionarray(); + iot_idl::RdbCondition *pCondition = msgRemove.add_msgcondtionarray(); pCondition->set_enlogic(ENConditionLogic::enumCondOr); pCondition->set_enrelation(ENConditionRelation::enumCondEqual); pCondition->set_strcolumnname("tag_name"); @@ -217,8 +217,8 @@ void testAsynRemove() void testInsert() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(2, 4); bool bRet = objNetApi.lock("accuml"); @@ -226,7 +226,7 @@ void testInsert() { std::cout << "lock failed." << std::endl; } - kbd_idlfile::RdbInsert msgInsert; + iot_idl::RdbInsert msgInsert; char tmpValue[128] = {0}; msgInsert.set_strtablename("accuml"); msgInsert.add_strcolumnname("tag_name"); @@ -271,8 +271,8 @@ void testInsert() void testRemove() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(2, 4); bool bRet = objNetApi.lock("accuml"); @@ -280,12 +280,12 @@ void testRemove() { std::cout << "lock failed." << std::endl; } - kbd_idlfile::RdbRemove msgRemove; + iot_idl::RdbRemove msgRemove; msgRemove.set_strtablename("accuml"); char tmpValue[128] = { 0 }; for (int i = 0; i < 2; ++i) { - kbd_idlfile::RdbCondition *pCondition = msgRemove.add_msgcondtionarray(); + iot_idl::RdbCondition *pCondition = msgRemove.add_msgcondtionarray(); pCondition->set_enlogic(ENConditionLogic::enumCondOr); pCondition->set_enrelation(ENConditionRelation::enumCondEqual); pCondition->set_strcolumnname("tag_name"); @@ -308,8 +308,8 @@ void testRemove() void testUpdate() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(2, 4); bool bRet = objNetApi.lock("accuml"); @@ -317,9 +317,9 @@ void testUpdate() { std::cout << "lock failed." << std::endl; } - kbd_idlfile::RdbUpdate msgUpdate; + iot_idl::RdbUpdate msgUpdate; msgUpdate.set_strtablename("accuml"); - kbd_idlfile::RdbCondition *pCondition = msgUpdate.add_msgcondition(); + iot_idl::RdbCondition *pCondition = msgUpdate.add_msgcondition(); pCondition->set_enlogic(ENConditionLogic::enumCondOr); pCondition->set_enrelation(ENConditionRelation::enumCondEqual); pCondition->set_strcolumnname("tag_name"); @@ -327,7 +327,7 @@ void testUpdate() pValue->set_edatatype(DataType::CN_DATATYPE_STRING); pValue->set_strvalue("tag_name_value测试:2"); - kbd_idlfile::RdbUpdateValue *pUpdateValue = msgUpdate.add_msgupdatevalue(); + iot_idl::RdbUpdateValue *pUpdateValue = msgUpdate.add_msgupdatevalue(); pUpdateValue->set_strcolumnname("value"); pValue = pUpdateValue->mutable_msgvalue(); pValue->set_edatatype(DataType::CN_DATATYPE_FLOAT); @@ -347,16 +347,16 @@ void testUpdate() void testQuery() { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; CRdbNetApi objNetApi; objNetApi.connect(1, 4); bool bRet = false; - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("digital"); std::string *pColName = msgQuery.add_strselectcolnamearr(); *pColName = "value"; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("tag_name"); @@ -364,7 +364,7 @@ void testQuery() pCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue("qy1.jgxh_a06Gcopy1312Gcopy559.QL1"); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; int ns = QTime::currentTime().msecsSinceStartOfDay(); bRet = objNetApi.query(msgQuery, retMsg); if (false == bRet) diff --git a/product/src/example/dbms_test/test/rdb_redundant_test/rdb_redundant_test.cpp b/product/src/example/dbms_test/test/rdb_redundant_test/rdb_redundant_test.cpp index b31700c8..7abba7f1 100644 --- a/product/src/example/dbms_test/test/rdb_redundant_test/rdb_redundant_test.cpp +++ b/product/src/example/dbms_test/test/rdb_redundant_test/rdb_redundant_test.cpp @@ -3,7 +3,7 @@ #include "stdlib.h" #include "boost/thread.hpp" -using namespace kbd_dbms; +using namespace iot_dbms; #define CN_loop_times 10 #define CN_insert_count 50 @@ -11,7 +11,7 @@ using namespace kbd_dbms; int main(int argc, char *argv[]) { CRdbAccessEx objAccess; - kbd_public::StartLogSystem("default","rdb_redundant_test"); + iot_public::StartLogSystem("default","rdb_redundant_test"); bool bRet= objAccess.open(4, "accuml"); //test update diff --git a/product/src/example/frame_example/common/MessageQueue.cpp b/product/src/example/frame_example/common/MessageQueue.cpp index c7ff088b..fc45d66a 100644 --- a/product/src/example/frame_example/common/MessageQueue.cpp +++ b/product/src/example/frame_example/common/MessageQueue.cpp @@ -6,8 +6,8 @@ #include "MessageQueue.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; CMessageQueue::CMessageQueue() diff --git a/product/src/example/frame_example/common/MessageQueue.h b/product/src/example/frame_example/common/MessageQueue.h index cc566599..5034c99f 100644 --- a/product/src/example/frame_example/common/MessageQueue.h +++ b/product/src/example/frame_example/common/MessageQueue.h @@ -9,7 +9,7 @@ #include "MessageStruct.h" #include -namespace kbd_service +namespace iot_service { class CMessageQueue { diff --git a/product/src/example/frame_example/common/NetMsgBusThread.cpp b/product/src/example/frame_example/common/NetMsgBusThread.cpp index c36143f6..ca5d9ff8 100644 --- a/product/src/example/frame_example/common/NetMsgBusThread.cpp +++ b/product/src/example/frame_example/common/NetMsgBusThread.cpp @@ -9,9 +9,9 @@ #include "MessageType.h" #include "pub_logger_api/logger.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; using namespace std; diff --git a/product/src/example/frame_example/common/NetMsgBusThread.h b/product/src/example/frame_example/common/NetMsgBusThread.h index b5f2e21b..af880b24 100644 --- a/product/src/example/frame_example/common/NetMsgBusThread.h +++ b/product/src/example/frame_example/common/NetMsgBusThread.h @@ -13,9 +13,9 @@ #include -namespace kbd_service +namespace iot_service { -class CNetMsgBusThread : public kbd_public::CTimerThreadBase +class CNetMsgBusThread : public iot_public::CTimerThreadBase { public: CNetMsgBusThread(int nDomian,int nAppID ); @@ -26,8 +26,8 @@ private: int m_nAppID; //应用ID ; private: - kbd_net::CMbCommunicator m_objComm; //通讯器； - kbd_net::CMbCommunicator m_objSendComm; //发生数据通讯器； + iot_net::CMbCommunicator m_objComm; //通讯器； + iot_net::CMbCommunicator m_objSendComm; //发生数据通讯器； CMessageQueuePtr m_ptrMsgBuffer; //消息缓存类 @@ -35,11 +35,11 @@ private: /* @brief 从消息总线接收操作消息并并存入消息缓存队列 */ - bool readToQueue(kbd_net::CMbMessage &objMsg); + bool readToQueue(iot_net::CMbMessage &objMsg); /* @brief 从消息缓存队列读取消息发送到消息总线 */ - bool sendFromQueue(kbd_net::CMbMessage &objMsg); + bool sendFromQueue(iot_net::CMbMessage &objMsg); public: /* diff --git a/product/src/example/frame_example/common/RdbTableMng.cpp b/product/src/example/frame_example/common/RdbTableMng.cpp index 6586938f..28050e0a 100644 --- a/product/src/example/frame_example/common/RdbTableMng.cpp +++ b/product/src/example/frame_example/common/RdbTableMng.cpp @@ -1,9 +1,9 @@ #include "RdbTableMng.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_service; CRdbTableMng::CRdbTableMng(std::string strAppName) { @@ -81,7 +81,7 @@ bool CRdbTableMng::updateRecordTwoValueByIndex(const std::string strTableName, bool CRdbTableMng::updateRecordMultiValueByIndex(const std::string strTableName, int recordIndex, - std::vector vecUpdColumn) + std::vector vecUpdColumn) { return true; } @@ -143,7 +143,7 @@ bool CRdbTableMng::updateRecordTwoValueByKey(const std::string strTableName, bool CRdbTableMng::updateRecordMultiValueByKey(const std::string strTableName, const void* keyValue, - std::vector vecUpdColumn) + std::vector vecUpdColumn) { return true; diff --git a/product/src/example/frame_example/common/RdbTableMng.h b/product/src/example/frame_example/common/RdbTableMng.h index 143eb97e..21b71ae6 100644 --- a/product/src/example/frame_example/common/RdbTableMng.h +++ b/product/src/example/frame_example/common/RdbTableMng.h @@ -10,7 +10,7 @@ #include "rdb_api/RdbDefine.h" #include "rdb_api/CRdbAccessEx.h" -namespace kbd_service +namespace iot_service { class CRdbTableMng @@ -20,7 +20,7 @@ public: private: std::string m_strAppName; - std::map m_mapRdbTable; + std::map m_mapRdbTable; public: /*RDB 管理初始化 */ int init(std::string strAppName); @@ -68,7 +68,7 @@ public: bool updateRecordMultiValueByIndex(const std::string strTableName, int recordIndex, - std::vector vecUpdColumn); + std::vector vecUpdColumn); //通过KEY接口函数 //========================================================================================== @@ -106,7 +106,7 @@ public: bool updateRecordMultiValueByKey(const std::string strTableName, const void* keyValue, - std::vector vecUpdColumn); + std::vector vecUpdColumn); //通过条件查询接口函数 //========================================================================================== @@ -177,7 +177,7 @@ public: bool selectAllColumnMultiCondition(const std::string &strTableName, std::vector &vecTableStruct, const std::string &strConColName, //条件列名 - const std::vector &vecCondInfo, + const std::vector &vecCondInfo, const std::string &strOrder="", int nAsc=1); @@ -186,7 +186,7 @@ public: bool selectSelColumnMultiCondition(const std::string strTableName,//表名称 const std::vector &vecSelColnumn, //选择列 std::vector &vecTableStruct, //输出结构 - const std::vector &vecCondInfo, + const std::vector &vecCondInfo, const std::string &strOrder="", int nAsc=1); @@ -195,7 +195,7 @@ public: bool selectOneColumnMultiCondition(const std::string &strTableName,//表名称 const std::string &strColnumnName,//选择列 std::vector &vecColumnValue,//输出列值 - const std::vector &vecCondInfo, + const std::vector &vecCondInfo, const std::string &strOrder="", int nAsc=1); @@ -221,7 +221,7 @@ public: bool updateMultiCondition(const std::string strTableName, const std::string strColName, const T &value, - const std::vector &vecCondInfo); + const std::vector &vecCondInfo); //Delete //========================================================================================== @@ -238,7 +238,7 @@ public: /*按条件删除N条记录,多个条件 */ template bool removeMultiCondition(const std::string strTableName, - const std::vector &vecCondInfo); + const std::vector &vecCondInfo); //Insert //========================================================================================== diff --git a/product/src/example/frame_example/data_process/AnaProcess.cpp b/product/src/example/frame_example/data_process/AnaProcess.cpp index fedf0402..42c477f8 100644 --- a/product/src/example/frame_example/data_process/AnaProcess.cpp +++ b/product/src/example/frame_example/data_process/AnaProcess.cpp @@ -3,10 +3,10 @@ #include "../common/RdbTableMng.cpp" 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() { @@ -2580,10 +2580,10 @@ int CAnaProcess::writeRdbAndSendMsg(const SChangeAiData &stOneAiLimit, int style @return 无 @retval */ -void CAnaProcess::InitAiMiVS(kbd_service::SOldValueStatus &stOldValueStatus, - kbd_service::SNewValueStatus &stNewValueStatus, - kbd_service::SMiOldValueStatus &stMiOldValueStatus, - kbd_service::SMiNewValueStatus &stMiNewValueStatus) +void CAnaProcess::InitAiMiVS(iot_service::SOldValueStatus &stOldValueStatus, + iot_service::SNewValueStatus &stNewValueStatus, + iot_service::SMiOldValueStatus &stMiOldValueStatus, + iot_service::SMiNewValueStatus &stMiNewValueStatus) { stOldValueStatus.oldstatus = 0; stOldValueStatus.oldvalue = 0; diff --git a/product/src/example/frame_example/data_process/AnaProcess.h b/product/src/example/frame_example/data_process/AnaProcess.h index ec944bac..9dbf3bb7 100644 --- a/product/src/example/frame_example/data_process/AnaProcess.h +++ b/product/src/example/frame_example/data_process/AnaProcess.h @@ -18,7 +18,7 @@ #include "data_process_api/DataProcessApi.h" #include -namespace kbd_service +namespace iot_service { class CAnaProcess { @@ -27,10 +27,10 @@ public: CAnaProcess(); ~CAnaProcess(); -// kbd_idlfile::SAppToAlarmServerMsg m_stAlarmMsg; -// kbd_idlfile::SRealTimeDataPkg m_stChangeMsg; -// kbd_idlfile::STransDataPkg m_AoTransOptSrvMsg;//遥控 -// kbd_idlfile::STransDataPkg m_DoTransOptSrvMsg;//控制面板 +// iot_idl::SAppToAlarmServerMsg m_stAlarmMsg; +// iot_idl::SRealTimeDataPkg m_stChangeMsg; +// iot_idl::STransDataPkg m_AoTransOptSrvMsg;//遥控 +// iot_idl::STransDataPkg m_DoTransOptSrvMsg;//控制面板 public: /* @brief 执行业务进程前执行内容 @@ -45,28 +45,28 @@ public: @return 成功 true 失败 false @retval */ - int procAiChange(const kbd_idlfile::SFesChangeAiPkg &stFesChgAiPkg); + int procAiChange(const iot_idl::SFesChangeAiPkg &stFesChgAiPkg); /* @brief 模拟量全数据处理函数 @param chgAiPkg 变化数据包结构体 @return 成功 true 失败 false @retval */ - int procAiUpdate(const kbd_idlfile::SFesUpdateAiPkg &stFesUpAiPkg); + int procAiUpdate(const iot_idl::SFesUpdateAiPkg &stFesUpAiPkg); /* @brief 变化累计量处理函数CAnaProcess @param chgPiPkg 变化数据包结构体 @return 成功 true 失败 false @retval */ - int procPiChange(const kbd_idlfile::SFesChangePiPkg &stFesChgPiPkg); + int procPiChange(const iot_idl::SFesChangePiPkg &stFesChgPiPkg); /* @brief 累计量全数据处理函数 @param chgAiPkg 变化数据包结构体 @return 成功 true 失败 false @retval */ - int procPiUpdate(const kbd_idlfile::SFesUpdatePiPkg &stFesUpPiPkg); + int procPiUpdate(const iot_idl::SFesUpdatePiPkg &stFesUpPiPkg); /* @brief 发生变化数据给HMI,DATASAVE等 */ @@ -78,7 +78,7 @@ public: /* @brief 置数、取消置数、取消禁止刷新处理 */ - int optLockData(const kbd_idlfile::SLockDataPkg &stLockDataPkg); + int optLockData(const iot_idl::SLockDataPkg &stLockDataPkg); /* @brief 越线延迟处理 */ @@ -160,10 +160,10 @@ private: std::map m_mapDelayPiLimitType; -// kbd_dbms::CRdbAccess m_RdbAnaTable; -// kbd_dbms::CRdbAccess m_RdbAnaCtrlTable; -// kbd_dbms::CRdbAccess m_RdbMixTable; -// kbd_dbms::CRdbAccess m_RdbPiTable; +// iot_dbms::CRdbAccess m_RdbAnaTable; +// iot_dbms::CRdbAccess m_RdbAnaCtrlTable; +// iot_dbms::CRdbAccess m_RdbMixTable; +// iot_dbms::CRdbAccess m_RdbPiTable; CDataProcessApi m_DataProcApi; CNetMsgBusThreadPtr m_ptrThDataComm; diff --git a/product/src/example/frame_example/data_process/AnaStructDefine.h b/product/src/example/frame_example/data_process/AnaStructDefine.h index be39531a..4bd9f7f1 100644 --- a/product/src/example/frame_example/data_process/AnaStructDefine.h +++ b/product/src/example/frame_example/data_process/AnaStructDefine.h @@ -4,7 +4,7 @@ #include "DataProcessInclude.h" -namespace kbd_service +namespace iot_service { struct SScadaAiInfo diff --git a/product/src/example/frame_example/data_process/DataCommThread.cpp b/product/src/example/frame_example/data_process/DataCommThread.cpp index fab4086b..2998822e 100644 --- a/product/src/example/frame_example/data_process/DataCommThread.cpp +++ b/product/src/example/frame_example/data_process/DataCommThread.cpp @@ -10,9 +10,9 @@ #include "DataProcessDefine.h" #include "pub_logger_api/logger.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; using namespace std; diff --git a/product/src/example/frame_example/data_process/DataCommThread.h b/product/src/example/frame_example/data_process/DataCommThread.h index 48c95f02..36fc1f33 100644 --- a/product/src/example/frame_example/data_process/DataCommThread.h +++ b/product/src/example/frame_example/data_process/DataCommThread.h @@ -14,9 +14,9 @@ #include -namespace kbd_service +namespace iot_service { -class CDataCommThread : public kbd_public::CTimerThreadBase +class CDataCommThread : public iot_public::CTimerThreadBase { public: CDataCommThread(int nDomian,int nAppID ); @@ -27,8 +27,8 @@ private: int m_nAppID; //应用ID ; private: - kbd_net::CMbCommunicator m_objComm; //通讯器； - kbd_net::CMbCommunicator m_objSendComm; //发生数据通讯器； + iot_net::CMbCommunicator m_objComm; //通讯器； + iot_net::CMbCommunicator m_objSendComm; //发生数据通讯器； CMessageBufferPtr m_ptrMsgBuffer; //消息缓存类 @@ -36,11 +36,11 @@ private: /* @brief 从消息总线接收操作消息并并存入消息缓存队列 */ - bool readToQueue(kbd_net::CMbMessage &objMsg); + bool readToQueue(iot_net::CMbMessage &objMsg); /* @brief 从消息缓存队列读取消息发送到消息总线 */ - bool sendFromQueue(kbd_net::CMbMessage &objMsg); + bool sendFromQueue(iot_net::CMbMessage &objMsg); public: /* diff --git a/product/src/example/frame_example/data_process/DataProcess.cpp b/product/src/example/frame_example/data_process/DataProcess.cpp index db776edf..68f9a9ea 100644 --- a/product/src/example/frame_example/data_process/DataProcess.cpp +++ b/product/src/example/frame_example/data_process/DataProcess.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; CDataProcess::CDataProcess() { @@ -84,7 +84,7 @@ bool CDataProcess::isAlreadyRunning(std::string strProcessName) m_strInstName += " -s "; m_strInstName += m_strAppName; - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); } /* diff --git a/product/src/example/frame_example/data_process/DataProcess.h b/product/src/example/frame_example/data_process/DataProcess.h index 7ae68e1e..8adf1fb4 100644 --- a/product/src/example/frame_example/data_process/DataProcess.h +++ b/product/src/example/frame_example/data_process/DataProcess.h @@ -20,9 +20,9 @@ //=============================================================== #include "MainWorkThread.h" -namespace kbd_service +namespace iot_service { -class CDataProcess : public kbd_public::CBaseService,kbd_sys::CProcessQuitInterface +class CDataProcess : public iot_public::CBaseService,iot_sys::CProcessQuitInterface { public: CDataProcess(); @@ -47,15 +47,15 @@ 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_strAppName; std::string m_strProcessName; std::string m_strInstName; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; //工作线程指针 CMainWorkThreadPtr m_ptrMainWorkThread; diff --git a/product/src/example/frame_example/data_process/DataProcessDefine.h b/product/src/example/frame_example/data_process/DataProcessDefine.h index dce516f2..1a1f3cb5 100644 --- a/product/src/example/frame_example/data_process/DataProcessDefine.h +++ b/product/src/example/frame_example/data_process/DataProcessDefine.h @@ -7,7 +7,7 @@ #include -namespace kbd_service +namespace iot_service { //定义消息发送方式 //======================================================================== diff --git a/product/src/example/frame_example/data_process/DataProcessMain.cpp b/product/src/example/frame_example/data_process/DataProcessMain.cpp index 606c0b14..2ecac75a 100644 --- a/product/src/example/frame_example/data_process/DataProcessMain.cpp +++ b/product/src/example/frame_example/data_process/DataProcessMain.cpp @@ -1,7 +1,7 @@  #include "DataProcess.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/product/src/example/frame_example/data_process/DigProcess.cpp b/product/src/example/frame_example/data_process/DigProcess.cpp index f984e880..e37fc7bd 100644 --- a/product/src/example/frame_example/data_process/DigProcess.cpp +++ b/product/src/example/frame_example/data_process/DigProcess.cpp @@ -6,10 +6,10 @@ #include "DigProcess.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; #pragma comment(lib,"winmm.lib") @@ -1524,7 +1524,7 @@ int CDigProcess::AddOneDiAlarm(SDiAlarm *pDiAlarmStru, string strModuleTag, int @retval */ /* -void CDigProcess::AddOneAlarmToQueue(kbd_idlfile::SAppToAlarmServerMsg &stAlarmMsg,SDiAlarm *stDiAlarm, std::string strSourceTag,\ +void CDigProcess::AddOneAlarmToQueue(iot_idl::SAppToAlarmServerMsg &stAlarmMsg,SDiAlarm *stDiAlarm, std::string strSourceTag,\ int nIsRestrain,int nInferType, std::string strALarmDesc, std::string strALarmTypeName) { diff --git a/product/src/example/frame_example/data_process/DigProcess.h b/product/src/example/frame_example/data_process/DigProcess.h index 9aba9669..fea0adb2 100644 --- a/product/src/example/frame_example/data_process/DigProcess.h +++ b/product/src/example/frame_example/data_process/DigProcess.h @@ -14,7 +14,7 @@ #include "../common/RdbTableMng.h" #include "../common/NetMsgBusThread.h" -namespace kbd_service +namespace iot_service { class CDigProcess { @@ -98,9 +98,9 @@ private: public: void SetDataCommPtr(CNetMsgBusThreadPtr ptrDataComm){m_ptrThDataComm = ptrDataComm; } - int ProcessDiChange(const kbd_idlfile::SFesChangeDiPkg &stChangeDiPkg, int nSoeFlag); //0:yx bw;1,soe - int ProcessDiUpdate(const kbd_idlfile::SFesUpdateDiPkg &stUpdateDiPkg, bool bIsForceFvCommit); - int ProcessOperate(kbd_idlfile::SLockDataPkg lock_pkg);//人工置数/静止刷新等处理 + int ProcessDiChange(const iot_idl::SFesChangeDiPkg &stChangeDiPkg, int nSoeFlag); //0:yx bw;1,soe + int ProcessDiUpdate(const iot_idl::SFesUpdateDiPkg &stUpdateDiPkg, bool bIsForceFvCommit); + int ProcessOperate(iot_idl::SLockDataPkg lock_pkg);//人工置数/静止刷新等处理 int ProcessSetData(const char *strTagName, int nFlag); //人工置数/静止刷新等处理，操作实时库 void DeleteNoUseInfo(); @@ -118,12 +118,12 @@ private: int AddOneDiAlarm(SDiAlarm *stDiAlarm, std::string strModuleTag, int nFlag = 0); int AddOneSoeAlarm(SDiAlarm *stDiAlarm, std::string strModuleTag); - //void AddOneAlarmToQueue(kbd_idlfile::SAppToAlarmServerMsg &stAlarmMsg,SDiAlarm *stDiAlarm, std::string strSourceTag,\ + //void AddOneAlarmToQueue(iot_idl::SAppToAlarmServerMsg &stAlarmMsg,SDiAlarm *stDiAlarm, std::string strSourceTag,\ int nIsRestrain,int nInferType, std::string strALarmDesc, std::string strALarmTypeName); void GetTimeString(char *strTimeBuf, const int nSec, short sMsec = 0, bool bMsecFlag = false); - int ProcessOnePscadaSoe(const SChangeDiInfo &stChangeInfo, kbd_idlfile::SSoeDataMsg &stSoeMsgUnit) ; + int ProcessOnePscadaSoe(const SChangeDiInfo &stChangeInfo, iot_idl::SSoeDataMsg &stSoeMsgUnit) ; int ProcessOneDiChange(SChangeDiInfo stChangeInfo, SampleDataList &vecFvdbRec) ; int GetDiAlarmInfo(std::string &strAlarm, SDiAlarm *stDiAlarm); diff --git a/product/src/example/frame_example/data_process/MainWorkThread.cpp b/product/src/example/frame_example/data_process/MainWorkThread.cpp index 5b4e82bf..31706ae8 100644 --- a/product/src/example/frame_example/data_process/MainWorkThread.cpp +++ b/product/src/example/frame_example/data_process/MainWorkThread.cpp @@ -10,10 +10,10 @@ #include "MessageType.h" #include "pub_logger_api/logger.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; using namespace std; CMainWorkThread::CMainWorkThread(int nDomian,int nAppID): diff --git a/product/src/example/frame_example/data_process/MainWorkThread.h b/product/src/example/frame_example/data_process/MainWorkThread.h index a031cfc8..97131967 100644 --- a/product/src/example/frame_example/data_process/MainWorkThread.h +++ b/product/src/example/frame_example/data_process/MainWorkThread.h @@ -21,9 +21,9 @@ #include -namespace kbd_service +namespace iot_service { -class CMainWorkThread : public kbd_public::CTimerThreadBase +class CMainWorkThread : public iot_public::CTimerThreadBase { public: CMainWorkThread(int nDomain,int nAppID); diff --git a/product/src/example/frame_example/data_process/MessageBuffer.cpp b/product/src/example/frame_example/data_process/MessageBuffer.cpp index 27236200..353d4b94 100644 --- a/product/src/example/frame_example/data_process/MessageBuffer.cpp +++ b/product/src/example/frame_example/data_process/MessageBuffer.cpp @@ -6,8 +6,8 @@ #include "MessageBuffer.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; CMessageBuffer::CMessageBuffer() diff --git a/product/src/example/frame_example/data_process/MessageBuffer.h b/product/src/example/frame_example/data_process/MessageBuffer.h index cd4a2838..86c65677 100644 --- a/product/src/example/frame_example/data_process/MessageBuffer.h +++ b/product/src/example/frame_example/data_process/MessageBuffer.h @@ -9,7 +9,7 @@ #include "MessageStruct.h" #include -namespace kbd_service +namespace iot_service { class CMessageBuffer { diff --git a/product/src/example/frame_example/data_process/RealDataPublish.cpp b/product/src/example/frame_example/data_process/RealDataPublish.cpp index 13c61c0d..65cfa5c0 100644 --- a/product/src/example/frame_example/data_process/RealDataPublish.cpp +++ b/product/src/example/frame_example/data_process/RealDataPublish.cpp @@ -10,9 +10,9 @@ #include "pub_logger_api/logger.h" -using namespace kbd_service; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_idl; +using namespace iot_public; using namespace std; diff --git a/product/src/example/frame_example/data_process/RealDataPublish.h b/product/src/example/frame_example/data_process/RealDataPublish.h index 75a29be9..234335bc 100644 --- a/product/src/example/frame_example/data_process/RealDataPublish.h +++ b/product/src/example/frame_example/data_process/RealDataPublish.h @@ -9,7 +9,7 @@ #include "../common/NetMsgBusThread.h" #include "HmiRealDataMessage.pb.h" -namespace kbd_service +namespace iot_service { class CRealDataPublish { @@ -19,7 +19,7 @@ public: private: int m_nAppID; //应用ID; - kbd_idlfile::SRealTimeDataPkg m_stChangeMsg; + iot_idl::SRealTimeDataPkg m_stChangeMsg; CNetMsgBusThreadPtr m_ptrOptCommon; public: diff --git a/product/src/example/frame_example/data_process/RedundantSwitch.cpp b/product/src/example/frame_example/data_process/RedundantSwitch.cpp index f9f854e7..6fed8b30 100644 --- a/product/src/example/frame_example/data_process/RedundantSwitch.cpp +++ b/product/src/example/frame_example/data_process/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_ptrMainWorkThread = NULL; diff --git a/product/src/example/frame_example/data_process/RedundantSwitch.h b/product/src/example/frame_example/data_process/RedundantSwitch.h index a1a2c746..315cc3de 100644 --- a/product/src/example/frame_example/data_process/RedundantSwitch.h +++ b/product/src/example/frame_example/data_process/RedundantSwitch.h @@ -10,17 +10,17 @@ #include "MainWorkThread.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: CMainWorkThreadPtr m_ptrMainWorkThread; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; public: /* diff --git a/product/src/example/genMySQLConfig/main.cpp b/product/src/example/genMySQLConfig/main.cpp index 77d14eef..f0848853 100644 --- a/product/src/example/genMySQLConfig/main.cpp +++ b/product/src/example/genMySQLConfig/main.cpp @@ -42,7 +42,7 @@ void replaceAll(std::string& str, const std::string& from, const std::string& to string ExePath() { - return kbd_public::CFileUtil::getCurModuleDir(); + return iot_public::CFileUtil::getCurModuleDir(); } ] /* diff --git a/product/src/example/i18n/main.cpp b/product/src/example/i18n/main.cpp index 34511582..8fc616b0 100644 --- a/product/src/example/i18n/main.cpp +++ b/product/src/example/i18n/main.cpp @@ -6,7 +6,7 @@ int main() std::string strTest1 = "中文test测试"; std::string strTest2 = boost::locale::conv::between(strTest1, "GBK", "UTF-8"); - kbd_public::initI18N(".", "hello", "cn.UTF-8"); + iot_public::initI18N(".", "hello", "cn.UTF-8"); std::string str1 = I18N("test"); std::string strTest = (boost::locale::format(I18N("hello_world {1}")) % str1).str(); diff --git a/product/src/example/kbdlogtest/main.cpp b/product/src/example/kbdlogtest/main.cpp index 76c2997f..130468e7 100644 --- a/product/src/example/kbdlogtest/main.cpp +++ b/product/src/example/kbdlogtest/main.cpp @@ -18,7 +18,7 @@ using namespace std; using namespace log4cplus; -using namespace kbd_public; +using namespace iot_public; const char* appName = "BASE"; //exists const char* procName = "sys_ctrl"; //exists @@ -62,7 +62,7 @@ int main() StartLogSystem(appName, procName); // log4cplus::Logger tmpLogger; -// bool b = kbd_public::getLogger(tmpLogger); +// bool b = iot_public::getLogger(tmpLogger); QString sss = "测试中文123abc!@#"; diff --git a/product/src/example/kbdlogtest_thread/kbdlogtest_thread.cpp b/product/src/example/kbdlogtest_thread/kbdlogtest_thread.cpp index a8d8f318..5f66241d 100644 --- a/product/src/example/kbdlogtest_thread/kbdlogtest_thread.cpp +++ b/product/src/example/kbdlogtest_thread/kbdlogtest_thread.cpp @@ -3,7 +3,7 @@ #include "pub_logger_api/logger.h" #include -using namespace kbd_public; +using namespace iot_public; kbdlogtest_thread::kbdlogtest_thread(QWidget *parent) : QMainWindow(parent), diff --git a/product/src/example/link_seq_test/linkage_server_test/CGetDBData.cpp b/product/src/example/link_seq_test/linkage_server_test/CGetDBData.cpp index 6cb11867..927796b8 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CGetDBData.cpp +++ b/product/src/example/link_seq_test/linkage_server_test/CGetDBData.cpp @@ -11,7 +11,7 @@ CGetDBData::CGetDBData(): bool CGetDBData::openDb() { - using namespace kbd_dbms; + using namespace iot_dbms; if (isOpen()) { return true; } diff --git a/product/src/example/link_seq_test/linkage_server_test/CGetDBData.h b/product/src/example/link_seq_test/linkage_server_test/CGetDBData.h index c3a35ec7..996e89c3 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CGetDBData.h +++ b/product/src/example/link_seq_test/linkage_server_test/CGetDBData.h @@ -42,7 +42,7 @@ private: bool remapDbTableActionInfo(CLinkageDbContainer &dbContainer); private: - kbd_dbms::CDbApi m_objLocalDbConn; + iot_dbms::CDbApi m_objLocalDbConn; }; diff --git a/product/src/example/link_seq_test/linkage_server_test/CGetRdbData.h b/product/src/example/link_seq_test/linkage_server_test/CGetRdbData.h index e2a8a1a1..2aff18cb 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CGetRdbData.h +++ b/product/src/example/link_seq_test/linkage_server_test/CGetRdbData.h @@ -8,7 +8,7 @@ class MainWindow; class CGetRdbData - : public QObject, public kbd_public::CTimerThreadBase + : public QObject, public iot_public::CTimerThreadBase { Q_OBJECT diff --git a/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.cpp b/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.cpp index 016be781..92f56459 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.cpp +++ b/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.cpp @@ -4,7 +4,7 @@ #include #include -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; CLinkageForHmiApiInterface::CLinkageForHmiApiInterface(MainWindow* mainWindow) :m_ptrMain(mainWindow) { @@ -310,7 +310,7 @@ bool CLinkageForHmiApiInterface::handleLinkStateChange( std::string CLinkageForHmiApiInterface::nodeStatusStr( ENLcsStatus type) { - using namespace kbd_idlfile; + using namespace iot_idl; std::string strRet; switch (type) { diff --git a/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h b/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h index 054cc3dd..c1d73348 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h +++ b/product/src/example/link_seq_test/linkage_server_test/CLinkageForHmiApiInterface.h @@ -3,7 +3,7 @@ #include "application/linkage_server_api/CLinkageForHmiApi.h" class MainWindow; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; class CLinkageForHmiApiInterface : public kbd_application::CLinkageForHmiApi diff --git a/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.cpp b/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.cpp index 6b2f2c27..3f1de036 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.cpp +++ b/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.cpp @@ -16,7 +16,7 @@ bool CRdbLinkRunningAccess::remapRunningTable(CRecoverNodeContainer& info) { info.clearData(); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("linkage_running"); std::string *pColName = msgQuery.add_strselectcolnamearr(); *pColName = "linkage_name"; @@ -66,7 +66,7 @@ bool CRdbLinkRunningAccess::remapRunningTable(CRecoverNodeContainer& info) pColName = msgQuery.add_strordercolnamearr(); *pColName = "node_type"; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("linkage_name"); @@ -75,7 +75,7 @@ bool CRdbLinkRunningAccess::remapRunningTable(CRecoverNodeContainer& info) pCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(m_strLinkName); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet = objNetApi.query(msgQuery, retMsg); if (false == bRet) { std::cout << "query failed." << std::endl; diff --git a/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.h b/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.h index bd44116f..e3d352e7 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.h +++ b/product/src/example/link_seq_test/linkage_server_test/CRdbLinkRunningAccess.h @@ -18,8 +18,8 @@ #include "CRecoverNodeContainer.h" #include "CGetDBData.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; class CRdbLinkRunningAccess { diff --git a/product/src/example/link_seq_test/linkage_server_test/CSetReqMsgInfo.h b/product/src/example/link_seq_test/linkage_server_test/CSetReqMsgInfo.h index 99aa1208..6591864d 100644 --- a/product/src/example/link_seq_test/linkage_server_test/CSetReqMsgInfo.h +++ b/product/src/example/link_seq_test/linkage_server_test/CSetReqMsgInfo.h @@ -8,7 +8,7 @@ #include "ConfigureDialog.h" class CRecoverNode; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; typedef std::map MapCheckState; class QTreeWidgetItem; diff --git a/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.h b/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.h index 309a76e5..9ab3c1b8 100644 --- a/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.h +++ b/product/src/example/link_seq_test/linkage_server_test/ConfigureDialog.h @@ -10,7 +10,7 @@ namespace Ui { class ConfigureDialog; } -using namespace kbd_dbms; +using namespace iot_dbms; class ConfigureDialog : public QDialog { Q_OBJECT diff --git a/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.cpp b/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.cpp index 3aa7933c..e7ed1701 100644 --- a/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.cpp +++ b/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.cpp @@ -1,11 +1,11 @@ #include "RefreshExeStateThread.h" #include "rdb_net_api/CRdbNetApi.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; RefreshExeStateThread::RefreshExeStateThread() - :CTimerThreadBase("RefreshExeState thread", 500, kbd_public::CN_DeadlockTimeoutMsec, false) + :CTimerThreadBase("RefreshExeState thread", 500, iot_public::CN_DeadlockTimeoutMsec, false) { } @@ -20,7 +20,7 @@ bool RefreshExeStateThread::getDomainLinkStatue() RefreshExeStateThreadStatusLocker lock(*this); linkStatus.clear(); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("linkage_running"); std::string *pColName = msgQuery.add_strselectcolnamearr(); *pColName = "linkage_name"; @@ -29,7 +29,7 @@ bool RefreshExeStateThread::getDomainLinkStatue() pColName = msgQuery.add_strselectcolnamearr(); *pColName = "status"; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("node_type"); @@ -38,7 +38,7 @@ bool RefreshExeStateThread::getDomainLinkStatue() pCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pCondValue->set_nvalue(0); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet = objNetApi.query(msgQuery, retMsg); if (false == bRet) { std::cout << "query failed." << std::endl; diff --git a/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.h b/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.h index 639599d9..99ca1760 100644 --- a/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.h +++ b/product/src/example/link_seq_test/linkage_server_test/RefreshExeStateThread.h @@ -5,7 +5,7 @@ #include "CGetRdbData.h" class RefreshExeStateThread - :public kbd_public::CTimerThreadBase + :public iot_public::CTimerThreadBase { public: RefreshExeStateThread(); diff --git a/product/src/example/link_seq_test/linkage_server_test/main.cpp b/product/src/example/link_seq_test/linkage_server_test/main.cpp index e70486ef..822ad7de 100644 --- a/product/src/example/link_seq_test/linkage_server_test/main.cpp +++ b/product/src/example/link_seq_test/linkage_server_test/main.cpp @@ -8,9 +8,9 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("comapp", "hmi-test"); + iot_public::StartLogSystem("comapp", "hmi-test"); - int nRet = kbd_net::initMsgBus( + int nRet = iot_net::initMsgBus( std::string("hmi").c_str(), std::string("hmiInstance").c_str()); if (false == nRet) { @@ -25,8 +25,8 @@ int main(int argc, char *argv[]) w.quit(); } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return nRet; } diff --git a/product/src/example/link_seq_test/linkage_server_test/mainwindow.cpp b/product/src/example/link_seq_test/linkage_server_test/mainwindow.cpp index a1ff526d..68441061 100644 --- a/product/src/example/link_seq_test/linkage_server_test/mainwindow.cpp +++ b/product/src/example/link_seq_test/linkage_server_test/mainwindow.cpp @@ -585,7 +585,7 @@ void MainWindow::slot_showMsg(const QString & msg) void MainWindow::slot_showUiMsg(const QString& msgStr, void* pData) { - using namespace kbd_idlfile; + using namespace iot_idl; UiRequestMessage* msg = (UiRequestMessage*)pData; UiRequestMessageAck retMsg; diff --git a/product/src/example/link_seq_test/linkage_server_test/mainwindow.h b/product/src/example/link_seq_test/linkage_server_test/mainwindow.h index 54e3ad4f..a1130eb2 100644 --- a/product/src/example/link_seq_test/linkage_server_test/mainwindow.h +++ b/product/src/example/link_seq_test/linkage_server_test/mainwindow.h @@ -22,7 +22,7 @@ class QListWidget; class QListWidgetItem; class QTreeWidget; class QTreeWidgetItem; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; class MainWindow : public QMainWindow { @@ -101,7 +101,7 @@ private: QAbstractButton * m_btnStop; QAbstractButton * m_btnSkip; - kbd_dbms::CDbApi m_objLocalDbConn; + iot_dbms::CDbApi m_objLocalDbConn; QStringList refreshBuf; QTimer *RunTabTimer; diff --git a/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.cpp b/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.cpp index 6ce4a711..09e34392 100644 --- a/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.cpp +++ b/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.cpp @@ -5,7 +5,7 @@ #include "clinkageforhmiapiimpl.h" -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; class MainWindow; CLinkageForHmiApiImpl::CLinkageForHmiApiImpl( @@ -57,7 +57,7 @@ void CLinkageForHmiApiImpl::afterSuspend() } void CLinkageForHmiApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; if (!m_objRecvLinkCMb.recvMsg(m_objRecvMsg)) { return; @@ -102,10 +102,10 @@ bool CLinkageForHmiApiImpl::handleLinkActionToHmiMessage(ActionToHmiMessage &msg } bool CLinkageForHmiApiImpl::recvMsgLink( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; if (msg.getMsgType() != MT_LINKAGE_ACTION_UP) { diff --git a/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.h b/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.h index c3dd3a2e..98f5468b 100644 --- a/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.h +++ b/product/src/example/link_seq_test/linkage_tuihuamian_test/clinkageforhmiapiimpl.h @@ -8,10 +8,10 @@ #include "LinkageMessage.pb.h" #include "mainwindow.h" -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; class MainWindow; class CLinkageForHmiApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CLinkageForHmiApiImpl(int appid, MainWindow* mainwindow); @@ -32,13 +32,13 @@ private: bool handleLinkActionToHmiMessage( ActionToHmiMessage& msg); - bool recvMsgLink(kbd_net::CMbMessage& msg); + bool recvMsgLink(iot_net::CMbMessage& msg); private: MainWindow* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendLinkCMb;//发送 linkage - kbd_net::CMbCommunicator m_objRecvLinkCMb;//接收 linkage + iot_net::CMbCommunicator m_objSendLinkCMb;//发送 linkage + iot_net::CMbCommunicator m_objRecvLinkCMb;//接收 linkage const int m_nServerAppId; }; diff --git a/product/src/example/link_seq_test/linkage_tuihuamian_test/main.cpp b/product/src/example/link_seq_test/linkage_tuihuamian_test/main.cpp index 7f50cc5a..23f7281b 100644 --- a/product/src/example/link_seq_test/linkage_tuihuamian_test/main.cpp +++ b/product/src/example/link_seq_test/linkage_tuihuamian_test/main.cpp @@ -8,9 +8,9 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("comapp", "hmi-test"); + iot_public::StartLogSystem("comapp", "hmi-test"); - int nRet = kbd_net::initMsgBus( + int nRet = iot_net::initMsgBus( std::string("hmi").c_str(), std::string("hmiInstance").c_str()); if (false == nRet) { @@ -25,8 +25,8 @@ int main(int argc, char *argv[]) w.quit(); } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return nRet; } diff --git a/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.h b/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.h index 9ef187b3..f8a8ceca 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.h +++ b/product/src/example/link_seq_test/sequence_server_test/CConfigureDialog.h @@ -10,7 +10,7 @@ namespace Ui { class CConfigureDialog; } -using namespace kbd_dbms; +using namespace iot_dbms; class CConfigureDialog : public QDialog { Q_OBJECT @@ -50,8 +50,8 @@ private: Ui::CConfigureDialog *ui; CSqlDbCtrl *m_objDbCtrl; - kbd_dbms::CDbPara m_objDbPara; - kbd_dbms::CQDbInterface m_objLocalDbConn; + iot_dbms::CDbPara m_objDbPara; + iot_dbms::CQDbInterface m_objLocalDbConn; QTreeWidgetItem * m_objItem = 0; QTreeWidgetItem * m_objDbParaItem; diff --git a/product/src/example/link_seq_test/sequence_server_test/CGetRdbDataThread.h b/product/src/example/link_seq_test/sequence_server_test/CGetRdbDataThread.h index d44e6d3a..a3487531 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CGetRdbDataThread.h +++ b/product/src/example/link_seq_test/sequence_server_test/CGetRdbDataThread.h @@ -9,7 +9,7 @@ class MainWindow; class CGetRdbDataThread - : public QObject, public kbd_public::CTimerThreadBase + : public QObject, public iot_public::CTimerThreadBase { Q_OBJECT diff --git a/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.cpp b/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.cpp index 45160364..b8394c6d 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.cpp @@ -2,8 +2,8 @@ #include #include "rdb_net_api/CRdbNetApi.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CRdbSeqRunningAccess::CRdbSeqRunningAccess(const std::string& seqName, int domainId): m_strSeqName(seqName),m_domainId(domainId) { @@ -19,7 +19,7 @@ bool CRdbSeqRunningAccess::remapRunningTable(CRecoverNodeContainer& info) { info.clearData(); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("sequence_running"); std::string *pColName = msgQuery.add_strselectcolnamearr(); *pColName = "seq_name"; @@ -71,7 +71,7 @@ bool CRdbSeqRunningAccess::remapRunningTable(CRecoverNodeContainer& info) pColName = msgQuery.add_strordercolnamearr(); *pColName = "node_type"; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("seq_name"); @@ -80,7 +80,7 @@ bool CRdbSeqRunningAccess::remapRunningTable(CRecoverNodeContainer& info) pCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(m_strSeqName); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet = objNetApi.query(msgQuery, retMsg); if (false == bRet) { std::cout << "query failed." << std::endl; diff --git a/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.h b/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.h index 770cff0a..1a9e9639 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.h +++ b/product/src/example/link_seq_test/sequence_server_test/CRdbSeqRunningAccess.h @@ -16,8 +16,8 @@ #include "DbTableDefine.h" #include "CRecoverNodeContainer.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; class CRdbSeqRunningAccess { public: diff --git a/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.cpp b/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.cpp index 6c9980e9..447e6530 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.cpp @@ -1,11 +1,11 @@ #include "CRefreshExeStatusThread.h" #include "rdb_net_api/CRdbNetApi.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CRefreshExeStateThread::CRefreshExeStateThread() - :CTimerThreadBase("RefreshExeState thread", 500, kbd_public::CN_DeadlockTimeoutMsec, false) + :CTimerThreadBase("RefreshExeState thread", 500, iot_public::CN_DeadlockTimeoutMsec, false) { } @@ -20,7 +20,7 @@ bool CRefreshExeStateThread::getDomainSeqStatue() CRefreshExeStateThreadStatusLocker lock(*this); m_mapLinkStatus.clear(); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("sequence_running"); std::string *pColName = msgQuery.add_strselectcolnamearr(); *pColName = "seq_name"; @@ -29,7 +29,7 @@ bool CRefreshExeStateThread::getDomainSeqStatue() pColName = msgQuery.add_strselectcolnamearr(); *pColName = "status"; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("node_type"); @@ -38,7 +38,7 @@ bool CRefreshExeStateThread::getDomainSeqStatue() pCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pCondValue->set_nvalue(0); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet = objNetApi.query(msgQuery, retMsg); if (false == bRet) { std::cout << "query failed." << std::endl; diff --git a/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.h b/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.h index e112eb98..6cc31f3b 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.h +++ b/product/src/example/link_seq_test/sequence_server_test/CRefreshExeStatusThread.h @@ -5,7 +5,7 @@ #include "CGetRdbDataThread.h" class CRefreshExeStateThread - :public kbd_public::CTimerThreadBase + :public iot_public::CTimerThreadBase { public: CRefreshExeStateThread(); diff --git a/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.cpp b/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.cpp index 9bfd74ec..dd17bf0e 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.cpp @@ -3,7 +3,7 @@ #include "common/DataType.h" #include -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; CSequenceForHmiApiInterface::CSequenceForHmiApiInterface(MainWindow* mainWindow) :m_ptrMain(mainWindow) { @@ -250,7 +250,7 @@ bool CSequenceForHmiApiInterface::handleSeqStateChange( std::string CSequenceForHmiApiInterface::nodeStatusStr( ENSeqStatus type) { - using namespace kbd_idlfile; + using namespace iot_idl; std::string strRet; switch (type) { diff --git a/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h b/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h index 738ea001..b304b1de 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h +++ b/product/src/example/link_seq_test/sequence_server_test/CSequenceForHmiApiInterface.h @@ -3,7 +3,7 @@ #include "application/sequence_server_api/CSeqForHmiApi.h" class MainWindow; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; class CSequenceForHmiApiInterface : public kbd_application::CSeqForHmiApi { diff --git a/product/src/example/link_seq_test/sequence_server_test/CSetSeqMsgInfo.h b/product/src/example/link_seq_test/sequence_server_test/CSetSeqMsgInfo.h index af41eb19..b266f66e 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CSetSeqMsgInfo.h +++ b/product/src/example/link_seq_test/sequence_server_test/CSetSeqMsgInfo.h @@ -4,7 +4,7 @@ #include "SequenceMessage.pb.h" #include "predifineforseqserver.h" #include "CRecoverNodeContainer.h" -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; typedef std::map MapCheckState; struct SSetReqMsg diff --git a/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp b/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp index 8933322f..ca1c9894 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.cpp @@ -20,9 +20,9 @@ CSqlDbCtrl::~CSqlDbCtrl() } } -bool CSqlDbCtrl::getDbParam(kbd_dbms::CDbPara& param) +bool CSqlDbCtrl::getDbParam(iot_dbms::CDbPara& param) { - using namespace kbd_dbms; + using namespace iot_dbms; std::string strNodeName; if (!CDbSysInfo::getInitDbNode(strNodeName)) { @@ -45,7 +45,7 @@ bool CSqlDbCtrl::getDbParam(kbd_dbms::CDbPara& param) bool CSqlDbCtrl::openDb() { - using namespace kbd_dbms; + using namespace iot_dbms; if (m_objLocalDbConn.isOpen()) { return true; } @@ -60,9 +60,9 @@ bool CSqlDbCtrl::openDb() return m_objLocalDbConn.open(); } -bool CSqlDbCtrl::openDb(const kbd_dbms::CDbPara& param) +bool CSqlDbCtrl::openDb(const iot_dbms::CDbPara& param) { - using namespace kbd_dbms; + using namespace iot_dbms; if (m_objLocalDbConn.isOpen()) { return true; } diff --git a/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.h b/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.h index 547025fd..69342b07 100644 --- a/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.h +++ b/product/src/example/link_seq_test/sequence_server_test/CSqlDbCtrl.h @@ -17,9 +17,9 @@ public: bool remapDbTable(CSeqDbContainer& dbContainer); - static bool getDbParam(kbd_dbms::CDbPara& param); + static bool getDbParam(iot_dbms::CDbPara& param); bool openDb(); - bool openDb(const kbd_dbms::CDbPara& param); + bool openDb(const iot_dbms::CDbPara& param); void closeDb(); bool isOpen(); @@ -46,5 +46,5 @@ private: bool remapDbTableActionInfo(CSeqDbContainer& dbContainer); private: - kbd_dbms::CQDbInterface m_objLocalDbConn; + iot_dbms::CQDbInterface m_objLocalDbConn; }; diff --git a/product/src/example/link_seq_test/sequence_server_test/main.cpp b/product/src/example/link_seq_test/sequence_server_test/main.cpp index c30b07c7..e5d3601a 100644 --- a/product/src/example/link_seq_test/sequence_server_test/main.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/main.cpp @@ -8,9 +8,9 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("comapp", "hmi-test"); + iot_public::StartLogSystem("comapp", "hmi-test"); - int nRet = kbd_net::initMsgBus( + int nRet = iot_net::initMsgBus( std::string("hmi").c_str(), std::string("hmiInstance").c_str()); if (false == nRet) { @@ -25,8 +25,8 @@ int main(int argc, char *argv[]) w.quit(); } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return nRet; } diff --git a/product/src/example/link_seq_test/sequence_server_test/mainwindow.cpp b/product/src/example/link_seq_test/sequence_server_test/mainwindow.cpp index 1b668433..0ae7dda0 100644 --- a/product/src/example/link_seq_test/sequence_server_test/mainwindow.cpp +++ b/product/src/example/link_seq_test/sequence_server_test/mainwindow.cpp @@ -4,7 +4,7 @@ #include #include -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -135,7 +135,7 @@ void MainWindow::slot_showMsg(const QString & msg) void MainWindow::slot_showUiMsg(const QString& msgStr, void* pData) { - using namespace kbd_idlfile; + using namespace iot_idl; UiRequestMessage* msg = (UiRequestMessage*)pData; UiRequestMessageAck retMsg; diff --git a/product/src/example/link_seq_test/trigger_test/CEditTimerWidget.cpp b/product/src/example/link_seq_test/trigger_test/CEditTimerWidget.cpp index 09dd2c83..ec0266a7 100644 --- a/product/src/example/link_seq_test/trigger_test/CEditTimerWidget.cpp +++ b/product/src/example/link_seq_test/trigger_test/CEditTimerWidget.cpp @@ -62,7 +62,7 @@ bool CEditTimerWidget::checkParam() bool CEditTimerWidget::del(const QString& name) { - kbd_dbms::CDbPara objPara; + iot_dbms::CDbPara objPara; if (!CSqlDbCtrl::getDbParam(objPara)) { return false; @@ -86,7 +86,7 @@ bool CEditTimerWidget::add() return false; } - kbd_dbms::CDbPara objPara; + iot_dbms::CDbPara objPara; if (!CSqlDbCtrl::getDbParam(objPara)) { return false; @@ -110,7 +110,7 @@ bool CEditTimerWidget::update(const QString& name) return false; } - kbd_dbms::CDbPara objPara; + iot_dbms::CDbPara objPara; if (!CSqlDbCtrl::getDbParam(objPara)) { return false; diff --git a/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp b/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp index 4ab82e31..553fea8a 100644 --- a/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp +++ b/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.cpp @@ -18,9 +18,9 @@ CSqlDbCtrl::~CSqlDbCtrl() } } -bool CSqlDbCtrl::getDbParam(kbd_dbms::CDbPara& param) +bool CSqlDbCtrl::getDbParam(iot_dbms::CDbPara& param) { - using namespace kbd_dbms; + using namespace iot_dbms; std::string strNodeName; if (!CDbSysInfo::getInitDbNode(strNodeName)) { @@ -36,10 +36,10 @@ bool CSqlDbCtrl::getDbParam(kbd_dbms::CDbPara& param) return true; } -bool CSqlDbCtrl::getdefaultDbParam(kbd_dbms::CDbPara& param) +bool CSqlDbCtrl::getdefaultDbParam(iot_dbms::CDbPara& param) { param.setHostName("192.168.77.236"); - param.setDbType(kbd_dbms::DB_TYPE_MYSQL); + param.setDbType(iot_dbms::DB_TYPE_MYSQL); param.setPort(3306); param.setDatabaseName("sjq_iscs"); param.setUserName("root"); @@ -49,7 +49,7 @@ bool CSqlDbCtrl::getdefaultDbParam(kbd_dbms::CDbPara& param) bool CSqlDbCtrl::openDb() { - using namespace kbd_dbms; + using namespace iot_dbms; if (m_objLocalDbConn.isOpen()) { return true; } @@ -64,9 +64,9 @@ bool CSqlDbCtrl::openDb() return m_objLocalDbConn.open(); } -bool CSqlDbCtrl::openDb(const kbd_dbms::CDbPara& param) +bool CSqlDbCtrl::openDb(const iot_dbms::CDbPara& param) { - using namespace kbd_dbms; + using namespace iot_dbms; if (m_objLocalDbConn.isOpen()) { return true; } diff --git a/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.h b/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.h index ab0b8956..fdc57e86 100644 --- a/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.h +++ b/product/src/example/link_seq_test/trigger_test/CSqlDbCtrl.h @@ -16,11 +16,11 @@ public: CSqlDbCtrl(); ~CSqlDbCtrl(); - static bool getDbParam(kbd_dbms::CDbPara& param); - static bool getdefaultDbParam(kbd_dbms::CDbPara& param); + static bool getDbParam(iot_dbms::CDbPara& param); + static bool getdefaultDbParam(iot_dbms::CDbPara& param); bool openDb(); - bool openDb(const kbd_dbms::CDbPara& param); + bool openDb(const iot_dbms::CDbPara& param); bool remapDbTable(CDbContainer& container); bool addTimer(STimerDefine* info); @@ -45,5 +45,5 @@ private: bool remapCondition(CDbContainer& container); private: - kbd_dbms::CQDbInterface m_objLocalDbConn; + iot_dbms::CQDbInterface m_objLocalDbConn; }; diff --git a/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp b/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp index 34b6bff8..c4ceef6f 100644 --- a/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp +++ b/product/src/example/link_seq_test/trigger_test/CTriggerMngr.cpp @@ -3,7 +3,7 @@ #include "CTriggerMngr.h" -using namespace kbd_public; +using namespace iot_public; CTriggerMngr::CTriggerMngr() :m_objInterface(this) diff --git a/product/src/example/link_seq_test/trigger_test/main.cpp b/product/src/example/link_seq_test/trigger_test/main.cpp index 1660e9a1..02c38b6f 100644 --- a/product/src/example/link_seq_test/trigger_test/main.cpp +++ b/product/src/example/link_seq_test/trigger_test/main.cpp @@ -8,9 +8,9 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("COMAPP", "trigger-test"); + iot_public::StartLogSystem("COMAPP", "trigger-test"); - int nRet = kbd_net::initMsgBus( + int nRet = iot_net::initMsgBus( std::string("hmi").c_str(), std::string("hmiInstance").c_str()); if (false == nRet) @@ -26,8 +26,8 @@ int main(int argc, char *argv[]) w.quit(); } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return nRet; } \ No newline at end of file diff --git a/product/src/example/link_seq_test/trigger_test/mainwindow.cpp b/product/src/example/link_seq_test/trigger_test/mainwindow.cpp index 252de041..4e017f1f 100644 --- a/product/src/example/link_seq_test/trigger_test/mainwindow.cpp +++ b/product/src/example/link_seq_test/trigger_test/mainwindow.cpp @@ -207,7 +207,7 @@ void MainWindow::slot_recreateBtn() bool MainWindow::recreateModel() { - kbd_dbms::CDbPara objPara; + iot_dbms::CDbPara objPara; if (!CSqlDbCtrl::getDbParam(objPara)) { return false; diff --git a/product/src/example/lua_test/main.cpp b/product/src/example/lua_test/main.cpp index 0ff3571f..d2bff760 100644 --- a/product/src/example/lua_test/main.cpp +++ b/product/src/example/lua_test/main.cpp @@ -1,6 +1,6 @@ #include "pub_lua_engine_api/LuaEngineInterface.h" -using namespace kbd_public; +using namespace iot_public; using namespace std; int main(int argc, char *argv[]) diff --git a/product/src/example/luabridge_test/incomeTest.hpp b/product/src/example/luabridge_test/incomeTest.hpp index 0d5964c2..29af9165 100644 --- a/product/src/example/luabridge_test/incomeTest.hpp +++ b/product/src/example/luabridge_test/incomeTest.hpp @@ -14,7 +14,7 @@ #include "pub_logger_api/logger.h" -int splitTagName(const std::string &inTag,kbd_dbms::SMeasPointKey &outPoint,std::string &outTagName) +int splitTagName(const std::string &inTag,iot_dbms::SMeasPointKey &outPoint,std::string &outTagName) { std::size_t firstDotindex = inTag.find_first_of('.'); @@ -26,16 +26,16 @@ int splitTagName(const std::string &inTag,kbd_dbms::SMeasPointKey &outPoint,std: // 赋值表名; if(inTag.substr(0,firstDotindex) == std::string("analog")) { - outPoint.m_enType = kbd_dbms::MPT_AI; + outPoint.m_enType = iot_dbms::MPT_AI; } else if(inTag.substr(0,firstDotindex) == std::string("accuml")){ - outPoint.m_enType = kbd_dbms::MPT_ACC; + outPoint.m_enType = iot_dbms::MPT_ACC; } else if(inTag.substr(0,firstDotindex) == std::string("digital")){ - outPoint.m_enType = kbd_dbms::MPT_DI; + outPoint.m_enType = iot_dbms::MPT_DI; } else if(inTag.substr(0,firstDotindex) == std::string("mix")){ - outPoint.m_enType = kbd_dbms::MPT_MIX; + outPoint.m_enType = iot_dbms::MPT_MIX; }else{ return kbdFailed; } @@ -190,15 +190,15 @@ bool savePVCfg(const std::string &curve,const std::string &charge,const quint64 * @param outYeildPoints * @return */ -bool findYieldPoints(kbd_dbms::CTsdbConn &objConn,int nTimeOut,const std::vector &vecMpKey,quint64 inTimeBegin,quint64 inTimeEnd,const std::vector *pVecStatusHave,std::vector &outYeildPoints) +bool findYieldPoints(iot_dbms::CTsdbConn &objConn,int nTimeOut,const std::vector &vecMpKey,quint64 inTimeBegin,quint64 inTimeEnd,const std::vector *pVecStatusHave,std::vector &outYeildPoints) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(inTimeBegin); boost::int64_t nTimeEnd = boost::int64_t(inTimeEnd); - if(kbd_dbms::getHisValue(objConn,nTimeOut,vecMpKey,nTimeBegin,nTimeEnd,pVecStatusHave,NULL,kbd_dbms::CM_DIFFERENCE,-1,vecResult) == false) + if(iot_dbms::getHisValue(objConn,nTimeOut,vecMpKey,nTimeBegin,nTimeEnd,pVecStatusHave,NULL,iot_dbms::CM_DIFFERENCE,-1,vecResult) == false) { LOGERROR("查询错误"); delete vecResult[0]; @@ -216,12 +216,12 @@ bool findYieldPoints(kbd_dbms::CTsdbConn &objConn,int nTimeOut,const std::vector return true; } -bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, +bool findPvFirstPoints(iot_dbms::CTsdbConn &objConn, int nTimeOut, quint64 lastComputeTime, quint64 currentTimeEpoch, - const std::vector curveKey, - const std::vector chargeKey, + const std::vector curveKey, + const std::vector chargeKey, std::vector *vecStatus, quint64 &firstCurveTime,int &firstCurveVal,double &firstChargeVal) { @@ -229,12 +229,12 @@ bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, //< 查询第一个电度量/时间点 这种算法可能存在问题 if(lastComputeTime == 0) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(-1); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,nTimeOut,curveKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,curveKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -247,12 +247,12 @@ bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, } else{ //< 计算第一个电度量的值firstChargeVal, last(lastComputeTime) - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(-1); boost::int64_t nTimeEnd = boost::int64_t(lastComputeTime); - if(kbd_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -268,13 +268,13 @@ bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, { //< 查询第一个计划曲线时间点之后第一个有意义的电度量点 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(firstCurveTime); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -288,12 +288,12 @@ bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, //< 再查询第一个有意义的计划曲线点,第一个有意义的电度量之后的第一个计划曲线点 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(firstChargeTime); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,nTimeOut,curveKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,curveKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -309,14 +309,14 @@ bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, firstChargeTime = lastComputeTime; //< 查询当前初始时间段的计划曲线值 - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(-1); boost::int64_t nTimeEnd = boost::int64_t(lastComputeTime); - if(kbd_dbms::getHisValue(objConn,nTimeOut,curveKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,curveKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -331,12 +331,12 @@ bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, return true; } -bool handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn,int nTimeOut, - const std::vector curveKey, - const std::vector chargeKey, - const std::vector priceKey, +bool handlePvYieldPoints(iot_dbms::CTsdbConn &objConn,int nTimeOut, + const std::vector curveKey, + const std::vector chargeKey, + const std::vector priceKey, std::vector *vecStatus, - int startCurveVal,double startChargeVal,quint64 startCurveTime,quint64 currentTimeEpoch,std::vector &yieldPoints,quint64 & lastChargeTime,double *resultTmp) + int startCurveVal,double startChargeVal,quint64 startCurveTime,quint64 currentTimeEpoch,std::vector &yieldPoints,quint64 & lastChargeTime,double *resultTmp) { //< 处理拐点 for(std::size_t i = 0; i < yieldPoints.size(); i ++) @@ -344,12 +344,12 @@ bool handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn,int nTimeOut, double endChargeVal; // 区间末结点 //<寻找拐点的上一个各时段计划曲线值 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(-1); boost::int64_t nTimeEnd = boost::int64_t(yieldPoints.at(i).m_nTime); - if(kbd_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false&& vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false&& vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -362,12 +362,12 @@ bool handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn,int nTimeOut, } //< 计算收益 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = startCurveTime ; boost::int64_t nTimeEnd = boost::int64_t(yieldPoints.at(i).m_nTime); - if(kbd_dbms::getHisValue(objConn,nTimeOut,priceKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_MEDIAN,-1,vecResult) == false) + if(iot_dbms::getHisValue(objConn,nTimeOut,priceKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_MEDIAN,-1,vecResult) == false) { LOGERROR("查询错误"); delete vecResult[0]; @@ -388,12 +388,12 @@ bool handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn,int nTimeOut, double lastChargeVal; //< 只处理一段,寻找最后一个last 电度量 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(-1); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,chargeKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -409,12 +409,12 @@ bool handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn,int nTimeOut, //< 计算最后一段的收益 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = startCurveTime ; boost::int64_t nTimeEnd = boost::int64_t(lastChargeTime); - if(kbd_dbms::getHisValue(objConn,nTimeOut,priceKey,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_MEDIAN,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,priceKey,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_MEDIAN,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询错误"); delete vecResult[0]; @@ -448,7 +448,7 @@ luabridge::LuaRef PvIncomeAndPerPeriod(std::string curve, std::string discharge, } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -467,9 +467,9 @@ luabridge::LuaRef PvIncomeAndPerPeriod(std::string curve, std::string discharge, int firstCurveVal = 0; //< 接口用于查询的主键 - std::vector curveKey(1); - std::vector chargeKey(1); - std::vector priceKey(1); + std::vector curveKey(1); + std::vector chargeKey(1); + std::vector priceKey(1); //< 主键赋值 std::string curveTagName; @@ -514,7 +514,7 @@ luabridge::LuaRef PvIncomeAndPerPeriod(std::string curve, std::string discharge, } //< 寻找拐点 - std::vector yieldPoints; + std::vector yieldPoints; if(findYieldPoints(*conn.get(),nTimeOut,curveKey,firstCurveTime,currentTimeEpoch,&vecStatus,yieldPoints) == false) { LOGERROR("查询错误"); @@ -550,16 +550,16 @@ luabridge::LuaRef PvIncomeAndPerPeriod(std::string curve, std::string discharge, } bool findFirstTime( - kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, + iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,quint64 &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最早时间错误"); delete vecResult[0]; @@ -572,16 +572,16 @@ bool findFirstTime( } bool findFirstTimeAndVal( - kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, + iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,quint64 &resultTime,int &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_FIRST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最早时间错误"); delete vecResult[0]; @@ -596,16 +596,16 @@ bool findFirstTimeAndVal( bool findLastTime( - kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, + iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,quint64 &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -618,16 +618,16 @@ bool findLastTime( } bool findLastTimeAndVal( - kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, + iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,quint64 &resultTime, int &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -641,16 +641,16 @@ bool findLastTimeAndVal( } bool findLastTimeAndVal( - kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, + iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,quint64 &resultTime, double &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -679,16 +679,16 @@ quint64 getOlderVal(quint64 a,quint64 b) return result; } -bool findLastVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, +bool findLastVal(iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,double &result) { -std::vector *> vecResult(1); -vecResult[0] = new std::vector(); +std::vector *> vecResult(1); +vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = boost::int64_t(timeEnd); -if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) +if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -701,11 +701,11 @@ return true; } -bool findLastVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, +bool findLastVal(iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,double &result) { -std::vector *> vecResult(1); -vecResult[0] = new std::vector(); +std::vector *> vecResult(1); +vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = boost::int64_t(timeEnd); @@ -714,7 +714,7 @@ boost::int64_t nTimeEnd = boost::int64_t(timeEnd); std::vector vecStatus(1); vecStatus[0] = boost::int32_t(2); -if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,&vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) +if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,&vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -727,16 +727,16 @@ return true; } -bool findLastVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, +bool findLastVal(iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,int &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -749,16 +749,16 @@ bool findLastVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, +bool findMedianVal(iot_dbms::CTsdbConn &objConn,const std::vector &key,int nTimeOut, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatus,double &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,kbd_dbms::CM_MEDIAN,-1,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,nTimeOut,key,nTimeBegin,nTimeEnd,vecStatus,NULL,iot_dbms::CM_MEDIAN,-1,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询众数错误"); delete vecResult[0]; @@ -771,12 +771,12 @@ bool findMedianVal(kbd_dbms::CTsdbConn &objConn,const std::vector curveKey, - const std::vector dischargeKey, - const std::vector chargeKey, + const std::vector curveKey, + const std::vector dischargeKey, + const std::vector chargeKey, std::vector *vecStatus, quint64 &firstCurveTime, int &firstCurveVal,double &firstChargeVal,double &firstDischargeVal @@ -994,16 +994,16 @@ bool savePcsCfg(const std::string &curve,const std::string &discharge,const std: bool handlePcsYieldPoints( - kbd_dbms::CTsdbConn &objConn,int nTimeOut, - const std::vector curveKey, - const std::vector dischargeKey, - const std::vector chargeKey, - const std::vector priceKey, + iot_dbms::CTsdbConn &objConn,int nTimeOut, + const std::vector curveKey, + const std::vector dischargeKey, + const std::vector chargeKey, + const std::vector priceKey, std::vector *vecStatus, int startCurveVal,double startDischargeVal,double startChargeVal, quint64 startCurveTime, quint64 currentTimeEpoch, - std::vector &yieldPoints, + std::vector &yieldPoints, quint64 & lastDischargeTime,quint64 &lastChargeTime, double *resultTmp ) @@ -1134,7 +1134,7 @@ luabridge::LuaRef PcsIncomeAndPerPeriod(std::string curve, std::string discharge } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1153,10 +1153,10 @@ luabridge::LuaRef PcsIncomeAndPerPeriod(std::string curve, std::string discharge int firstCurveVal = 0; //< 接口用于查询的主键 - std::vector curveKey(1); - std::vector chargeKey(1); - std::vector priceKey(1); - std::vector dischargeKey(1); + std::vector curveKey(1); + std::vector chargeKey(1); + std::vector priceKey(1); + std::vector dischargeKey(1); //< 主键赋值 std::string curveTagName; @@ -1197,7 +1197,7 @@ luabridge::LuaRef PcsIncomeAndPerPeriod(std::string curve, std::string discharge } //< 查找拐点 - std::vector yieldPoints; + std::vector yieldPoints; if(findYieldPoints(*conn.get(),nTimeOut,curveKey,firstCurveTime,currentTimeEpoch,&vecStatus,yieldPoints) == false) { LOGERROR("查询错误"); @@ -1271,7 +1271,7 @@ double getPeriodDiff(const std::string keyIdTag,int period) } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1283,7 +1283,7 @@ double getPeriodDiff(const std::string keyIdTag,int period) } //< 用于查询的主键 - std::vector key(1); + std::vector key(1); //< 主键赋值 std::string tagName; diff --git a/product/src/example/luabridge_test/main.cpp b/product/src/example/luabridge_test/main.cpp index 1966ba45..a322565d 100644 --- a/product/src/example/luabridge_test/main.cpp +++ b/product/src/example/luabridge_test/main.cpp @@ -66,8 +66,8 @@ void testVal(luabridge::LuaRef ret) int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("defalut","db_manager"); - kbd_dbms::initTsdbApi(); + iot_public::StartLogSystem("defalut","db_manager"); + iot_dbms::initTsdbApi(); lua_State* lua_state = luaL_newstate(); luaL_openlibs(lua_state); @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) } //< 加载内置函数 - kbd_service::loadKbdFunc(lua_state); + iot_service::loadKbdFunc(lua_state); // 验证公式是否加载正确 if( true == luaL_dostring(lua_state,genGetLastValFunctionText().c_str()) ) @@ -96,8 +96,8 @@ int main(int argc, char *argv[]) // testVal(objFunc()); - kbd_dbms::releaseTsdbApi(); - kbd_public::StopLogSystem(); + iot_dbms::releaseTsdbApi(); + iot_public::StopLogSystem(); } diff --git a/product/src/example/luabridge_test/price.hpp b/product/src/example/luabridge_test/price.hpp index efa3f529..fe28314c 100644 --- a/product/src/example/luabridge_test/price.hpp +++ b/product/src/example/luabridge_test/price.hpp @@ -12,7 +12,7 @@ luabridge::LuaRef genPrice(std::string curve,std::string price,lua_State* LuaSta quint64 currentTimeSinceEpoch = QDateTime::currentMSecsSinceEpoch(); // 当前进入函数的时间 //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -21,14 +21,14 @@ luabridge::LuaRef genPrice(std::string curve,std::string price,lua_State* LuaSta else{ LOGINFO("influxdb连接正常"); } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); //< 接口用于查询的主键 - std::vector curveKey(4); - std::vector priceKey(1); + std::vector curveKey(4); + std::vector priceKey(1); std::vector vecStatus(4); std::vector vecValue(4); - std::vector *> vecResult(4); + std::vector *> vecResult(4); std::string curveTagName; splitTagName(curve,curveKey[0],curveTagName); @@ -43,11 +43,11 @@ luabridge::LuaRef genPrice(std::string curve,std::string price,lua_State* LuaSta curveKey[i].m_pszTagName = curveTagName.c_str(); vecStatus[i] = boost::int32_t(2); vecValue[i] = boost::int32_t(i+1); - vecResult[i] = new std::vector(); + vecResult[i] = new std::vector(); } - if(kbd_dbms::getHisValue(objConn,nTimeOut,curveKey,-1,currentTimeSinceEpoch,&vecStatus,NULL,&vecValue,kbd_dbms::CM_LAST,-1,vecResult) == false || vecResult.size() != 4) + if(iot_dbms::getHisValue(objConn,nTimeOut,curveKey,-1,currentTimeSinceEpoch,&vecStatus,NULL,&vecValue,iot_dbms::CM_LAST,-1,vecResult) == false || vecResult.size() != 4) { LOGERROR("查询错误"); for(int i = 0; i < 4; i ++) diff --git a/product/src/example/performanceTest/testex.h b/product/src/example/performanceTest/testex.h index 256a1592..9bb5bd52 100644 --- a/product/src/example/performanceTest/testex.h +++ b/product/src/example/performanceTest/testex.h @@ -16,7 +16,7 @@ extern const char* tableName; -using namespace kbd_dbms; +using namespace iot_dbms; extern CRdbAccessEx crt_ex; diff --git a/product/src/example/program_option/App.cpp b/product/src/example/program_option/App.cpp index 70e57873..12f1c1b4 100644 --- a/product/src/example/program_option/App.cpp +++ b/product/src/example/program_option/App.cpp @@ -84,5 +84,5 @@ bool CApp::IsAlreadyRunning() { std::string strUniqueName = PROCESS_NAME_CMD_PROCESS; strUniqueName += " -s " + m_strAppLabel; - return kbd_public::CSingleProcInstance::hasInstanceRunning(strUniqueName); + return iot_public::CSingleProcInstance::hasInstanceRunning(strUniqueName); } diff --git a/product/src/example/program_option/App.h b/product/src/example/program_option/App.h index c66de82b..53473200 100644 --- a/product/src/example/program_option/App.h +++ b/product/src/example/program_option/App.h @@ -1,6 +1,6 @@ #pragma once #include "pub_utility_api/BaseService.h" -class CApp : public kbd_public::CBaseService +class CApp : public iot_public::CBaseService { public: CApp(); diff --git a/product/src/example/rdb_open_test/MainWindow.cpp b/product/src/example/rdb_open_test/MainWindow.cpp index c5bc3300..aed10efb 100644 --- a/product/src/example/rdb_open_test/MainWindow.cpp +++ b/product/src/example/rdb_open_test/MainWindow.cpp @@ -15,7 +15,7 @@ MainWindow::~MainWindow() void MainWindow::on_pushButton_clicked() { - kbd_dbms::CRdbAccessEx m_objRunProcInfoTable; + iot_dbms::CRdbAccessEx m_objRunProcInfoTable; if (!m_objRunProcInfoTable.open(CN_AppName_BASE.c_str(), "sys_run_proc_info")) { m_objRunProcInfoTable.close(); diff --git a/product/src/example/service_test/App.h b/product/src/example/service_test/App.h index dda5ec8c..4b1b19c4 100644 --- a/product/src/example/service_test/App.h +++ b/product/src/example/service_test/App.h @@ -1,6 +1,6 @@ #pragma once #include "public/Service.h" -class CApp : public kbd_public::CService +class CApp : public iot_public::CService { public: CApp(); diff --git a/product/src/example/sys_login_api_test/MainWindow.cpp b/product/src/example/sys_login_api_test/MainWindow.cpp index 4ef8d1fb..b33e2105 100644 --- a/product/src/example/sys_login_api_test/MainWindow.cpp +++ b/product/src/example/sys_login_api_test/MainWindow.cpp @@ -17,7 +17,7 @@ MainWindow::MainWindow(QWidget *parent) : // std::string strLanguage; // QDir dir; -// if(true == kbd_public::initI18N(strRootPath,strLanguage)) +// if(true == iot_public::initI18N(strRootPath,strLanguage)) // { // dir.setPath(QString::fromStdString(strRootPath)); // dir.cd(QString::fromStdString(strLanguage)); diff --git a/product/src/example/testFileUtil/Main.cpp b/product/src/example/testFileUtil/Main.cpp index ecee71dc..3c55eac6 100644 --- a/product/src/example/testFileUtil/Main.cpp +++ b/product/src/example/testFileUtil/Main.cpp @@ -13,6 +13,6 @@ int main(/*int argc, char *argv[]*/) { - std::cout << kbd_public::CFileUtil::getPathOfCfgFile("setup_config.xml") << std::endl; + std::cout << iot_public::CFileUtil::getPathOfCfgFile("setup_config.xml") << std::endl; return 0; } diff --git a/product/src/example/testHibernation/Main.cpp b/product/src/example/testHibernation/Main.cpp index 6482fffc..ccf98326 100644 --- a/product/src/example/testHibernation/Main.cpp +++ b/product/src/example/testHibernation/Main.cpp @@ -17,7 +17,7 @@ int main(/*int argc, char *argv[]*/) long long nNow = 0, nLast = 0, nDiff = 0; while (1) { - nNow = kbd_public::getMonotonicMsec(); + nNow = iot_public::getMonotonicMsec(); nDiff = nNow - nLast; if (nDiff > 10000 && 0 != nLast) { diff --git a/product/src/example/thread_test/App.cpp b/product/src/example/thread_test/App.cpp index 7aedc35d..f90be489 100644 --- a/product/src/example/thread_test/App.cpp +++ b/product/src/example/thread_test/App.cpp @@ -24,7 +24,7 @@ bool CApp::start(int argc, char *argv[], int &nStatus) //ParseCommandLine(); //2. - kbd_public::StartLogSystem("default", "thread_test"); + iot_public::StartLogSystem("default", "thread_test"); //3. m_ptrAppThread = boost::make_shared("Test"); @@ -49,7 +49,7 @@ bool CApp::stop() } //2. - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); //1. diff --git a/product/src/example/thread_test/App.h b/product/src/example/thread_test/App.h index f084b02d..bd903b8c 100644 --- a/product/src/example/thread_test/App.h +++ b/product/src/example/thread_test/App.h @@ -6,7 +6,7 @@ #include "AppThread.h" -class CApp : public kbd_public::CBaseService, kbd_sys::CProcessQuitInterface +class CApp : public iot_public::CBaseService, iot_sys::CProcessQuitInterface { public: CApp(); diff --git a/product/src/example/thread_test/AppThread.cpp b/product/src/example/thread_test/AppThread.cpp index 3dc39d6a..fd84bf3b 100644 --- a/product/src/example/thread_test/AppThread.cpp +++ b/product/src/example/thread_test/AppThread.cpp @@ -3,7 +3,7 @@ #include "AppThread.h" -using namespace kbd_public; +using namespace iot_public; CAppThread::CAppThread(const std::string &strName) : CTimerThreadBase(strName) diff --git a/product/src/example/thread_test/AppThread.h b/product/src/example/thread_test/AppThread.h index cfa6b97a..df321013 100644 --- a/product/src/example/thread_test/AppThread.h +++ b/product/src/example/thread_test/AppThread.h @@ -1,6 +1,6 @@ #include "pub_utility_api//TimerThreadBase.h" -class CAppThread : public kbd_public::CTimerThreadBase +class CAppThread : public iot_public::CTimerThreadBase { public: CAppThread(const std::string &strName); diff --git a/product/src/fes/R80Info/R80Info.cpp b/product/src/fes/R80Info/R80Info.cpp index cb68c141..36c2f6cf 100644 --- a/product/src/fes/R80Info/R80Info.cpp +++ b/product/src/fes/R80Info/R80Info.cpp @@ -26,15 +26,15 @@ #define PROCESS_NAME_CMD_PROCESS "R80Info" using namespace std; -using namespace kbd_sys; -using namespace kbd_public; +using namespace iot_sys; +using namespace iot_public; bool g_IsMainR80Info =false; bool g_IsMainR80InfoOld=false; CR80Info::CR80Info() { - //kbd_public::initI18N("/fes/translate", "fes"); + //iot_public::initI18N("/fes/translate", "fes"); m_ptrProcManage = NULL; m_ptrReduSwitchManage = NULL; m_ptrRedundantMng = NULL; @@ -101,7 +101,7 @@ bool CR80Info::isAlreadyRunning() { m_strInstName = PROCESS_NAME_CMD_PROCESS; m_strInstName += " -s " + m_strAppLabel; - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); } /* diff --git a/product/src/fes/R80Info/R80Info.h b/product/src/fes/R80Info/R80Info.h index b0de82d3..889d3166 100644 --- a/product/src/fes/R80Info/R80Info.h +++ b/product/src/fes/R80Info/R80Info.h @@ -9,7 +9,7 @@ #include "R80InfoDataThread.h" -class CR80Info:public kbd_public::CBaseService,kbd_sys::CProcessQuitInterface +class CR80Info:public iot_public::CBaseService,iot_sys::CProcessQuitInterface { public: CR80Info(); @@ -45,11 +45,11 @@ private: std::string m_strAppLabel; //应用名： pscada\bus.... std::string m_strInstName; //实例名： 进程名+"-s"+应用名。进程名固定为"fes" std::string m_strStartArgs; - kbd_sys::SProcessInfoKey m_ProcessInfo;//进程信息 - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_sys::SProcessInfoKey m_ProcessInfo;//进程信息 + iot_public::SRunAppInfo m_stRunAppInfo; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; CR80InfoRedundantManagePtr m_ptrReduSwitchManage; CR80InfoDataThreadPtr m_ptrR80InfoDataThread; diff --git a/product/src/fes/R80Info/R80InfoDataThread.cpp b/product/src/fes/R80Info/R80InfoDataThread.cpp index a30ee6c5..4f37fd70 100644 --- a/product/src/fes/R80Info/R80InfoDataThread.cpp +++ b/product/src/fes/R80Info/R80InfoDataThread.cpp @@ -14,7 +14,7 @@ #include "R80InfoDataThread.h" -using namespace kbd_public; +using namespace iot_public; char g_R80InfoMultIpAddr[] = "239.0.0.11"; //组播地址 int g_R80InfoSendPort = 6664; //组播信息发送的端口号 diff --git a/product/src/fes/R80Info/R80InfoDataThread.h b/product/src/fes/R80Info/R80InfoDataThread.h index 3c6dbfee..dfd89657 100644 --- a/product/src/fes/R80Info/R80InfoDataThread.h +++ b/product/src/fes/R80Info/R80InfoDataThread.h @@ -21,7 +21,7 @@ typedef struct _SR80InfoETH{ }SR80InfoETH; -class CR80InfoDataThread : public kbd_public::CTimerThreadBase +class CR80InfoDataThread : public iot_public::CTimerThreadBase { public: CR80InfoDataThread(); diff --git a/product/src/fes/R80Info/R80InfoRedundantManage.cpp b/product/src/fes/R80Info/R80InfoRedundantManage.cpp index 551a55f0..63ad9306 100644 --- a/product/src/fes/R80Info/R80InfoRedundantManage.cpp +++ b/product/src/fes/R80Info/R80InfoRedundantManage.cpp @@ -8,12 +8,12 @@ #include "R80InfoRedundantManage.h" #include "R80Info.h" -using namespace kbd_sys; +using namespace iot_sys; extern bool g_IsMainR80Info; extern bool g_IsMainR80InfoOld; -CR80InfoRedundantManage::CR80InfoRedundantManage(kbd_sys::CProcMngInterfacePtr ptrProc) +CR80InfoRedundantManage::CR80InfoRedundantManage(iot_sys::CProcMngInterfacePtr ptrProc) { m_ptrProcManage = ptrProc; m_bMaster = false; diff --git a/product/src/fes/R80Info/R80InfoRedundantManage.h b/product/src/fes/R80Info/R80InfoRedundantManage.h index 5d57d7b3..0165621a 100644 --- a/product/src/fes/R80Info/R80InfoRedundantManage.h +++ b/product/src/fes/R80Info/R80InfoRedundantManage.h @@ -14,10 +14,10 @@ typedef struct{ }SRedundantManageThreadParam; class CR80InfoRedundantManage : - public ::kbd_sys::CRedundantSwitchInterface + public ::iot_sys::CRedundantSwitchInterface { public: - CR80InfoRedundantManage(kbd_sys::CProcMngInterfacePtr ptrProc); + CR80InfoRedundantManage(iot_sys::CProcMngInterfacePtr ptrProc); ~CR80InfoRedundantManage(void); /* @@ -66,7 +66,7 @@ private: bool m_bMaster; bool m_bSlave; bool m_startThreadFlag; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; CR80InfoDataThreadPtr m_ptrR80InfoDataThread; }; diff --git a/product/src/fes/fes/AccWorkThread.cpp b/product/src/fes/fes/AccWorkThread.cpp index 9a2b3239..f6050077 100644 --- a/product/src/fes/fes/AccWorkThread.cpp +++ b/product/src/fes/fes/AccWorkThread.cpp @@ -9,9 +9,9 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; using namespace std; @@ -93,14 +93,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 ; procAccChange(objFesChangePiPkg); //t2 = getMonotonicMsec() ; //LOGDEBUG("processFesMessage:处理变化累计量 num=%d，用时=%lld(ms)",objFesChangePiPkg.stpidata_size(),(long long)(t2-t1)); @@ -109,7 +109,7 @@ int CAccWorkThread::processFesMessage() //处理全数据 //============================================================================================================= - kbd_idlfile::SFesUpdatePiPkg objFesUpdPiPkg; + iot_idl::SFesUpdatePiPkg objFesUpdPiPkg; if(m_ptrPacketQueue->getFesUpdateAccPkg(objFesUpdPiPkg)) //获得全数据 { //t1 = getMonotonicMsec() ; diff --git a/product/src/fes/fes/AccWorkThread.h b/product/src/fes/fes/AccWorkThread.h index 917cafec..300b53a6 100644 --- a/product/src/fes/fes/AccWorkThread.h +++ b/product/src/fes/fes/AccWorkThread.h @@ -16,7 +16,7 @@ //=============================================================== -class CAccWorkThread : public kbd_public::CTimerThreadBase +class CAccWorkThread : public iot_public::CTimerThreadBase { public: CAccWorkThread(void* FesBaseAddr,CPacketQueuePtr ptrPacketQueue); @@ -31,8 +31,8 @@ private: @brief 前置实时数据处理（变化数据/全数据/报警/SOE/各种事件） */ int processFesMessage(); - void procAccUpdate(const kbd_idlfile::SFesUpdatePiPkg &UpdateAccPkg); - void procAccChange(const kbd_idlfile::SFesChangePiPkg &ChangeAccPkg); + void procAccUpdate(const iot_idl::SFesUpdatePiPkg &UpdateAccPkg); + void procAccChange(const iot_idl::SFesChangePiPkg &ChangeAccPkg); public: /** diff --git a/product/src/fes/fes/AnaWorkThread.cpp b/product/src/fes/fes/AnaWorkThread.cpp index a922461c..9ef42af9 100644 --- a/product/src/fes/fes/AnaWorkThread.cpp +++ b/product/src/fes/fes/AnaWorkThread.cpp @@ -9,8 +9,8 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_idl; using namespace std; CAnaWorkThread::CAnaWorkThread(void* FesBaseAddr, CPacketQueuePtr ptrPacketQueue): @@ -61,14 +61,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 ; procAiChangeData(objFesChangeAiPkg); // t2 = getMonotonicMsec() ; //LOGDEBUG("processFesMessage:处理变化模拟量 num=%d，用时=%lld(ms)",objFesChangeAiPkg.staidata_size(),(long long)(t2-t1)); @@ -77,7 +77,7 @@ int CAnaWorkThread::processFesMessage() //处理全数据 //============================================================================================================= - kbd_idlfile::SFesUpdateAiPkg objFesUpdAiPkg; + iot_idl::SFesUpdateAiPkg objFesUpdAiPkg; if(m_ptrPacketQueue->getFesUpdateAnaPkg(objFesUpdAiPkg)) //获得全数据 { //t1 = getMonotonicMsec() ; diff --git a/product/src/fes/fes/AnaWorkThread.h b/product/src/fes/fes/AnaWorkThread.h index 82e49b27..fd070e05 100644 --- a/product/src/fes/fes/AnaWorkThread.h +++ b/product/src/fes/fes/AnaWorkThread.h @@ -16,7 +16,7 @@ //=============================================================== -class CAnaWorkThread : public kbd_public::CTimerThreadBase +class CAnaWorkThread : public iot_public::CTimerThreadBase { public: CAnaWorkThread(void* FesBaseAddr, CPacketQueuePtr ptrPacketQueue); @@ -30,8 +30,8 @@ private: private: int processFesMessage(); - void procAiChangeData(const kbd_idlfile::SFesChangeAiPkg &ChangeAiPkg); - void procAiUpdataData(const kbd_idlfile::SFesUpdateAiPkg &UpdateAiPkg); + void procAiChangeData(const iot_idl::SFesChangeAiPkg &ChangeAiPkg); + void procAiUpdataData(const iot_idl::SFesUpdateAiPkg &UpdateAiPkg); /** public: diff --git a/product/src/fes/fes/DigWorkThread.cpp b/product/src/fes/fes/DigWorkThread.cpp index 3a763d43..c1a35903 100644 --- a/product/src/fes/fes/DigWorkThread.cpp +++ b/product/src/fes/fes/DigWorkThread.cpp @@ -9,8 +9,8 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_idl; using namespace std; diff --git a/product/src/fes/fes/DigWorkThread.h b/product/src/fes/fes/DigWorkThread.h index 2608d1e2..22d97b13 100644 --- a/product/src/fes/fes/DigWorkThread.h +++ b/product/src/fes/fes/DigWorkThread.h @@ -15,7 +15,7 @@ //工作线程实现类 //=============================================================== -class CDigWorkThread : public kbd_public::CTimerThreadBase +class CDigWorkThread : public iot_public::CTimerThreadBase { public: CDigWorkThread(void* FesBaseAddr, CPacketQueuePtr ptrPacketQueue); @@ -30,9 +30,9 @@ private: @brief 前置实时数据处理（变化数据/全数据/报警/SOE/各种事件） */ int processFesMessage(); - void processDiChange(const kbd_idlfile::SFesChangeDiPkg &ChangeDiPkg); - void processSoeEvent(const kbd_idlfile::SFesSoeEventPkg &SOEPkg); - void processDiUpdate(const kbd_idlfile::SFesUpdateDiPkg &UpdateDiPkg); + void processDiChange(const iot_idl::SFesChangeDiPkg &ChangeDiPkg); + void processSoeEvent(const iot_idl::SFesSoeEventPkg &SOEPkg); + void processDiUpdate(const iot_idl::SFesUpdateDiPkg &UpdateDiPkg); public: /** diff --git a/product/src/fes/fes/FesApp.cpp b/product/src/fes/fes/FesApp.cpp index d265c19a..d5f8fc9d 100644 --- a/product/src/fes/fes/FesApp.cpp +++ b/product/src/fes/fes/FesApp.cpp @@ -31,9 +31,9 @@ #define PROCESS_NAME_CMD_PROCESS "fes" //2022-07-11 thxiao 修改名字 using namespace std; -using namespace kbd_net; -using namespace kbd_sys; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_sys; +using namespace iot_public; bool g_IsMainFes=false; bool g_IsMainFesOld=false; @@ -48,7 +48,7 @@ int g_FesEventSendCyc =500; //变化数据发送周期 CFesApp::CFesApp() { - kbd_public::initI18N("/fes/translate", "fes"); + iot_public::initI18N("/fes/translate", "fes"); m_ptrProcManage = NULL; m_ptrReduSwitchManage = NULL; m_ptrRedundantMng = NULL; @@ -123,7 +123,7 @@ bool CFesApp::isAlreadyRunning() { m_strInstName = PROCESS_NAME_CMD_PROCESS; m_strInstName += " -s " + m_strAppLabel; - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strInstName); } /* @@ -680,7 +680,7 @@ std::string CFesApp::getDllPath(const std::string &strDllName) #else strFileName = "lib" + strDllName + boost::dll::shared_library::suffix().string(); #endif - return kbd_public::CFileUtil::getPathOfBinFile(strFileName); + return iot_public::CFileUtil::getPathOfBinFile(strFileName); } /* @@ -697,7 +697,7 @@ int CFesApp::LoadProtocolDll() int i; std::string dllpath; - m_CFesBase.m_ptrProtocolBaseDll = new kbd_public::CLoadLibrary; + m_CFesBase.m_ptrProtocolBaseDll = new iot_public::CLoadLibrary; if(m_CFesBase.m_ptrProtocolBaseDll == NULL) { LOGERROR("Create m_ptrProtocolBaseDll failed."); @@ -740,7 +740,7 @@ int CFesApp::LoadProtocolDll() if(m_CFesBase.m_protoclName[i].Name[0] == 0)//没有对应的协议，继续下一个协议ID continue; - m_CFesBase.m_ptrProtocolDll[i] = new kbd_public::CLoadLibrary; + m_CFesBase.m_ptrProtocolDll[i] = new iot_public::CLoadLibrary; if(m_CFesBase.m_ptrProtocolDll[i] ==NULL) { LOGERROR("Create m_ptrProtocolDll[%d] failed.",i); diff --git a/product/src/fes/fes/FesApp.h b/product/src/fes/fes/FesApp.h index 63a6736f..8e080b37 100644 --- a/product/src/fes/fes/FesApp.h +++ b/product/src/fes/fes/FesApp.h @@ -28,7 +28,7 @@ -class CFesApp:public kbd_public::CBaseService,kbd_sys::CProcessQuitInterface +class CFesApp:public iot_public::CBaseService,iot_sys::CProcessQuitInterface { public: CFesApp(); @@ -67,17 +67,17 @@ private: std::string m_strAppLabel; //应用名： pscada\bus.... std::string m_strInstName; //实例名： 进程名+"-s"+应用名。进程名固定为"fes" std::string m_strStartArgs; - kbd_sys::SProcessInfoKey m_ProcessInfo;//进程信息 + iot_sys::SProcessInfoKey m_ProcessInfo;//进程信息 SRunAppInfo m_stRunAppInfo; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; CFesRedundantManagePtr m_ptrReduSwitchManage; bool InitWinsock(); int LoadProtocolDll(); void UnloadProtocolDll(); - kbd_service::CAlmApiForAppPtr m_ptrAlmApiForApp; + iot_service::CAlmApiForAppPtr m_ptrAlmApiForApp; CFesRxDataUpDateThreadPtr m_ptrFesRxDataUpDateThread; CFesTxDataChangeThreadPtr m_ptrFesTxDataChangeThread; CFesRxControlCmdThreadPtr m_PtrFesRxControlCmdThread; diff --git a/product/src/fes/fes/FesBase.cpp b/product/src/fes/fes/FesBase.cpp index 91b13882..807f6844 100644 --- a/product/src/fes/fes/FesBase.cpp +++ b/product/src/fes/fes/FesBase.cpp @@ -50,8 +50,8 @@ #include "FesForwardConfig.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CFesBase::CFesBase() { @@ -163,21 +163,21 @@ int CFesBase::InitBaseData(int flag) SFesDz *pDz; bool ret; int count; - kbd_dbms::CRdbAccessEx RdbLocationTable; - kbd_dbms::CRdbAccessEx RdbRtuTable; - kbd_dbms::CRdbAccessEx RdbChanTable; - kbd_dbms::CRdbAccessEx RdbProtocolTable; - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbAoTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbDoTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbMiTable; - kbd_dbms::CRdbAccessEx RdbMoTable; - kbd_dbms::CRdbAccessEx RdbDzTable; - kbd_dbms::CRdbAccessEx RdbDataBlockTable; - kbd_dbms::CRdbAccessEx RdbDevInfoTable; - kbd_dbms::CRdbAccessEx RdbFaultCodeTable; + iot_dbms::CRdbAccessEx RdbLocationTable; + iot_dbms::CRdbAccessEx RdbRtuTable; + iot_dbms::CRdbAccessEx RdbChanTable; + iot_dbms::CRdbAccessEx RdbProtocolTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbDoTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbMiTable; + iot_dbms::CRdbAccessEx RdbMoTable; + iot_dbms::CRdbAccessEx RdbDzTable; + iot_dbms::CRdbAccessEx RdbDataBlockTable; + iot_dbms::CRdbAccessEx RdbDevInfoTable; + iot_dbms::CRdbAccessEx RdbFaultCodeTable; int BlockSeqNo; //清除m_FesBase的内容 @@ -202,7 +202,7 @@ int CFesBase::InitBaseData(int flag) std::vector vecFaultColumn; //2019-08-23 thxiao 通用配置的文本定义不应该叫“SOE故障相”，应该叫“保护故障” - kbd_dbms::CRdbPublic::addCondInfo(condInfo,"class_name","保护故障"); + iot_dbms::CRdbPublic::addCondInfo(condInfo,"class_name","保护故障"); vecFaultColumn.push_back("actual_value"); vecFaultColumn.push_back("display_name"); @@ -2039,13 +2039,13 @@ bool CFesBase::ProtocolRtuInitByParam1(char* ProtocolName) */ bool CFesBase::InitProtocolPointMapping(CFesRtuPtr RtuPtr) { - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbAoTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbDoTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbMiTable; - kbd_dbms::CRdbAccessEx RdbMoTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbDoTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbMiTable; + iot_dbms::CRdbAccessEx RdbMoTable; int count,ret; SFesAiIndex *pAiIndex; SFesDiIndex *pDiIndex; diff --git a/product/src/fes/fes/FesChan.cpp b/product/src/fes/fes/FesChan.cpp index be38f83e..31bef208 100644 --- a/product/src/fes/fes/FesChan.cpp +++ b/product/src/fes/fes/FesChan.cpp @@ -12,7 +12,7 @@ */ #include "FesChan.h" -using namespace kbd_public; +using namespace iot_public; /** diff --git a/product/src/fes/fes/FesChanManageThread.cpp b/product/src/fes/fes/FesChanManageThread.cpp index 95f5e475..cc341579 100644 --- a/product/src/fes/fes/FesChanManageThread.cpp +++ b/product/src/fes/fes/FesChanManageThread.cpp @@ -27,13 +27,13 @@ #include "pub_utility_api/CommonConfigParse.h" //#include "FesRtu.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; extern bool g_IsMainFes; extern bool g_IsMainFesOld; -CFesChanManageThread::CFesChanManageThread(kbd_public::SRunAppInfo stRunAppInfo,void* FesBaseAddr): +CFesChanManageThread::CFesChanManageThread(iot_public::SRunAppInfo stRunAppInfo,void* FesBaseAddr): CTimerThreadBase("FesChanManageThread", 100) { m_ptrCFesBase = (CFesBase*)FesBaseAddr; @@ -66,7 +66,7 @@ CTimerThreadBase("FesChanManageThread", 100) m_ComDownStopMSec = m_ComDownStartMSec + m_ComDownKeepMsec; //停止时间 m_lastCheckDogTimes = 0; ReadConfigParam(); - m_ptrDogAuth = kbd_sys::getDogAuthInstance(); + m_ptrDogAuth = iot_sys::getDogAuthInstance(); LOGDEBUG("current=%lld m_ComDownOffSet=%lld m_ComDownStartMSec=%lld m_ComDownStopMSec=%lld", m_ComDownMSec, m_ComDownOffSet, m_ComDownStartMSec, m_ComDownStopMSec); } diff --git a/product/src/fes/fes/FesChanManageThread.h b/product/src/fes/fes/FesChanManageThread.h index e93c6e2d..8899af77 100644 --- a/product/src/fes/fes/FesChanManageThread.h +++ b/product/src/fes/fes/FesChanManageThread.h @@ -7,10 +7,10 @@ #include "rdb_api/RdbTableMng.h" #include "sys_dog_auth_api/DogAuthInterface.h" -class CFesChanManageThread : public kbd_public::CTimerThreadBase +class CFesChanManageThread : public iot_public::CTimerThreadBase { public: - CFesChanManageThread(kbd_public::SRunAppInfo stRunAppInfo,void* BaseDataAddr); + CFesChanManageThread(iot_public::SRunAppInfo stRunAppInfo,void* BaseDataAddr); virtual ~CFesChanManageThread(); /* @@ -45,9 +45,9 @@ public: private: - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; - kbd_public::SRunAppInfo m_stRunAppInfo ; - kbd_sys::CDogAuthInterfacePtr m_ptrDogAuth; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_public::SRunAppInfo m_stRunAppInfo ; + iot_sys::CDogAuthInterfacePtr m_ptrDogAuth; CFesBase *m_ptrCFesBase; //设备离线监视相关变量 diff --git a/product/src/fes/fes/FesDataPublish.cpp b/product/src/fes/fes/FesDataPublish.cpp index 60fed5a0..53c0afd0 100644 --- a/product/src/fes/fes/FesDataPublish.cpp +++ b/product/src/fes/fes/FesDataPublish.cpp @@ -13,10 +13,10 @@ #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; CFesDataPublish::CFesDataPublish(SRunAppInfo stRunAppInfo) @@ -31,7 +31,7 @@ CFesDataPublish::CFesDataPublish(SRunAppInfo stRunAppInfo) release(); } -bool CFesDataPublish::initialize(kbd_service::CAlmApiForAppPtr alarmApi) +bool CFesDataPublish::initialize(iot_service::CAlmApiForAppPtr alarmApi) { //初始化本专业RDB管理实例 diff --git a/product/src/fes/fes/FesDataPublish.h b/product/src/fes/fes/FesDataPublish.h index ae87f285..92852f0e 100644 --- a/product/src/fes/fes/FesDataPublish.h +++ b/product/src/fes/fes/FesDataPublish.h @@ -16,20 +16,20 @@ class CFesDataPublish { public: - CFesDataPublish(kbd_public::SRunAppInfo stRunAppInfo); + CFesDataPublish(iot_public::SRunAppInfo stRunAppInfo); virtual ~CFesDataPublish(); private: - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_public::SRunAppInfo m_stRunAppInfo; int m_nDomainId; int m_nAppId; public: - kbd_idlfile::SAppAddAlm m_stAppAddAlarm; //告警消息 - kbd_service::CAlmApiForAppPtr m_ptrAlmApiForApp; + iot_idl::SAppAddAlm m_stAppAddAlarm; //告警消息 + iot_service::CAlmApiForAppPtr m_ptrAlmApiForApp; public: - bool initialize(kbd_service::CAlmApiForAppPtr alarmApi); + bool initialize(iot_service::CAlmApiForAppPtr alarmApi); void release() ; /*发送报警到消息总线*/ diff --git a/product/src/fes/fes/FesDataSyncThread.cpp b/product/src/fes/fes/FesDataSyncThread.cpp index 587cc4a2..5860a4d5 100644 --- a/product/src/fes/fes/FesDataSyncThread.cpp +++ b/product/src/fes/fes/FesDataSyncThread.cpp @@ -20,9 +20,9 @@ #include "MessageChannel.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; extern bool g_IsMainFes; extern int g_FesRtuSyncDataInterval; //主备机间FES数据同步时间间隔(单位:秒) diff --git a/product/src/fes/fes/FesDataSyncThread.h b/product/src/fes/fes/FesDataSyncThread.h index 73dd2fea..b49dd297 100644 --- a/product/src/fes/fes/FesDataSyncThread.h +++ b/product/src/fes/fes/FesDataSyncThread.h @@ -3,10 +3,10 @@ #include "FesBase.h" #include "net/net_msg_bus_api/MsgBusApi.h" -using namespace kbd_net; +using namespace iot_net; -class CFesDataSyncThread : public kbd_public::CTimerThreadBase +class CFesDataSyncThread : public iot_public::CTimerThreadBase { public: CFesDataSyncThread(int iDomainID, int iAppID, void* BaseDataAddr); diff --git a/product/src/fes/fes/FesForwardConfig.cpp b/product/src/fes/fes/FesForwardConfig.cpp index 91118ba2..62862d34 100644 --- a/product/src/fes/fes/FesForwardConfig.cpp +++ b/product/src/fes/fes/FesForwardConfig.cpp @@ -11,7 +11,7 @@ #include "rdb_api/CRdbAccessEx.h" #include "rdb_api/CRdbAccess.h" -using namespace kbd_dbms; +using namespace iot_dbms; CFesForwarding::CFesForwarding() { @@ -35,7 +35,7 @@ void CFesForwarding::GetRdbFwAiTable(CFesRtuPtr RtuPtr,std::string m_strAppLabel bool ret; int count; - kbd_dbms::CRdbAccessEx RdbFwAiTable; + iot_dbms::CRdbAccessEx RdbFwAiTable; std::vector VecFwAiParam; std::vector vecFwAiColumn; @@ -161,7 +161,7 @@ void CFesForwarding::GetRdbFwSDiTable(CFesRtuPtr RtuPtr,std::string m_strAppLabe bool ret; int count; - kbd_dbms::CRdbAccessEx RdbFwDiTable; + iot_dbms::CRdbAccessEx RdbFwDiTable; std::vector VecFwDiParam; std::vector vecFwDiColumn; @@ -278,7 +278,7 @@ void CFesForwarding::GetRdbFwDDiTable(CFesRtuPtr RtuPtr, std::string m_strAppLab int count; //int RtuNum; - kbd_dbms::CRdbAccessEx RdbFwDiTable; + iot_dbms::CRdbAccessEx RdbFwDiTable; std::vector VecFwDiParam; std::vector vecFwDiColumn; @@ -394,7 +394,7 @@ void CFesForwarding::GetRdbFwAccTable(CFesRtuPtr RtuPtr,std::string m_strAppLabe bool ret; int count; - kbd_dbms::CRdbAccessEx RdbFwAccTable; + iot_dbms::CRdbAccessEx RdbFwAccTable; std::vector VecFwAccParam; std::vector vecFwAccColumn; @@ -513,7 +513,7 @@ void CFesForwarding::GetRdbFwMiTable(CFesRtuPtr RtuPtr, std::string m_strAppLabe bool ret; int count; - kbd_dbms::CRdbAccessEx RdbFwMiTable; + iot_dbms::CRdbAccessEx RdbFwMiTable; std::vector VecFwMiParam; std::vector vecFwMiColumn; @@ -631,7 +631,7 @@ void CFesForwarding::GetRdbFwAoTable(CFesRtuPtr RtuPtr,std::string m_strAppLabel bool ret; int count; - kbd_dbms::CRdbAccessEx RdbFwAoTable; + iot_dbms::CRdbAccessEx RdbFwAoTable; std::vector VecFwAoParam; std::vector vecFwAoColumn; @@ -747,7 +747,7 @@ void CFesForwarding::GetRdbFwDoTable(CFesRtuPtr RtuPtr,std::string m_strAppLabel bool ret; int count; - kbd_dbms::CRdbAccessEx RdbFwDoTable; + iot_dbms::CRdbAccessEx RdbFwDoTable; std::vector VecFwDoParam; std::vector vecFwDoColumn; @@ -870,7 +870,7 @@ void CFesForwarding::GetRdbFwMoTable(CFesRtuPtr RtuPtr, std::string m_strAppLabe int count; //int RtuNum; - kbd_dbms::CRdbAccessEx RdbFwMoTable; + iot_dbms::CRdbAccessEx RdbFwMoTable; std::vector VecFwMoParam; std::vector vecFwMoColumn; diff --git a/product/src/fes/fes/FesFwRxControlCmdThread.cpp b/product/src/fes/fes/FesFwRxControlCmdThread.cpp index 5ccbb011..818c2d39 100644 --- a/product/src/fes/fes/FesFwRxControlCmdThread.cpp +++ b/product/src/fes/fes/FesFwRxControlCmdThread.cpp @@ -7,9 +7,9 @@ #include "MessageChannel.h" #include "FesFwMessage.pb.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CFesFwRxControlCmdThread::CFesFwRxControlCmdThread(int iDomainID, int iAppID ,void* FesBaseAddr): CTimerThreadBase("FesFwRxControlCmdThread",20) diff --git a/product/src/fes/fes/FesFwRxControlCmdThread.h b/product/src/fes/fes/FesFwRxControlCmdThread.h index 37270c88..5c96f43c 100644 --- a/product/src/fes/fes/FesFwRxControlCmdThread.h +++ b/product/src/fes/fes/FesFwRxControlCmdThread.h @@ -5,10 +5,10 @@ #include "net/net_msg_bus_api/MsgBusApi.h" #include "FesFwMessage.pb.h" -using namespace kbd_net; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_idl; -class CFesFwRxControlCmdThread : public kbd_public::CTimerThreadBase +class CFesFwRxControlCmdThread : public iot_public::CTimerThreadBase { public: CFesFwRxControlCmdThread(int iDomainID, int iAppID, void* BaseDataAddr); diff --git a/product/src/fes/fes/FesFwTxControlCmdThread.cpp b/product/src/fes/fes/FesFwTxControlCmdThread.cpp index eb7012b7..17fac0f0 100644 --- a/product/src/fes/fes/FesFwTxControlCmdThread.cpp +++ b/product/src/fes/fes/FesFwTxControlCmdThread.cpp @@ -9,9 +9,9 @@ #include "MessageChannel.h" #include "FesFwMessage.pb.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CFesFwTxControlCmdThread::CFesFwTxControlCmdThread(int iDomainID, int iAppID ,void *FesBaseAddr): CTimerThreadBase("FesFwTxControlCmdThread",20) diff --git a/product/src/fes/fes/FesFwTxControlCmdThread.h b/product/src/fes/fes/FesFwTxControlCmdThread.h index 1b55c29b..1eb3b9f8 100644 --- a/product/src/fes/fes/FesFwTxControlCmdThread.h +++ b/product/src/fes/fes/FesFwTxControlCmdThread.h @@ -4,9 +4,9 @@ #include "FesBase.h" #include "net/net_msg_bus_api/MsgBusApi.h" -using namespace kbd_net; +using namespace iot_net; -class CFesFwTxControlCmdThread : public kbd_public::CTimerThreadBase +class CFesFwTxControlCmdThread : public iot_public::CTimerThreadBase { public: CFesFwTxControlCmdThread(int iDomainID, int iAppID, void* BaseDataAddr); diff --git a/product/src/fes/fes/FesRedundantManage.cpp b/product/src/fes/fes/FesRedundantManage.cpp index 22af9dca..d8bc8530 100644 --- a/product/src/fes/fes/FesRedundantManage.cpp +++ b/product/src/fes/fes/FesRedundantManage.cpp @@ -11,12 +11,12 @@ #include "FesRedundantManage.h" #include "FesApp.h" -using namespace kbd_sys; +using namespace iot_sys; extern bool g_IsMainFes; extern bool g_IsMainFesOld; -CFesRedundantManage::CFesRedundantManage(kbd_sys::CProcMngInterfacePtr ptrProc) +CFesRedundantManage::CFesRedundantManage(iot_sys::CProcMngInterfacePtr ptrProc) { m_ptrProcManage = ptrProc; m_bMaster = false; diff --git a/product/src/fes/fes/FesRedundantManage.h b/product/src/fes/fes/FesRedundantManage.h index f8cc56f2..6c08aa85 100644 --- a/product/src/fes/fes/FesRedundantManage.h +++ b/product/src/fes/fes/FesRedundantManage.h @@ -44,10 +44,10 @@ typedef struct{ }SRedundantManageThreadParam; class CFesRedundantManage : - public ::kbd_sys::CRedundantSwitchInterface + public ::iot_sys::CRedundantSwitchInterface { public: - CFesRedundantManage(kbd_sys::CProcMngInterfacePtr ptrProc); + CFesRedundantManage(iot_sys::CProcMngInterfacePtr ptrProc); ~CFesRedundantManage(void); /* @@ -96,7 +96,7 @@ private: bool m_bMaster; bool m_bSlave; bool m_startThreadFlag; - kbd_sys::CProcMngInterfacePtr m_ptrProcManage; + iot_sys::CProcMngInterfacePtr m_ptrProcManage; CFesRxDataUpDateThreadPtr m_ptrRxDataUpDateThread; CFesTxDataChangeThreadPtr m_ptrTxDataChangeThread; diff --git a/product/src/fes/fes/FesRtu.cpp b/product/src/fes/fes/FesRtu.cpp index 32d20c83..d7396648 100644 --- a/product/src/fes/fes/FesRtu.cpp +++ b/product/src/fes/fes/FesRtu.cpp @@ -43,7 +43,7 @@ #include "FesRtu.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_public; +using namespace iot_public; CFesRtu::CFesRtu() { diff --git a/product/src/fes/fes/FesRxControlCmdThread.cpp b/product/src/fes/fes/FesRxControlCmdThread.cpp index f13d3340..4724b5c4 100644 --- a/product/src/fes/fes/FesRxControlCmdThread.cpp +++ b/product/src/fes/fes/FesRxControlCmdThread.cpp @@ -11,9 +11,9 @@ #include "MessageChannel.h" #include "FesMessage.pb.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CFesRxControlCmdThread::CFesRxControlCmdThread(int iDomainID, int iAppID ,void* FesBaseAddr): CTimerThreadBase("FesRxControlCmdThread",20) @@ -428,7 +428,7 @@ void CFesRxControlCmdThread::RxDefCmdControl(const std::string &RecvStr) count = CmddefPkg.seqcustcmddata_size(); for(i=0;i 0) { mSec = getUTCTimeMsec(); - ::kbd_idlfile::SAiRealTimeData aiStru; + ::iot_idl::SAiRealTimeData aiStru; std::string strTagName = ""; for (i = 0; i < nChangeNum; i++) { @@ -355,7 +355,7 @@ int CFesRxDPDataThread::RxAccChangeData(const SRealTimeDataPkg & ChangeDataPkg) int nChangeNum = ChangeDataPkg.stpirtd_size(); if (nChangeNum > 0) { - ::kbd_idlfile::SPiRealTimeData piStru; + ::iot_idl::SPiRealTimeData piStru; std::string strTagName = ""; mSec = getUTCTimeMsec(); for (i = 0; i < nChangeNum; i++) @@ -418,7 +418,7 @@ int CFesRxDPDataThread::RxMiChangeData(const SRealTimeDataPkg & ChangeDataPkg) int nChangeNum = ChangeDataPkg.stmirtd_size(); if (nChangeNum > 0) { - ::kbd_idlfile::SMiRealTimeData miStru; + ::iot_idl::SMiRealTimeData miStru; std::string strTagName = ""; mSec = getUTCTimeMsec(); for (int i = 0; i < nChangeNum; i++) diff --git a/product/src/fes/fes/FesRxDPDataThread.h b/product/src/fes/fes/FesRxDPDataThread.h index bd9e6d93..e2a81ee4 100644 --- a/product/src/fes/fes/FesRxDPDataThread.h +++ b/product/src/fes/fes/FesRxDPDataThread.h @@ -8,11 +8,11 @@ #include "DataProcMessage.pb.h" -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_service; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_service; -class CFesRxDPDataThread : public kbd_public::CTimerThreadBase +class CFesRxDPDataThread : public iot_public::CTimerThreadBase { public: CFesRxDPDataThread(int iDomainID, int iAppID, void* BaseDataAddr); @@ -49,7 +49,7 @@ private: int m_iAppID; CFesBase *m_ptrCFesBase; - kbd_service::CDpcdaForAppPtr m_ptrCdpcda; //订阅点 + iot_service::CDpcdaForAppPtr m_ptrCdpcda; //订阅点 void subScribe(); int readFromBus(); diff --git a/product/src/fes/fes/FesRxDataUpDateThread.cpp b/product/src/fes/fes/FesRxDataUpDateThread.cpp index fa21b625..0cb1aab3 100644 --- a/product/src/fes/fes/FesRxDataUpDateThread.cpp +++ b/product/src/fes/fes/FesRxDataUpDateThread.cpp @@ -21,9 +21,9 @@ #include "MessageChannel.h" #include "FesMessage.pb.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; const int CN_FesMessageSendMaxDiNum =10000; const int CN_FesMessageSendMaxAiNum =10000; diff --git a/product/src/fes/fes/FesRxDataUpDateThread.h b/product/src/fes/fes/FesRxDataUpDateThread.h index e4d14be3..1343df9c 100644 --- a/product/src/fes/fes/FesRxDataUpDateThread.h +++ b/product/src/fes/fes/FesRxDataUpDateThread.h @@ -3,9 +3,9 @@ #include "FesBase.h" #include "net/net_msg_bus_api/MsgBusApi.h" -using namespace kbd_net; +using namespace iot_net; -class CFesRxDataUpDateThread : public kbd_public::CTimerThreadBase +class CFesRxDataUpDateThread : public iot_public::CTimerThreadBase { public: CFesRxDataUpDateThread(int iDomainID, int iAppID, void* BaseDataAddr); diff --git a/product/src/fes/fes/FesRxFesDataThread.cpp b/product/src/fes/fes/FesRxFesDataThread.cpp index b4425e26..5aeb06cb 100644 --- a/product/src/fes/fes/FesRxFesDataThread.cpp +++ b/product/src/fes/fes/FesRxFesDataThread.cpp @@ -11,9 +11,9 @@ #include "FesRxFesDataThread.h" #include "MessageChannel.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CFesRxFesDataThread::CFesRxFesDataThread(int iDomainID, int iAppID ,void* FesBaseAddr, CPacketQueuePtr ptrPacketQueue): CTimerThreadBase("FesRxFesDataThread",0) @@ -292,7 +292,7 @@ int CFesRxFesDataThread::setSlave() @return 无 @retval */ -int CFesRxFesDataThread::parseFesPackage(const kbd_net::CMbMessage &objRecvMsg) +int CFesRxFesDataThread::parseFesPackage(const iot_net::CMbMessage &objRecvMsg) { //int64 t1,t2; bool bRetCode = false; diff --git a/product/src/fes/fes/FesRxFesDataThread.h b/product/src/fes/fes/FesRxFesDataThread.h index 6c3e8546..b6f8efdc 100644 --- a/product/src/fes/fes/FesRxFesDataThread.h +++ b/product/src/fes/fes/FesRxFesDataThread.h @@ -7,10 +7,10 @@ #include "PacketQueue.h" #include -using namespace kbd_net; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_idl; -class CFesRxFesDataThread : public kbd_public::CTimerThreadBase +class CFesRxFesDataThread : public iot_public::CTimerThreadBase { public: CFesRxFesDataThread(int iDomainID, int iAppID, void* BaseDataAddr, CPacketQueuePtr ptrPacketQueue); @@ -47,7 +47,7 @@ private: CPacketQueuePtr m_ptrPacketQueue; //消息缓存类 - int parseFesPackage(const kbd_net::CMbMessage &objRecvMsg); + int parseFesPackage(const iot_net::CMbMessage &objRecvMsg); diff --git a/product/src/fes/fes/FesSimServerThread.cpp b/product/src/fes/fes/FesSimServerThread.cpp index 254a17c2..de4e2f4d 100644 --- a/product/src/fes/fes/FesSimServerThread.cpp +++ b/product/src/fes/fes/FesSimServerThread.cpp @@ -22,7 +22,7 @@ */ #include "FesSimServerThread.h" -using namespace kbd_public; +using namespace iot_public; CFesSimServerThread::CFesSimServerThread(void* BaseDataAddr): diff --git a/product/src/fes/fes/FesSimServerThread.h b/product/src/fes/fes/FesSimServerThread.h index 031d9eb5..7b9b01e7 100644 --- a/product/src/fes/fes/FesSimServerThread.h +++ b/product/src/fes/fes/FesSimServerThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "FesSimProtocol.h" -using namespace kbd_public; +using namespace iot_public; const int CN_FesSimServerMaxBufSize= 2048; const int CN_FesSimServerMaxRecvCount= 5; diff --git a/product/src/fes/fes/FesTxControlCmdThread.cpp b/product/src/fes/fes/FesTxControlCmdThread.cpp index 009260dc..7f134262 100644 --- a/product/src/fes/fes/FesTxControlCmdThread.cpp +++ b/product/src/fes/fes/FesTxControlCmdThread.cpp @@ -12,9 +12,9 @@ #include "MessageChannel.h" #include "FesMessage.pb.h" -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CFesTxControlCmdThread::CFesTxControlCmdThread(int iDomainID, int iAppID ,void *FesBaseAddr): CTimerThreadBase("FesTxControlCmdThread",20) diff --git a/product/src/fes/fes/FesTxControlCmdThread.h b/product/src/fes/fes/FesTxControlCmdThread.h index 4c15e4de..aa4928a6 100644 --- a/product/src/fes/fes/FesTxControlCmdThread.h +++ b/product/src/fes/fes/FesTxControlCmdThread.h @@ -4,9 +4,9 @@ #include "FesBase.h" #include "net/net_msg_bus_api/MsgBusApi.h" -using namespace kbd_net; +using namespace iot_net; -class CFesTxControlCmdThread : public kbd_public::CTimerThreadBase +class CFesTxControlCmdThread : public iot_public::CTimerThreadBase { public: CFesTxControlCmdThread(int iDomainID, int iAppID, void* BaseDataAddr); diff --git a/product/src/fes/fes/FesTxDataChangeThread.cpp b/product/src/fes/fes/FesTxDataChangeThread.cpp index 40de6121..627c0a9c 100644 --- a/product/src/fes/fes/FesTxDataChangeThread.cpp +++ b/product/src/fes/fes/FesTxDataChangeThread.cpp @@ -21,10 +21,10 @@ #include "alarm_server_api/AlarmCommonDef.h" #include "alarm_server_api/CAlmApiForApp.h" -using namespace kbd_net; -using namespace kbd_dbms; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_dbms; +using namespace iot_public; +using namespace iot_idl; extern int g_FesChgDigSendCyc; //变化数据发送周期 extern int g_FesChgAnaSendCyc; //变化数据发送周期 @@ -32,7 +32,7 @@ extern int g_FesChgAccSendCyc; //变化数据发送周期 extern int g_FesChgMixSendCyc; //变化数据发送周期 extern int g_FesEventSendCyc ; //变化数据发送周期 -CFesTxDataChangeThread::CFesTxDataChangeThread(kbd_service::CAlmApiForAppPtr alarmApi, SRunAppInfo stRunAppInfo ,void* FesBaseAddr): +CFesTxDataChangeThread::CFesTxDataChangeThread(iot_service::CAlmApiForAppPtr alarmApi, SRunAppInfo stRunAppInfo ,void* FesBaseAddr): CTimerThreadBase("FesTxDataChangeThread",20) { m_ptrTxCommunicator = new CMbCommunicator("FesTxDataChangeThread"); diff --git a/product/src/fes/fes/FesTxDataChangeThread.h b/product/src/fes/fes/FesTxDataChangeThread.h index 8c57ace0..2f282377 100644 --- a/product/src/fes/fes/FesTxDataChangeThread.h +++ b/product/src/fes/fes/FesTxDataChangeThread.h @@ -5,17 +5,17 @@ #include "FesDataPublish.h" #include "rdb_api/RdbTableMng.h" -using namespace kbd_net; +using namespace iot_net; const int CN_FesMessageSendMaxDiChgNum =10000; const int CN_FesMessageSendMaxAiChgNum =10000; const int CN_FesMessageSendMaxMiChgNum =5000; const int CN_FesMessageSendMaxAccChgNum =5000; -class CFesTxDataChangeThread : public kbd_public::CTimerThreadBase +class CFesTxDataChangeThread : public iot_public::CTimerThreadBase { public: - CFesTxDataChangeThread(kbd_service::CAlmApiForAppPtr alarmApi,SRunAppInfo stRunAppInfo, void* BaseDataAddr); + CFesTxDataChangeThread(iot_service::CAlmApiForAppPtr alarmApi,SRunAppInfo stRunAppInfo, void* BaseDataAddr); virtual ~CFesTxDataChangeThread(); /* @@ -40,7 +40,7 @@ private: int64 m_lLastAccTime; int64 m_lLastEvtTime; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; CFesDataPublishPtr m_ptrDataPublish; CMbCommunicator *m_ptrTxCommunicator; byte *m_pTxData; diff --git a/product/src/fes/fes/FesTxEventThread.cpp b/product/src/fes/fes/FesTxEventThread.cpp index fd22ba78..99f05a1d 100644 --- a/product/src/fes/fes/FesTxEventThread.cpp +++ b/product/src/fes/fes/FesTxEventThread.cpp @@ -9,8 +9,8 @@ #include "common/MessageType.h" #include "common/MessageChannel.h" -using namespace kbd_net; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_public; CFesTxEventThread::CFesTxEventThread(int iDomainID, int iAppID ,void* FesBaseAddr): CTimerThreadBase("TxDataChangeThread",100) diff --git a/product/src/fes/fes/FesTxEventThread.h b/product/src/fes/fes/FesTxEventThread.h index 0cda8008..c7dabc22 100644 --- a/product/src/fes/fes/FesTxEventThread.h +++ b/product/src/fes/fes/FesTxEventThread.h @@ -3,9 +3,9 @@ #include "FesBase.h" #include "net/net_msg_bus_api/MsgBusApi.h" -using namespace kbd_net; +using namespace iot_net; -class CFesTxEventThread : public kbd_public::CTimerThreadBase +class CFesTxEventThread : public iot_public::CTimerThreadBase { public: CFesTxEventThread(int iDomainID, int iAppID, void* BaseDataAddr); diff --git a/product/src/fes/fes/FesWaveFormThread.cpp b/product/src/fes/fes/FesWaveFormThread.cpp index 35e0ada4..19b98ada 100644 --- a/product/src/fes/fes/FesWaveFormThread.cpp +++ b/product/src/fes/fes/FesWaveFormThread.cpp @@ -10,15 +10,15 @@ #include "FesWaveFormThread.h" #include -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; extern bool g_IsMainFes; const int CN_FesWaveFormMaxSendSize = 10240; //10k CFesWaveFormThread::CFesWaveFormThread( - kbd_service::CAlmApiForAppPtr alarmApi, + iot_service::CAlmApiForAppPtr alarmApi, void* FesBaseAddr): CTimerThreadBase("FesWaveFormThread",1000) { diff --git a/product/src/fes/fes/FesWaveFormThread.h b/product/src/fes/fes/FesWaveFormThread.h index b6dc53d7..7c98ebc9 100644 --- a/product/src/fes/fes/FesWaveFormThread.h +++ b/product/src/fes/fes/FesWaveFormThread.h @@ -5,14 +5,14 @@ #include "FesWaveRecord.h" #include "sys/sys_file_sync_api/FilesyncApi.h" -using namespace kbd_net; -using namespace kbd_sys; +using namespace iot_net; +using namespace iot_sys; -class CFesWaveFormThread : public kbd_public::CTimerThreadBase +class CFesWaveFormThread : public iot_public::CTimerThreadBase { public: CFesWaveFormThread( - kbd_service::CAlmApiForAppPtr alarmApi, + iot_service::CAlmApiForAppPtr alarmApi, void* BaseDataAddr); virtual ~CFesWaveFormThread(); diff --git a/product/src/fes/fes/FesWaveRecord.cpp b/product/src/fes/fes/FesWaveRecord.cpp index 7e658555..265cafe8 100644 --- a/product/src/fes/fes/FesWaveRecord.cpp +++ b/product/src/fes/fes/FesWaveRecord.cpp @@ -22,7 +22,7 @@ //#include "service/alarm_server_api/AlarmCommonDef.h" -using namespace kbd_public; +using namespace iot_public; FesWaveRecord::FesWaveRecord() { } @@ -31,7 +31,7 @@ FesWaveRecord::~FesWaveRecord() { } -void FesWaveRecord::initAlarmApi(kbd_service::CAlmApiForAppPtr alarmApi) +void FesWaveRecord::initAlarmApi(iot_service::CAlmApiForAppPtr alarmApi) { m_objAlmApi = alarmApi; } @@ -79,7 +79,7 @@ void FesWaveRecord::createRecord(CFesRtuPtr rtuPtr,const SFesWaveForm& waveCfg) bool FesWaveRecord::sendToAlarm(const WaveRecordTable& tableInfo) { BOOST_ASSERT(m_objAlmApi); - using namespace kbd_idlfile; + using namespace iot_idl; SAppAddWave objAlarm; objAlarm.set_start_time(tableInfo.startTime); @@ -270,7 +270,7 @@ bool FesWaveCfgFile::stringToPTime(const string& strOutput, int nMinute = boost::lexical_cast(strList.at(4)); int nSec = boost::lexical_cast(strList.at(5)); int nMsec = boost::lexical_cast(strList.at(6))/1000; - retTime = kbd_public::getUTCMsecFromLocalTime(nYear,nMonth,nDay,nHour,nMinute,nSec,nMsec); + retTime = iot_public::getUTCMsecFromLocalTime(nYear,nMonth,nDay,nHour,nMinute,nSec,nMsec); LOGDEBUG("stringToPTime %d-%d-%d %d:%d:%d.%d",nYear,nMonth,nDay,nHour,nMinute,nSec,nMsec); diff --git a/product/src/fes/fes/FesWaveRecord.h b/product/src/fes/fes/FesWaveRecord.h index 7046f22f..1eccbc84 100644 --- a/product/src/fes/fes/FesWaveRecord.h +++ b/product/src/fes/fes/FesWaveRecord.h @@ -26,7 +26,7 @@ public: ~FesWaveRecord(); - void initAlarmApi(kbd_service::CAlmApiForAppPtr alarmApi); + void initAlarmApi(iot_service::CAlmApiForAppPtr alarmApi); //创建录波记录 void createRecord(CFesRtuPtr rtuPtr,const SFesWaveForm& waveCfg); @@ -41,7 +41,7 @@ private: int m_nServerAppId; private: - kbd_service::CAlmApiForAppPtr m_objAlmApi; + iot_service::CAlmApiForAppPtr m_objAlmApi; }; typedef boost::shared_ptr FesWaveRecordPtr; diff --git a/product/src/fes/fes/MixWorkThread.cpp b/product/src/fes/fes/MixWorkThread.cpp index d8e0c580..7b9bccf9 100644 --- a/product/src/fes/fes/MixWorkThread.cpp +++ b/product/src/fes/fes/MixWorkThread.cpp @@ -9,9 +9,9 @@ #include "pub_logger_api/logger.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_service; +using namespace iot_idl; using namespace std; @@ -51,14 +51,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 ; procMixChange(objFesChangeMiPkg); // t2 = getMonotonicMsec() ; //LOGDEBUG("processFesMessage:处理混合量 num=%d，用时=%lld(ms)",objFesChangeMiPkg.stmidata_size(),(long long)(t2-t1)); @@ -67,7 +67,7 @@ int CMixWorkThread::processFesMessage() //处理全数据 //============================================================================================================= - kbd_idlfile::SFesUpdateMiPkg objFesUpdMiPkg; + iot_idl::SFesUpdateMiPkg objFesUpdMiPkg; if(m_ptrPacketQueue->getFesUpdateMixPkg(objFesUpdMiPkg)) //获得全数据 { // t1 = getMonotonicMsec() ; diff --git a/product/src/fes/fes/MixWorkThread.h b/product/src/fes/fes/MixWorkThread.h index 122edb56..b6156ce7 100644 --- a/product/src/fes/fes/MixWorkThread.h +++ b/product/src/fes/fes/MixWorkThread.h @@ -14,7 +14,7 @@ //工作线程实现类 //=============================================================== -class CMixWorkThread : public kbd_public::CTimerThreadBase +class CMixWorkThread : public iot_public::CTimerThreadBase { public: CMixWorkThread(void* FesBaseAddr,CPacketQueuePtr ptrPacketQueue); @@ -30,8 +30,8 @@ private: @brief 前置实时数据处理（变化数据/全数据/报警/SOE/各种事件） */ int processFesMessage(); - void procMixChange(const kbd_idlfile::SFesChangeMiPkg &ChangeMiPkg); - void procMixUpdate(const kbd_idlfile::SFesUpdateMiPkg &UpdateMiPkg); + void procMixChange(const iot_idl::SFesChangeMiPkg &ChangeMiPkg); + void procMixUpdate(const iot_idl::SFesUpdateMiPkg &UpdateMiPkg); public: /** diff --git a/product/src/fes/fes/PacketQueue.cpp b/product/src/fes/fes/PacketQueue.cpp index 99e047fe..6ba760c6 100644 --- a/product/src/fes/fes/PacketQueue.cpp +++ b/product/src/fes/fes/PacketQueue.cpp @@ -6,9 +6,9 @@ #include "PacketQueue.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; using namespace std; -using namespace kbd_idlfile; +using namespace iot_idl; CPacketQueue::CPacketQueue() { @@ -31,7 +31,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); @@ -45,7 +45,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()) { @@ -58,7 +58,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) @@ -70,7 +70,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()) { @@ -86,7 +86,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); @@ -100,7 +100,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) @@ -112,7 +112,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()) { @@ -124,7 +124,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()) { @@ -137,7 +137,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); @@ -150,7 +150,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()) { @@ -166,7 +166,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); @@ -179,7 +179,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()) { @@ -192,7 +192,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); @@ -205,7 +205,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()) { @@ -221,7 +221,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); @@ -234,7 +234,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); @@ -248,7 +248,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()) { @@ -261,7 +261,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/product/src/fes/fes/PacketQueue.h b/product/src/fes/fes/PacketQueue.h index 45575f64..2b38cacc 100644 --- a/product/src/fes/fes/PacketQueue.h +++ b/product/src/fes/fes/PacketQueue.h @@ -26,55 +26,55 @@ 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_objMutexSoeEvt; //锁 - std::deque m_deqFesSoeEventPkg; + std::deque m_deqFesSoeEventPkg; 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 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/product/src/fes/iec61850/common/IEC850C_RDBInterface.cpp b/product/src/fes/iec61850/common/IEC850C_RDBInterface.cpp index 1e71c621..abbdc002 100644 --- a/product/src/fes/iec61850/common/IEC850C_RDBInterface.cpp +++ b/product/src/fes/iec61850/common/IEC850C_RDBInterface.cpp @@ -9,8 +9,8 @@ #include namespace IEC850C{ -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; /************************************************************************/ /* For debug version, use a static pointer to avoid duplication of */ /* __FILE__ strings. */ diff --git a/product/src/fes/iec61850/common/IEC850C_Resource.cpp b/product/src/fes/iec61850/common/IEC850C_Resource.cpp index 1d736821..ca29b244 100644 --- a/product/src/fes/iec61850/common/IEC850C_Resource.cpp +++ b/product/src/fes/iec61850/common/IEC850C_Resource.cpp @@ -545,7 +545,7 @@ void CFesDevInfo::addInfoHelper(const QList &value, QMap &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CFesDevInfo::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { //要求和SRDBRET字段顺序一致 vecCol.push_back( "tag_name" ); @@ -958,7 +958,7 @@ void CFesChannelPara::addInfoHelper(const QList &value, QMap &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CFesChannelPara::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { } @@ -1009,7 +1009,7 @@ void CFesRtuPara::addInfoHelper(const QList &value, QMap &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CFesRtuPara::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { } @@ -1085,7 +1085,7 @@ bool CSclRcb::enableSuccess() return m_pNetInfo != NULL; } #ifdef USE_RDB -void CSclRcb::getTableInfo(std::vector &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CSclRcb::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { //vecCol 要求和 SRDBRET字段顺序一致 vecCol.push_back( "id" ); @@ -1177,7 +1177,7 @@ CSclSgcb::CSclSgcb(const CSclSgcb &rhd) } #ifdef USE_RDB -void CSclSgcb::getTableInfo(std::vector &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CSclSgcb::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { //vecCol 要求和 SRDBRET字段顺序一致 vecCol.push_back( "id" ); @@ -1244,7 +1244,7 @@ CSclLcb::CSclLcb(const CSclLcb &rhd) } #ifdef USE_RDB -void CSclLcb::getTableInfo(std::vector &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CSclLcb::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { //vecCol 要求和 SRDBRET字段顺序一致 vecCol.push_back( "id" ); @@ -1303,7 +1303,7 @@ CSclDataSet::CSclDataSet(const CSclDataSet &rhd) } #ifdef USE_RDB -void CSclDataSet::getTableInfo(std::vector &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CSclDataSet::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { //vecCol 要求和 SRDBRET字段顺序一致 vecCol.push_back( "id" ); @@ -1744,7 +1744,7 @@ void CSysModelLocationInfo::addInfoHelper(const QList &value, QMap< } #ifdef USE_RDB -void CSysModelLocationInfo::getTableInfo(std::vector &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CSysModelLocationInfo::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { } @@ -1821,7 +1821,7 @@ void CCfgDevTypeMap::addInfoHelper(const QList &value, QMap &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CCfgDevTypeMap::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { } @@ -1934,7 +1934,7 @@ void CSysModelAppInfo::addInfoHelper(const QList &value, QMap &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CSysModelAppInfo::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { } @@ -1962,7 +1962,7 @@ CCfgDeviceInst::CCfgDeviceInst(const SRRDBRET &rdbV) } #ifdef USE_RDB -void CCfgDeviceInst::getTableInfo(std::vector &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CCfgDeviceInst::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { //要求和SRDBRET字段顺序一致 vecCol.push_back( "id" ); @@ -2047,7 +2047,7 @@ CCfgSignalInst::CCfgSignalInst(const CCfgSignalInst::SRRDBRET &rdbV) } #ifdef USE_RDB -void CCfgSignalInst::getTableInfo(std::vector &vecCol, kbd_dbms::CONDINFO &objCondition, QString &strTableName) +void CCfgSignalInst::getTableInfo(std::vector &vecCol, iot_dbms::CONDINFO &objCondition, QString &strTableName) { //要求和SRDBRET字段顺序一致 vecCol.push_back( "id" ); diff --git a/product/src/fes/iec61850/include/IEC850C_Resource.h b/product/src/fes/iec61850/include/IEC850C_Resource.h index 06079456..49eb5fa1 100644 --- a/product/src/fes/iec61850/include/IEC850C_Resource.h +++ b/product/src/fes/iec61850/include/IEC850C_Resource.h @@ -105,7 +105,7 @@ public: int m_nCheckState; #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap &result); #endif @@ -180,7 +180,7 @@ public: bool enableSuccess(); #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &result); @@ -223,7 +223,7 @@ public: #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &IedNametolstSgcb, QMap &ReftoSgcb); #endif @@ -272,7 +272,7 @@ public: #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &IedNametolstLcb); #endif @@ -311,7 +311,7 @@ public: CSclDataSet *m_pModelDataSet; #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &mapIedNameToDataSet, QMap &mapIDToDataSet); #endif @@ -354,7 +354,7 @@ public: QString m_strSignalRef; #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap &mapKeyToCfgSignalInst, QMap>> &mapIedNameToTypeToCfgSignalInst, @@ -588,7 +588,7 @@ public: #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &result); #endif @@ -633,7 +633,7 @@ public: #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &result); #endif @@ -668,7 +668,7 @@ public: #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &result); #endif @@ -865,7 +865,7 @@ public: static void addInfoHelper(const QList &value, QMap> &result); #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &result); #endif @@ -1117,7 +1117,7 @@ public: static void addInfoHelper(const QList &value, QMap> &result); #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet,QMap> &result); #endif @@ -1153,7 +1153,7 @@ public: static void addInfoHelper(const QList &value, QMap> &result); #ifdef USE_RDB //表的信息 - static void getTableInfo(std::vector &vecCol,kbd_dbms::CONDINFO &objCondition, QString &strTableName); + static void getTableInfo(std::vector &vecCol,iot_dbms::CONDINFO &objCondition, QString &strTableName); //从实时库读取转换数据 static void addInfoHelper(std::vector &vecRet, QMap> &result); #endif diff --git a/product/src/fes/include/ComTcpClient.h b/product/src/fes/include/ComTcpClient.h index 8a95edab..fc46252a 100644 --- a/product/src/fes/include/ComTcpClient.h +++ b/product/src/fes/include/ComTcpClient.h @@ -8,7 +8,7 @@ #include "FesDef.h" #include "FesBase.h" -using namespace kbd_public; +using namespace iot_public; class CComTcpClient { diff --git a/product/src/fes/include/FesBase.h b/product/src/fes/include/FesBase.h index d906a318..06876ebb 100644 --- a/product/src/fes/include/FesBase.h +++ b/product/src/fes/include/FesBase.h @@ -25,7 +25,7 @@ typedef int (* LPFUN4)(int MainChanNo,int ChanNo,int CloseFlag); typedef int (* LPFUN5)(int MainChanNo); typedef int (* LPFUN6)(int flag); -using namespace kbd_public; +using namespace iot_public; class CFesForwarding; diff --git a/product/src/fes/include/FesDef.h b/product/src/fes/include/FesDef.h index 7384334f..88a50efb 100644 --- a/product/src/fes/include/FesDef.h +++ b/product/src/fes/include/FesDef.h @@ -39,7 +39,7 @@ #pragma warning(disable: 4251)//需要有dll接口由class"xxxx"的客户端使用 #pragma warning(disable: 4267)// “=”: 从“size_t”转换到“int”，可能丢失数据 #pragma warning(disable: 4305)// “初始化”: 从“double”到“float”截断 -#pragma warning(disable: 4275)// 非 dll 接口 class“google::protobuf::Message”用作 dll 接口 class“kbd_idlfile:: +#pragma warning(disable: 4275)// 非 dll 接口 class“google::protobuf::Message”用作 dll 接口 class“iot_idl:: #pragma warning(disable: 4819)//该文件包含不能在当前代码页(0)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 #pragma warning(disable: 4474)// sprintf: 格式字符串中传递的参数太多 #pragma warning(disable: 4313)//“sprintf”: 格式字符串中的“%d”与“char *”类型的参数 5 冲突 diff --git a/product/src/fes/include/SerialPortThread.h b/product/src/fes/include/SerialPortThread.h index 5376f370..11da070e 100644 --- a/product/src/fes/include/SerialPortThread.h +++ b/product/src/fes/include/SerialPortThread.h @@ -28,7 +28,7 @@ #define COM_ONE5STOPBITS 1 #define COM_TWOSTOPBITS 2 -using namespace kbd_public; +using namespace iot_public; class CSerialPortThread : public CTimerThreadBase { diff --git a/product/src/fes/include/SnmpUdpClientThread.h b/product/src/fes/include/SnmpUdpClientThread.h index 300d54ca..640e6ab1 100644 --- a/product/src/fes/include/SnmpUdpClientThread.h +++ b/product/src/fes/include/SnmpUdpClientThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CUdpClientThread : public CTimerThreadBase { diff --git a/product/src/fes/include/TcpClientNotChangeThread.h b/product/src/fes/include/TcpClientNotChangeThread.h index eb31f936..afc86454 100644 --- a/product/src/fes/include/TcpClientNotChangeThread.h +++ b/product/src/fes/include/TcpClientNotChangeThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CTcpClientNotChangeThread : public CTimerThreadBase { diff --git a/product/src/fes/include/TcpClientThread.h b/product/src/fes/include/TcpClientThread.h index d62d4a9c..7eb04613 100644 --- a/product/src/fes/include/TcpClientThread.h +++ b/product/src/fes/include/TcpClientThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CTcpClientThread : public CTimerThreadBase { diff --git a/product/src/fes/include/TcpServerListenThread.h b/product/src/fes/include/TcpServerListenThread.h index 669a4218..83ceb601 100644 --- a/product/src/fes/include/TcpServerListenThread.h +++ b/product/src/fes/include/TcpServerListenThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "TcpServerRxTxThread.h" #include -using namespace kbd_public; +using namespace iot_public; #define MAXCLIENTSIZE 64 #define CLOSESOCKET 1 class CTcpServerRxTxThread; diff --git a/product/src/fes/include/TcpServerRxTxThread.h b/product/src/fes/include/TcpServerRxTxThread.h index a9d29194..bb9866ed 100644 --- a/product/src/fes/include/TcpServerRxTxThread.h +++ b/product/src/fes/include/TcpServerRxTxThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CTcpServerListenThread; class CTcpServerRxTxThread : public CTimerThreadBase { diff --git a/product/src/fes/include/TcpServerThread.h b/product/src/fes/include/TcpServerThread.h index 13e760be..1234b2a2 100644 --- a/product/src/fes/include/TcpServerThread.h +++ b/product/src/fes/include/TcpServerThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CTcpServerThread : public CTimerThreadBase { diff --git a/product/src/fes/include/UdpClientThread.h b/product/src/fes/include/UdpClientThread.h index 300d54ca..640e6ab1 100644 --- a/product/src/fes/include/UdpClientThread.h +++ b/product/src/fes/include/UdpClientThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CUdpClientThread : public CTimerThreadBase { diff --git a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdt.cpp b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdt.cpp index bf052de0..3a5da313 100644 --- a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdt.cpp +++ b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdt.cpp @@ -1,7 +1,7 @@ #include "HttpServer_szdt.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CHttpServer_szdt HttpServer_szdt; bool g_HttpServer_szdtIsMainFes = false; diff --git a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp index 43f1fb6f..a0cf66c8 100644 --- a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp +++ b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.cpp @@ -1,7 +1,7 @@ #include "HttpServer_szdtDataProcThread.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_HttpServer_szdtIsMainFes; extern bool g_HttpServer_szdtChanelRun; diff --git a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.h b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.h index 8a2176b8..86c5fef3 100644 --- a/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.h +++ b/product/src/fes/protocol/Testexample/httpServer_szdt/HttpServer_szdtDataProcThread.h @@ -6,7 +6,7 @@ #include "common/mongoose.h" //用于IO线程向工作线程发送请求 -using namespace kbd_public; +using namespace iot_public; typedef struct { uint32 conn_id; diff --git a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp index 212d496b..4c3d9ca8 100644 --- a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp +++ b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjc.cpp @@ -1,7 +1,7 @@ #include "HttpHttpsSer_bjjc.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CHttpsSer_bjjc HttpsSer_bjjc; bool g_HttpsSer_bjjcIsMainFes = false; diff --git a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp index b41a5b93..905cdb0f 100644 --- a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp +++ b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.cpp @@ -1,6 +1,6 @@ #include "HttpHttpsSer_bjjcDataProcThread.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_HttpsSer_bjjcIsMainFes; extern bool g_HttpsSer_bjjcChanelRun; diff --git a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.h b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.h index 62ed2da1..6502541f 100644 --- a/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.h +++ b/product/src/fes/protocol/Testexample/httpsSer_bjjc/HttpHttpsSer_bjjcDataProcThread.h @@ -4,7 +4,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include ".\common\mongoose.h" -using namespace kbd_public; +using namespace iot_public; //用于IO线程向工作线程发送请求 typedef struct { diff --git a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp index 3a9d8ee6..4886283d 100644 --- a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp +++ b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850c.cpp @@ -11,8 +11,8 @@ #include "pub_utility_api/CommonConfigParse.h" //#include "dbms/rdb_api/RdbDefine.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CIEC61850c IEC61850c; @@ -289,9 +289,9 @@ CIEC61850cDataProcThreadPtr CIEC61850c::GetDataProcThreadPtrByChan(int ChanNo) void CIEC61850c::InitRTUData() { int RtuCount, ret, i, j, RtuNo, ProtocolId, ChanNo; - kbd_dbms::CRdbAccessEx RdbRtuTable; - kbd_dbms::CRdbAccessEx RdbProtocolTable; - kbd_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbRtuTable; + iot_dbms::CRdbAccessEx RdbProtocolTable; + iot_dbms::CRdbAccessEx RdbAoTable; int PointCount; diff --git a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp index ef3a46c9..4c8bd083 100644 --- a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp +++ b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.cpp @@ -11,7 +11,7 @@ #include "KBD_dll.h" #include "IEC61850dll.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC61850cIsMainFes; extern bool g_IEC61850cChanelRun; diff --git a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.h b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.h index 0e575e8a..bbaeaa25 100644 --- a/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.h +++ b/product/src/fes/protocol/Testexample/iec61850client2/IEC61850cDataProcThread.h @@ -11,7 +11,7 @@ #include "KBD_dll.h" #include "IEC61850cRtu.h" -using namespace kbd_public; +using namespace iot_public; //设备类型 const int CN_IEC61850c_SCHNEIDER = 0; diff --git a/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp b/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp index 328a08b5..27653941 100644 --- a/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp +++ b/product/src/fes/protocol/Testexample/iec61850client2/KBD_dll.cpp @@ -8,7 +8,7 @@ #include "KBD_dll.h" #include "IEC61850cDataProcThread.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC61850cIsMainFes; CIEC61850dll iec61850dll; @@ -99,7 +99,7 @@ int InitLibrary() int i; iec61850dll.init(); - g_IEC61850Dll = new kbd_public::CLoadLibrary; + g_IEC61850Dll = new iot_public::CLoadLibrary; if (g_IEC61850Dll == NULL) { LOGERROR("Create g_IEC61850Dll failed."); diff --git a/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp b/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp index ad0d4004..b1e8247b 100644 --- a/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp +++ b/product/src/fes/protocol/Testexample/iec61850dll2/IEC61850dll.cpp @@ -6,7 +6,7 @@ */ #include "IEC61850dll.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; #define DLL_K_STATE_IDLE 0 #define DLL_K_STATE_CONNECTCALLBACK 1 diff --git a/product/src/fes/protocol/ad104s/AD104S.cpp b/product/src/fes/protocol/ad104s/AD104S.cpp index a311805b..bd0e3250 100644 --- a/product/src/fes/protocol/ad104s/AD104S.cpp +++ b/product/src/fes/protocol/ad104s/AD104S.cpp @@ -15,7 +15,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CAD104S AD104S; bool g_AD104SIsMainFes=false; diff --git a/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp b/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp index af640a14..bbb01a44 100644 --- a/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp +++ b/product/src/fes/protocol/ad104s/AD104SDataProcThread.cpp @@ -23,7 +23,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_AD104SIsMainFes; extern bool g_AD104SChanelRun; diff --git a/product/src/fes/protocol/ad104s/AD104SDataProcThread.h b/product/src/fes/protocol/ad104s/AD104SDataProcThread.h index a41e4aed..2b0c8919 100644 --- a/product/src/fes/protocol/ad104s/AD104SDataProcThread.h +++ b/product/src/fes/protocol/ad104s/AD104SDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include "ADTcpServerRxTxThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_AD104S_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp b/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp index 8e18c593..c55616fa 100644 --- a/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp +++ b/product/src/fes/protocol/ad104s/ADTcpServerListenThread.cpp @@ -11,7 +11,7 @@ #include "ADTcpServerListenThread.h" #include "ADTcpServerRxTxThread.h" #include "boost/format.hpp" -using namespace kbd_public; +using namespace iot_public; CADTcpServerListenThread::CADTcpServerListenThread(vector& m_pCADTcpServerRxTxQueue,CFesBase*& m_ptrCFesBase,int ProtocolId): CTimerThreadBase("ADTcpServerListenThread",100,0,true),m_ADTcpServerRxTxQueue(m_pCADTcpServerRxTxQueue),m_ptrCFesBase(m_ptrCFesBase),m_ProtocolId(ProtocolId) diff --git a/product/src/fes/protocol/ad104s/ADTcpServerListenThread.h b/product/src/fes/protocol/ad104s/ADTcpServerListenThread.h index 52f752b2..d8ecfe78 100644 --- a/product/src/fes/protocol/ad104s/ADTcpServerListenThread.h +++ b/product/src/fes/protocol/ad104s/ADTcpServerListenThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ADTcpServerRxTxThread.h" #include -using namespace kbd_public; +using namespace iot_public; #define MAXCLIENTSIZE 64 #define CLOSESOCKET 1 diff --git a/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp b/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp index efa1b3b6..1b4dc12b 100644 --- a/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp +++ b/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.cpp @@ -12,7 +12,7 @@ #include "ADTcpServerRxTxThread.h" #include "ADTcpServerListenThread.h" -using namespace kbd_public; +using namespace iot_public; CADTcpServerRxTxThread::CADTcpServerRxTxThread(CFesChanPtr ptrCFesChan,boost::shared_ptr& m_CADTcpServerListenQueue): CTimerThreadBase("ADTcpServerRxTxThread",10,0,true),m_ptrListenthread(m_CADTcpServerListenQueue) diff --git a/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.h b/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.h index c93660fc..b02af775 100644 --- a/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.h +++ b/product/src/fes/protocol/ad104s/ADTcpServerRxTxThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CADTcpServerListenThread; class CADTcpServerRxTxThread : public CTimerThreadBase { diff --git a/product/src/fes/protocol/ats_casco/CascoAts.cpp b/product/src/fes/protocol/ats_casco/CascoAts.cpp index 4414db5e..ee9034ab 100644 --- a/product/src/fes/protocol/ats_casco/CascoAts.cpp +++ b/product/src/fes/protocol/ats_casco/CascoAts.cpp @@ -7,7 +7,7 @@ #include "CascoAts.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CCascoAts CascoAts; bool g_CascoAtsIsMainFes=false; diff --git a/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp b/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp index 8a01e578..eed0cb4d 100644 --- a/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp +++ b/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.cpp @@ -17,8 +17,8 @@ #include "dbms/rdb_api/CRdbAccessEx.h" #include "dbms/rdb_api/CRdbAccess.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; extern bool g_CascoAtsIsMainFes; @@ -179,7 +179,7 @@ int CCascoAtsDataProcThread::ReadConfigParam() if(m_ptrCFesBase == NULL) return kbdFailed; - kbd_dbms::CRdbAccessEx RdbAtsTable; + iot_dbms::CRdbAccessEx RdbAtsTable; int ret ; //读取实时库RTU配置 ret = RdbAtsTable.open(m_ptrCFesBase->m_strAppLabel.c_str(),"ats_fes_location_info"); diff --git a/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.h b/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.h index 7c7cd4fb..68ae1106 100644 --- a/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.h +++ b/product/src/fes/protocol/ats_casco/CascoAtsDataProcThread.h @@ -13,8 +13,8 @@ #include "db_sysinfo_api/CDbSysInfo.h" #include "db_model_api/CDbModelApi.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; #define CN_CASCOATS_MAX_RECV_LEN 1024 diff --git a/product/src/fes/protocol/cdt/Cdt.cpp b/product/src/fes/protocol/cdt/Cdt.cpp index 7bf31240..1708baaa 100644 --- a/product/src/fes/protocol/cdt/Cdt.cpp +++ b/product/src/fes/protocol/cdt/Cdt.cpp @@ -8,7 +8,7 @@ */#include "Cdt.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CCdt Cdt; bool g_CdtIsMainFes=false; diff --git a/product/src/fes/protocol/cdt/CdtDataProcThread.cpp b/product/src/fes/protocol/cdt/CdtDataProcThread.cpp index 52d2b280..e5d01b9c 100644 --- a/product/src/fes/protocol/cdt/CdtDataProcThread.cpp +++ b/product/src/fes/protocol/cdt/CdtDataProcThread.cpp @@ -20,7 +20,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_CdtIsMainFes; extern bool g_CdtChanelRun; diff --git a/product/src/fes/protocol/cdt/CdtDataProcThread.h b/product/src/fes/protocol/cdt/CdtDataProcThread.h index d02d6266..b3d93ac2 100644 --- a/product/src/fes/protocol/cdt/CdtDataProcThread.h +++ b/product/src/fes/protocol/cdt/CdtDataProcThread.h @@ -3,7 +3,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_CDT_MAX_CMD_LEN 256 #define MAX_BUF 1024 diff --git a/product/src/fes/protocol/cdts/Cdts.cpp b/product/src/fes/protocol/cdts/Cdts.cpp index 7f32f962..5fdf3fe6 100644 --- a/product/src/fes/protocol/cdts/Cdts.cpp +++ b/product/src/fes/protocol/cdts/Cdts.cpp @@ -8,7 +8,7 @@ */#include "Cdts.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CCdts Cdts; bool g_CdtsIsMainFes=false; diff --git a/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp b/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp index 5f14dc39..0988620c 100644 --- a/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp +++ b/product/src/fes/protocol/cdts/CdtsDataProcThread.cpp @@ -18,7 +18,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_CdtsIsMainFes; extern bool g_CdtsChanelRun; diff --git a/product/src/fes/protocol/cdts/CdtsDataProcThread.h b/product/src/fes/protocol/cdts/CdtsDataProcThread.h index 2caa1814..6a23eeb4 100644 --- a/product/src/fes/protocol/cdts/CdtsDataProcThread.h +++ b/product/src/fes/protocol/cdts/CdtsDataProcThread.h @@ -3,7 +3,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_CDTS_MAX_CMD_LEN 256 #define MAX_BUF 1024 diff --git a/product/src/fes/protocol/combase/ComTcpClient.cpp b/product/src/fes/protocol/combase/ComTcpClient.cpp index b62fb31e..48df58de 100644 --- a/product/src/fes/protocol/combase/ComTcpClient.cpp +++ b/product/src/fes/protocol/combase/ComTcpClient.cpp @@ -8,7 +8,7 @@ */ #include "ComTcpClient.h" -using namespace kbd_public; +using namespace iot_public; CComTcpClient::CComTcpClient(CFesChanPtr ptrCFesChan) { diff --git a/product/src/fes/protocol/combase/SerialPortThread.cpp b/product/src/fes/protocol/combase/SerialPortThread.cpp index c23e03e3..6cdcc0c2 100644 --- a/product/src/fes/protocol/combase/SerialPortThread.cpp +++ b/product/src/fes/protocol/combase/SerialPortThread.cpp @@ -31,8 +31,8 @@ #endif -using namespace kbd_public; -using namespace kbd_public; +using namespace iot_public; +using namespace iot_public; const int g_SerialPortThreadTime = 10; diff --git a/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp b/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp index 744d604a..b5ae76d1 100644 --- a/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp +++ b/product/src/fes/protocol/combase/SnmpUdpClientThread.cpp @@ -9,7 +9,7 @@ */ #include "UdpClientThread.h" -using namespace kbd_public; +using namespace iot_public; const int g_UdpClientThreadTime = 10; diff --git a/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp b/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp index 4ccc2872..9276d222 100644 --- a/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp +++ b/product/src/fes/protocol/combase/TcpClientNotChangeThread.cpp @@ -11,7 +11,7 @@ */ #include "TcpClientNotChangeThread.h" -using namespace kbd_public; +using namespace iot_public; const int g_TCPClientThreadTime = 10; diff --git a/product/src/fes/protocol/combase/TcpClientThread.cpp b/product/src/fes/protocol/combase/TcpClientThread.cpp index dec9d30f..6f789135 100644 --- a/product/src/fes/protocol/combase/TcpClientThread.cpp +++ b/product/src/fes/protocol/combase/TcpClientThread.cpp @@ -13,7 +13,7 @@ */ #include "TcpClientThread.h" -using namespace kbd_public; +using namespace iot_public; const int g_TCPClientThreadTime = 10; CTcpClientThread::CTcpClientThread(CFesChanPtr ptrCFesChan): diff --git a/product/src/fes/protocol/combase/TcpServerListenThread.cpp b/product/src/fes/protocol/combase/TcpServerListenThread.cpp index 2a7c2548..6348a559 100644 --- a/product/src/fes/protocol/combase/TcpServerListenThread.cpp +++ b/product/src/fes/protocol/combase/TcpServerListenThread.cpp @@ -11,7 +11,7 @@ #include "TcpServerListenThread.h" #include "TcpServerRxTxThread.h" #include "boost/format.hpp" -using namespace kbd_public; +using namespace iot_public; CTcpServerListenThread::CTcpServerListenThread(vector& m_pCTcpServerRxTxQueue,CFesBase*& m_ptrCFesBase,int ProtocolId): CTimerThreadBase("TcpServerListenThread",100,0,true),m_TcpServerRxTxQueue(m_pCTcpServerRxTxQueue),m_ptrCFesBase(m_ptrCFesBase),m_ProtocolId(ProtocolId) diff --git a/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp b/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp index 1b77f20d..a2280e4d 100644 --- a/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp +++ b/product/src/fes/protocol/combase/TcpServerRxTxThread.cpp @@ -12,7 +12,7 @@ #include "TcpServerRxTxThread.h" #include "TcpServerListenThread.h" -using namespace kbd_public; +using namespace iot_public; CTcpServerRxTxThread::CTcpServerRxTxThread(CFesChanPtr ptrCFesChan,boost::shared_ptr& m_CTcpServerListenQueue): CTimerThreadBase("TcpServerRxTxThread",10,0,true),m_ptrListenthread(m_CTcpServerListenQueue) diff --git a/product/src/fes/protocol/combase/TcpServerThread.cpp b/product/src/fes/protocol/combase/TcpServerThread.cpp index 832700f2..18169ad0 100644 --- a/product/src/fes/protocol/combase/TcpServerThread.cpp +++ b/product/src/fes/protocol/combase/TcpServerThread.cpp @@ -6,7 +6,7 @@ */ #include "TcpServerThread.h" -using namespace kbd_public; +using namespace iot_public; CTcpServerThread::CTcpServerThread(CFesChanPtr ptrCFesChan): CTimerThreadBase("TcpServerThread",10,0,true) diff --git a/product/src/fes/protocol/combase/UdpClientThread.cpp b/product/src/fes/protocol/combase/UdpClientThread.cpp index ce954723..7fb65cf4 100644 --- a/product/src/fes/protocol/combase/UdpClientThread.cpp +++ b/product/src/fes/protocol/combase/UdpClientThread.cpp @@ -9,7 +9,7 @@ */ #include "UdpClientThread.h" -using namespace kbd_public; +using namespace iot_public; const int g_UdpClientThreadTime = 20; diff --git a/product/src/fes/protocol/dlt645/DLT645.cpp b/product/src/fes/protocol/dlt645/DLT645.cpp index 4309a4e6..5f7388af 100644 --- a/product/src/fes/protocol/dlt645/DLT645.cpp +++ b/product/src/fes/protocol/dlt645/DLT645.cpp @@ -20,7 +20,7 @@ using namespace std; #define kbdFailed 1 using boost::property_tree::ptree; -using namespace kbd_public; +using namespace iot_public; CDLT645 DLT645; bool g_DLT645IsMainFes=false; diff --git a/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp b/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp index ed0c82c4..a78690c7 100644 --- a/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp +++ b/product/src/fes/protocol/dlt645/DLT645DataProcThread.cpp @@ -23,7 +23,7 @@ #include -using namespace kbd_public; +using namespace iot_public; extern bool g_DLT645IsMainFes; extern bool g_DLT645ChanelRun; diff --git a/product/src/fes/protocol/dlt645/DLT645DataProcThread.h b/product/src/fes/protocol/dlt645/DLT645DataProcThread.h index 314aa7a6..f88fb37c 100644 --- a/product/src/fes/protocol/dlt645/DLT645DataProcThread.h +++ b/product/src/fes/protocol/dlt645/DLT645DataProcThread.h @@ -10,7 +10,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; //< 解析 ASDU #define DLT645_AI_ACC 0x01 diff --git a/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp b/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp index 96ccfe32..4e6d7b6d 100644 --- a/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp +++ b/product/src/fes/protocol/fesdatarecv/fesdatarecv.cpp @@ -11,7 +11,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CFesdatarecv fesdatarecv; bool g_fesdatarecvIsMainFes=false; diff --git a/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp b/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp index 15809936..96ccb178 100644 --- a/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp +++ b/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_fesdatarecvIsMainFes; extern bool g_fesdatarecvChanelRun; diff --git a/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.h b/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.h index ec2de612..07d1bd96 100644 --- a/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.h +++ b/product/src/fes/protocol/fesdatarecv/fesdatarecvDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include "TcpServerThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_FesdatarecvMaxRecvDataSize 5000 #define CN_Fesdatarecv_MAX_Point_NUM 100 diff --git a/product/src/fes/protocol/fesdatazf/fesdatazf.cpp b/product/src/fes/protocol/fesdatazf/fesdatazf.cpp index 2d1ab5e6..dea6a84a 100644 --- a/product/src/fes/protocol/fesdatazf/fesdatazf.cpp +++ b/product/src/fes/protocol/fesdatazf/fesdatazf.cpp @@ -11,7 +11,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CFesdatazf fesdatazf; bool g_fesdatazfIsMainFes=false; diff --git a/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp b/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp index 0dcbca85..f30b91c5 100644 --- a/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp +++ b/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_fesdatazfIsMainFes; extern bool g_fesdatazfChanelRun; diff --git a/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.h b/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.h index 69e9ffc5..2e4dbab4 100644 --- a/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.h +++ b/product/src/fes/protocol/fesdatazf/fesdatazfDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include "TcpServerThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_Fesdatazf_MAX_Point_NUM 165 #define CN_Fesdatazf_MAX_ACC_NUM 125 diff --git a/product/src/fes/protocol/gf104/GF104.cpp b/product/src/fes/protocol/gf104/GF104.cpp index 0602d32a..c7115293 100644 --- a/product/src/fes/protocol/gf104/GF104.cpp +++ b/product/src/fes/protocol/gf104/GF104.cpp @@ -9,7 +9,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CGF104 gf104; bool g_GF104IsMainFes=false; diff --git a/product/src/fes/protocol/gf104/GF104DataProcThread.cpp b/product/src/fes/protocol/gf104/GF104DataProcThread.cpp index 64e0df22..8c63ecd5 100644 --- a/product/src/fes/protocol/gf104/GF104DataProcThread.cpp +++ b/product/src/fes/protocol/gf104/GF104DataProcThread.cpp @@ -17,7 +17,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_GF104IsMainFes; extern bool g_GF104ChanelRun; diff --git a/product/src/fes/protocol/gf104/GF104DataProcThread.h b/product/src/fes/protocol/gf104/GF104DataProcThread.h index 487dd7c8..8e088107 100644 --- a/product/src/fes/protocol/gf104/GF104DataProcThread.h +++ b/product/src/fes/protocol/gf104/GF104DataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_GF104_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp b/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp index dbfc9b26..b4bbb43d 100644 --- a/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp +++ b/product/src/fes/protocol/gf104/GFTcpServerListenThread.cpp @@ -10,7 +10,7 @@ #include "GFTcpServerListenThread.h" #include "GFTcpServerRxTxThread.h" #include "boost/format.hpp" -using namespace kbd_public; +using namespace iot_public; CGFTcpServerListenThread::CGFTcpServerListenThread(vector& m_pCTcpServerRxTxQueue,CFesBase*& m_ptrCFesBase,int ProtocolId): CTimerThreadBase("GFTcpServerListenThread",100,0,true),m_TcpServerRxTxQueue(m_pCTcpServerRxTxQueue),m_ptrCFesBase(m_ptrCFesBase),m_ProtocolId(ProtocolId) diff --git a/product/src/fes/protocol/gf104/GFTcpServerListenThread.h b/product/src/fes/protocol/gf104/GFTcpServerListenThread.h index 371de96b..cba75e2b 100644 --- a/product/src/fes/protocol/gf104/GFTcpServerListenThread.h +++ b/product/src/fes/protocol/gf104/GFTcpServerListenThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "GFTcpServerRxTxThread.h" #include -using namespace kbd_public; +using namespace iot_public; #define GF104_K_MAXCLIENTSIZE 1024 class CGFTcpServerRxTxThread; diff --git a/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp b/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp index d2835e46..43e0e9bf 100644 --- a/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp +++ b/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.cpp @@ -12,7 +12,7 @@ #include "GFTcpServerRxTxThread.h" #include "GFTcpServerListenThread.h" -using namespace kbd_public; +using namespace iot_public; CGFTcpServerRxTxThread::CGFTcpServerRxTxThread(CFesChanPtr ptrCFesChan,boost::shared_ptr& m_CTcpServerListenQueue): CTimerThreadBase("TcpServerRxTxThread",10,0,true),m_ptrListenthread(m_CTcpServerListenQueue) diff --git a/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.h b/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.h index ae46d487..6c8bfbc2 100644 --- a/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.h +++ b/product/src/fes/protocol/gf104/GFTcpServerRxTxThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" //#include -using namespace kbd_public; +using namespace iot_public; class CGFTcpServerListenThread; class CGFTcpServerRxTxThread : public CTimerThreadBase { diff --git a/product/src/fes/protocol/gf104s/GF104S.cpp b/product/src/fes/protocol/gf104s/GF104S.cpp index 3d66accd..d64d60da 100644 --- a/product/src/fes/protocol/gf104s/GF104S.cpp +++ b/product/src/fes/protocol/gf104s/GF104S.cpp @@ -14,7 +14,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CGF104S GF104S; bool g_GF104SIsMainFes=false; diff --git a/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp b/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp index 016ae512..226129c3 100644 --- a/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp +++ b/product/src/fes/protocol/gf104s/GF104SDataProcThread.cpp @@ -18,7 +18,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_GF104SIsMainFes; extern bool g_GF104SChanelRun; diff --git a/product/src/fes/protocol/gf104s/GF104SDataProcThread.h b/product/src/fes/protocol/gf104s/GF104SDataProcThread.h index 1db641b4..2d196b88 100644 --- a/product/src/fes/protocol/gf104s/GF104SDataProcThread.h +++ b/product/src/fes/protocol/gf104s/GF104SDataProcThread.h @@ -8,7 +8,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_GF104S_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp index a9845684..caa13a0f 100644 --- a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp +++ b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdt.cpp @@ -7,7 +7,7 @@ #include "HttpClient_szdt.h" #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; CHttpClient_szdt HttpClient_szdt; bool g_HttpClient_szdtIsMainFes = false; diff --git a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp index 7d0a8ec8..b5dc8137 100644 --- a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp +++ b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.cpp @@ -1,6 +1,6 @@ #include "HttpClient_szdtDataProcThread.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_HttpClient_szdtIsMainFes; extern bool g_HttpClient_szdtChanelRun; diff --git a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.h b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.h index a42fb28f..49860822 100644 --- a/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.h +++ b/product/src/fes/protocol/httpClient_szdt/HttpClient_szdtDataProcThread.h @@ -11,7 +11,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; //point typedef struct diff --git a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp index 4c37c78c..6288a9c0 100644 --- a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp +++ b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjc.cpp @@ -2,7 +2,7 @@ #include "pub_utility_api/I18N.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CHttpsClient_bjjc HttpsClient_bjjc; bool g_HttpsClient_bjjcIsMainFes = false; diff --git a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp index f2fbbfaf..b68aff07 100644 --- a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp +++ b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.cpp @@ -16,7 +16,7 @@ #include "openssl/des.h" #include "Des/DesUtil.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_HttpsClient_bjjcIsMainFes; extern bool g_HttpsClient_bjjcChanelRun; diff --git a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.h b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.h index a3e7cdb3..7fd6bf76 100644 --- a/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.h +++ b/product/src/fes/protocol/httpsClient_bjjc/HttpsClient_bjjcDataProcThread.h @@ -11,7 +11,7 @@ #include "zlib.h" #include "quazip/zip.h" #include "curl/curl.h" -using namespace kbd_public; +using namespace iot_public; std::vector HttpsClient_bjjcSplit(std::string str, std::string pattern); #define MAX_WAITING_EXITTHREAD_TIMEOUT 65000 //等待退出线程最长时间 diff --git a/product/src/fes/protocol/iec101s/IEC101S.cpp b/product/src/fes/protocol/iec101s/IEC101S.cpp index 16e483ad..c4a11d09 100644 --- a/product/src/fes/protocol/iec101s/IEC101S.cpp +++ b/product/src/fes/protocol/iec101s/IEC101S.cpp @@ -11,7 +11,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CIEC101S IEC101S; bool g_IEC101SIsMainFes=false; diff --git a/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp b/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp index 9cbd1a81..3a3a6131 100644 --- a/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp +++ b/product/src/fes/protocol/iec101s/IEC101SDataProcThread.cpp @@ -18,7 +18,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC101SIsMainFes; extern bool g_IEC101SChanelRun; diff --git a/product/src/fes/protocol/iec101s/IEC101SDataProcThread.h b/product/src/fes/protocol/iec101s/IEC101SDataProcThread.h index 3bea8661..8300b91e 100644 --- a/product/src/fes/protocol/iec101s/IEC101SDataProcThread.h +++ b/product/src/fes/protocol/iec101s/IEC101SDataProcThread.h @@ -8,7 +8,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_IEC101S_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/iec103/IEC103.cpp b/product/src/fes/protocol/iec103/IEC103.cpp index 3e12666a..13784549 100644 --- a/product/src/fes/protocol/iec103/IEC103.cpp +++ b/product/src/fes/protocol/iec103/IEC103.cpp @@ -23,7 +23,7 @@ using namespace std; #define kbdFailed 1 using boost::property_tree::ptree; -using namespace kbd_public; +using namespace iot_public; CIEC103 IEC103; bool g_IEC103IsMainFes=false; diff --git a/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp b/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp index 13cdacb2..08b6d763 100644 --- a/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp +++ b/product/src/fes/protocol/iec103/IEC103DataProcThread.cpp @@ -54,8 +54,8 @@ #include "dbms/rdb_api/RdbDefine.h" #include "pub_utility_api/FileUtil.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; extern bool g_IEC103IsMainFes; extern bool g_IEC103ChanelRun; diff --git a/product/src/fes/protocol/iec103/IEC103DataProcThread.h b/product/src/fes/protocol/iec103/IEC103DataProcThread.h index c3f48c3b..67b51e20 100644 --- a/product/src/fes/protocol/iec103/IEC103DataProcThread.h +++ b/product/src/fes/protocol/iec103/IEC103DataProcThread.h @@ -10,7 +10,7 @@ #include "ProtocolBase.h" #include "IEC103RtuLbStruct.h" -using namespace kbd_public; +using namespace iot_public; #define MAX_REC 20 //设备保存最大19个故障记录 diff --git a/product/src/fes/protocol/iec103/IEC103RtuLbStruct.h b/product/src/fes/protocol/iec103/IEC103RtuLbStruct.h index 3e0a9890..10ccda8a 100644 --- a/product/src/fes/protocol/iec103/IEC103RtuLbStruct.h +++ b/product/src/fes/protocol/iec103/IEC103RtuLbStruct.h @@ -7,7 +7,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_IEC103NameLen 64 diff --git a/product/src/fes/protocol/iec104/IEC104.cpp b/product/src/fes/protocol/iec104/IEC104.cpp index 30364b0f..3d310c5f 100644 --- a/product/src/fes/protocol/iec104/IEC104.cpp +++ b/product/src/fes/protocol/iec104/IEC104.cpp @@ -15,7 +15,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CIEC104 Iec104; bool g_IEC104IsMainFes=false; diff --git a/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp b/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp index ee97dd5c..5c96dbb8 100644 --- a/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp +++ b/product/src/fes/protocol/iec104/IEC104DataProcThread.cpp @@ -34,7 +34,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC104IsMainFes; extern bool g_IEC104ChanelRun; diff --git a/product/src/fes/protocol/iec104/IEC104DataProcThread.h b/product/src/fes/protocol/iec104/IEC104DataProcThread.h index c8f449ef..b7d14e26 100644 --- a/product/src/fes/protocol/iec104/IEC104DataProcThread.h +++ b/product/src/fes/protocol/iec104/IEC104DataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_IEC104_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/iec104V2/IEC104V2.cpp b/product/src/fes/protocol/iec104V2/IEC104V2.cpp index e18e9d4f..369a28d1 100644 --- a/product/src/fes/protocol/iec104V2/IEC104V2.cpp +++ b/product/src/fes/protocol/iec104V2/IEC104V2.cpp @@ -15,7 +15,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CIEC104V2 Iec104; bool g_IEC104V2IsMainFes=false; diff --git a/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp b/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp index f9356c90..714bb3e9 100644 --- a/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp +++ b/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC104V2IsMainFes; extern bool g_IEC104V2ChanelRun; diff --git a/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.h b/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.h index 04bdaa46..05dd3c6d 100644 --- a/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.h +++ b/product/src/fes/protocol/iec104V2/IEC104V2DataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_IEC104V2_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/iec104s/IEC104S.cpp b/product/src/fes/protocol/iec104s/IEC104S.cpp index 691679f3..db0405e6 100644 --- a/product/src/fes/protocol/iec104s/IEC104S.cpp +++ b/product/src/fes/protocol/iec104s/IEC104S.cpp @@ -15,7 +15,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CIEC104S IEC104S; bool g_IEC104SIsMainFes=false; diff --git a/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp b/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp index ec3fb24c..bc44b56d 100644 --- a/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp +++ b/product/src/fes/protocol/iec104s/IEC104SDataProcThread.cpp @@ -23,7 +23,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC104SIsMainFes; extern bool g_IEC104SChanelRun; diff --git a/product/src/fes/protocol/iec104s/IEC104SDataProcThread.h b/product/src/fes/protocol/iec104s/IEC104SDataProcThread.h index fa9cd7e5..31c67192 100644 --- a/product/src/fes/protocol/iec104s/IEC104SDataProcThread.h +++ b/product/src/fes/protocol/iec104s/IEC104SDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include "TcpServerThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_IEC104S_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/iec61850client2/IEC61850c.cpp b/product/src/fes/protocol/iec61850client2/IEC61850c.cpp index a6e9d968..ff31043e 100644 --- a/product/src/fes/protocol/iec61850client2/IEC61850c.cpp +++ b/product/src/fes/protocol/iec61850client2/IEC61850c.cpp @@ -8,7 +8,7 @@ #include "KBD_dll.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CIEC61850c IEC61850c; diff --git a/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.cpp b/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.cpp index dd33390a..028ede96 100644 --- a/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.cpp +++ b/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.cpp @@ -21,7 +21,7 @@ #include "KBD_dll.h" #include "IEC61850dll.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC61850cIsMainFes; extern bool g_IEC61850cChanelRun; diff --git a/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.h b/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.h index af82429b..c7949e53 100644 --- a/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.h +++ b/product/src/fes/protocol/iec61850client2/IEC61850cDataProcThread.h @@ -11,7 +11,7 @@ #include "KBD_dll.h" #include "IEC61850cRtu.h" -using namespace kbd_public; +using namespace iot_public; //设备类型 const int CN_IEC61850c_SCHNEIDER = 0; diff --git a/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp b/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp index 94b8f700..815d5dc0 100644 --- a/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp +++ b/product/src/fes/protocol/iec61850client2/IEC61850cThread.cpp @@ -15,7 +15,7 @@ #include "IEC61850dll.h" #include "IEC61850cThread.h" -using namespace kbd_dbms; +using namespace iot_dbms; extern bool g_IEC61850cIsMainFes; extern bool g_IEC61850cChanelRun; @@ -278,9 +278,9 @@ CIEC61850cDataProcThreadPtr CIEC61850cThread::GetDataProcThreadPtrByChan(int Cha void CIEC61850cThread::InitRTUData() { int RtuCount, ret, i, j, RtuNo, ProtocolId, ChanNo; - kbd_dbms::CRdbAccessEx RdbRtuTable; - kbd_dbms::CRdbAccessEx RdbProtocolTable; - kbd_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbRtuTable; + iot_dbms::CRdbAccessEx RdbProtocolTable; + iot_dbms::CRdbAccessEx RdbAoTable; char str1[48]; int iValue,iSoeSec; CCommonConfigParse config; diff --git a/product/src/fes/protocol/iec61850client2/IEC61850cThread.h b/product/src/fes/protocol/iec61850client2/IEC61850cThread.h index 30325403..975a16ed 100644 --- a/product/src/fes/protocol/iec61850client2/IEC61850cThread.h +++ b/product/src/fes/protocol/iec61850client2/IEC61850cThread.h @@ -11,7 +11,7 @@ #include "IEC61850cRtu.h" #include "IEC61850cDataProcThread.h" -using namespace kbd_public; +using namespace iot_public; class CIEC61850cThread : public CTimerThreadBase { diff --git a/product/src/fes/protocol/iec61850client2/KBD_dll.cpp b/product/src/fes/protocol/iec61850client2/KBD_dll.cpp index ceb36794..23bff660 100644 --- a/product/src/fes/protocol/iec61850client2/KBD_dll.cpp +++ b/product/src/fes/protocol/iec61850client2/KBD_dll.cpp @@ -8,7 +8,7 @@ #include "KBD_dll.h" #include "IEC61850cDataProcThread.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_IEC61850cIsMainFes; CIEC61850dll iec61850dll; diff --git a/product/src/fes/protocol/kbd104/KBD104.cpp b/product/src/fes/protocol/kbd104/KBD104.cpp index 5b365e1c..9aa00143 100644 --- a/product/src/fes/protocol/kbd104/KBD104.cpp +++ b/product/src/fes/protocol/kbd104/KBD104.cpp @@ -23,7 +23,7 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CKBD104 Kbd104; bool g_KBD104IsMainFes=false; diff --git a/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp b/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp index 24c4182d..6459e778 100644 --- a/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp +++ b/product/src/fes/protocol/kbd104/KBD104DataProcThread.cpp @@ -69,7 +69,7 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_KBD104IsMainFes; extern char g_KBD104PathWaveForm[CN_FesMaxWaveFileNameSize]; diff --git a/product/src/fes/protocol/kbd104/KBD104DataProcThread.h b/product/src/fes/protocol/kbd104/KBD104DataProcThread.h index f00c81de..e920d76c 100644 --- a/product/src/fes/protocol/kbd104/KBD104DataProcThread.h +++ b/product/src/fes/protocol/kbd104/KBD104DataProcThread.h @@ -13,7 +13,7 @@ #include "ProtocolBase.h" #include -using namespace kbd_public; +using namespace iot_public; #define CN_KBD104_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp b/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp index 3f490115..cca376f1 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp +++ b/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.cpp @@ -10,7 +10,7 @@ #include "KBD_DLL.h" #include "En_De_Packet.h" -using namespace kbd_public; +using namespace iot_public; CIEC61850DataParseThread::CIEC61850DataParseThread(CServer* ptrSvr): CTimerThreadBase("IEC61850DataParseThread",5,0,true) diff --git a/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.h b/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.h index 9abea17d..2c7f81b0 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.h +++ b/product/src/fes/protocol/kbd61850m/IEC61850DataParseThread.h @@ -4,7 +4,7 @@ class CServer; -class CIEC61850DataParseThread : public kbd_public::CTimerThreadBase +class CIEC61850DataParseThread : public iot_public::CTimerThreadBase { public: CIEC61850DataParseThread(CServer* ptrSvr); diff --git a/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp b/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp index bed55589..33a9cb18 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp +++ b/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.cpp @@ -9,7 +9,7 @@ #include "IEC61850DataRecvThread.h" #include "KBD_DLL.h" -using namespace kbd_public; +using namespace iot_public; CIEC61850DataRecvThread::CIEC61850DataRecvThread(CServer* ptrSvr): CTimerThreadBase("IEC61850DataRecvThread",5,0,true) diff --git a/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.h b/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.h index 6e12fd72..33f706fd 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.h +++ b/product/src/fes/protocol/kbd61850m/IEC61850DataRecvThread.h @@ -4,7 +4,7 @@ class CServer; -class CIEC61850DataRecvThread : public kbd_public::CTimerThreadBase +class CIEC61850DataRecvThread : public iot_public::CTimerThreadBase { public: CIEC61850DataRecvThread(CServer* ptrSvr); diff --git a/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp b/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp index f12876dc..96072cf8 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp +++ b/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.cpp @@ -8,7 +8,7 @@ #include "GlobalVar.h" #include "IEC61850TCPThread.h" -using namespace kbd_public; +using namespace iot_public; CIEC61850TCPThread::CIEC61850TCPThread(CServer* ptrSvr): CTimerThreadBase("IEC61850TCPThread",200,0,true) diff --git a/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.h b/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.h index 7211ea29..70cae067 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.h +++ b/product/src/fes/protocol/kbd61850m/IEC61850TCPThread.h @@ -4,7 +4,7 @@ class CServer; -class CIEC61850TCPThread : public kbd_public::CTimerThreadBase +class CIEC61850TCPThread : public iot_public::CTimerThreadBase { public: CIEC61850TCPThread(CServer* ptrSvr); diff --git a/product/src/fes/protocol/kbd61850m/IEC61850_FormReqCmd.cpp b/product/src/fes/protocol/kbd61850m/IEC61850_FormReqCmd.cpp index ce7fc8a0..3f32922c 100644 --- a/product/src/fes/protocol/kbd61850m/IEC61850_FormReqCmd.cpp +++ b/product/src/fes/protocol/kbd61850m/IEC61850_FormReqCmd.cpp @@ -32,7 +32,7 @@ #endif*/ #include "KBD_DLL.h" -using namespace kbd_public; +using namespace iot_public; CServer::CServer() { diff --git a/product/src/fes/protocol/kbd61850m/KBD61850m.cpp b/product/src/fes/protocol/kbd61850m/KBD61850m.cpp index 8de1bfe5..227d2e41 100644 --- a/product/src/fes/protocol/kbd61850m/KBD61850m.cpp +++ b/product/src/fes/protocol/kbd61850m/KBD61850m.cpp @@ -27,8 +27,8 @@ #include "pub_utility_api/FileUtil.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CKBD61850m Kbd61850m; bool g_Kbd61850mIsMainFes=false; @@ -302,16 +302,16 @@ CKBD61850mDataProcThreadPtr CKBD61850m::GetDataProcBySvrName(const char* svrName void CKBD61850m::InitRTUData() { int RtuCount,ret,i,j,RtuNo,ProtocolId,ChanNo; - kbd_dbms::CRdbAccessEx RdbRtuTable; - kbd_dbms::CRdbAccessEx RdbProtocolTable; - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbAoTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbDoTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbMiTable; - kbd_dbms::CRdbAccessEx RdbSettingTable; - kbd_dbms::CRdbAccessEx RdbDataBlockTable; + iot_dbms::CRdbAccessEx RdbRtuTable; + iot_dbms::CRdbAccessEx RdbProtocolTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbDoTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbMiTable; + iot_dbms::CRdbAccessEx RdbSettingTable; + iot_dbms::CRdbAccessEx RdbDataBlockTable; int PointCount,PointNum; if(m_ptrCFesBase==NULL) diff --git a/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp b/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp index f63b176c..aa3e37ae 100644 --- a/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp +++ b/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.cpp @@ -137,7 +137,7 @@ #include "pub_utility_api/I18N.h" #include "KbdPing.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_Kbd61850mIsMainFes; extern bool g_Kbd61850mChangeSetIsMainFes;//2021-05-10 thxiao diff --git a/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.h b/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.h index f6fffac1..05cc969f 100644 --- a/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.h +++ b/product/src/fes/protocol/kbd61850m/KBD61850mDataProcThread.h @@ -14,7 +14,7 @@ #include "IEC61850C.h" #include -using namespace kbd_public; +using namespace iot_public; using namespace std; #define SERVER_NAME "channel" //服务器名的前缀 diff --git a/product/src/fes/protocol/khbas/Khbas.cpp b/product/src/fes/protocol/khbas/Khbas.cpp index 4891277e..bea551ad 100644 --- a/product/src/fes/protocol/khbas/Khbas.cpp +++ b/product/src/fes/protocol/khbas/Khbas.cpp @@ -9,7 +9,7 @@ #include "Khbas.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CKhbas Khbas; bool g_KhbasIsMainFes=false; diff --git a/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp b/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp index b8818706..870b292c 100644 --- a/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp +++ b/product/src/fes/protocol/khbas/KhbasDataProcThread.cpp @@ -37,7 +37,7 @@ #include "pub_utility_api/I18N.h" #include "pub_utility_api/TimeUtil.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_KhbasIsMainFes; extern bool g_KhbasChanelRun; diff --git a/product/src/fes/protocol/khbas/KhbasDataProcThread.h b/product/src/fes/protocol/khbas/KhbasDataProcThread.h index 2a96fbcd..dd5dc31d 100644 --- a/product/src/fes/protocol/khbas/KhbasDataProcThread.h +++ b/product/src/fes/protocol/khbas/KhbasDataProcThread.h @@ -10,7 +10,7 @@ #include "ProtocolBase.h" #include "TcpClientThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUS_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp b/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp index 1a7441a1..6b509578 100644 --- a/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp +++ b/product/src/fes/protocol/modbus_c30/ModbusRtuC30.cpp @@ -10,7 +10,7 @@ #include "ModbusRtuC30.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CModbusRtuC30 ModbusRtuC30; bool g_ModbusRtuC30IsMainFes=false; diff --git a/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp b/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp index 89c426e5..fd54823e 100644 --- a/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp +++ b/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.cpp @@ -27,7 +27,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusRtuC30IsMainFes; extern bool g_ModbusRtuC30ChanelRun; diff --git a/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.h b/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.h index b41d3a31..5642d571 100644 --- a/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.h +++ b/product/src/fes/protocol/modbus_c30/ModbusRtuC30DataProcThread.h @@ -3,7 +3,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUSRTU_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp b/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp index 4152abc2..128c30dd 100644 --- a/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp +++ b/product/src/fes/protocol/modbus_micomP/ModbusMicomP.cpp @@ -9,7 +9,7 @@ #include "ModbusMicomP.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CModbusMicomP ModbusMicomP; bool g_ModbusMicomPIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp b/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp index cd4354fd..a6723016 100644 --- a/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.cpp @@ -32,7 +32,7 @@ RTU“自定义参数1”=0时, R80导入配置模板后，使用原有的配置 #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusMicomPIsMainFes; extern bool g_ModbusMicomPChanelRun; diff --git a/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.h b/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.h index 1a4b2f33..dcdd4bb4 100644 --- a/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.h +++ b/product/src/fes/protocol/modbus_micomP/ModbusMicomPDataProcThread.h @@ -4,7 +4,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUSMICOMP_MAX_CMD_LEN 256 #define MAX_P12xREC 5 //Micon P系列录波最大个数(目前P127=5个） diff --git a/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp b/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp index bfc2fc86..f9a6be82 100644 --- a/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp +++ b/product/src/fes/protocol/modbus_pm/ModbusRtuPm.cpp @@ -9,7 +9,7 @@ #include "ModbusRtuPm.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CModbusRtuPm ModbusRtuPm; bool g_ModbusRtuPmIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp b/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp index 71ca31b8..2d1ba984 100644 --- a/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.cpp @@ -24,7 +24,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusRtuPmIsMainFes; extern bool g_ModbusRtuPmChanelRun; diff --git a/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.h b/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.h index 1739c6b0..8e1f8afc 100644 --- a/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.h +++ b/product/src/fes/protocol/modbus_pm/ModbusRtuPmDataProcThread.h @@ -3,7 +3,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_ModbusRtuPm_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp b/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp index 3436d98f..3b7e6da6 100644 --- a/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp +++ b/product/src/fes/protocol/modbus_rtu/ModbusRtu.cpp @@ -13,7 +13,7 @@ #include "dbms/rdb_api/CRdbAccess.h" #include "dbms/rdb_api/RdbDefine.h" -using namespace kbd_public; +using namespace iot_public; CModbusRtu ModbusRtu; bool g_ModbusRtuIsMainFes=false; @@ -697,13 +697,13 @@ void CModbusRtu::InitProcess() bool CModbusRtu::InitProtocolPointMapping(CFesRtuPtr RtuPtr) { - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbAoTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbDoTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbMiTable; - kbd_dbms::CRdbAccessEx RdbMoTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbDoTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbMiTable; + iot_dbms::CRdbAccessEx RdbMoTable; int count, ret; SFesAiIndex *pAiIndex; SFesDiIndex *pDiIndex; @@ -717,7 +717,7 @@ bool CModbusRtu::InitProtocolPointMapping(CFesRtuPtr RtuPtr) int j; //条件判断 - kbd_dbms::CONDINFO con; + iot_dbms::CONDINFO con; con.relationop = ATTRCOND_EQU; con.conditionval = RtuPtr->m_Param.RtuNo; strcpy(con.name, "rtu_no"); diff --git a/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp b/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp index cf9840a0..c38393df 100644 --- a/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.cpp @@ -45,7 +45,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusRtuIsMainFes; extern bool g_ModbusRtuChanelRun; diff --git a/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.h b/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.h index 6219a0fe..7e4bbb1b 100644 --- a/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.h +++ b/product/src/fes/protocol/modbus_rtu/ModbusRtuDataProcThread.h @@ -6,7 +6,7 @@ #include "SerialPortThread.h" #include "TcpClientThread.h" #include "TcpServerRxTxThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUSRTU_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp index cf11a5a7..faf10954 100644 --- a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp +++ b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSer.cpp @@ -9,7 +9,7 @@ #include "ModbusRtuSer.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CModbusRtuSer ModbusRtuSer; bool g_ModbusRtuSerIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp index 1fd7815f..8696c17b 100644 --- a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.cpp @@ -19,7 +19,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusRtuSerIsMainFes; extern bool g_ModbusRtuSerChanelRun; diff --git a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.h b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.h index 3f15ee64..52ae63bc 100644 --- a/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.h +++ b/product/src/fes/protocol/modbus_rtu_s/ModbusRtuSerDataProcThread.h @@ -3,7 +3,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_ModbusRtuSer_MAX_CMD_LEN 256 #define DATA_MAX_LEN 300 diff --git a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp index 517bb748..72456008 100644 --- a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp +++ b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepam.cpp @@ -18,7 +18,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/FileUtil.h" -using namespace kbd_public; +using namespace iot_public; CModbusRtuSepam ModbusRtuSepam; bool g_ModbusRtuSepamIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp index 1b6c51df..e35dc9d4 100644 --- a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.cpp @@ -38,7 +38,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusRtuSepamIsMainFes; extern bool g_ModbusRtuSepamChanelRun; diff --git a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.h b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.h index 6deff30e..14f6408d 100644 --- a/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.h +++ b/product/src/fes/protocol/modbus_sepam/ModbusRtuSepamDataProcThread.h @@ -3,7 +3,7 @@ #include "FesDef.h" #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUSRTUSEPAM_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp index 5f65cda1..7d34b4ce 100644 --- a/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.cpp @@ -48,7 +48,7 @@ #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusIsMainFes; extern bool g_ModbusChanelRun; diff --git a/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.h b/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.h index 126d758c..de39f934 100644 --- a/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp/ModbusDataProcThread.h @@ -10,7 +10,7 @@ #include "ProtocolBase.h" #include "TcpClientThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUS_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp b/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp index 5a52c1a5..707b833c 100644 --- a/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp +++ b/product/src/fes/protocol/modbus_tcp/ModbusTcp.cpp @@ -12,7 +12,7 @@ #include "ModbusTcp.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CModbusTcp ModbusTcp; bool g_ModbusIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp index a1362a28..7c901c51 100644 --- a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp +++ b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3.cpp @@ -12,7 +12,7 @@ #include "dbms/rdb_api/CRdbAccess.h" #include "dbms/rdb_api/RdbDefine.h" -using namespace kbd_public; +using namespace iot_public; CModbusTcpV3 ModbusTcpV3; bool g_ModbusTcpV3IsMainFes=false; @@ -301,13 +301,13 @@ void CModbusTcpV3::InitProcess() bool CModbusTcpV3::InitPointMapping(CFesRtuPtr RtuPtr) { - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbAoTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbDoTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbMiTable; - kbd_dbms::CRdbAccessEx RdbMoTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbDoTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbMiTable; + iot_dbms::CRdbAccessEx RdbMoTable; int count, ret; SFesAiIndex *pAiIndex; SFesDiIndex *pDiIndex; @@ -321,7 +321,7 @@ bool CModbusTcpV3::InitPointMapping(CFesRtuPtr RtuPtr) int j; //条件判断 - kbd_dbms::CONDINFO con; + iot_dbms::CONDINFO con; con.relationop = ATTRCOND_EQU; con.conditionval = RtuPtr->m_Param.RtuNo; strcpy(con.name, "rtu_no"); diff --git a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp index b3c2c2e1..e4c8b024 100644 --- a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.cpp @@ -31,7 +31,7 @@ #include "ModbusTcpV3DataProcThread.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusTcpV3IsMainFes; extern bool g_ModbusTcpV3ChanelRun; diff --git a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.h b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.h index 4c9bce6e..5565f814 100644 --- a/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.h +++ b/product/src/fes/protocol/modbus_tcpV3/ModbusTcpV3DataProcThread.h @@ -10,7 +10,7 @@ #include "ProtocolBase.h" #include "ComTcpClient.h" -using namespace kbd_public; +using namespace iot_public; #define CN_ModbusTcpV3_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp index 7203d980..3d0e1ccb 100644 --- a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp +++ b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200.cpp @@ -6,7 +6,7 @@ #include "ModbusTcpEpm9200.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CModbusTcpEpm9200 ModbusTcpEpm9200; bool g_ModbusIsMainFes = false; diff --git a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp index 5abd57b9..666e8efc 100644 --- a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.cpp @@ -38,7 +38,7 @@ #include -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusIsMainFes; extern bool g_ModbusChanelRun; diff --git a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.h b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.h index a30bdd5c..020bbe3f 100644 --- a/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp_epm9200/ModbusTcpEpm9200DataProcThread.h @@ -11,7 +11,7 @@ #include "TcpClientThread.h" #include -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUS_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp index 2850ca01..d5920590 100644 --- a/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.cpp @@ -26,7 +26,7 @@ #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusIsMainFes; extern bool g_ModbusChanelRun; diff --git a/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.h b/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.h index 5cdc2a85..b862d375 100644 --- a/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp_fpd/ModbusDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUS_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp b/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp index f0ec462f..836d2700 100644 --- a/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp +++ b/product/src/fes/protocol/modbus_tcp_fpd/ModbusTcp.cpp @@ -7,7 +7,7 @@ #include "ModbusTcp.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CModbusTcp ModbusTcp; bool g_ModbusIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp b/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp index 2c461c35..c0390ddb 100644 --- a/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp +++ b/product/src/fes/protocol/modbus_tcp_nhats/NHAts.cpp @@ -7,7 +7,7 @@ #include "NHAts.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CNHAts NHAts; bool g_NHAtsIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp index 926efb72..b2474339 100644 --- a/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.cpp @@ -22,7 +22,7 @@ #include "dbms/rdb_api/CRdbAccessEx.h" #include "dbms/rdb_api/CRdbAccess.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_NHAtsIsMainFes; extern bool g_NHAtsChanelRun; @@ -926,7 +926,7 @@ int CNHAtsDataProcThread::RecvDataProcess(uint8 *Data, int DataSize) int CNHAtsDataProcThread::InitConfigParam() { - kbd_dbms::CRdbAccessEx RdbAtsTable; + iot_dbms::CRdbAccessEx RdbAtsTable; int ret; //读取实时库RTU配置 ret = RdbAtsTable.open(m_ptrCFesBase->m_strAppLabel.c_str(), "ats_fes_location_info"); diff --git a/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.h b/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.h index b3e9cee3..6e9613d3 100644 --- a/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp_nhats/NHAtsDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUS_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp index 3a626d98..6e6e8bb9 100644 --- a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp +++ b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPa.cpp @@ -7,7 +7,7 @@ #include "ModbusTcpPa.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CModbusTcpPa ModbusTcpPa; bool g_ModbusIsMainFes = false; diff --git a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp index a92cf280..3c9b5072 100644 --- a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.cpp @@ -14,7 +14,7 @@ #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusIsMainFes; extern bool g_ModbusChanelRun; diff --git a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.h b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.h index 18d559a9..35ef42c1 100644 --- a/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp_pa/ModbusTcpPaDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUS_MAX_CMD_LEN 256 #define RADIOAREANUM 8 //用于中心监控的广播区个数 diff --git a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp index 4aa8952c..9cf38009 100644 --- a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp +++ b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPis.cpp @@ -7,7 +7,7 @@ #include "ModbusTcpPis.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CModbusTcpPis ModbusTcpPis; bool g_ModbusIsMainFes = false; diff --git a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp index c679d273..4c346a42 100644 --- a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.cpp @@ -17,7 +17,7 @@ #include "boost/locale/conversion.hpp" #include "boost/locale/encoding.hpp" -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusIsMainFes; extern bool g_ModbusChanelRun; diff --git a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.h b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.h index 8fcfdbb3..8e57ade3 100644 --- a/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp_pis/ModbusTcpPisDataProcThread.h @@ -15,7 +15,7 @@ #pragma warning(disable: 4244)//SOCKET->int #endif -using namespace kbd_public; +using namespace iot_public; #define CN_MODBUS_MAX_CMD_LEN 300 diff --git a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp index 9636713b..8ea0b82a 100644 --- a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp +++ b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSer.cpp @@ -16,7 +16,7 @@ #include "MdbTcpSer.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CMdbTcpSer MdbTcpSer; bool g_MdbTcpSerIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp index 731af94b..869edfd4 100644 --- a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.cpp @@ -23,7 +23,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_MdbTcpSerIsMainFes; extern bool g_MdbTcpSerChanelRun; diff --git a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.h b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.h index 5fa2b96f..2f696457 100644 --- a/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp_s/MdbTcpSerDataProcThread.h @@ -13,7 +13,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include "TcpServerRxTxThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_MdbTcpSer_MAX_CMD_LEN 256 #define DATA_MAX_LEN 300 diff --git a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp index 30f739c2..f4a1be52 100644 --- a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp +++ b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVamp.cpp @@ -7,7 +7,7 @@ #include "ModbusTcpVamp.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CModbusTcpVamp ModbusTcpVamp; bool g_ModbusTcpVampIsMainFes=false; diff --git a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp index f6fabc61..0ffb4b87 100644 --- a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp +++ b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.cpp @@ -24,7 +24,7 @@ #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_ModbusTcpVampIsMainFes; extern bool g_ModbusTcpVampChanelRun; diff --git a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.h b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.h index 68679b8a..6c49137a 100644 --- a/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.h +++ b/product/src/fes/protocol/modbus_tcp_vamp/ModbusTcpVampDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; #define CN_ModbusTcpVamp_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/opcclient/OpcClient.cpp b/product/src/fes/protocol/opcclient/OpcClient.cpp index 697854b0..032b3d2d 100644 --- a/product/src/fes/protocol/opcclient/OpcClient.cpp +++ b/product/src/fes/protocol/opcclient/OpcClient.cpp @@ -8,8 +8,8 @@ #include "pub_utility_api/I18N.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; COpcClient OpcClient; bool g_OpcClientIsMainFes=false; @@ -251,12 +251,12 @@ void COpcClient::InformTcpThreadExit() void COpcClient::InitPointTable() { int RtuCount, ret, i, j, RtuNo, ProtocolId, ChanNo; - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbDoTable; - kbd_dbms::CRdbAccessEx RdbAoTable; - kbd_dbms::CRdbAccessEx RdbSettingTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbDoTable; + iot_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbSettingTable; int PointCount; if (m_ptrCFesBase == NULL) diff --git a/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp b/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp index 5a4a0dc3..374e0243 100644 --- a/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp +++ b/product/src/fes/protocol/opcclient/OpcClientDataProcThread.cpp @@ -8,8 +8,8 @@ #include "OpcClientDataProcThread.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; extern bool g_OpcClientIsMainFes; extern bool g_OpcClientChanelRun; diff --git a/product/src/fes/protocol/opcclient/OpcClientDataProcThread.h b/product/src/fes/protocol/opcclient/OpcClientDataProcThread.h index 3cd596cd..2143ac8f 100644 --- a/product/src/fes/protocol/opcclient/OpcClientDataProcThread.h +++ b/product/src/fes/protocol/opcclient/OpcClientDataProcThread.h @@ -10,7 +10,7 @@ #include "ProtocolBase.h" #include "OpcRtu.h" -using namespace kbd_public; +using namespace iot_public; #define CN_OpcClient_MAX_CMD_LEN 256 #define CN_OpcClient_MAX_ALLNUM 50000 diff --git a/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp b/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp index fd86eacf..5ae76a5c 100644 --- a/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp +++ b/product/src/fes/protocol/r80x_io/r80x_ioRtu.cpp @@ -9,7 +9,7 @@ #include "r80x_ioRtu.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; Cr80x_ioRtu r80x_ioRtu; bool g_r80x_ioRtuIsMainFes=false; diff --git a/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp b/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp index 0802353b..62bf3fde 100644 --- a/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp +++ b/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.cpp @@ -14,7 +14,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_r80x_ioRtuIsMainFes; extern bool g_r80x_ioRtuChanelRun; @@ -57,7 +57,7 @@ Cr80x_ioRtuDataProcThread::Cr80x_ioRtuDataProcThread(CFesBase *ptrCFesBase, CFe #ifdef WIN32 //初始化ArborDIO75111_64.dll - BaseDll = new kbd_public::CLoadLibrary; + BaseDll = new iot_public::CLoadLibrary; if (BaseDll == NULL) { LOGERROR("Create BaseDll failed."); @@ -128,7 +128,7 @@ Cr80x_ioRtuDataProcThread::Cr80x_ioRtuDataProcThread(CFesBase *ptrCFesBase, CFe m_LEDIsOk = 0; #if 0 - BaseDllLed = new kbd_public::CLoadLibrary; + BaseDllLed = new iot_public::CLoadLibrary; if (BaseDll == NULL) { LOGERROR("Create BaseDllLed failed."); diff --git a/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.h b/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.h index 09503994..3f9cc4b5 100644 --- a/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.h +++ b/product/src/fes/protocol/r80x_io/r80x_ioRtuDataProcThread.h @@ -9,7 +9,7 @@ #include #include #endif // WIN32 -using namespace kbd_public; +using namespace iot_public; #define CN_r80x_ioRTU_MAX_CMD_LEN 256 diff --git a/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp b/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp index 70f1484e..dbd4b034 100644 --- a/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp +++ b/product/src/fes/protocol/siemens103_tcp/SIEMENS103.cpp @@ -12,7 +12,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CSIEMENS103 Siemens103; bool g_SIEMENS103IsMainFes=false; diff --git a/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp b/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp index 86708451..683ab6ce 100644 --- a/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp +++ b/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.cpp @@ -20,7 +20,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_SIEMENS103IsMainFes; extern bool g_SIEMENS103ChanelRun; diff --git a/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.h b/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.h index 93547826..0e049620 100644 --- a/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.h +++ b/product/src/fes/protocol/siemens103_tcp/SIEMENS103DataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" -using namespace kbd_public; +using namespace iot_public; //< 解析 组号 #define SIE_DI_GP 0x00 diff --git a/product/src/fes/protocol/snmp/snmp.cpp b/product/src/fes/protocol/snmp/snmp.cpp index 61b07cfc..ab55bdea 100644 --- a/product/src/fes/protocol/snmp/snmp.cpp +++ b/product/src/fes/protocol/snmp/snmp.cpp @@ -15,7 +15,7 @@ #include "pub_utility_api/FileUtil.h" #include "dbms/rdb_api/RdbDefine.h" -using namespace kbd_public; +using namespace iot_public; CSnmp snmp; bool g_snmpIsMainFes=false; @@ -387,15 +387,15 @@ void CSnmp::InitRTUData() { int RtuCount, ret, i, j, RtuNo, ProtocolId, ChanNo; - kbd_dbms::CRdbAccessEx RdbRtuTable; - kbd_dbms::CRdbAccessEx RdbProtocolTable; - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbDoTable; - kbd_dbms::CRdbAccessEx RdbAoTable; - kbd_dbms::CRdbAccessEx RdbSettingTable; - kbd_dbms::CRdbAccessEx RdbDataBlockTable; + iot_dbms::CRdbAccessEx RdbRtuTable; + iot_dbms::CRdbAccessEx RdbProtocolTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbDoTable; + iot_dbms::CRdbAccessEx RdbAoTable; + iot_dbms::CRdbAccessEx RdbSettingTable; + iot_dbms::CRdbAccessEx RdbDataBlockTable; int PointCount, PointNum; LOGDEBUG("CSnmp::InitRTUData start..."); @@ -438,7 +438,7 @@ void CSnmp::InitRTUData() strcpy(RtuPtr->LocationDesc, m_ptrCFesBase->m_vectCFesRtuPtr[i]->m_Param.LocationDesc); //条件判断 - kbd_dbms::CONDINFO con; + iot_dbms::CONDINFO con; con.relationop = ATTRCOND_EQU; con.conditionval = RtuNo; strcpy(con.name, "rtu_no"); diff --git a/product/src/fes/protocol/snmp/snmpDataProcThread.cpp b/product/src/fes/protocol/snmp/snmpDataProcThread.cpp index a63fce14..45bb79bc 100644 --- a/product/src/fes/protocol/snmp/snmpDataProcThread.cpp +++ b/product/src/fes/protocol/snmp/snmpDataProcThread.cpp @@ -19,7 +19,7 @@ #include "asn1.h" #include "snmperrs.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_snmpIsMainFes; extern bool g_snmpChanelRun; diff --git a/product/src/fes/protocol/snmp/snmpDataProcThread.h b/product/src/fes/protocol/snmp/snmpDataProcThread.h index 1620a2d8..8ede5eba 100644 --- a/product/src/fes/protocol/snmp/snmpDataProcThread.h +++ b/product/src/fes/protocol/snmp/snmpDataProcThread.h @@ -15,7 +15,7 @@ extern "C" { } //using namespace Snmp_pp; -using namespace kbd_public; +using namespace iot_public; #define SNMPM_K_MAX_CONFIG_FILE_SIZE 100 #ifndef INVALID_SOCKET diff --git a/product/src/fes/protocol/snmps/snmpAgent/AgentCommon.cpp b/product/src/fes/protocol/snmps/snmpAgent/AgentCommon.cpp index c0f9053c..011feac6 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/AgentCommon.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/AgentCommon.h b/product/src/fes/protocol/snmps/snmpAgent/AgentCommon.h index 5f85dd7c..6b61c63f 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/AgentCommon.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/CAgentServer.cpp b/product/src/fes/protocol/snmps/snmpAgent/CAgentServer.cpp index 5599cb7f..b4a9d8e9 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/CAgentServer.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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)) void(); - //< 本程序相对独立，避免增加动态库依赖，不使用 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/product/src/fes/protocol/snmps/snmpAgent/CAgentServer.h b/product/src/fes/protocol/snmps/snmpAgent/CAgentServer.h index 6310a5f3..e4ef3c6e 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/CAgentServer.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/CpuGroup.cpp b/product/src/fes/protocol/snmps/snmpAgent/CpuGroup.cpp index f2fe4317..4f5b1e40 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/CpuGroup.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/CpuGroup.h b/product/src/fes/protocol/snmps/snmpAgent/CpuGroup.h index c0c2895e..8fad6b13 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/CpuGroup.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/FileSysGroup.cpp b/product/src/fes/protocol/snmps/snmpAgent/FileSysGroup.cpp index 2d205d93..ed185525 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/FileSysGroup.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/FileSysGroup.h b/product/src/fes/protocol/snmps/snmpAgent/FileSysGroup.h index b28c2044..ff12f2c8 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/FileSysGroup.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/MainLinux.cpp b/product/src/fes/protocol/snmps/snmpAgent/MainLinux.cpp index 00fde998..b8b0217f 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/MainLinux.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/MainWindows.cpp b/product/src/fes/protocol/snmps/snmpAgent/MainWindows.cpp index 0ad3df4f..a0b7b33a 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/MainWindows.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/MemoryGroup.cpp b/product/src/fes/protocol/snmps/snmpAgent/MemoryGroup.cpp index cc76a2dd..4eb960f3 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/MemoryGroup.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/MemoryGroup.h b/product/src/fes/protocol/snmps/snmpAgent/MemoryGroup.h index 3c95b5ec..efb07e42 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/MemoryGroup.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/NetInterfaceGroup.cpp b/product/src/fes/protocol/snmps/snmpAgent/NetInterfaceGroup.cpp index e797fade..443f42cc 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/NetInterfaceGroup.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/NetInterfaceGroup.h b/product/src/fes/protocol/snmps/snmpAgent/NetInterfaceGroup.h index 2237faea..0208f524 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/NetInterfaceGroup.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/ProcessGroup.cpp b/product/src/fes/protocol/snmps/snmpAgent/ProcessGroup.cpp index 104b41f5..f87e9e37 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/ProcessGroup.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/ProcessGroup.h b/product/src/fes/protocol/snmps/snmpAgent/ProcessGroup.h index 7b299418..0cd04c6a 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/ProcessGroup.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/SystemGroup.cpp b/product/src/fes/protocol/snmps/snmpAgent/SystemGroup.cpp index f0fdaa79..16d8d092 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/SystemGroup.cpp +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmpAgent/SystemGroup.h b/product/src/fes/protocol/snmps/snmpAgent/SystemGroup.h index bbd8b910..94b8a993 100644 --- a/product/src/fes/protocol/snmps/snmpAgent/SystemGroup.h +++ b/product/src/fes/protocol/snmps/snmpAgent/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/product/src/fes/protocol/snmps/snmps.cpp b/product/src/fes/protocol/snmps/snmps.cpp index 5eea280b..edd8176f 100644 --- a/product/src/fes/protocol/snmps/snmps.cpp +++ b/product/src/fes/protocol/snmps/snmps.cpp @@ -2,7 +2,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CSnmps Snmps; bool g_SnmpsIsMainFes = false; diff --git a/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp b/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp index a758ec57..04c11a67 100644 --- a/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp +++ b/product/src/fes/protocol/snmps/snmpsDataProcThread.cpp @@ -4,7 +4,7 @@ #include "staticTable.h" #include "mibGroup.h" -using namespace kbd_public; +using namespace iot_public; #ifdef SNMP_PP_NAMESPACE using namespace Snmp_pp; diff --git a/product/src/fes/protocol/snmps/snmpsDataProcThread.h b/product/src/fes/protocol/snmps/snmpsDataProcThread.h index 26d08531..9290e6c8 100644 --- a/product/src/fes/protocol/snmps/snmpsDataProcThread.h +++ b/product/src/fes/protocol/snmps/snmpsDataProcThread.h @@ -20,7 +20,7 @@ #define DEFAULT_READ_COMMUNITY "public" */ -using namespace kbd_public; +using namespace iot_public; #ifdef SNMP_PP_NAMESPACE using namespace Snmp_pp; diff --git a/product/src/fes/protocol/snmpv3/snmp.cpp b/product/src/fes/protocol/snmpv3/snmp.cpp index ce97369e..668e467a 100644 --- a/product/src/fes/protocol/snmpv3/snmp.cpp +++ b/product/src/fes/protocol/snmpv3/snmp.cpp @@ -15,7 +15,7 @@ #include "pub_utility_api/FileUtil.h" #include "dbms/rdb_api/RdbDefine.h" -using namespace kbd_public; +using namespace iot_public; CSnmp snmp; bool g_snmpIsMainFes=false; @@ -468,13 +468,13 @@ void CSnmp::InitRTUData() { int RtuCount, ret, i, j, RtuNo, ProtocolId, ChanNo; - kbd_dbms::CRdbAccessEx RdbRtuTable; - kbd_dbms::CRdbAccessEx RdbProtocolTable; - kbd_dbms::CRdbAccessEx RdbAiTable; - kbd_dbms::CRdbAccessEx RdbDiTable; - kbd_dbms::CRdbAccessEx RdbAccTable; - kbd_dbms::CRdbAccessEx RdbSettingTable; - kbd_dbms::CRdbAccessEx RdbDataBlockTable; + iot_dbms::CRdbAccessEx RdbRtuTable; + iot_dbms::CRdbAccessEx RdbProtocolTable; + iot_dbms::CRdbAccessEx RdbAiTable; + iot_dbms::CRdbAccessEx RdbDiTable; + iot_dbms::CRdbAccessEx RdbAccTable; + iot_dbms::CRdbAccessEx RdbSettingTable; + iot_dbms::CRdbAccessEx RdbDataBlockTable; int PointCount, PointNum; //LOGDEBUG("CSnmp::InitRTUData start..."); @@ -517,7 +517,7 @@ void CSnmp::InitRTUData() strcpy(RtuPtr->LocationDesc, m_ptrCFesBase->m_vectCFesRtuPtr[i]->m_Param.LocationDesc); //条件判断 - kbd_dbms::CONDINFO con; + iot_dbms::CONDINFO con; con.relationop = ATTRCOND_EQU; con.conditionval = RtuNo; strcpy(con.name, "rtu_no"); diff --git a/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp b/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp index 13aca30c..f79f2793 100644 --- a/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp +++ b/product/src/fes/protocol/snmpv3/snmpDataProcThread.cpp @@ -18,7 +18,7 @@ //#include "asn1.h" #include "snmperrs.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_snmpIsMainFes; extern bool g_snmpChanelRun; diff --git a/product/src/fes/protocol/snmpv3/snmpDataProcThread.h b/product/src/fes/protocol/snmpv3/snmpDataProcThread.h index f5d61532..3815fddb 100644 --- a/product/src/fes/protocol/snmpv3/snmpDataProcThread.h +++ b/product/src/fes/protocol/snmpv3/snmpDataProcThread.h @@ -18,7 +18,7 @@ #include "snmp_pp/auth_priv.h" //using namespace Snmp_pp; -using namespace kbd_public; +using namespace iot_public; #ifdef WIN32 #define strcasecmp _stricmp #endif diff --git a/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp b/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp index 87397006..32ba52a5 100644 --- a/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp +++ b/product/src/fes/protocol/sqlserver_s/DataProcThread.cpp @@ -10,7 +10,7 @@ #include #include #include -using namespace kbd_public; +using namespace iot_public; extern bool g_SqlServerIsMainFes; diff --git a/product/src/fes/protocol/sqlserver_s/DataProcThread.h b/product/src/fes/protocol/sqlserver_s/DataProcThread.h index d17a530b..e963aac8 100644 --- a/product/src/fes/protocol/sqlserver_s/DataProcThread.h +++ b/product/src/fes/protocol/sqlserver_s/DataProcThread.h @@ -12,7 +12,7 @@ #include #include -using namespace kbd_public; +using namespace iot_public; typedef struct{ int RtuNo; //rtu号 diff --git a/product/src/fes/protocol/sqlserver_s/SqlServer.cpp b/product/src/fes/protocol/sqlserver_s/SqlServer.cpp index 959f55aa..5a05716f 100644 --- a/product/src/fes/protocol/sqlserver_s/SqlServer.cpp +++ b/product/src/fes/protocol/sqlserver_s/SqlServer.cpp @@ -2,7 +2,7 @@ #include "SqlServer.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CSqlServer server; bool g_SqlServerIsMainFes = false; diff --git a/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp b/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp index ee511e81..d31898e9 100644 --- a/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp +++ b/product/src/fes/protocol/szdt_robot/SZDT_Robot.cpp @@ -10,7 +10,7 @@ #include "SZDT_Robot.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CSZDT_Robot SZDT_Robot; bool g_SZDT_RobotIsMainFes = false; diff --git a/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp b/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp index 67f4caed..b64d416e 100644 --- a/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp +++ b/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.cpp @@ -12,7 +12,7 @@ #include "pub_utility_api/I18N.h" #include "tinyxml.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_SZDT_RobotIsMainFes; extern bool g_SZDT_RobotChanelRun; diff --git a/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.h b/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.h index 0d7413ef..a94cf14a 100644 --- a/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.h +++ b/product/src/fes/protocol/szdt_robot/SZDT_RobotDataProcThread.h @@ -10,7 +10,7 @@ #include "ProtocolBase.h" #include "TcpServerThread.h" #include -using namespace kbd_public; +using namespace iot_public; const uint32 CN_SZDT_Robot_MAX_CMD_LEN = 10240; //当缓冲区太大时，内存会出现问题 const uint64 CN_SZDT_Robot_MAX_CMD_COUNT = 0xFFFFFFFFFFFFFFFF; diff --git a/product/src/fes/protocol/virtualrtu/virtualrtu.cpp b/product/src/fes/protocol/virtualrtu/virtualrtu.cpp index bb3fc684..74a4700d 100644 --- a/product/src/fes/protocol/virtualrtu/virtualrtu.cpp +++ b/product/src/fes/protocol/virtualrtu/virtualrtu.cpp @@ -9,7 +9,7 @@ #include "virtualrtu.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CVirtualRtu virtualrtu; bool g_virtualrtu_IsMainFes=false; diff --git a/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp b/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp index d33369cf..7e718895 100644 --- a/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp +++ b/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.cpp @@ -15,7 +15,7 @@ #include "pub_utility_api/I18N.h" #include -using namespace kbd_public; +using namespace iot_public; extern bool g_virtualrtu_IsMainFes; extern bool g_virtualrtu_ChanelRun; diff --git a/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.h b/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.h index 9bf526f3..20ac553c 100644 --- a/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.h +++ b/product/src/fes/protocol/virtualrtu/virtualrtuDataProcThread.h @@ -5,7 +5,7 @@ #include "ProtocolBase.h" #include -using namespace kbd_public; +using namespace iot_public; class CVirtualRtuDataProcThread : public CTimerThreadBase,CProtocolBase diff --git a/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp b/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp index e15883e4..7d2eb441 100644 --- a/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp +++ b/product/src/fes/protocol/wfudpcdt/wfudpcdt.cpp @@ -11,7 +11,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; CWfudpcdt wfudpcdt; bool g_wfudpcdtIsMainFes=false; diff --git a/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp b/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp index 3cde158d..de419508 100644 --- a/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp +++ b/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/CommonConfigParse.h" #include "pub_utility_api/I18N.h" -using namespace kbd_public; +using namespace iot_public; extern bool g_wfudpcdtIsMainFes; extern bool g_wfudpcdtChanelRun; diff --git a/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.h b/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.h index 271d4555..d5e266b9 100644 --- a/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.h +++ b/product/src/fes/protocol/wfudpcdt/wfudpcdtDataProcThread.h @@ -9,7 +9,7 @@ #include "FesBase.h" #include "ProtocolBase.h" #include "TcpServerThread.h" -using namespace kbd_public; +using namespace iot_public; #define CN_wfudpcdt_MAX_CMD_LEN 256 const int CN_wfudpcdtAppState_idle = 0; diff --git a/product/src/gui/GraphTool/IconActTool/CFileOpt.cpp b/product/src/gui/GraphTool/IconActTool/CFileOpt.cpp index 6cd0fa73..b9374de3 100644 --- a/product/src/gui/GraphTool/IconActTool/CFileOpt.cpp +++ b/product/src/gui/GraphTool/IconActTool/CFileOpt.cpp @@ -11,7 +11,7 @@ CFileOpt::CFileOpt() { - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); readColorCofig(QString::fromStdString(currentPath) + "/../../data/model/colorConfig.xml", m_strategyMap); readIconDefaultStrategy(QString::fromStdString(currentPath) + "/../../data/model/toolbox.xml", m_iconDefaultStrategyMap); } diff --git a/product/src/gui/GraphTool/IconActTool/CIconActDialog.cpp b/product/src/gui/GraphTool/IconActTool/CIconActDialog.cpp index 54400fb4..dbcd600b 100644 --- a/product/src/gui/GraphTool/IconActTool/CIconActDialog.cpp +++ b/product/src/gui/GraphTool/IconActTool/CIconActDialog.cpp @@ -159,7 +159,7 @@ void CIconActDialog::initialize() m_actMap.insert(ACT_LEFT_DOUCLICK, tr("左键双击")); m_simMap.insert(SIM_FORBID, tr("禁止")); m_simMap.insert(SIM_ALLOW, tr("允许")); - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); CTableDelegate * iconDelegate = new CTableDelegate(this, CTableDelegate::IconFile); iconDelegate->setFilePath(QString::fromStdString(currentPath) + "/../../data/icon/"); CTableDelegate * actnDelegate = new CTableDelegate(this, CTableDelegate::ComboBox); diff --git a/product/src/gui/GraphTool/NavigationApi/CJsonOpt.cpp b/product/src/gui/GraphTool/NavigationApi/CJsonOpt.cpp index 4b1013c6..ddfa8c74 100644 --- a/product/src/gui/GraphTool/NavigationApi/CJsonOpt.cpp +++ b/product/src/gui/GraphTool/NavigationApi/CJsonOpt.cpp @@ -10,7 +10,7 @@ CJsonOpt::CJsonOpt() { - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); QDir dir(QString::fromStdString(currentPath)); dir.cdUp(); dir.cdUp(); diff --git a/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.cpp b/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.cpp index 24ba9ee7..5c814223 100644 --- a/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.cpp +++ b/product/src/gui/GraphTool/NavigationTool/CNavigationDialog.cpp @@ -71,7 +71,7 @@ void CNavigationDialog::initialize() CTreeItemDelegate *boxDelegate2 = new CTreeItemDelegate(this, CTreeItemDelegate::ComboBox); boxDelegate2->setComboMap(m_mapType); - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); QDir dir(QString::fromStdString(currentPath)); dir.cdUp(); dir.cdUp(); @@ -783,7 +783,7 @@ QMap CNavigationDialog::makePathMap() { QMap fileMap; QDir picDir(m_strFileHomePath + "pic" + QDir::separator()); - std::string exePath = kbd_public::CFileUtil::getCurModuleDir(); + std::string exePath = iot_public::CFileUtil::getCurModuleDir(); fileMap.insert(SWITCH_GRAPH, picDir.path()); fileMap.insert(LOAD_WEBURL, picDir.path()); fileMap.insert(EXTERN_PRO, QString::fromStdString(exePath)); diff --git a/product/src/gui/GraphTool/fileSync/CConfirmDialog.h b/product/src/gui/GraphTool/fileSync/CConfirmDialog.h index f51fcc26..bf11defd 100644 --- a/product/src/gui/GraphTool/fileSync/CConfirmDialog.h +++ b/product/src/gui/GraphTool/fileSync/CConfirmDialog.h @@ -9,7 +9,7 @@ namespace Ui { class CConfirmDialog; } -using namespace kbd_sys; +using namespace iot_sys; class CConfirmDialog : public QDialog { Q_OBJECT diff --git a/product/src/gui/GraphTool/fileSync/CFileSyncDialog.cpp b/product/src/gui/GraphTool/fileSync/CFileSyncDialog.cpp index 7b199122..146dc163 100644 --- a/product/src/gui/GraphTool/fileSync/CFileSyncDialog.cpp +++ b/product/src/gui/GraphTool/fileSync/CFileSyncDialog.cpp @@ -18,7 +18,7 @@ CFileSyncDialog::CFileSyncDialog(QDialog *parent) : { QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf8")); - if(kbd_public::getCurLanguage() == "en") + if(iot_public::getCurLanguage() == "en") { QTranslator * sysTranslator = new QTranslator(this); sysTranslator->load(":/fileSync_en.qm"); @@ -289,7 +289,7 @@ void CFileSyncDialog::getFileInfos(const QString &path, QFileInfoList &list) void CFileSyncDialog::getSvnFile(const QString &path, QMap &name, QString& error) { - QVector vecFileStatus; + QVector vecFileStatus; QStringList list; list.append(path); diff --git a/product/src/gui/GraphTool/fileSync/CFileSyncDialog.h b/product/src/gui/GraphTool/fileSync/CFileSyncDialog.h index a449d487..66f9ed58 100644 --- a/product/src/gui/GraphTool/fileSync/CFileSyncDialog.h +++ b/product/src/gui/GraphTool/fileSync/CFileSyncDialog.h @@ -26,7 +26,7 @@ struct stSelectedPath QStringList path; }; -using namespace kbd_sys; +using namespace iot_sys; class CFileSyncDialog : public QDialog { Q_OBJECT diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp index 32c23877..9df0b069 100644 --- a/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp +++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CAlarmStatistics.cpp @@ -3,8 +3,8 @@ #include "pub_utility_api/I18N.h" #include "pub_utility_api/FileStyle.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; //#ff0000 255,0,0 //#ff7414 255,116,20 @@ -24,7 +24,7 @@ CAlarmStatistics::CAlarmStatistics(QWidget *parent,bool editMode) : ui->comboBox_location->setView(new QListView()); // 加载qss文件 QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -38,7 +38,7 @@ CAlarmStatistics::CAlarmStatistics(QWidget *parent,bool editMode) : qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm_statistics.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm_statistics.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.cpp index 01450b62..7c9047d6 100644 --- a/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.cpp +++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.cpp @@ -1,7 +1,7 @@ #include "CCompareQueryThread.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CCompareQueryThread::CCompareQueryThread() { diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h index c4d8668b..044bee07 100644 --- a/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h +++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CCompareQueryThread.h @@ -46,7 +46,7 @@ public: int getAlarmLevelIndexById( int nId, SAlarmLevel* &pAlarmLevel ); public: - kbd_dbms::CDbApi* m_pDb; // 数据库接口 + iot_dbms::CDbApi* m_pDb; // 数据库接口 CAlarmModel* m_pAlarmModel; // 详细告警信息显示窗的model QList m_listAlarmLevelColor; // 告警优先级的颜色集合 QList m_listAlarmLevel; // 告警级别列表 diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp index 7d23a1ce..ea095b87 100644 --- a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp +++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.cpp @@ -1,7 +1,7 @@ #include "CStatisticsQueryThread.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CStatisticsQueryThread::CStatisticsQueryThread() { diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h index 9940fc7e..8246f840 100644 --- a/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h +++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CStatisticsQueryThread.h @@ -37,7 +37,7 @@ public: void getWavePath( QString sAppTagName, QString& sPath, QString& sErrorMsg ); public: - kbd_dbms::CDbApi* m_pDb; // 数据库接口 + iot_dbms::CDbApi* m_pDb; // 数据库接口 CAlarmModel* m_pAlarmModel; // 详细告警信息显示窗的model QList m_listAlarmLevelColor; // 告警优先级的颜色集合 QList m_listAlarmLevel; // 告警级别列表 diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp index 82df9720..70cfcde6 100644 --- a/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp +++ b/product/src/gui/plugin/AlarmAnalyzeWidget/CWaveListDialog.cpp @@ -33,8 +33,8 @@ void CWaveListDialog::addFileNameList( QString sPath, QStringList listName ) void CWaveListDialog::slotShowWave( QListWidgetItem* pItem ) { - const std::string strPath = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("WaveAnalyze") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strPath = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("WaveAnalyze") + iot_public::CFileUtil::getProcSuffix())); if(strPath.empty()) { LOGERROR("未找到可执行文件WaveAnalyze"); diff --git a/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp b/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp index 43fecb90..a5acd0da 100644 --- a/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp +++ b/product/src/gui/plugin/AlarmAnalyzeWidget/main.cpp @@ -6,12 +6,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem( "BASE", "alarm_statistics" ); + iot_public::StartLogSystem( "BASE", "alarm_statistics" ); CAlarmStatistics w( 0, false ); w.show(); int nRet = a.exec(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return nRet; } diff --git a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp index 1beba725..331923b2 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.cpp @@ -98,7 +98,7 @@ void AddObjAlarmDialog::initMember() { if(m_pWriteDb == NULL) { - m_pWriteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_pWriteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); } if(m_model == NULL) diff --git a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h index e65ba856..dcb05a27 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h +++ b/product/src/gui/plugin/AlarmManageWidget/AddObjAlarmDialog.h @@ -69,7 +69,7 @@ private slots: private: Ui::AddObjAlarmDialog *ui; - kbd_dbms::CDbApi *m_pWriteDb; + iot_dbms::CDbApi *m_pWriteDb; QMap m_alarmActionCheckMap;//选中的告警动作 diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp index e4a76d69..f640473a 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageForm.cpp @@ -16,7 +16,7 @@ AlarmManageForm::AlarmManageForm(QWidget *parent,bool edit) : ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -30,7 +30,7 @@ AlarmManageForm::AlarmManageForm(QWidget *parent,bool edit) : qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarmmng.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarmmng.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp index 551031c9..cdb4d02d 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.cpp @@ -52,7 +52,7 @@ AlarmManageWidget::AlarmManageWidget(QWidget *parent, bool editMode) : initView(); m_pThread->start(); } - QDir dir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir dir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); dir.cdUp(); dir.cdUp(); dir.cd("data"); @@ -86,8 +86,8 @@ void AlarmManageWidget::initMember() } AlarmMng::instance()->moveToThread(m_pThread); - m_pWriteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pWriteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pWriteDb->open()) { LOGERROR("打开数据库失败,error:%s",m_pWriteDb->getLastErrorString().toStdString().c_str()); @@ -202,7 +202,7 @@ bool AlarmManageWidget::initCurUser() { m_userId = -1; m_usergId = -1; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h index 92f2a7ec..45cd1e1e 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmManageWidget.h @@ -126,8 +126,8 @@ private: QMap m_alarmLevelIndexMap; - kbd_dbms::CDbApi *m_pReadDb; - kbd_dbms::CDbApi *m_pWriteDb; + iot_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pWriteDb; int m_userId; int m_usergId; diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp index b61d80fa..a75ce0af 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.cpp @@ -6,8 +6,8 @@ #include #include -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; using namespace std; AlarmMng *AlarmMng::pInstance = NULL; @@ -249,7 +249,7 @@ QList AlarmMng::getDiText() bool AlarmMng::getNomRptEditPerm() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -278,12 +278,12 @@ AlarmMng::AlarmMng() { mutex = new QMutex; - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { LOGERROR("打开数据库失败,error:%s",m_pReadDb->getLastErrorString().toStdString().c_str()); } - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); loadLocInfo(); loadDevgInfo(); loadDevInfo(); @@ -298,7 +298,7 @@ AlarmMng::AlarmMng() void AlarmMng::loadLocInfo() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -320,8 +320,8 @@ void AlarmMng::loadLocInfo() id_value.second = "description"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back(id_value.first); columns.push_back(id_value.second); @@ -332,8 +332,8 @@ void AlarmMng::loadLocInfo() m_locMap.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); diff --git a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h index 7081523e..f3f1d2b9 100644 --- a/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h +++ b/product/src/gui/plugin/AlarmManageWidget/AlarmMng.h @@ -119,9 +119,9 @@ private: static AlarmMng * pInstance; - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_locMap; //<车站ID,车站描述> QMap m_devgMap; //<设备组标签,设备组描述> QMap m_devMap; //<设备标签,设备描述> diff --git a/product/src/gui/plugin/AlarmManageWidget/main.cpp b/product/src/gui/plugin/AlarmManageWidget/main.cpp index ed3ed624..51e2811d 100644 --- a/product/src/gui/plugin/AlarmManageWidget/main.cpp +++ b/product/src/gui/plugin/AlarmManageWidget/main.cpp @@ -9,12 +9,12 @@ int main(int argc, char *argv[]) std::string name="admin"; std::string password ="kbdct"; - kbd_public::StartLogSystem("HMI", "hmi"); + iot_public::StartLogSystem("HMI", "hmi"); - kbd_net::initMsgBus("HMI", "HMI"); + iot_net::initMsgBus("HMI", "HMI"); int group =1; - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -29,9 +29,9 @@ int main(int argc, char *argv[]) w.show(); a.exec(); } - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp b/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp index e79bc9b2..658a7072 100644 --- a/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp +++ b/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp @@ -498,7 +498,7 @@ int CAddShieldDialog::getMonthOption() bool CAddShieldDialog::getCurUser(int &userId, int &usergId, QString &hostName, int &locationId) { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -514,9 +514,9 @@ bool CAddShieldDialog::getCurUser(int &userId, int &usergId, QString &hostName, LOGERROR("获取当前登录用户失败!"); return false; } - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败!"); return false; diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp index 83d9b1f6..dff13099 100644 --- a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp +++ b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp @@ -21,7 +21,7 @@ CAlarmShield::CAlarmShield(QWidget *parent, bool editMode) : if(!editMode) { QString style = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile file1(QString::fromStdString(strFullPath)); if (file1.open(QIODevice::ReadOnly)) { @@ -31,7 +31,7 @@ CAlarmShield::CAlarmShield(QWidget *parent, bool editMode) : } file1.close(); - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarmShield.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarmShield.qss") ; QFile file2(QString::fromStdString(strFullPath)); if (file2.open(QIODevice::ReadOnly)) { diff --git a/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.cpp b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.cpp index abb4dcad..29647b97 100644 --- a/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.cpp +++ b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.cpp @@ -150,7 +150,7 @@ QMap CDbInfoManage::getShieldPropMap() bool CDbInfoManage::loadShieldObj(const int &shieldId, QList &objList) { - kbd_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); bool ret = objReadDb.open(); if(!ret) { @@ -188,7 +188,7 @@ bool CDbInfoManage::loadShieldObj(const int &shieldId, QList &obj bool CDbInfoManage::loadShieldObj(const QStringList &objList, QMap > &objMap) { - kbd_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); bool ret = objReadDb.open(); if(!ret) { @@ -232,7 +232,7 @@ bool CDbInfoManage::loadShieldObj(const QStringList &objList, QMap &objList, QList &infoList) { - kbd_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); bool ret = objReadDb.open(); if(!ret) { @@ -820,13 +820,13 @@ bool CDbInfoManage::checkOptPerm(const std::vector &vecRegionOptId, const s CDbInfoManage::CDbInfoManage() { initPermMng(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); - m_pWriteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_rtdbAccess = new iot_dbms::CRdbAccess(); + m_pWriteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); // m_tagInfo.reserve(5000); - kbd_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); bool ret = objReadDb.open(); if(!ret) { @@ -845,7 +845,7 @@ CDbInfoManage::CDbInfoManage() void CDbInfoManage::initPermMng() { - m_ptrPermMng = kbd_service::getPermMngInstance("base"); + m_ptrPermMng = iot_service::getPermMngInstance("base"); if(m_ptrPermMng == NULL || (PERM_NORMAL != m_ptrPermMng->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -892,8 +892,8 @@ void CDbInfoManage::loadRTLocation() std::string strTableName = "sys_model_location_info"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("tag_name"); @@ -906,9 +906,9 @@ void CDbInfoManage::loadRTLocation() m_locationTag.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType location_id; - kbd_dbms::CVarType tag_name; - kbd_dbms::CVarType description; + iot_dbms::CVarType location_id; + iot_dbms::CVarType tag_name; + iot_dbms::CVarType description; result.getColumnValue(nIndex, 0, location_id); result.getColumnValue(nIndex, 1, tag_name); result.getColumnValue(nIndex, 2, description); @@ -930,7 +930,7 @@ void CDbInfoManage::loadRTLocation() m_rtdbAccess->close(); } -void CDbInfoManage::loadDevGroupInfo(kbd_dbms::CDbApi &objReadDb) +void CDbInfoManage::loadDevGroupInfo(iot_dbms::CDbApi &objReadDb) { QSqlQuery query; @@ -974,7 +974,7 @@ void CDbInfoManage::loadDevGroupInfo(kbd_dbms::CDbApi &objReadDb) } } -void CDbInfoManage::loadDeviceInfo(kbd_dbms::CDbApi &objReadDb) +void CDbInfoManage::loadDeviceInfo(iot_dbms::CDbApi &objReadDb) { QSqlQuery query; @@ -1002,7 +1002,7 @@ void CDbInfoManage::loadDeviceInfo(kbd_dbms::CDbApi &objReadDb) } } -void CDbInfoManage::loadPointInfo(kbd_dbms::CDbApi &objReadDb) +void CDbInfoManage::loadPointInfo(iot_dbms::CDbApi &objReadDb) { QSqlQuery query; QStringList listType; @@ -1045,7 +1045,7 @@ void CDbInfoManage::loadPointInfo(kbd_dbms::CDbApi &objReadDb) } } -void CDbInfoManage::loadUserInfo(kbd_dbms::CDbApi &objReadDb) +void CDbInfoManage::loadUserInfo(iot_dbms::CDbApi &objReadDb) { QSqlQuery query; QString sql = QString("select perm_id,perm_alias from rm_user_def"); @@ -1059,7 +1059,7 @@ void CDbInfoManage::loadUserInfo(kbd_dbms::CDbApi &objReadDb) } } -void CDbInfoManage::loadShieldDefine(kbd_dbms::CDbApi &objReadDb) +void CDbInfoManage::loadShieldDefine(iot_dbms::CDbApi &objReadDb) { QSqlQuery query; QString sql = QString("select shield_id,description,shield_prop from opt_shield_define"); @@ -1074,7 +1074,7 @@ void CDbInfoManage::loadShieldDefine(kbd_dbms::CDbApi &objReadDb) } } -void CDbInfoManage::loadShieldProperty(kbd_dbms::CDbApi &objReadDb) +void CDbInfoManage::loadShieldProperty(iot_dbms::CDbApi &objReadDb) { QSqlQuery query; QString sql = QString("select actual_value,display_value from dict_menu_info where menu_name = '%1' ").arg("屏蔽属性"); @@ -1091,7 +1091,7 @@ void CDbInfoManage::loadShieldProperty(kbd_dbms::CDbApi &objReadDb) bool CDbInfoManage::getMaxId(int &timeId, int &shieldId) { bool ret = false; - kbd_dbms::CDbApi readDb(DB_CONN_MODEL_READ); + iot_dbms::CDbApi readDb(DB_CONN_MODEL_READ); if(!readDb.open()) { return false; diff --git a/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h index f8cdcaf1..84f669b9 100644 --- a/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h +++ b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h @@ -57,20 +57,20 @@ private: QString getJoinStr(const QList &list, char c); void loadRTLocation(); - void loadDevGroupInfo(kbd_dbms::CDbApi &objReadDb); - void loadDeviceInfo(kbd_dbms::CDbApi &objReadDb); - void loadPointInfo(kbd_dbms::CDbApi &objReadDb); - void loadUserInfo(kbd_dbms::CDbApi &objReadDb); - void loadShieldDefine(kbd_dbms::CDbApi &objReadDb); - void loadShieldProperty(kbd_dbms::CDbApi &objReadDb); + void loadDevGroupInfo(iot_dbms::CDbApi &objReadDb); + void loadDeviceInfo(iot_dbms::CDbApi &objReadDb); + void loadPointInfo(iot_dbms::CDbApi &objReadDb); + void loadUserInfo(iot_dbms::CDbApi &objReadDb); + void loadShieldDefine(iot_dbms::CDbApi &objReadDb); + void loadShieldProperty(iot_dbms::CDbApi &objReadDb); bool getMaxId(int &timeId, int &shieldId); private: static CDbInfoManage * m_pInstance; - kbd_service::CPermMngApiPtr m_ptrPermMng; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CDbApi *m_pWriteDb; + iot_service::CPermMngApiPtr m_ptrPermMng; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi *m_pWriteDb; QMap m_regionMap; QMap m_locationInfo; QMap m_locationTag; diff --git a/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp b/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp index 75e6d94d..7d2533c2 100644 --- a/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp +++ b/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp @@ -8,8 +8,8 @@ CHeaderView::CHeaderView(QWidget *parent, int nAddCheckBoxColumn): QHeaderView(Qt::Horizontal, parent), m_bChecked(false) { - m_indicatorCheck = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/ckb-select.png").c_str(); - m_indicatorUnCheck = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/unchecked.png").c_str(); + m_indicatorCheck = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/ckb-select.png").c_str(); + m_indicatorUnCheck = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/unchecked.png").c_str(); setSectionsClickable(true); connect(this, SIGNAL(sectionClicked(int)), this, SLOT(onHeaderClicked(int))); diff --git a/product/src/gui/plugin/AlarmShieldWidget/main.cpp b/product/src/gui/plugin/AlarmShieldWidget/main.cpp index c8abd55e..df59d478 100644 --- a/product/src/gui/plugin/AlarmShieldWidget/main.cpp +++ b/product/src/gui/plugin/AlarmShieldWidget/main.cpp @@ -5,9 +5,9 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); + iot_public::StartLogSystem("", "hmi"); - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -25,6 +25,6 @@ int main(int argc, char *argv[]) a.exec(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp index 56bb56f4..3df1e2f1 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp @@ -2,18 +2,18 @@ #include "dbms/db_api_ex/CDbApi.h" #include "CStatisCommon.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDataInfoManage *CDataInfoManage::m_pInstance = NULL; CDataInfoManage::CDataInfoManage() { - m_rtdbAccess = new kbd_dbms::CRdbAccess(); - m_rtdbNetAcs = new kbd_dbms::CRdbNetApi(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); + m_rtdbNetAcs = new iot_dbms::CRdbNetApi(); m_nDomain = CN_InvalidDomainId; - if(kbd_public::createSysInfoInstance(m_ptrSysInfo)) + if(iot_public::createSysInfoInstance(m_ptrSysInfo)) { - kbd_public::SNodeInfo sNodeInfo; + iot_public::SNodeInfo sNodeInfo; m_ptrSysInfo->getLocalNodeInfo(sNodeInfo); m_nDomain = sNodeInfo.nDomainId; } @@ -205,8 +205,8 @@ void CDataInfoManage::loadAlarmLevel() std::string strTableName = "alarm_level_define"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("priority_id"); columns.push_back("priority_name"); @@ -224,9 +224,9 @@ void CDataInfoManage::loadAlarmLevel() m_alarmOrderMap.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; - kbd_dbms::CVarType order; + iot_dbms::CVarType key; + iot_dbms::CVarType value; + iot_dbms::CVarType order; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); result.getColumnValue(nIndex, 2, order); @@ -245,8 +245,8 @@ void CDataInfoManage::loadLocation() std::string strTableName = "sys_model_location_info"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("description"); @@ -260,10 +260,10 @@ void CDataInfoManage::loadLocation() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType id; - kbd_dbms::CVarType desc; - kbd_dbms::CVarType p_id; - kbd_dbms::CVarType type; + iot_dbms::CVarType id; + iot_dbms::CVarType desc; + iot_dbms::CVarType p_id; + iot_dbms::CVarType type; result.getColumnValue(nIndex, 0, id); result.getColumnValue(nIndex, 1, desc); result.getColumnValue(nIndex, 2, p_id); @@ -300,8 +300,8 @@ void CDataInfoManage::loadDevType() std::string strTableName = "dev_type_def"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("dev_type_id"); columns.push_back("description"); @@ -311,8 +311,8 @@ void CDataInfoManage::loadDevType() m_devTypeMap.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); @@ -327,7 +327,7 @@ void CDataInfoManage::loadDevInfo() { std::string strTableName = "dev_info"; m_rtdbNetAcs->connect(m_nDomain, CN_AppId_PSCADA); - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector columns; columns.push_back("tag_name"); columns.push_back("description"); @@ -389,8 +389,8 @@ void CDataInfoManage::loadAlarmStatus() std::string strTableName = "alarm_status_define"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("alarm_type"); columns.push_back("status_value"); @@ -401,9 +401,9 @@ void CDataInfoManage::loadAlarmStatus() m_alarmStatusMap.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType alarm_type; - kbd_dbms::CVarType status_value; - kbd_dbms::CVarType alarm_manner; + iot_dbms::CVarType alarm_type; + iot_dbms::CVarType status_value; + iot_dbms::CVarType alarm_manner; result.getColumnValue(nIndex, 0, alarm_type); result.getColumnValue(nIndex, 1, status_value); result.getColumnValue(nIndex, 2, alarm_manner); @@ -424,8 +424,8 @@ void CDataInfoManage::loadAlarmManner() std::string strTableName = "alarm_manner_define"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("manner_id"); columns.push_back("alarm_priority"); @@ -435,8 +435,8 @@ void CDataInfoManage::loadAlarmManner() m_alarmMannerMap.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); @@ -460,7 +460,7 @@ void CDataInfoManage::loadDevPoint() for(int nIndex=0; nIndexconnect(m_nDomain, CN_AppId_PSCADA); - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector columns; columns.push_back("tag_name"); columns.push_back("device"); diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h index eb1c50db..afa79f2a 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h @@ -43,9 +43,9 @@ private: void loadDevPoint(); private: - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CRdbNetApi * m_rtdbNetAcs; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbNetApi * m_rtdbNetAcs; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; int m_nDomain; QMap m_alarmLevelMap; //< alarm_level_define PRIORITY_ID - PRIORITY_NAME QMap m_alarmOrderMap; //< alarm_level_define PRIORITY_ID - PRIORITY_ORDER diff --git a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp index eeda5faa..4471f9fd 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp @@ -17,7 +17,7 @@ void CHisEventManage::queryHisEventStatis(int location, int devType, qint64 star { QTime time; time.start(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(!getValidTsdbConnPtr(tsdbConnPtr)) { LOGERROR("CTsdbQuery: 未获取到有效的TSDB连接！"); @@ -40,7 +40,7 @@ void CHisEventManage::queryHisEventContrast(QList selectedList, qint64 star { QTime time; time.start(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(!getValidTsdbConnPtr(tsdbConnPtr)) { LOGERROR("CTsdbQuery: 未获取到有效的TSDB连接！"); @@ -69,7 +69,7 @@ void CHisEventManage::queryHisEventContrast(QList selectedList, qint64 star emit updateHisEventContrast(record); } -bool CHisEventManage::getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr) +bool CHisEventManage::getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr) { if(m_tsdbConnPtr != NULL) { diff --git a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h index f9424b04..7b5895cc 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h @@ -19,7 +19,7 @@ public slots: void queryHisEventContrast(QList selectedList, qint64 startTime, qint64 endTime, EN_STATIS_STYLE style); private: - bool getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr); + bool getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr); signals: void updateHisEventStatis(const QMap > &event); @@ -27,7 +27,7 @@ signals: void updateHisEventContrast(const QMap > &event); private: - kbd_dbms::CTsdbConnPtr m_tsdbConnPtr; + iot_dbms::CTsdbConnPtr m_tsdbConnPtr; }; #endif // CHISEVENTMANAGE_H diff --git a/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp b/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp index af8c3cad..5947996f 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp @@ -28,7 +28,7 @@ CMainWidget::~CMainWidget() { if(!m_editMode) { - kbd_dbms::releaseTsdbApi(); + iot_dbms::releaseTsdbApi(); } if(m_pHisEventManage) @@ -76,7 +76,7 @@ void CMainWidget::initialize() if(!m_editMode) { - kbd_dbms::initTsdbApi(); + iot_dbms::initTsdbApi(); loadAlarmColor(); @@ -87,7 +87,7 @@ void CMainWidget::initialize() void CMainWidget::initStyleSheet() { QString style = QString(); - std::string strFullPath = kbd_public::CFileStyle + std::string strFullPath = iot_public::CFileStyle ::getPathOfStyleFile("public.qss") ; QFile file1(QString::fromStdString(strFullPath)); if (file1.open(QIODevice::ReadOnly)) @@ -98,7 +98,7 @@ void CMainWidget::initStyleSheet() } file1.close(); - strFullPath = kbd_public::CFileStyle + strFullPath = iot_public::CFileStyle ::getPathOfStyleFile("AlarmStatisWidget.qss") ; QFile file2(QString::fromStdString(strFullPath)); if (file2.open(QIODevice::ReadOnly)) @@ -116,7 +116,7 @@ void CMainWidget::initStyleSheet() void CMainWidget::loadAlarmColor() { - QString filePath = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString filePath = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); QDomDocument document; diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp index ceb645f7..6a424ac8 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp @@ -32,7 +32,7 @@ CTsdbQuery::~CTsdbQuery() { int64 resultSize = 0; //< 释放结果集 - std::vector *>::iterator res = m_pVecResult->begin(); + std::vector *>::iterator res = m_pVecResult->begin(); while(res != m_pVecResult->end()) { resultSize += (*res)->size(); @@ -98,8 +98,8 @@ bool CTsdbQuery::queryEventByUnit(qint64 startTime, qint64 endTime, QMapsize(); nIndex++) { - std::vector *evetVector = m_pVecResult->at(nIndex); - std::vector::iterator iter = evetVector->begin(); + std::vector *evetVector = m_pVecResult->at(nIndex); + std::vector::iterator iter = evetVector->begin(); for(; iter != evetVector->end(); iter++) { int priority = getAlarmLevel(m_pVecMpKey->at(nIndex).m_pszTagName, @@ -189,8 +189,8 @@ void CTsdbQuery::parseResult(qint64 startTime, qint64 endTime, EN_STATIS_MODE mo { for(size_t nIndex(0); nIndex < m_pVecResult->size(); nIndex++) { - std::vector *evetVector = m_pVecResult->at(nIndex); - std::vector::iterator iter = evetVector->begin(); + std::vector *evetVector = m_pVecResult->at(nIndex); + std::vector::iterator iter = evetVector->begin(); qint64 time = startTime; qint64 addTime = getAddMsecByMode(time, mode); for(; iter != evetVector->end(); iter++) diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h index 621b2597..98078a47 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h @@ -5,7 +5,7 @@ #include "tsdb_api/TsdbApi.h" #include "db_his_query_api/DbHisQueryBase.h" -using namespace kbd_dbms; +using namespace iot_dbms; class CTsdbQuery { public: @@ -28,7 +28,7 @@ private: std::vector *> *m_pVecResult; private: - kbd_dbms::CTsdbConnPtr m_tsdbConnPtr; + iot_dbms::CTsdbConnPtr m_tsdbConnPtr; QString m_strDevice; }; diff --git a/product/src/gui/plugin/AlarmStatisWidget/main.cpp b/product/src/gui/plugin/AlarmStatisWidget/main.cpp index 5bd1e506..9605fd59 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/main.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("HMI", "AlarmStatisWidget"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("HMI", "AlarmStatisWidget"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) return -1; } -// kbd_service::CDpcdaForApp::initGlobalThread(); +// iot_service::CDpcdaForApp::initGlobalThread(); { LOGINFO("=========================== AlarmStatisWidget ==========================="); @@ -35,10 +35,10 @@ int main(int argc, char *argv[]) app.exec(); } -// kbd_service::CDpcdaForApp::releaseGlobalThread(); +// iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp index 62e8c97a..430d4f7a 100644 --- a/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp @@ -58,7 +58,7 @@ void CAccidentReviewDialog::initView() void CAccidentReviewDialog::initTree() { QMap>> m_mapNav; - readNavJson(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + readNavJson(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/NavigationWidget.json"), m_mapNav); QList> nodeList = m_mapNav.value(-1); for(int nIndex=0; nIndex #include "CAlarmDataCollect.h" -using namespace kbd_service; +using namespace iot_service; CAiAlarmDataCollect * CAiAlarmDataCollect::m_pInstance = NULL; CAiAlarmDataCollect::CAiAlarmDataCollect() : CIntelliAlmApi4Clt(), @@ -12,7 +12,7 @@ CAiAlarmDataCollect::CAiAlarmDataCollect() m_pAlternateTimer(Q_NULLPTR) { m_rtdbMutex = new QMutex(); - m_rtdbPriorityOrderAccess = new kbd_dbms::CRdbAccess(); + m_rtdbPriorityOrderAccess = new iot_dbms::CRdbAccess(); m_rtdbPriorityOrderAccess->open("base", "alarm_level_define"); } @@ -68,25 +68,25 @@ bool CAiAlarmDataCollect::isFaultRecallState() return m_bFaultRecallState; } -bool CAiAlarmDataCollect::requestDelAlm(kbd_idlfile::SIntelliAlmDel &objDelAlm) +bool CAiAlarmDataCollect::requestDelAlm(iot_idl::SIntelliAlmDel &objDelAlm) { LOGDEBUG("请求删除!"); - return kbd_service::CIntelliAlmApi4Clt::requestDelAlm(objDelAlm); + return iot_service::CIntelliAlmApi4Clt::requestDelAlm(objDelAlm); } -bool CAiAlarmDataCollect::requestSeprAlm(kbd_idlfile::SIntelliAlmSepr &objSeprAlm) +bool CAiAlarmDataCollect::requestSeprAlm(iot_idl::SIntelliAlmSepr &objSeprAlm) { LOGDEBUG("请求分离!"); - return kbd_service::CIntelliAlmApi4Clt::requestSeprAlm(objSeprAlm); + return iot_service::CIntelliAlmApi4Clt::requestSeprAlm(objSeprAlm); } -bool CAiAlarmDataCollect::requestMergeAlm(kbd_idlfile::SIntelliAlmMerge &objMergeAlm) +bool CAiAlarmDataCollect::requestMergeAlm(iot_idl::SIntelliAlmMerge &objMergeAlm) { LOGDEBUG("请求合并!"); - return kbd_service::CIntelliAlmApi4Clt::requestMergeAlm(objMergeAlm); + return iot_service::CIntelliAlmApi4Clt::requestMergeAlm(objMergeAlm); } -void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, kbd_idlfile::SIntelliAlmAdd &objAllAlm) +void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, iot_idl::SIntelliAlmAdd &objAllAlm) { LOGINFO("========== AiAlarmDataCollect handleAllAlmMsg =========="); @@ -98,7 +98,7 @@ void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, kbd_idlfile::SIntelliAl QList almList; for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SIntelliAlmInfo msg = objAllAlm.alm_info(nAddMsgIndex); + iot_idl::SIntelliAlmInfo msg = objAllAlm.alm_info(nAddMsgIndex); AiAlarmMsgPtr alm(new CAiAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -109,7 +109,7 @@ void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, kbd_idlfile::SIntelliAl emit sigMsgRefresh(); } -void CAiAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm) +void CAiAlarmDataCollect::handleAddAlmMsg(iot_idl::SIntelliAlmAdd &objAddAlm) { LOGINFO("========== AiAlarmDataCollect handleAddAlmMsg =========="); QMutexLocker locker(m_rtdbMutex); @@ -118,7 +118,7 @@ void CAiAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm QList almList; for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SIntelliAlmInfo msg = objAddAlm.alm_info(nAddMsgIndex); + iot_idl::SIntelliAlmInfo msg = objAddAlm.alm_info(nAddMsgIndex); AiAlarmMsgPtr alm(new CAiAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -128,7 +128,7 @@ void CAiAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm LOGDEBUG("AiAlarmDataCollect handleAddAlmMsg():count[%d]",nAlarmCount); } -void CAiAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm) +void CAiAlarmDataCollect::handleDelAlmMsg(iot_idl::SIntelliAlmDel &objDelAlm) { LOGINFO("========== AiAlarmDataCollect handleDelAlmMsg =========="); QMutexLocker locker(m_rtdbMutex); @@ -144,7 +144,7 @@ void CAiAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm LOGDEBUG("AiAlarmDataCollect handleDelAlmMsg():count[%d]",nAlarmCount); } -void CAiAlarmDataCollect::handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm) +void CAiAlarmDataCollect::handleBrokenAlmMsg(iot_idl::SIntelliAlmBroken &objBrokenAlm) { //先保证能够编译通过 LOGINFO("========== AiAlarmDataCollect handleBrokenAlmMsg =========="); @@ -160,7 +160,7 @@ void CAiAlarmDataCollect::handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &obj LOGDEBUG("AiAlarmDataCollect handleBrokenAlmMsg():count[%d]",nAlarmCount); } -void CAiAlarmDataCollect::handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objReleaseAlm) +void CAiAlarmDataCollect::handleReleaseAlmMsg(iot_idl::SIntelliAlmRelease &objReleaseAlm) { //先保证能够编译通过 LOGINFO("========== AiAlarmDataCollect handleReleaseAlmMsg =========="); @@ -226,8 +226,8 @@ void CAiAlarmDataCollect::slotSwitchFaultRecallState(bool bFaultRecallState) int CAiAlarmDataCollect::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); - kbd_dbms::CVarType value = -1000; + iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); + iot_dbms::CVarType value = -1000; m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h index c2f237c0..ab56bf83 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h @@ -11,7 +11,7 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "dbms/rdb_api/CRdbAccess.h" -class CAiAlarmDataCollect : public QObject, public kbd_service::CIntelliAlmApi4Clt +class CAiAlarmDataCollect : public QObject, public iot_service::CIntelliAlmApi4Clt { Q_OBJECT public: @@ -25,21 +25,21 @@ public: bool isFaultRecallState(); - virtual bool requestDelAlm(kbd_idlfile::SIntelliAlmDel &objDelAlm); + virtual bool requestDelAlm(iot_idl::SIntelliAlmDel &objDelAlm); - virtual bool requestSeprAlm(kbd_idlfile::SIntelliAlmSepr &objSeprAlm); + virtual bool requestSeprAlm(iot_idl::SIntelliAlmSepr &objSeprAlm); - virtual bool requestMergeAlm(kbd_idlfile::SIntelliAlmMerge &objMergeAlm); + virtual bool requestMergeAlm(iot_idl::SIntelliAlmMerge &objMergeAlm); - virtual void handleAllAlmMsg(int nDomainId,kbd_idlfile::SIntelliAlmAdd &objAllAlm); + virtual void handleAllAlmMsg(int nDomainId,iot_idl::SIntelliAlmAdd &objAllAlm); - virtual void handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm); + virtual void handleAddAlmMsg(iot_idl::SIntelliAlmAdd &objAddAlm); - virtual void handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm); + virtual void handleDelAlmMsg(iot_idl::SIntelliAlmDel &objDelAlm); - virtual void handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm); + virtual void handleBrokenAlmMsg(iot_idl::SIntelliAlmBroken &objBrokenAlm); - virtual void handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objReleaseAlm); + virtual void handleReleaseAlmMsg(iot_idl::SIntelliAlmRelease &objReleaseAlm); signals: //< 启停定时器 void sigTimerShot(const bool bStop); @@ -77,7 +77,7 @@ private: bool m_bFaultRecallState; QMutex *m_rtdbMutex; QTimer * m_pAlternateTimer; - kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; static CAiAlarmDataCollect * m_pInstance; }; diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp index c6ffefc6..1d02cb41 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp @@ -380,8 +380,8 @@ bool CAiAlarmDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, con wave = QString("%1%2%3").arg("\"").arg(wave).arg("\""); LOGINFO("录波文件为:%s",wave.toStdString().c_str()); - const std::string strProc = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("WaveAnalyze") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("WaveAnalyze") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) LOGERROR("未找到可执行文件WaveAnalyze"); else @@ -401,8 +401,8 @@ void CAiAlarmDelegate::slotLoadConfig() CAlarmSetMng::instance()->getEmptyInfo(m_emptyBackgroundColor,m_emptyTipColor,m_emptyTip); //CAlarmColorMng::instance()->getActAndFunc(m_act,m_func); - std::string style = kbd_public::CFileStyle::getCurStyle(); - m_strTrendPath = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/trend_"+style+".png").c_str(); - m_strVideoPath = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video_"+style+".png").c_str(); - m_strWavePath = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + m_strTrendPath = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/trend_"+style+".png").c_str(); + m_strVideoPath = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video_"+style+".png").c_str(); + m_strWavePath = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); } diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp index 4834b7cc..dadde560 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp @@ -51,7 +51,7 @@ CAiAlarmMsgInfo::CAiAlarmMsgInfo(const CAiAlarmMsgInfo &other): priority(0) m_tagname_type = other.m_tagname_type; } -void CAiAlarmMsgInfo::initialize(const kbd_idlfile::SIntelliAlmInfo &alarmInfo) +void CAiAlarmMsgInfo::initialize(const iot_idl::SIntelliAlmInfo &alarmInfo) { logic_state = (E_AiALARM_LOGICSTATE)alarmInfo.logic_state(); diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h index bd806b79..15d7996f 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h @@ -21,7 +21,7 @@ class CAiAlarmMsgInfo public: CAiAlarmMsgInfo(); CAiAlarmMsgInfo(const CAiAlarmMsgInfo &other); - void initialize(const kbd_idlfile::SIntelliAlmInfo &alarmInfo); + void initialize(const iot_idl::SIntelliAlmInfo &alarmInfo); //< [优先级越小表示越大]-智能告警窗调用 bool ailessThan(const AlarmMsgPtr &info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp index fdcaded2..d40a12a8 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp @@ -8,7 +8,7 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/CharUtil.h" -using namespace kbd_public; +using namespace iot_public; using namespace std; CAlarmBaseData *CAlarmBaseData::pInstance = NULL; @@ -88,8 +88,8 @@ CAlarmBaseData::CAlarmBaseData(QObject *parent) : QObject(parent), m_rtdbAccess(Q_NULLPTR) { - m_rtdbAccess = new kbd_dbms::CRdbAccess(); - m_pWriteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_rtdbAccess = new iot_dbms::CRdbAccess(); + m_pWriteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); createSysInfoInstance(m_ptrSysInfo); initData(); @@ -97,7 +97,7 @@ CAlarmBaseData::CAlarmBaseData(QObject *parent) : void CAlarmBaseData::loadPermInfo() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); m_listPermLocationId.clear(); m_listPermRegionId.clear(); if(permMngPtr != NULL) @@ -159,7 +159,7 @@ bool CAlarmBaseData::queryAllPointDevGroup(int nDomainId, int nSubsystemId, cons LOGERROR("queryAllPointDevGroup 获取应用ID失败"); return false; } - kbd_dbms::CRdbNetApi rdbNetApi; + iot_dbms::CRdbNetApi rdbNetApi; rdbNetApi.connect(nDomainId, stAppInfo.nId); //< 查询所有设备 @@ -259,8 +259,8 @@ void CAlarmBaseData::loadPriorityDescription() m_priorityDescriptionMap.clear(); m_priorityOrderDescriptionMap.clear(); m_priorityPermDescriptionMap.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("priority_id"); columns.push_back("priority_order"); @@ -270,9 +270,9 @@ void CAlarmBaseData::loadPriorityDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType order; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType order; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, order); result.getColumnValue(nIndex, 2, value); @@ -296,8 +296,8 @@ void CAlarmBaseData::loadLocationDescription() m_locationDescriptionMap.clear(); m_locationPermDescriptionMap.clear(); m_listPermLocationOrder.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("description"); @@ -310,11 +310,11 @@ void CAlarmBaseData::loadLocationDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType id; - kbd_dbms::CVarType desc; - kbd_dbms::CVarType tag; - kbd_dbms::CVarType type; - kbd_dbms::CVarType pid; + iot_dbms::CVarType id; + iot_dbms::CVarType desc; + iot_dbms::CVarType tag; + iot_dbms::CVarType type; + iot_dbms::CVarType pid; result.getColumnValue(nIndex, 0, id); result.getColumnValue(nIndex, 1, desc); result.getColumnValue(nIndex, 2, tag); @@ -389,8 +389,8 @@ void CAlarmBaseData::loadRegionDescription() { m_regionDescriptionMap.clear(); m_regionPermDescriptionMap.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("region_id"); columns.push_back("description"); @@ -399,8 +399,8 @@ void CAlarmBaseData::loadRegionDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermRegionId.contains(key.toInt())) @@ -420,8 +420,8 @@ void CAlarmBaseData::loadAlarmTypeDescription() if(m_rtdbAccess->open("base", "alarm_type_define")) { m_alarmTypeDescriptionMap.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("type_id"); columns.push_back("type_name"); @@ -430,8 +430,8 @@ void CAlarmBaseData::loadAlarmTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -445,8 +445,8 @@ void CAlarmBaseData::loadAlarmStatusDescription() if(m_rtdbAccess->open("base", "alarm_status_define")) { m_alarmStatusDescriptionMap.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("status_value"); columns.push_back("display_name"); @@ -455,8 +455,8 @@ void CAlarmBaseData::loadAlarmStatusDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmStatusDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -470,8 +470,8 @@ void CAlarmBaseData::loadDeviceTypeDescription() if(m_rtdbAccess->open("base", "dev_type_def")) { m_deviceTypeDescriptionMap.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("dev_type_id"); columns.push_back("description"); @@ -480,8 +480,8 @@ void CAlarmBaseData::loadDeviceTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -495,8 +495,8 @@ void CAlarmBaseData::loadDeviceGroupDescription() if(m_rtdbAccess->open("base", "dev_group")) { m_deviceGroupDescriptionMap.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("tag_name"); columns.push_back("description"); @@ -505,8 +505,8 @@ void CAlarmBaseData::loadDeviceGroupDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceGroupDescriptionMap[QString::fromStdString(key.toStdString())] = QString::fromStdString(value.toStdString()); @@ -517,7 +517,7 @@ void CAlarmBaseData::loadDeviceGroupDescription() void CAlarmBaseData::loadAlarmShowStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; m_alarmShowStatusDescriptionMap.clear(); @@ -553,7 +553,7 @@ void CAlarmBaseData::loadAlarmShowStatusDescription() void CAlarmBaseData::loadAlarmOtherStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; m_alarmOtherStatusDescriptionMap.clear(); @@ -581,21 +581,21 @@ void CAlarmBaseData::loadAlarmOtherStatusDescription() } } -bool CAlarmBaseData::queryAllDeviceDevGroup(kbd_dbms::CRdbNetApi &rdbNetApi, const QString &devg, QList &devList) +bool CAlarmBaseData::queryAllDeviceDevGroup(iot_dbms::CRdbNetApi &rdbNetApi, const QString &devg, QList &devList) { //< 查询设备组所有设备 - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("dev_info"); msgQuery.add_strselectcolnamearr("tag_name"); - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); - pCondtion->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); - pCondtion->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + pCondtion->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); + pCondtion->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("group_tag_name"); - kbd_idlfile::SVariable *pCondValue = pCondtion->mutable_msgvalue(); - pCondValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable *pCondValue = pCondtion->mutable_msgvalue(); + pCondValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(devg.toStdString()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet; bRet = rdbNetApi.query(msgQuery, retMsg); if (false == bRet) @@ -619,20 +619,20 @@ bool CAlarmBaseData::queryAllDeviceDevGroup(kbd_dbms::CRdbNetApi &rdbNetApi, con return true; } -bool CAlarmBaseData::queryAllPointDevice(kbd_dbms::CRdbNetApi &rdbNetApi, const QString &device, const QString &table, QList &pointList) +bool CAlarmBaseData::queryAllPointDevice(iot_dbms::CRdbNetApi &rdbNetApi, const QString &device, const QString &table, QList &pointList) { - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename(table.toStdString().c_str()); msgQuery.add_strselectcolnamearr("tag_name"); - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); - pCondtion->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); - pCondtion->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + pCondtion->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); + pCondtion->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("device"); - kbd_idlfile::SVariable *pCondValue = pCondtion->mutable_msgvalue(); - pCondValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable *pCondValue = pCondtion->mutable_msgvalue(); + pCondValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(device.toStdString().c_str()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet; bRet = rdbNetApi.query(msgQuery, retMsg); if (false == bRet) diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h index d9d8a0d5..de8d32ee 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h @@ -154,7 +154,7 @@ private: * @param rdbNetApi * @param devg */ - bool queryAllDeviceDevGroup(kbd_dbms::CRdbNetApi &rdbNetApi, const QString &devg, QList &devList); + bool queryAllDeviceDevGroup(iot_dbms::CRdbNetApi &rdbNetApi, const QString &devg, QList &devList); /** * @brief queryAllPointDevice 查询表中设备下所有测点 * @param rdbNetApi @@ -163,13 +163,13 @@ private: * @param pointList "digital.station.G01_dlq.r.value" * @return */ - bool queryAllPointDevice(kbd_dbms::CRdbNetApi &rdbNetApi, const QString &device, const QString &table, QList &pointList); + bool queryAllPointDevice(iot_dbms::CRdbNetApi &rdbNetApi, const QString &device, const QString &table, QList &pointList); private: static CAlarmBaseData * pInstance; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CDbApi *m_pWriteDb; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi *m_pWriteDb; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; QList m_listPermLocationId; //< 原始告警车站权限 QList m_listPermRegionId; //< 原始告警责任区权限 QList m_listPermLocationOrder; //< 有权限的loaction_id: 按location_no排序 diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp index 46b20ea8..8edbd432 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp @@ -6,8 +6,8 @@ #include "CAiAlarmDataCollect.h" #include "alarm_server_api/AlarmCommonDef.h" -using namespace kbd_service; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_dbms; CAlarmDataCollect * CAlarmDataCollect::m_pInstance = NULL; CAlarmDataCollect::CAlarmDataCollect() @@ -20,7 +20,7 @@ CAlarmDataCollect::CAlarmDataCollect() m_removeNum(0) { m_rtdbMutex = new QMutex(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); m_rtdbAccess->open("base", "alarm_level_define"); } @@ -138,17 +138,17 @@ void CAlarmDataCollect::slotSwitchFaultRecallState(bool bFaultRecallState) emit sigAlarmOperateEnable(!m_bFaultRecallState); } -bool CAlarmDataCollect::requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +bool CAlarmDataCollect::requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm) { - return kbd_service::CAlmApiForAlmClt::requestCfmAlm(objCfmAlm); + return iot_service::CAlmApiForAlmClt::requestCfmAlm(objCfmAlm); } -bool CAlarmDataCollect::requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +bool CAlarmDataCollect::requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm) { - return kbd_service::CAlmApiForAlmClt::requestDelAlm(objDelAlm); + return iot_service::CAlmApiForAlmClt::requestDelAlm(objDelAlm); } -void CAlarmDataCollect::handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void CAlarmDataCollect::handleAllAlmMsg(int domainId, iot_idl::SAlmCltAddAlm &objAllAlm) { if(!m_referenceCount) { @@ -165,7 +165,7 @@ void CAlarmDataCollect::handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm QList almList; for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SAlmInfoToAlmClt msg = objAllAlm.alm_info(nAddMsgIndex); + iot_idl::SAlmInfoToAlmClt msg = objAllAlm.alm_info(nAddMsgIndex); AlarmMsgPtr alm(new CAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -194,7 +194,7 @@ void CAlarmDataCollect::handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm } } -void CAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) +void CAlarmDataCollect::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) { if(!m_referenceCount) { @@ -207,7 +207,7 @@ void CAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) QList almList; for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SAlmInfoToAlmClt msg = objAddAlm.alm_info(nAddMsgIndex); + iot_idl::SAlmInfoToAlmClt msg = objAddAlm.alm_info(nAddMsgIndex); AlarmMsgPtr alm(new CAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -227,7 +227,7 @@ void CAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) LOGINFO("handleAddAlmMsg END[%d] ",nAlarmCount); } -void CAlarmDataCollect::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +void CAlarmDataCollect::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) { if(!m_referenceCount) { @@ -247,7 +247,7 @@ void CAlarmDataCollect::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) LOGINFO("handleCfmAlmMsg END[%d] ",nAlarmCount); } -void CAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +void CAlarmDataCollect::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) { if(!m_referenceCount) { @@ -269,7 +269,7 @@ void CAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) LOGINFO("handleDelAlmMsg END[%d] ",nAlarmCount); } -void CAlarmDataCollect::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objRelAlm) +void CAlarmDataCollect::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objRelAlm) { if(!m_referenceCount) { @@ -291,7 +291,7 @@ void CAlarmDataCollect::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objR LOGINFO("handleReleaseAlmMsg END[%d] ",nAlarmCount); } -void CAlarmDataCollect::handleLinkWave2AlmMsg(kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm) +void CAlarmDataCollect::handleLinkWave2AlmMsg(iot_idl::SAlmCltLinkWave2Alm &objWave2Alm) { if(!m_referenceCount) { @@ -341,16 +341,16 @@ void CAlarmDataCollect::slotAlarmStateChanged() int CAlarmDataCollect::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CVarType value = -1000; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CVarType value = -1000; m_rtdbAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } int CAlarmDataCollect::queryAlarmAction(const int &priority) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CVarType value; m_rtdbAccess->getColumnValueByKey((void*)&priority, "alarm_actions",value); return value.toInt(); } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h index 72495d40..42bdef11 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h @@ -11,7 +11,7 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "dbms/rdb_api/CRdbAccess.h" -class CAlarmDataCollect : public QObject, public kbd_service::CAlmApiForAlmClt +class CAlarmDataCollect : public QObject, public iot_service::CAlmApiForAlmClt { Q_OBJECT public: @@ -25,21 +25,21 @@ public: bool isFaultRecallState(); - virtual bool requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm); + virtual bool requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm); - virtual bool requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm); + virtual bool requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm); - virtual void handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm &objAllAlm); + virtual void handleAllAlmMsg(int domainId, 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 &objDelAlm); + virtual void handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objDelAlm); - virtual void handleLinkWave2AlmMsg(kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Alm); + virtual void handleLinkWave2AlmMsg(iot_idl::SAlmCltLinkWave2Alm &objWave2Alm); void refresh(); signals: @@ -95,9 +95,9 @@ private: bool m_bFaultRecallState; //是否处于事故追忆 QMutex * m_rtdbMutex; QTimer * m_pAlternateTimer; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CRdbAccess * m_rtdbAlmLvlDefTab; // 告警等级定义表 - kbd_dbms::CRdbAccess * m_rtdbAlmActDefTab; // 告警动作定义表 + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAlmLvlDefTab; // 告警等级定义表 + iot_dbms::CRdbAccess * m_rtdbAlmActDefTab; // 告警动作定义表 bool m_bIsNeedUpdate; //< 是否消息确认（每秒更新） bool m_bIsNeedRemove; //< 是否需要删除（每秒更新） bool m_bIsNeedRelease; //< 是否需要释放（每秒更新）- diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp index 6ebc1dde..6fc50c49 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp @@ -269,8 +269,8 @@ bool CAlarmDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const wave = QString("%1%2%3").arg("\"").arg(wave).arg("\""); LOGINFO("录波文件为:%s",wave.toStdString().c_str()); - const std::string strProc = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("WaveAnalyze") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("WaveAnalyze") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) LOGERROR("未找到可执行文件WaveAnalyze"); else @@ -300,8 +300,8 @@ void CAlarmDelegate::slotLoadConfig() m_isFlash = false; } - std::string style = kbd_public::CFileStyle::getCurStyle(); - m_strTrendPath = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/trend_"+style+".png").c_str(); - m_strVideoPath = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video_"+style+".png").c_str(); - m_strWavePath = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + m_strTrendPath = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/trend_"+style+".png").c_str(); + m_strVideoPath = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video_"+style+".png").c_str(); + m_strWavePath = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp index 0ae1bad9..7374d486 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp @@ -41,7 +41,7 @@ CAlarmFilterDialog::CAlarmFilterDialog(QWidget *parent) : ui->setupUi(this); setObjectName("alarm_dialog"); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -49,7 +49,7 @@ CAlarmFilterDialog::CAlarmFilterDialog(QWidget *parent) : qss += QLatin1String(qssfile1.readAll()); qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -84,7 +84,7 @@ CAlarmFilterDialog::~CAlarmFilterDialog() void CAlarmFilterDialog::initialize() { - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); ui->level->setSelectionMode(QAbstractItemView::MultiSelection); //ui->location->setSelectionMode(QAbstractItemView::MultiSelection); @@ -161,12 +161,12 @@ void CAlarmFilterDialog::initialize() ui->status->addItem(value); } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(info.nId <= CN_AppId_COMAPP) { @@ -717,12 +717,12 @@ void CAlarmFilterDialog::slot_updateCheckStatusState() void CAlarmFilterDialog::slot_updateDevice(const QString &subSystem) { int nSubSystemId = -1; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(subSystem.toStdString() == info.strDesc) { @@ -733,34 +733,34 @@ void CAlarmFilterDialog::slot_updateDevice(const QString &subSystem) ui->deviceType->clear(); - QList values; + QList values; if(nSubSystemId != -1) { - kbd_dbms::CVarType subSystemId = nSubSystemId; + iot_dbms::CVarType subSystemId = nSubSystemId; if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CONDINFO condition; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CONDINFO condition; condition.relationop = ATTRCOND_EQU; memcpy(condition.name, "sub_system", strlen("sub_system") ); condition.conditionval = subSystemId; std::vector columns; columns.push_back("description"); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; if(m_rtdbAccess->select(condition, result, columns)) { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType value; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, value); values.append(value); } } } } - foreach (kbd_dbms::CVarType value, values) + foreach (iot_dbms::CVarType value, values) { ui->deviceType->addItem(value.c_str()); } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h index 39b3a787..5803b5c4 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h @@ -102,7 +102,7 @@ private: private: Ui::CAlarmFilterDialog *ui; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_priorityMap; QMap m_locationMap; QMap m_regionMap; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp index 87b44a07..9487741f 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp @@ -53,7 +53,7 @@ CAlarmForm::CAlarmForm(QWidget *parent) : m_isNeedAccidentReview(true), m_strAccidenPath(QString()) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); qRegisterMetaType("QItemSelection"); qRegisterMetaType< QList > >("QList >"); qRegisterMetaType >("QVector"); @@ -176,13 +176,13 @@ CAlarmForm::~CAlarmForm() void CAlarmForm::initialize() { - if (!kbd_public::createSysInfoInstance(m_ptrSysInfo)) + if (!iot_public::createSysInfoInstance(m_ptrSysInfo)) { LOGERROR("创建系统信息访问库实例失败！"); } if(m_pReadDb == NULL) { - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { LOGERROR("数据库打开失败,%s",m_pReadDb->getLastErrorString().toStdString().c_str()); @@ -255,7 +255,7 @@ void CAlarmForm::updateAlarmOperatePerm() m_listLocationOptId.clear(); m_listRegionDelId.clear(); m_listLocationDelId.clear(); - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; if (!m_ptrSysInfo) { if(!createSysInfoInstance(m_ptrSysInfo)) @@ -268,7 +268,7 @@ void CAlarmForm::updateAlarmOperatePerm() m_nodeName = stNodeInfo.strName; m_nDomainId = stNodeInfo.nDomainId; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -1638,7 +1638,7 @@ void CAlarmForm::removeAlarm0() } QList listInfo = m_pModel->getListShowAlarmInfo(); //声明告警删除package - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 int unConfirmSkip = -1; //< 未确认告警是否跳过： 0-单步跳过、1-全部跳过 @@ -1734,17 +1734,17 @@ void CAlarmForm::removeAlarm0() } //构建告警删除package - QMap::iterator it = pkgMap.find(info->domain_id); + QMap::iterator it = pkgMap.find(info->domain_id); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltDelAlm * pkg = new kbd_idlfile::SAlmCltDelAlm(); + iot_idl::SAlmCltDelAlm * pkg = new iot_idl::SAlmCltDelAlm(); pkg->set_domain_id(info->domain_id); pkgMap[info->domain_id] = pkg; } pkgMap.value(info->domain_id)->add_uuid_base64(info->uuid_base64.toStdString()); } //请求删除 - foreach (kbd_idlfile::SAlmCltDelAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltDelAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestDelAlm(*pkg)!= true) { @@ -1771,8 +1771,8 @@ void CAlarmForm::removeAlarm1() QList aimsgList; //选中的智能告警 QList msgList; //选中的原始告警 //声明智能告警删除package - QMap aipkgMap; //Domain-DelPkg; ai - QMap pkgMap; //Domain-DelPkg; alarm + QMap aipkgMap; //Domain-DelPkg; ai + QMap pkgMap; //Domain-DelPkg; alarm int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 int unConfirmSkip = -1; //< 未确认告警是否跳过： 0-单步跳过、1-全部跳过 QModelIndexList::iterator modelIndexIter = modelIndexList.begin(); @@ -1895,10 +1895,10 @@ void CAlarmForm::removeAlarm1() } } //构建告警删除package - QMap::iterator it = pkgMap.find(info->domain_id); + QMap::iterator it = pkgMap.find(info->domain_id); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltDelAlm * pkg = new kbd_idlfile::SAlmCltDelAlm(); + iot_idl::SAlmCltDelAlm * pkg = new iot_idl::SAlmCltDelAlm(); pkg->set_domain_id(info->domain_id); pkgMap[info->domain_id] = pkg; } @@ -1991,17 +1991,17 @@ void CAlarmForm::removeAlarm1() } int domain_id = aimsgList.at(aialarm)->domain_id; QString aiuuid = aimsgList.at(aialarm)->uuid_base64; - QMap::iterator it = aipkgMap.find(domain_id); + QMap::iterator it = aipkgMap.find(domain_id); if(it == aipkgMap.end()) { - kbd_idlfile::SIntelliAlmDel * pkg = new kbd_idlfile::SIntelliAlmDel(); + iot_idl::SIntelliAlmDel * pkg = new iot_idl::SIntelliAlmDel(); pkg->set_domain_id(domain_id); aipkgMap[domain_id] = pkg; } aipkgMap.value(domain_id)->add_uuid_base64(aiuuid.toStdString()); } //请求删除 - foreach (kbd_idlfile::SAlmCltDelAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltDelAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestDelAlm(*pkg)!= true) { @@ -2011,7 +2011,7 @@ void CAlarmForm::removeAlarm1() qDeleteAll(pkgMap); pkgMap.clear(); //请求删除 - foreach (kbd_idlfile::SIntelliAlmDel * pkg, aipkgMap) + foreach (iot_idl::SIntelliAlmDel * pkg, aipkgMap) { if(CAiAlarmDataCollect::instance()->requestDelAlm(*pkg) != true) { @@ -2040,7 +2040,7 @@ void CAlarmForm::confirmAlarm0() //构建告警确认package QMap msgMap; //要确认的告警 - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 QModelIndexList::iterator modelIndexIter = modelIndexList.begin(); @@ -2100,10 +2100,10 @@ void CAlarmForm::confirmAlarm0() } QString key = QString("%1_%2_%3").arg(almIter.value()->domain_id).arg(almIter.value()->alm_type).arg(almIter.value()->app_id); - QMap::iterator it = pkgMap.find(key); + QMap::iterator it = pkgMap.find(key); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_nodeName); pkg->set_user_id(m_userId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -2118,7 +2118,7 @@ void CAlarmForm::confirmAlarm0() } //请求确认 - foreach (kbd_idlfile::SAlmCltCfmAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltCfmAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestCfmAlm(*pkg) != true) { @@ -2146,7 +2146,7 @@ void CAlarmForm::confirmAlarm1() QMap msgMap; //要确认的告警 msgMap.clear(); //构建告警确认package - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 QModelIndexList::iterator modelIndexIter = modelIndexList.begin(); for(;modelIndexIter != modelIndexList.end();modelIndexIter++) @@ -2231,10 +2231,10 @@ void CAlarmForm::confirmAlarm1() } } QString key = QString("%1_%2_%3").arg(almIter.value()->domain_id).arg(almIter.value()->alm_type).arg(almIter.value()->app_id); - QMap::iterator it = pkgMap.find(key); + QMap::iterator it = pkgMap.find(key); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_nodeName); pkg->set_user_id(m_userId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -2247,7 +2247,7 @@ void CAlarmForm::confirmAlarm1() pkgMap.value(key)->add_time_stamp(almIter.value()->time_stamp); pkgMap.value(key)->add_uuid_base64(almIter.value()->uuid_base64.toStdString()); } - foreach (kbd_idlfile::SAlmCltCfmAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltCfmAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestCfmAlm(*pkg) != true) { @@ -2312,7 +2312,7 @@ void CAlarmForm::rightMerge1() } } } - QMap pkgMap; + QMap pkgMap; QList listPtr; listPtr.clear(); int permSkip = -1; @@ -2399,7 +2399,7 @@ void CAlarmForm::rightMerge1() int32 domain_id = listPtr.at(x)->domain_id; if(!pkgMap.keys().contains(domain_id)) { - kbd_idlfile::SIntelliAlmMerge *pkg =new kbd_idlfile::SIntelliAlmMerge(); + iot_idl::SIntelliAlmMerge *pkg =new iot_idl::SIntelliAlmMerge(); pkg->set_domain_id(domain_id); pkgMap[domain_id] = pkg; } @@ -2419,7 +2419,7 @@ void CAlarmForm::rightMerge1() pkgMap.clear(); return ; } - foreach (kbd_idlfile::SIntelliAlmMerge * pkg, pkgMap) + foreach (iot_idl::SIntelliAlmMerge * pkg, pkgMap) { if(CAiAlarmDataCollect::instance()->requestMergeAlm(*pkg) != true) { @@ -2540,7 +2540,7 @@ void CAlarmForm::rightSepr1() } //拼包 int domain_id = msgList.at(0)->domain_id; - kbd_idlfile::SIntelliAlmSepr *pkg = new kbd_idlfile::SIntelliAlmSepr(); + iot_idl::SIntelliAlmSepr *pkg = new iot_idl::SIntelliAlmSepr(); pkg->set_domain_id(domain_id); for(int index(0);indexsub_system, CH_HMI_TO_OPT_OPTCMD_DOWN); SOptTagSet sOptTagSet; SOptTagQueue optTagQueue; @@ -2945,7 +2945,7 @@ void CAlarmForm::inhibitAlm(const AlarmMsgPtr &alm) bool CAlarmForm::permCheck(int location, int region) { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -3008,7 +3008,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) int loginSec; std::string instanceName; - kbd_service::CPermMngApiPtr permMng = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMng = iot_service::getPermMngInstance("base"); if(permMng != NULL) { if(permMng->PermDllInit() != PERM_NORMAL) @@ -3030,7 +3030,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) if(m_ptrSysInfo != Q_NULLPTR) { - kbd_public::SAppInfo stAppInfo; + iot_public::SAppInfo stAppInfo; m_ptrSysInfo->getAppInfoBySubsystemId(alm->sub_system,stAppInfo); head.nAppID = stAppInfo.nId; }else diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.h b/product/src/gui/plugin/AlarmWidget/CAlarmForm.h index e223fec4..fc7ada51 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.h @@ -214,8 +214,8 @@ private: int createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; - kbd_dbms::CDbApi *m_pReadDb; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_dbms::CDbApi *m_pReadDb; QLineEdit * m_pSearchTextEdit; QPushButton * m_pSearchButton; @@ -231,7 +231,7 @@ private: CAiAlarmDelegate * m_aiDelegate; CAlarmDeviceTreeModel * m_pDeviceModel; CAiAlarmTreeModel *m_treeModel; - kbd_net::CMbCommunicator *m_communicator; + iot_net::CMbCommunicator *m_communicator; int m_userId; std::string m_nodeName; int m_nDomainId; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp index 9e14ae3b..ccab6960 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp @@ -17,7 +17,7 @@ CAlarmInhibitDialog::CAlarmInhibitDialog(QWidget *parent) : { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -25,7 +25,7 @@ CAlarmInhibitDialog::CAlarmInhibitDialog(QWidget *parent) : qss += QLatin1String(qssfile1.readAll()); qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp index cfb96784..3c530299 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp @@ -22,7 +22,7 @@ ///////////////////////////////////////////////////////////////////////////// -using namespace kbd_public; +using namespace iot_public; using namespace std; const int DOCK_ROW_COUNT = 3; const int MAX_ROW_COUNT = 15000; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp index df6300e6..e0550f88 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp @@ -22,7 +22,7 @@ #include #include -using namespace kbd_public; +using namespace iot_public; CAlarmMediaPlayer * CAlarmMediaPlayer::m_pInstance = NULL; CAlarmMediaPlayer *CAlarmMediaPlayer::instance() { @@ -37,7 +37,7 @@ CAlarmMediaPlayer::CAlarmMediaPlayer() :m_bHaveValidAudioDev(true),m_pMediaPlayer(Q_NULLPTR),m_pTextToSpeech(Q_NULLPTR),m_pTimerCheckAudioDev(Q_NULLPTR),m_voice(100) { m_readFlag = true; - QDir dir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir dir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); dir.cdUp(); dir.cdUp(); dir.cd("data"); @@ -184,7 +184,7 @@ void CAlarmMediaPlayer::initSpeech() } } //添加语音转文本处理条件 - QFile file(kbd_public::CFileUtil::getPathOfCfgFile("alarmSpeechTextTrans.xml" , CN_DIR_PRODUCT).c_str()); + QFile file(iot_public::CFileUtil::getPathOfCfgFile("alarmSpeechTextTrans.xml" , CN_DIR_PRODUCT).c_str()); if (!file.open(QFile::ReadWrite)) { LOGERROR("打开语音文本转换文件失败,默认不进行语音转换"); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp index 6fec3a3a..ec65ae81 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp @@ -76,7 +76,7 @@ CAlarmMsgInfo::CAlarmMsgInfo(const CAlarmMsgInfo &other): m_alarmAction(0) wave_file = other.wave_file; } -void CAlarmMsgInfo::initialize(const kbd_idlfile::SAlmInfoToAlmClt &alarmInfo) +void CAlarmMsgInfo::initialize(const iot_idl::SAlmInfoToAlmClt &alarmInfo) { alm_type = alarmInfo.alm_type(); alm_status = alarmInfo.alm_status(); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h index 8a8dca1b..f8b286fd 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h @@ -30,7 +30,7 @@ class CAlarmMsgInfo public: CAlarmMsgInfo(); CAlarmMsgInfo(const CAlarmMsgInfo &other); - void initialize(const kbd_idlfile::SAlmInfoToAlmClt &alarmInfo); + void initialize(const iot_idl::SAlmInfoToAlmClt &alarmInfo); int getCameraInfoByTag(const QString &tag); //< [优先级越小表示越大]-原始告警窗调用 diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp index 06d44215..8149218f 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp @@ -17,7 +17,7 @@ #include "pub_logger_api/logger.h" #include "CAlarmBaseData.h" -using namespace kbd_public; +using namespace iot_public; using namespace std; CAlarmMsgManage *CAlarmMsgManage::pInstance = NULL; @@ -37,7 +37,7 @@ CAlarmMsgManage::CAlarmMsgManage() m_nAlmTotal(0) { mutex = new QMutex(); - QDir dir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir dir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); dir.cdUp(); dir.cdUp(); dir.cd("data"); @@ -60,13 +60,13 @@ CAlarmMsgManage::CAlarmMsgManage() m_all.clear(); m_aiall.clear(); - m_rtdbAlarmActionAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAlarmActionAccess = new iot_dbms::CRdbAccess(); m_rtdbAlarmActionAccess->open("base", "alarm_level_define"); - m_rtdbLocationDescriptionAccess = new kbd_dbms::CRdbAccess(); + m_rtdbLocationDescriptionAccess = new iot_dbms::CRdbAccess(); m_rtdbLocationDescriptionAccess->open("base", "sys_model_location_info"); - m_rtdbAppDescriptionAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAppDescriptionAccess = new iot_dbms::CRdbAccess(); m_rtdbAppDescriptionAccess->open("base", "sys_model_app_info"); loadPermInfo(); @@ -1868,24 +1868,24 @@ void CAlarmMsgManage::dealDelayAi() int CAlarmMsgManage::queryAlarmAction(const int &priority) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAlarmActionAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbAlarmActionAccess); + iot_dbms::CVarType value; m_rtdbAlarmActionAccess->getColumnValueByKey((void*)&priority, "alarm_actions",value); return value.toInt(); } QString CAlarmMsgManage::queryLocationDescription(int id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbLocationDescriptionAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbLocationDescriptionAccess); + iot_dbms::CVarType value; m_rtdbLocationDescriptionAccess->getColumnValueByKey((void*)&id, "description", value); return value.c_str(); } QString CAlarmMsgManage::queryAppDescription(int id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAppDescriptionAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbAppDescriptionAccess); + iot_dbms::CVarType value; m_rtdbAppDescriptionAccess->getColumnValueByKey((void*)&id, "description", value); return value.c_str(); } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h index a703873d..8891cf22 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h @@ -372,9 +372,9 @@ private: QMutex * mutex; - kbd_dbms::CRdbAccess * m_rtdbAlarmActionAccess; - kbd_dbms::CRdbAccess * m_rtdbLocationDescriptionAccess; - kbd_dbms::CRdbAccess * m_rtdbAppDescriptionAccess; + iot_dbms::CRdbAccess * m_rtdbAlarmActionAccess; + iot_dbms::CRdbAccess * m_rtdbLocationDescriptionAccess; + iot_dbms::CRdbAccess * m_rtdbAppDescriptionAccess; int m_nNDelComAlarmCount; //< 未删除未确认数量 N--not Del--delete Com--confirm QHash m_infos; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp index e5a0747b..07113962 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp @@ -41,7 +41,7 @@ CAlarmPlugin::CAlarmPlugin(QWidget *parent, bool editMode) #ifdef OS_LINUX QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + "/plugins"); #endif - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -49,7 +49,7 @@ CAlarmPlugin::CAlarmPlugin(QWidget *parent, bool editMode) qss += QLatin1String(qssfile1.readAll()); qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -242,7 +242,7 @@ void CAlarmPlugin::initialize(int mode) void CAlarmPlugin::loadConfig() { - QFile file(kbd_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml",CN_DIR_PLATFORM).c_str()); + QFile file(iot_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml",CN_DIR_PLATFORM).c_str()); if (!file.open(QFile::ReadWrite)) { LOGERROR("打开智能告警配置文件失败,默认不启动"); @@ -332,7 +332,7 @@ int CAlarmPlugin::confirmAlarm(const QList &msgs) return cofirmNum; } //< 可能有部分告警没有确认权限 - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; for(int nIndex(0); nIndex < msgs.size(); nIndex++) { AlarmMsgPtr info = msgs.at(nIndex); @@ -362,10 +362,10 @@ int CAlarmPlugin::confirmAlarm(const QList &msgs) if(regionEnable && locationEnable) { QString key = QString("%1_%2_%3").arg(info->domain_id).arg(info->alm_type).arg(info->app_id); - QMap::iterator it = pkgMap.find(key); + QMap::iterator it = pkgMap.find(key); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_currentNodeName); pkg->set_user_id(m_currentUsrId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -381,7 +381,7 @@ int CAlarmPlugin::confirmAlarm(const QList &msgs) } } //请求确认 - foreach (kbd_idlfile::SAlmCltCfmAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltCfmAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestCfmAlm(*pkg) != true) { @@ -406,7 +406,7 @@ int CAlarmPlugin::removeAlarm(const QList &msgs) return -1; } //< 可能有部分告警没有删除权限 - QMap pkgMap; + QMap pkgMap; for(int nIndex(0); nIndex < msgs.size(); nIndex++) { AlarmMsgPtr info = msgs.at(nIndex); @@ -432,10 +432,10 @@ int CAlarmPlugin::removeAlarm(const QList &msgs) } if(regionEnable && locationEnable) { - QMap::iterator it = pkgMap.find(info->domain_id); + QMap::iterator it = pkgMap.find(info->domain_id); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltDelAlm * pkg = new kbd_idlfile::SAlmCltDelAlm(); + iot_idl::SAlmCltDelAlm * pkg = new iot_idl::SAlmCltDelAlm(); pkg->set_domain_id(info->domain_id); pkgMap[info->domain_id] = pkg; } @@ -443,7 +443,7 @@ int CAlarmPlugin::removeAlarm(const QList &msgs) } } //请求删除 - foreach (kbd_idlfile::SAlmCltDelAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltDelAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestDelAlm(*pkg) != true) { @@ -1355,9 +1355,9 @@ void CAlarmPlugin::updateAlarmOperatePerm() m_vecRegionDelId.clear(); m_vecLocationDelId.clear(); - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败！"); return; @@ -1365,7 +1365,7 @@ void CAlarmPlugin::updateAlarmOperatePerm() spSysInfo->getLocalNodeInfo(stNodeInfo); m_currentNodeName = stNodeInfo.strName; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp index c33b3b32..4c9675e2 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp @@ -25,7 +25,7 @@ CAlarmSetDlg::CAlarmSetDlg(QWidget *parent) : { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -33,7 +33,7 @@ CAlarmSetDlg::CAlarmSetDlg(QWidget *parent) : qss += QLatin1String(qssfile1.readAll()); qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp index 96ef0ad6..2d3d464b 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp @@ -5,7 +5,7 @@ #include "pub_utility_api/FileUtil.h" #include "CAlarmBaseData.h" -using namespace kbd_public; +using namespace iot_public; using namespace std; CAlarmSetMng *CAlarmSetMng::pInstance = NULL; @@ -41,7 +41,7 @@ CAlarmSetMng::CAlarmSetMng() void CAlarmSetMng::loadXMLCfg() { m_colorMap.clear(); - QString filePath = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); + QString filePath = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); QDomDocument document; QFile file(filePath); if (!file.open(QIODevice::ReadOnly)) diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h index adcc0c96..c5f33a8c 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h @@ -66,7 +66,7 @@ private: static CAlarmSetMng * pInstance; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_priorityOrderDescriptionMap; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp index a555ef36..9c6e8ad9 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp @@ -15,7 +15,7 @@ CAlarmShiledDialog::CAlarmShiledDialog(QWidget *parent) : { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -23,7 +23,7 @@ CAlarmShiledDialog::CAlarmShiledDialog(QWidget *parent) : qss += QLatin1String(qssfile1.readAll()); qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -80,7 +80,7 @@ QWidget *CAlarmShiledDialog::createCustomWidget(const QString &name) } fileName += ".so"; #endif - std::string filePath = kbd_public::CFileUtil::getPathOfBinFile(fileName.toStdString()); + std::string filePath = iot_public::CFileUtil::getPathOfBinFile(fileName.toStdString()); path = QString::fromStdString(filePath); QPluginLoader loader(path); QObject *plugin = loader.instance(); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp index d6695388..af6644a4 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp @@ -305,7 +305,7 @@ void CAlarmWidget::confirmAlarm(const int &row) return; } - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_nodeName); pkg->set_user_id(m_userId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -355,9 +355,9 @@ void CAlarmWidget::setEnableLevel(bool isNeed) bool CAlarmWidget::updateAlarmOperatePerm() { - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败！"); return false; @@ -368,7 +368,7 @@ bool CAlarmWidget::updateAlarmOperatePerm() m_listRegionOptId.clear(); m_listLocationDelId.clear(); m_listRegionDelId.clear(); - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/AlarmWidget/main.cpp b/product/src/gui/plugin/AlarmWidget/main.cpp index d36c2ae7..69546a1d 100644 --- a/product/src/gui/plugin/AlarmWidget/main.cpp +++ b/product/src/gui/plugin/AlarmWidget/main.cpp @@ -41,12 +41,12 @@ int main(int argc, char *argv[]) } } } - kbd_public::StartLogSystem("HMI", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("HMI", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -67,8 +67,8 @@ int main(int argc, char *argv[]) } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp b/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp index 9ed7d437..0a8269e1 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp +++ b/product/src/gui/plugin/AssetWidget/CAssetDataMng.cpp @@ -4,7 +4,7 @@ #include #include "CAssetUuid.h" -using namespace kbd_dbms; +using namespace iot_dbms; CAssetDataMng *CAssetDataMng::m_pInstance = NULL; @@ -653,7 +653,7 @@ QString CAssetDataMng::getRandomId() CAssetDataMng::CAssetDataMng(): m_referenceCount(0) { - m_pWriteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_pWriteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); } diff --git a/product/src/gui/plugin/AssetWidget/CAssetDataMng.h b/product/src/gui/plugin/AssetWidget/CAssetDataMng.h index 1132defb..574b5ee9 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetDataMng.h +++ b/product/src/gui/plugin/AssetWidget/CAssetDataMng.h @@ -68,7 +68,7 @@ private: private: static CAssetDataMng * m_pInstance; - kbd_dbms::CDbApi *m_pWriteDb; + iot_dbms::CDbApi *m_pWriteDb; int m_referenceCount; diff --git a/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp b/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp index 10f32ba9..b9ea3ed3 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp +++ b/product/src/gui/plugin/AssetWidget/CAssetDelegate.cpp @@ -11,7 +11,7 @@ CAssetDelegate::CAssetDelegate(CAssetTableModel *model, QObject *parent) m_pModel(model), style(QString()) { - style = QString::fromStdString(kbd_public::CFileStyle::getCurStyle()) ; + style = QString::fromStdString(iot_public::CFileStyle::getCurStyle()) ; } void CAssetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const @@ -44,7 +44,7 @@ void CAssetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option button.rect.adjust(option.rect.width() - 40, option.rect.height()/2-10, -12, -(option.rect.height()/2-10)); //QString file = "../../common/resource/zh/gui/icon/asset/record.png"; - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/asset/record.png").c_str(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/asset/record.png").c_str(); button.iconSize = QSize(button.rect.width()+2,button.rect.height()+2); button.icon = QIcon(file); button.features = QStyleOptionButton::Flat; diff --git a/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp b/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp index ddcb21ae..8a23b986 100644 --- a/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp +++ b/product/src/gui/plugin/AssetWidget/CAssetWidget.cpp @@ -24,7 +24,7 @@ CAssetWidget::CAssetWidget(QWidget *parent, bool editMode) { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -38,7 +38,7 @@ CAssetWidget::CAssetWidget(QWidget *parent, bool editMode) qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("asset.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("asset.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp b/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp index f6c30c42..9de7db20 100644 --- a/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp +++ b/product/src/gui/plugin/AssetWidget/CPropertyDialog.cpp @@ -16,7 +16,7 @@ CPropertyDialog::CPropertyDialog(int mode, int loc, QString devg, QWidget *paren ui->setupUi(this); this->setWindowTitle(tr("添加")); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -30,7 +30,7 @@ CPropertyDialog::CPropertyDialog(int mode, int loc, QString devg, QWidget *paren qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("asset.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("asset.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp b/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp index 9cde4ca5..5d99adba 100644 --- a/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp +++ b/product/src/gui/plugin/AssetWidget/CRecordDialog.cpp @@ -18,7 +18,7 @@ CRecordDialog::CRecordDialog(int mode, AssetInfo info, QWidget *parent) : { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -32,7 +32,7 @@ CRecordDialog::CRecordDialog(int mode, AssetInfo info, QWidget *parent) : qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("asset.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("asset.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp b/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp index 25785d57..747fda27 100644 --- a/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp +++ b/product/src/gui/plugin/AssetWidget/CRecordPropertyDialog.cpp @@ -12,7 +12,7 @@ CRecordPropertyDialog::CRecordPropertyDialog(int mode, const AssetInfo &assetInf { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -26,7 +26,7 @@ CRecordPropertyDialog::CRecordPropertyDialog(int mode, const AssetInfo &assetInf qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("asset.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("asset.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/BIWidget/CBIWidget.cpp b/product/src/gui/plugin/BIWidget/CBIWidget.cpp index 6ef837ad..638df229 100644 --- a/product/src/gui/plugin/BIWidget/CBIWidget.cpp +++ b/product/src/gui/plugin/BIWidget/CBIWidget.cpp @@ -38,8 +38,8 @@ void CBIWidget::initWidget(bool editMode) QGridLayout *layout = new QGridLayout(this); m_imageLabel = new QLabel(this); m_imageLabel->setScaledContents(true); - std::string style = kbd_public::CFileStyle::getCurStyle(); - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); m_imageLabel->setPixmap(QPixmap(file)); layout->addWidget(m_imageLabel); setLayout(layout); @@ -64,8 +64,8 @@ bool CBIWidget::slotBIdentify() { return true; } - std::string style = kbd_public::CFileStyle::getCurStyle(); - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); m_imageLabel->setPixmap(QPixmap(file)); if(!m_permMng) { @@ -82,8 +82,8 @@ void CBIWidget::slotCancelBIdentify() { m_isRecognizing = false; m_permMng->cancelBioIdentify(); - std::string style = kbd_public::CFileStyle::getCurStyle(); - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); m_imageLabel->setPixmap(QPixmap(file)); } } @@ -210,8 +210,8 @@ void CBIWidget::slotRecvBioResult() delete[] img; if(pixmap.isNull()) { - std::string style = kbd_public::CFileStyle::getCurStyle(); - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/bi/face_"+style+".png").c_str(); m_imageLabel->setPixmap(QPixmap(file)); } else diff --git a/product/src/gui/plugin/BIWidget/CBIWidget.h b/product/src/gui/plugin/BIWidget/CBIWidget.h index 7f926ef6..631e321b 100644 --- a/product/src/gui/plugin/BIWidget/CBIWidget.h +++ b/product/src/gui/plugin/BIWidget/CBIWidget.h @@ -6,7 +6,7 @@ #include #include "perm_mng_api/PermMngApi.h" -using namespace kbd_service; +using namespace iot_service; class CBIWidget : public QWidget { diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp index 9fccca98..b3f3de7a 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp @@ -55,7 +55,7 @@ void CBreadcrumbNavWidget::initialize() void CBreadcrumbNavWidget::initStyleSheet() { - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("breadcrumbNav.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("breadcrumbNav.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -67,7 +67,7 @@ void CBreadcrumbNavWidget::initStyleSheet() void CBreadcrumbNavWidget::setCurrentGraph(const QString &data, const QString &name) { - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); QDir dir(QString::fromStdString(currentPath)); dir.cdUp(); dir.cdUp(); diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp b/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp index 33d30ab6..8f91e2e5 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp @@ -10,7 +10,7 @@ CNavInfoManage::CNavInfoManage(QObject *parent) : QObject(parent) { - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); QDir dir(QString::fromStdString(currentPath)); dir.cdUp(); dir.cdUp(); diff --git a/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp b/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp index e247c15e..ab761f74 100644 --- a/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp +++ b/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp @@ -21,7 +21,7 @@ BriefReportWidget::BriefReportWidget(QWidget *parent, bool editMode) : ui->setupUi(this); QString qss; - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssFile1(QString::fromStdString(strFullPath)); qssFile1.open(QFile::ReadOnly); if (qssFile1.isOpen()) @@ -34,7 +34,7 @@ BriefReportWidget::BriefReportWidget(QWidget *parent, bool editMode) : { qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("BriefReport.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("BriefReport.qss") ; QFile qssFile2(QString::fromStdString(strFullPath)); qssFile2.open(QFile::ReadOnly); if (qssFile2.isOpen()) @@ -63,12 +63,12 @@ BriefReportWidget::~BriefReportWidget() { delete ui; -// kbd_public::StopLogSystem(); +// iot_public::StopLogSystem(); } void BriefReportWidget::Init() { -// kbd_public::StartLogSystem("HMI", "BriefReportWidget" ); +// iot_public::StartLogSystem("HMI", "BriefReportWidget" ); ui->PushButton3->setVisible(false); ui->PushButton4->setVisible(false); @@ -171,7 +171,7 @@ void BriefReportWidget::Init() void BriefReportWidget::InitData() { - kbd_dbms::CDbApi *m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi *m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { LOGERROR("打开数据库连接失败! %s", m_pReadDb->getLastErrorString().toStdString().c_str()); diff --git a/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp b/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp index 92d93232..ddd5ff0c 100644 --- a/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp +++ b/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp @@ -6,7 +6,7 @@ QueryThread::QueryThread(): location_id(0) isStop = false; islocation = false; - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_HIS_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_HIS_READ); if (!m_pReadDb->open()) { LOGERROR("打开数据库连接失败! %s", m_pReadDb->getLastErrorString().toStdString().c_str()); diff --git a/product/src/gui/plugin/BriefReportWidget/QueryThread.h b/product/src/gui/plugin/BriefReportWidget/QueryThread.h index 8a9ed214..183b4db0 100644 --- a/product/src/gui/plugin/BriefReportWidget/QueryThread.h +++ b/product/src/gui/plugin/BriefReportWidget/QueryThread.h @@ -32,7 +32,7 @@ private: std::vector Events_Operates; //QVector Events_Operates; - kbd_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pReadDb; }; #endif // QUERYTHREAD_H diff --git a/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.cpp b/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.cpp index ae53642f..86e97548 100644 --- a/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.cpp +++ b/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.cpp @@ -49,7 +49,7 @@ void BTRealDataCollect::initMsg() { if(m_pMbComm == NULL) { - m_pMbComm = new kbd_net::CMbCommunicator("BusbarTemperatureWidget"); + m_pMbComm = new iot_net::CMbCommunicator("BusbarTemperatureWidget"); } } @@ -66,7 +66,7 @@ void BTRealDataCollect::clearMsg() { if(m_pMbComm) { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while(m_pMbComm->recvMsg(objMsg, 0)) {} } @@ -107,14 +107,14 @@ void BTRealDataCollect::recvMessage() try { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; for(int i = 0; i < 6; i++) { if(m_pMbComm->recvMsg(objMsg, 0)) { if(objMsg.isValid()) { - if(objMsg.getMsgType() != kbd_idlfile::MT_DP_CHANGE_DATA) + if(objMsg.getMsgType() != iot_idl::MT_DP_CHANGE_DATA) { continue; } @@ -160,16 +160,16 @@ void BTRealDataCollect::processChangeData() } } -int BTRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) +int BTRealDataCollect::parserMsg(const iot_net::CMbMessage &msg) { - kbd_idlfile::SRealTimeDataPkg changeDataPackage; + iot_idl::SRealTimeDataPkg changeDataPackage; try { changeDataPackage.ParseFromArray(msg.getDataPtr(),(int)msg.getDataSize()); int aiSize = changeDataPackage.stairtd_size(); if(aiSize > 0) { - kbd_idlfile::SAiRealTimeData aiStru; + iot_idl::SAiRealTimeData aiStru; QString tagName; float value; uint status; @@ -190,7 +190,7 @@ int BTRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int diSize = changeDataPackage.stdirtd_size(); if(diSize > 0) { - kbd_idlfile::SDiRealTimeData diStu; + iot_idl::SDiRealTimeData diStu; QString tagName; int value; uint status; @@ -207,7 +207,7 @@ int BTRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int piSize = changeDataPackage.stpirtd_size(); if(piSize > 0) { - kbd_idlfile::SPiRealTimeData piStu; + iot_idl::SPiRealTimeData piStu; QString tagName; double value; uint status; @@ -224,7 +224,7 @@ int BTRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int miSize = changeDataPackage.stmirtd_size(); if(miSize > 0) { - kbd_idlfile::SMiRealTimeData miStu; + iot_idl::SMiRealTimeData miStu; QString tagName; int value; uint status; diff --git a/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.h b/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.h index 193d59d9..d95ea14f 100644 --- a/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.h +++ b/product/src/gui/plugin/BusbarTemperatureWidget/BTRealDataCollect.h @@ -39,9 +39,9 @@ private: bool addSub(); bool delSub(); - int parserMsg(const kbd_net::CMbMessage &); + int parserMsg(const iot_net::CMbMessage &); - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; QTimer * m_pTimer; int m_nTimeCount; QMap> m_aiMap; diff --git a/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp b/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp index f191a91e..70d69c6c 100644 --- a/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp +++ b/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp @@ -215,8 +215,8 @@ void BusbarTemperatureWidget::initializeChart() initStyle(); - kbd_service::CDpcdaForApp::initGlobalThread(); - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + iot_service::CDpcdaForApp::initGlobalThread(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); //接收实时数据信号槽 connect(BTRealDataCollect::instance(), &BTRealDataCollect::signal_updateAi, this, &BusbarTemperatureWidget::slotUpdateAi); @@ -232,7 +232,7 @@ void BusbarTemperatureWidget::initializeChart() void BusbarTemperatureWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -242,7 +242,7 @@ void BusbarTemperatureWidget::initStyle() } qssfile1.close(); - std::string style = kbd_public::CFileStyle::getPathOfStyleFile("busbarTemperature.qss") ; + std::string style = iot_public::CFileStyle::getPathOfStyleFile("busbarTemperature.qss") ; QFile file(QString::fromStdString(style)); file.open(QFile::ReadOnly); if (file.isOpen()) @@ -509,7 +509,7 @@ void BusbarTemperatureWidget::onTreeClicked(QTreeWidgetItem *item, int column) chart->update(); //订阅实时数据 - kbd_dbms::CDbApi objReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReader(DB_CONN_MODEL_READ); if(!objReader.open()) { return;// tr("数据库连接打开失败!"); @@ -579,7 +579,7 @@ void BusbarTemperatureWidget::slotShowChange(bool checked) } -QString BusbarTemperatureWidget::QueryDevinfoTagName(const QString& groupTagName, kbd_dbms::CDbApi& objReader) const +QString BusbarTemperatureWidget::QueryDevinfoTagName(const QString& groupTagName, iot_dbms::CDbApi& objReader) const { if(!objReader.isOpen()) { @@ -588,11 +588,11 @@ QString BusbarTemperatureWidget::QueryDevinfoTagName(const QString& groupTagName QList listColName; listColName.append("DESCRIPTION"); - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; objCondition.m_value = groupTagName; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; QSqlQuery objQuery; if(objReader.select("dev_info", listColName, objCondition, objQuery)) @@ -605,7 +605,7 @@ QString BusbarTemperatureWidget::QueryDevinfoTagName(const QString& groupTagName return QString(); } -QMap BusbarTemperatureWidget::QueryAnalogTagName(const QString& device, kbd_dbms::CDbApi& objReader) +QMap BusbarTemperatureWidget::QueryAnalogTagName(const QString& device, iot_dbms::CDbApi& objReader) { if(!objReader.isOpen()) { @@ -616,11 +616,11 @@ QMap BusbarTemperatureWidget::QueryAnalogTagName(const QString listColName.append("TAG_NAME"); listColName.append("DESCRIPTION"); - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "DEVICE"; objCondition.m_value = device; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; QSqlQuery objQuery; QMap analogTagName; diff --git a/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.h b/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.h index fcf01cfc..168341a0 100644 --- a/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.h +++ b/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.h @@ -114,7 +114,7 @@ private: void initializeChart(); void initStyle(); bool m_isEditMode; - kbd_service::CDpcdaForApp* m_pDpcdaForApp; + iot_service::CDpcdaForApp* m_pDpcdaForApp; void subscribe(); void unsubscribeAll(); void updateChart(); @@ -142,8 +142,8 @@ private: QMap> m_barYValueMap; - QMap QueryAnalogTagName(const QString& device, kbd_dbms::CDbApi& objReader) ; - QString QueryDevinfoTagName(const QString& groupTagName, kbd_dbms::CDbApi& objReader) const; + QMap QueryAnalogTagName(const QString& device, iot_dbms::CDbApi& objReader) ; + QString QueryDevinfoTagName(const QString& groupTagName, iot_dbms::CDbApi& objReader) const; QString setDeviceTitle(); ShowInfoWidget* m_pPopupWidget; diff --git a/product/src/gui/plugin/BusbarTemperatureWidget/main.cpp b/product/src/gui/plugin/BusbarTemperatureWidget/main.cpp index e87c95d0..4e1d91c8 100644 --- a/product/src/gui/plugin/BusbarTemperatureWidget/main.cpp +++ b/product/src/gui/plugin/BusbarTemperatureWidget/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem( "BASE", "alarm_statistics" ); + iot_public::StartLogSystem( "BASE", "alarm_statistics" ); BusbarTemperatureWidget w( 0, false ); w.show(); int nRet = a.exec(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return nRet; } diff --git a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp index 5d2a4aa5..9e397bad 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp +++ b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp @@ -106,7 +106,7 @@ void CButtonGroupWidget::initView() return; } - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); QDir dir(QString::fromStdString(currentPath)); dir.cdUp(); dir.cdUp(); diff --git a/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp b/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp index a71b6f57..2ed709b9 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp +++ b/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp @@ -9,7 +9,7 @@ CJsonReader::CJsonReader(QObject *parent) : QObject(parent) { - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); QDir dir(QString::fromStdString(currentPath)); dir.cdUp(); dir.cdUp(); diff --git a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp index 8c3a03f7..80676375 100644 --- a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp +++ b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp @@ -48,7 +48,7 @@ void CRealDataCollect::initMsg() { if(m_pMbComm == NULL) { - m_pMbComm = new kbd_net::CMbCommunicator("ChanStatusWidget"); + m_pMbComm = new iot_net::CMbCommunicator("ChanStatusWidget"); } } @@ -65,7 +65,7 @@ void CRealDataCollect::clearMsg() { if(m_pMbComm) { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while(m_pMbComm->recvMsg(objMsg, 0)) {} } @@ -106,14 +106,14 @@ void CRealDataCollect::recvMessage() try { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; for(int i = 0; i < 6; i++) { if(m_pMbComm->recvMsg(objMsg, 0)) { if(objMsg.isValid()) { - if(objMsg.getMsgType() != kbd_idlfile::MT_DP_CHANGE_DATA) + if(objMsg.getMsgType() != iot_idl::MT_DP_CHANGE_DATA) { continue; } @@ -165,16 +165,16 @@ void CRealDataCollect::processChangeData() } } -int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) +int CRealDataCollect::parserMsg(const iot_net::CMbMessage &msg) { - kbd_idlfile::SRealTimeDataPkg changeDataPackage; + iot_idl::SRealTimeDataPkg changeDataPackage; try { changeDataPackage.ParseFromArray(msg.getDataPtr(),(int)msg.getDataSize()); int aiSize = changeDataPackage.stairtd_size(); if(aiSize > 0) { - kbd_idlfile::SAiRealTimeData aiStru; + iot_idl::SAiRealTimeData aiStru; QString tagName; float value; uint status; @@ -191,7 +191,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int diSize = changeDataPackage.stdirtd_size(); if(diSize > 0) { - kbd_idlfile::SDiRealTimeData diStu; + iot_idl::SDiRealTimeData diStu; QString tagName; int value; uint status; @@ -208,7 +208,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int piSize = changeDataPackage.stpirtd_size(); if(piSize > 0) { - kbd_idlfile::SPiRealTimeData piStu; + iot_idl::SPiRealTimeData piStu; QString tagName; double value; uint status; @@ -225,7 +225,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int miSize = changeDataPackage.stmirtd_size(); if(miSize > 0) { - kbd_idlfile::SMiRealTimeData miStu; + iot_idl::SMiRealTimeData miStu; QString tagName; int value; uint status; @@ -242,44 +242,44 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int utSize = changeDataPackage.sttblrtd_size(); if(utSize > 0) { - kbd_idlfile::STableRealTimeData uiStu; + iot_idl::STableRealTimeData uiStu; QString tagName; QVariant value; for(int i = 0;i < utSize; i++) { uiStu = changeDataPackage.sttblrtd(i); tagName = QString::fromStdString(uiStu.strtagname()); - kbd_idlfile::SVariable temp = uiStu.varvalue(); - if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_BOOL) + iot_idl::SVariable temp = uiStu.varvalue(); + if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_BOOL) { value = QVariant::fromValue(temp.bvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_UINT32) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_UINT32) { value = QVariant::fromValue(temp.uvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_INT32) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_INT32) { value = QVariant::fromValue(temp.nvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_UINT64) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_UINT64) { value = QVariant::fromValue(temp.ulvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_INT64) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_INT64) { value = QVariant::fromValue(temp.lvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_FLOAT) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_FLOAT) { value = QVariant::fromValue(temp.fvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_DOUBLE) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_DOUBLE) { value = QVariant::fromValue(temp.dvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_STRING || - temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_BYTES) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_STRING || + temp.edatatype() == iot_idl::DataType::CN_DATATYPE_BYTES) { QString str = QString::fromStdString(temp.strvalue()); value = QVariant::fromValue(str); diff --git a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h index 8ed824f3..1c28a8c9 100644 --- a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h +++ b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h @@ -26,7 +26,7 @@ private: bool addSub(); bool delSub(); - int parserMsg(const kbd_net::CMbMessage &); + int parserMsg(const iot_net::CMbMessage &); private slots: void recvMessage(); @@ -40,7 +40,7 @@ signals: void signal_updateUi(QMap uiMap); private: - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; QTimer * m_pTimer; int m_nTimeCount; QMap> m_aiMap; diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.cpp b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.cpp index 692467e4..e0b24fa7 100644 --- a/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.cpp +++ b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.cpp @@ -84,7 +84,7 @@ void ChanStatusWidget::setColumnWidth(int column, int width) void ChanStatusWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -93,7 +93,7 @@ void ChanStatusWidget::initStyle() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("chanStatus.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("chanStatus.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -140,7 +140,7 @@ void ChanStatusWidget::initView() void ChanStatusWidget::initData() { - kbd_dbms::CDbApi objDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objDbApi(DB_CONN_MODEL_READ); if(!objDbApi.open()) { LOGERROR("关系库打开失败 %s", objDbApi.getLastErrorString().toStdString().c_str()); @@ -154,8 +154,8 @@ void ChanStatusWidget::initData() listColName << "LOCATION_ID"; listColName << "TAG_NAME"; listColName << "DESCRIPTION"; - QList listOrderBy; - listOrderBy << kbd_dbms::CDbOrder("LOCATION_ID", kbd_dbms::CDbOrder::ORDER_ASC); + QList listOrderBy; + listOrderBy << iot_dbms::CDbOrder("LOCATION_ID", iot_dbms::CDbOrder::ORDER_ASC); if(!objDbApi.select("sys_model_location_info", listColName, listOrderBy, objQuery)) { LOGERROR("查询位置信息失败 %s", objDbApi.getLastErrorString().toStdString().c_str()); @@ -205,8 +205,8 @@ void ChanStatusWidget::initData() listColName << "NET_DESC3"; listColName << "NET_DESC4"; listColName << "COMM_PROPERTY"; - QList listOrderBy; - listOrderBy << kbd_dbms::CDbOrder("CHAN_NO", kbd_dbms::CDbOrder::ORDER_ASC); + QList listOrderBy; + listOrderBy << iot_dbms::CDbOrder("CHAN_NO", iot_dbms::CDbOrder::ORDER_ASC); if(!objDbApi.select("fes_channel_para", listColName, listOrderBy, objQuery)) { LOGERROR("查询通道信息失败 %s", objDbApi.getLastErrorString().toStdString().c_str()); @@ -295,7 +295,7 @@ void ChanStatusWidget::initData() void ChanStatusWidget::initConnect() { - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); connect(m_pTreeWidget, &QTreeWidget::itemClicked, this, &ChanStatusWidget::slotItemClicked); connect(CRealDataCollect::instance(), &CRealDataCollect::signal_updateUi, this, &ChanStatusWidget::slotUpdateUi); diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h index b55f6906..ab503ba2 100644 --- a/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h +++ b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h @@ -42,7 +42,7 @@ private: QTableView * m_pTableView; QPushButton * m_btnExport; ChanTableModel * m_pChanModel; - kbd_service::CDpcdaForApp *m_pDpcdaForApp; + iot_service::CDpcdaForApp *m_pDpcdaForApp; QMap > m_locMap; //< ID, QMap> m_dataMap; //< LOC_TAG - Chan }; diff --git a/product/src/gui/plugin/ChanStatusWidget/main.cpp b/product/src/gui/plugin/ChanStatusWidget/main.cpp index bd84a25c..703ef1b1 100644 --- a/product/src/gui/plugin/ChanStatusWidget/main.cpp +++ b/product/src/gui/plugin/ChanStatusWidget/main.cpp @@ -6,13 +6,13 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); { QApplication a(argc, argv); @@ -22,10 +22,10 @@ int main(int argc, char *argv[]) a.exec(); } - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/ConstCurves/CConstCurves.cpp b/product/src/gui/plugin/ConstCurves/CConstCurves.cpp index 1ab0c71d..fd403624 100644 --- a/product/src/gui/plugin/ConstCurves/CConstCurves.cpp +++ b/product/src/gui/plugin/ConstCurves/CConstCurves.cpp @@ -16,7 +16,7 @@ CConstCurves::CConstCurves(bool editMode, QVector ptrVec, QWidget *paren initView(); QString style = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("constCurves.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("constCurves.qss") ; QFile file1(QString::fromStdString(strFullPath)); if (file1.open(QIODevice::ReadOnly)) { @@ -26,7 +26,7 @@ CConstCurves::CConstCurves(bool editMode, QVector ptrVec, QWidget *paren } file1.close(); - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("constCurves.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("constCurves.qss") ; QFile file2(QString::fromStdString(strFullPath)); if (file2.open(QIODevice::ReadOnly)) { diff --git a/product/src/gui/plugin/ConstCurves/CDbInterface.cpp b/product/src/gui/plugin/ConstCurves/CDbInterface.cpp index 3bf35001..fd399be0 100644 --- a/product/src/gui/plugin/ConstCurves/CDbInterface.cpp +++ b/product/src/gui/plugin/ConstCurves/CDbInterface.cpp @@ -1,6 +1,6 @@ #include "CDbInterface.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbInterface::CDbInterface() : m_pReadDb(NULL) diff --git a/product/src/gui/plugin/ConstCurves/CDbInterface.h b/product/src/gui/plugin/ConstCurves/CDbInterface.h index 64784023..2e7480bb 100644 --- a/product/src/gui/plugin/ConstCurves/CDbInterface.h +++ b/product/src/gui/plugin/ConstCurves/CDbInterface.h @@ -34,7 +34,7 @@ private: void readFesConst(); private: - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; QMultiMap m_fesConstMap; }; diff --git a/product/src/gui/plugin/ConstCurves/CMessageManage.cpp b/product/src/gui/plugin/ConstCurves/CMessageManage.cpp index 9bc94b35..2d75e513 100644 --- a/product/src/gui/plugin/ConstCurves/CMessageManage.cpp +++ b/product/src/gui/plugin/ConstCurves/CMessageManage.cpp @@ -31,7 +31,7 @@ CMessageManage::~CMessageManage() bool CMessageManage::sendMessage(const SReadQueue& queueList, int nDstDomainId) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setMsgType(MT_OPT_COMMON_DOWN); msg.setSubject(E_PSCADA_APPID, CH_HMI_TO_OPT_OPTCMD_DOWN); COptCustCtrlRequest cOptCustCtrlRequest; @@ -63,7 +63,7 @@ bool CMessageManage::sendMessage(const SReadQueue& queueList, int nDstDomainId) void CMessageManage::recvMessage() { // test(); - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; if(m_communicator->recvMsg(msg, 50)) { if(msg.getMsgType() != MT_OPT_COMMON_UP) @@ -111,7 +111,7 @@ void CMessageManage::initMsg() { if(m_communicator == NULL) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); } } diff --git a/product/src/gui/plugin/ConstCurves/CMessageManage.h b/product/src/gui/plugin/ConstCurves/CMessageManage.h index fb672da0..0924981f 100644 --- a/product/src/gui/plugin/ConstCurves/CMessageManage.h +++ b/product/src/gui/plugin/ConstCurves/CMessageManage.h @@ -30,8 +30,8 @@ struct SReplyQueue QList valueList; }; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; class CMessageManage : public QObject { Q_OBJECT @@ -61,7 +61,7 @@ private: void test(); private: - kbd_net::CMbCommunicator *m_communicator; + iot_net::CMbCommunicator *m_communicator; CSysInfoInterfacePtr m_sysInfo; CPermMngApiPtr m_permMng; QTimer *m_timer; diff --git a/product/src/gui/plugin/ConstCurves/main.cpp b/product/src/gui/plugin/ConstCurves/main.cpp index 6c2cca97..dbaab4d7 100644 --- a/product/src/gui/plugin/ConstCurves/main.cpp +++ b/product/src/gui/plugin/ConstCurves/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) return -1; } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); { LOGINFO("===========================ConstCurves==========================="); @@ -36,10 +36,10 @@ int main(int argc, char *argv[]) app.exec(); } - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp index 2c505bfd..cf4b8ebb 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp @@ -9,9 +9,9 @@ #include "perm_mng_api/PermMngApi.h" #include "pub_logger_api/logger.h" #include "pub_sysinfo_api/SysInfoApi.h" -using namespace kbd_dbms; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_dbms; +using namespace iot_public; +using namespace iot_service; CDataOptWidget::CDataOptWidget(bool editMode, QWidget *parent) : QWidget(parent), @@ -110,7 +110,7 @@ void CDataOptWidget::setTagType(int actual) void CDataOptWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -119,7 +119,7 @@ void CDataOptWidget::initStyleSheet() qssfile1.close(); } -// strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; +// strFullPath = iot_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; // QFile qssfile2(QString::fromStdString(strFullPath)); // qssfile2.open(QFile::ReadOnly); // if (qssfile2.isOpen()) @@ -382,7 +382,7 @@ void CDataOptWidget::updateCount() bool CDataOptWidget::permCheck(int location, int region) { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); QString mess; if(permMngPtr != NULL) { @@ -437,7 +437,7 @@ void CDataOptWidget::initMsg() { if(m_communicator == Q_NULLPTR) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); } } @@ -693,7 +693,7 @@ bool CDataOptWidget::cancelItemSetValue(const QString &desc,const QString &tagNa void CDataOptWidget::removeOptTagInfo(const STOptTagInfo &info) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setMsgType(MT_OPT_COMMON_DOWN); msg.setSubject(info.subSystem, CH_HMI_TO_OPT_OPTCMD_DOWN); SOptTagSet sOptTagSet; diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h index 3f717ad4..2a0abc08 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h @@ -92,10 +92,10 @@ signals: private: Ui::CDataOptWidget *ui; - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; - kbd_net::CMbCommunicator *m_communicator; - kbd_public::CSysInfoInterfacePtr m_pSysInfo; + iot_net::CMbCommunicator *m_communicator; + iot_public::CSysInfoInterfacePtr m_pSysInfo; QMap m_locMap; QList m_locOrder; QMap m_subMap; diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp b/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp index 8489edee..187bdb79 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp @@ -2,7 +2,7 @@ #include "Common.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDataOptWork::CDataOptWork(QObject *parent) : QObject(parent) { m_pReadDb = new CDbApi(DB_CONN_MODEL_READ); @@ -72,7 +72,7 @@ void CDataOptWork::slotSearch(int domainId, int appid) bool CDataOptWork::readTagInfo() { m_optTagInfoList.clear(); - kbd_idlfile::RdbRet objRdbRet; + iot_idl::RdbRet objRdbRet; bool bRet = false; std::vector vecColumn = {"key_id_tag","tag_type","opt_time","location_id","sub_system","set_value","state_text","host_name","user_name","user_group"}; diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWork.h b/product/src/gui/plugin/DataOptWidget/CDataOptWork.h index c31a9cae..e5435d91 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWork.h +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWork.h @@ -51,8 +51,8 @@ private: private: - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbNetApi m_objRdbNetApi; //< 网络查询对象 + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbNetApi m_objRdbNetApi; //< 网络查询对象 QList m_optTagInfoList; QMap m_TagInfoMap; diff --git a/product/src/gui/plugin/DataOptWidget/main.cpp b/product/src/gui/plugin/DataOptWidget/main.cpp index 893ba916..533c51ca 100644 --- a/product/src/gui/plugin/DataOptWidget/main.cpp +++ b/product/src/gui/plugin/DataOptWidget/main.cpp @@ -8,12 +8,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("HMI", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("HMI", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/DevHisDataWidget/CDbInterface.cpp b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.cpp index cde3c2bc..4cbcf20d 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDbInterface.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.cpp @@ -2,7 +2,7 @@ #include "public/pub_sysinfo_api/SysInfoApi.h" #include "public/pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbInterface::CDbInterface() : m_pReadDb(NULL), @@ -38,12 +38,12 @@ void CDbInterface::initialize() LOGERROR("打开数据库连接失败! %s", m_pReadDb->getLastErrorString().toStdString().c_str()); } - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); nCurDomain = CN_InvalidDomainId; - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败!"); } diff --git a/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h index 2baf9c05..7428c6e5 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h +++ b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h @@ -29,8 +29,8 @@ private: void loadDictMenuInfo(); private: - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccess * m_rtdbAccess; int nCurDomain; QMap > m_dictText; //< state_text_name actual_value,display_value QMap m_dictMenu; //< menu_macro_name,actual_value diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp index cc07b4dc..ef16bcf5 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp @@ -22,7 +22,7 @@ CDevHisDataWidget::CDevHisDataWidget(bool editMode, QVector ptrVec, QWid ui->setupUi(this); QString style = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile file1(QString::fromStdString(strFullPath)); if (file1.open(QIODevice::ReadOnly)) { @@ -32,7 +32,7 @@ CDevHisDataWidget::CDevHisDataWidget(bool editMode, QVector ptrVec, QWid } file1.close(); - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("deviceHisData.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("deviceHisData.qss") ; QFile file2(QString::fromStdString(strFullPath)); if (file2.open(QIODevice::ReadOnly)) { @@ -171,7 +171,7 @@ void CDevHisDataWidget::initView() void CDevHisDataWidget::initData() { - kbd_dbms::initTsdbApi(); + iot_dbms::initTsdbApi(); m_dbInterface = new CDbInterface(); m_hisDataManage = new CHisDataManage(Q_NULLPTR, m_dbInterface); diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h index 47bfbafe..9997cb3f 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h @@ -14,7 +14,7 @@ struct SDevManage { QString tag_name; QString description; - kbd_dbms::EnMeasPiontType pointType; //< MPT_AI ,MPT_DI ,MPT_MIX ,MPT_ACC + iot_dbms::EnMeasPiontType pointType; //< MPT_AI ,MPT_DI ,MPT_MIX ,MPT_ACC }; class CDevHisDataWidget : public QWidget diff --git a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp index beb85f64..00a406ad 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp @@ -20,7 +20,7 @@ CHisDataManage::~CHisDataManage() } } -bool CHisDataManage::getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr) +bool CHisDataManage::getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr) { if(m_tsdbConnPtr != NULL) { diff --git a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h index ffc97b99..a4443aa3 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h +++ b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h @@ -8,7 +8,7 @@ #include "db_his_query_api/DbHisQueryApi.h" #include "CDbInterface.h" -using namespace kbd_dbms; +using namespace iot_dbms; class CHisDataManage : public QObject { Q_OBJECT @@ -24,11 +24,11 @@ signals: std::vector *> *vecResult); private: - bool getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr); + bool getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr); private: CDbInterface *m_dbInterface; - kbd_dbms::CTsdbConnPtr m_tsdbConnPtr; + iot_dbms::CTsdbConnPtr m_tsdbConnPtr; }; #endif // CHISDATAMANAGE_H diff --git a/product/src/gui/plugin/DevHisDataWidget/main.cpp b/product/src/gui/plugin/DevHisDataWidget/main.cpp index 49a2e7bf..af09229b 100644 --- a/product/src/gui/plugin/DevHisDataWidget/main.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) return -1; } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); { LOGINFO("=========================== CDevHisDataWidget ==========================="); @@ -35,10 +35,10 @@ int main(int argc, char *argv[]) app.exec(); } - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/DevRealDataWidget/CDbInterface.cpp b/product/src/gui/plugin/DevRealDataWidget/CDbInterface.cpp index aac0c55a..7905abd4 100644 --- a/product/src/gui/plugin/DevRealDataWidget/CDbInterface.cpp +++ b/product/src/gui/plugin/DevRealDataWidget/CDbInterface.cpp @@ -2,8 +2,8 @@ #include "service/perm_mng_api/PermMngApi.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_public; CDbInterface *CDbInterface::m_pInstance = NULL; @@ -12,7 +12,7 @@ CDbInterface::CDbInterface() m_pReadDb = new CDbApi(DB_CONN_MODEL_READ); m_pReadDb->open(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); readUnitInfo(); readDiStatus(); @@ -449,7 +449,7 @@ QString CDbInterface::getAiStatusStr(int status) void CDbInterface::loadRTLocation() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -471,8 +471,8 @@ void CDbInterface::loadRTLocation() id_value.second = "description"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back(id_value.first); columns.push_back(id_value.second); @@ -483,8 +483,8 @@ void CDbInterface::loadRTLocation() m_locationInfo.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); diff --git a/product/src/gui/plugin/DevRealDataWidget/CDbInterface.h b/product/src/gui/plugin/DevRealDataWidget/CDbInterface.h index 2df21b9a..050e99a1 100644 --- a/product/src/gui/plugin/DevRealDataWidget/CDbInterface.h +++ b/product/src/gui/plugin/DevRealDataWidget/CDbInterface.h @@ -62,8 +62,8 @@ private: private: static CDbInterface * m_pInstance; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_mapUnit; QMap m_mapDiStatus; QMap m_mapAiStatus; diff --git a/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp b/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp index ab04d438..2d6d4430 100644 --- a/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp +++ b/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.cpp @@ -9,9 +9,9 @@ #include #include "SetValueInputDialog.h" -using namespace kbd_dbms; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_dbms; +using namespace iot_public; +using namespace iot_service; CDevRealDataWidget::CDevRealDataWidget(bool editMode, QVector ptrVec, QWidget *parent) : QWidget(parent), ui(new Ui::CDevRealDataWidget), @@ -36,7 +36,7 @@ CDevRealDataWidget::CDevRealDataWidget(bool editMode, QVector ptrVec, QW qRegisterMetaType>>("QMap>"); qRegisterMetaType>>("QMap>"); - if(!kbd_public::createSysInfoInstance(m_sysInfoPtr)) + if(!iot_public::createSysInfoInstance(m_sysInfoPtr)) { LOGERROR("创建系统信息访问库实例失败!"); return; @@ -84,7 +84,7 @@ void CDevRealDataWidget::initMsg() { if(m_communicator == NULL) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); } } @@ -161,7 +161,7 @@ void CDevRealDataWidget::setShowSubSystem(bool isShow) void CDevRealDataWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -171,7 +171,7 @@ void CDevRealDataWidget::initStyleSheet() } qssfile1.close(); - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("deviceRealData.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("deviceRealData.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -224,7 +224,7 @@ void CDevRealDataWidget::initialize() } //< 初始化订阅线程 - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); m_realDataCollect = new CRealDataCollect; m_pCollectThread = new QThread(this); m_realDataCollect->moveToThread(m_pCollectThread); @@ -1075,7 +1075,7 @@ void CDevRealDataWidget::slotDisableCtrlBtnClick() bool CDevRealDataWidget::OptTagInfo(const STOptTagInfo &info) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setMsgType(MT_OPT_COMMON_DOWN); msg.setSubject(info.subSystem, CH_HMI_TO_OPT_OPTCMD_DOWN); SOptTagSet sOptTagSet; diff --git a/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.h b/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.h index c41d1c06..399d217a 100644 --- a/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.h +++ b/product/src/gui/plugin/DevRealDataWidget/CDevRealDataWidget.h @@ -102,7 +102,7 @@ private slots: void slotDisableCtrlBtnClick();//禁止控制 private: Ui::CDevRealDataWidget *ui; - kbd_service::CDpcdaForApp *m_pDpcdaForApp; + iot_service::CDpcdaForApp *m_pDpcdaForApp; CRealDataCollect *m_realDataCollect; QThread *m_pCollectThread; CRealTableModel *m_realModel; @@ -111,13 +111,13 @@ private: QString m_devg;//search QList m_devList; //search - kbd_net::CMbCommunicator *m_communicator; + iot_net::CMbCommunicator *m_communicator; int m_curUserId; int m_curUsergId; - kbd_public::CSysInfoInterfacePtr m_sysInfoPtr; - kbd_public::SNodeInfo m_nodeInfo; + iot_public::CSysInfoInterfacePtr m_sysInfoPtr; + iot_public::SNodeInfo m_nodeInfo; QMap> m_aiMap; //模拟量序号和设备标签 QMap> m_diMap; //数字量序号和设备标签 diff --git a/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.cpp b/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.cpp index 453d11ef..e7b9601e 100644 --- a/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.cpp +++ b/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.cpp @@ -40,7 +40,7 @@ void CRealDataCollect::initMsg() { if(m_pMbComm == NULL) { - m_pMbComm = new kbd_net::CMbCommunicator("DevRealDataWidget"); + m_pMbComm = new iot_net::CMbCommunicator("DevRealDataWidget"); } } @@ -88,7 +88,7 @@ void CRealDataCollect::recvMessage() try { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; for(int i = 0; i < 6; i++) { if(m_pMbComm->recvMsg(objMsg, 0)) @@ -96,7 +96,7 @@ void CRealDataCollect::recvMessage() if(objMsg.isValid()) { if(objMsg.getChannelID() == CH_SCADA_TO_HMI_DATA_CHANGE - && objMsg.getMsgType() == kbd_idlfile::MT_DP_CHANGE_DATA) + && objMsg.getMsgType() == iot_idl::MT_DP_CHANGE_DATA) { parserMsg(objMsg); } @@ -137,16 +137,16 @@ void CRealDataCollect::processChangeData() } } -int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) +int CRealDataCollect::parserMsg(const iot_net::CMbMessage &msg) { - kbd_idlfile::SRealTimeDataPkg changeDataPackage; + iot_idl::SRealTimeDataPkg changeDataPackage; try { changeDataPackage.ParseFromArray(msg.getDataPtr(),(int)msg.getDataSize()); int aiSize = changeDataPackage.stairtd_size(); if(aiSize > 0) { - kbd_idlfile::SAiRealTimeData aiStru; + iot_idl::SAiRealTimeData aiStru; QString tagName; float value; uint status; @@ -164,7 +164,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int diSize = changeDataPackage.stdirtd_size(); if(diSize > 0) { - kbd_idlfile::SDiRealTimeData diStu; + iot_idl::SDiRealTimeData diStu; QString tagName; int value; uint status; @@ -182,7 +182,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int piSize = changeDataPackage.stpirtd_size(); if(piSize > 0) { - kbd_idlfile::SPiRealTimeData piStu; + iot_idl::SPiRealTimeData piStu; QString tagName; double value; uint status; @@ -200,7 +200,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int miSize = changeDataPackage.stmirtd_size(); if(miSize > 0) { - kbd_idlfile::SMiRealTimeData miStu; + iot_idl::SMiRealTimeData miStu; QString tagName; int value; uint status; diff --git a/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.h b/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.h index 244a62e7..466e4db5 100644 --- a/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.h +++ b/product/src/gui/plugin/DevRealDataWidget/CRealDataCollect.h @@ -24,7 +24,7 @@ private: bool addSub(int appID, int channel); bool delSub(int appID, int channel); - int parserMsg(const kbd_net::CMbMessage &); + int parserMsg(const iot_net::CMbMessage &); private slots: void recvMessage(); @@ -37,7 +37,7 @@ signals: void signal_updateMi(QMap> miMap); private: - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; QTimer * m_pTimer; int m_nTimeCount; QMap> m_aiMap; diff --git a/product/src/gui/plugin/DevRealDataWidget/main.cpp b/product/src/gui/plugin/DevRealDataWidget/main.cpp index 6ba30861..c458e485 100644 --- a/product/src/gui/plugin/DevRealDataWidget/main.cpp +++ b/product/src/gui/plugin/DevRealDataWidget/main.cpp @@ -6,12 +6,12 @@ int main(int argc, char *argv[]) { - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) return -1; } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); { QVector ptrVec; @@ -33,9 +33,9 @@ int main(int argc, char *argv[]) a.exec(); } - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return 0; } diff --git a/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.cpp b/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.cpp index a2674f63..f1348ce0 100644 --- a/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.cpp +++ b/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.cpp @@ -54,7 +54,7 @@ QString CDevSpePointWidget::addRow(const QString &pointTag) return tr("测点标签为空!"); } - kbd_dbms::CDbApi objReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReader(DB_CONN_MODEL_READ); if(!objReader.open()) { return tr("数据库连接打开失败!"); @@ -210,7 +210,7 @@ QString CDevSpePointWidget::addRow(const QString &pointTag) QString valueType = list[5]; device = queryGetDevInfoTagName(valueType, device, objReader); - kbd_dbms::CDbApi descriptionReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi descriptionReader(DB_CONN_MODEL_READ); if(!descriptionReader.open()) { return tr("数据库连接打开失败!"); @@ -334,7 +334,7 @@ QString CDevSpePointWidget::addRowName(const QString &pointTag, const QString &D return str; } - kbd_dbms::CDbApi objReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReader(DB_CONN_MODEL_READ); if(!objReader.open()) { return tr("数据库连接打开失败!"); @@ -472,7 +472,7 @@ QString CDevSpePointWidget::addRowName(const QString &pointTag, const QString &D QString valueType = list[5]; device = queryGetDevInfoTagName(valueType, device, objReader); - kbd_dbms::CDbApi descriptionReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi descriptionReader(DB_CONN_MODEL_READ); if(!descriptionReader.open()) { return tr("数据库连接打开失败!"); @@ -521,7 +521,7 @@ QString CDevSpePointWidget::addColumn(const QString &title, const QString &point { return tr("测点标签为空!"); } - kbd_dbms::CDbApi objReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReader(DB_CONN_MODEL_READ); if(!objReader.open()) { return tr("数据库连接打开失败!"); @@ -906,7 +906,7 @@ void CDevSpePointWidget::initialize() qRegisterMetaType>>("QMap>"); qRegisterMetaType>>("QMap>"); - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); connect(CRealDataCollect::instance(), &CRealDataCollect::signal_updateAi, this, &CDevSpePointWidget::slotUpdateAi); connect(CRealDataCollect::instance(), &CRealDataCollect::signal_updateDi, this, &CDevSpePointWidget::slotUpdateDi); @@ -917,7 +917,7 @@ void CDevSpePointWidget::initialize() void CDevSpePointWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss"); + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss"); qDebug() << "strFullPath-->" << QString::fromStdString(strFullPath); QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); @@ -929,7 +929,7 @@ void CDevSpePointWidget::initStyle() } qssfile1.close(); - std::string style = kbd_public::CFileStyle::getPathOfStyleFile("devSpePoint.qss") ; + std::string style = iot_public::CFileStyle::getPathOfStyleFile("devSpePoint.qss") ; qDebug() << "Style Path-->" << QString::fromStdString(style); QFile file(QString::fromStdString(style)); file.open(QFile::ReadOnly); @@ -941,7 +941,7 @@ void CDevSpePointWidget::initStyle() } } -QString CDevSpePointWidget::queryDeviceDesc(const QString &devTag, kbd_dbms::CDbApi &objReader) const +QString CDevSpePointWidget::queryDeviceDesc(const QString &devTag, iot_dbms::CDbApi &objReader) const { if(!objReader.isOpen()) { @@ -950,11 +950,11 @@ QString CDevSpePointWidget::queryDeviceDesc(const QString &devTag, kbd_dbms::CDb QList listColName; listColName.append("DESCRIPTION"); - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; objCondition.m_value = devTag; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; QSqlQuery objQuery; if(objReader.select("dev_info", listColName, objCondition, objQuery)) @@ -967,7 +967,7 @@ QString CDevSpePointWidget::queryDeviceDesc(const QString &devTag, kbd_dbms::CDb return QString(); } -QString CDevSpePointWidget::queryDigitalStateText(const QString &point, kbd_dbms::CDbApi &objReader) const +QString CDevSpePointWidget::queryDigitalStateText(const QString &point, iot_dbms::CDbApi &objReader) const { if(!objReader.isOpen()) { @@ -975,11 +975,11 @@ QString CDevSpePointWidget::queryDigitalStateText(const QString &point, kbd_dbms } QList listColName; listColName.append("STATE_TEXT_NAME"); - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; objCondition.m_value = point; - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; QSqlQuery objQuery; if(objReader.select("digital", listColName, objCondition, objQuery)) @@ -993,7 +993,7 @@ QString CDevSpePointWidget::queryDigitalStateText(const QString &point, kbd_dbms } //获取设备组名，仅deviceOrGroupType==1时使用 -QString CDevSpePointWidget::queryGetGroupDescription(const QString &tagName, kbd_dbms::CDbApi &objReader) const +QString CDevSpePointWidget::queryGetGroupDescription(const QString &tagName, iot_dbms::CDbApi &objReader) const { if(!objReader.isOpen()) { @@ -1002,11 +1002,11 @@ QString CDevSpePointWidget::queryGetGroupDescription(const QString &tagName, kbd QList listColName; listColName.append("DESCRIPTION"); //需要取的值 - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; //比较的组名 objCondition.m_value = tagName; // 比较的值 - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; // 比较条件 - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; // 两个比较条件之间的关系 + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; // 比较条件 + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; // 两个比较条件之间的关系 QSqlQuery objQuery; if(objReader.select("dev_group", listColName, objCondition, objQuery)) @@ -1020,7 +1020,7 @@ QString CDevSpePointWidget::queryGetGroupDescription(const QString &tagName, kbd } //获取设备组里第1个存在的列标题值的设备名，仅deviceOrGroupType==1时使用 -QString CDevSpePointWidget::queryGetCollumnDevInfoTagName(const QString &measureType, const QString &valueType, const QString &groupName, kbd_dbms::CDbApi &objReader) const +QString CDevSpePointWidget::queryGetCollumnDevInfoTagName(const QString &measureType, const QString &valueType, const QString &groupName, iot_dbms::CDbApi &objReader) const { if(!objReader.isOpen()) { @@ -1047,7 +1047,7 @@ QString CDevSpePointWidget::queryGetCollumnDevInfoTagName(const QString &measu } //以第1个存在VA值的设备名为列标题时，仅deviceOrGroupType==2时使用 -QString CDevSpePointWidget::queryGetDevInfoTagName(const QString &valueType, const QString &groupTagName, kbd_dbms::CDbApi &objReader) const +QString CDevSpePointWidget::queryGetDevInfoTagName(const QString &valueType, const QString &groupTagName, iot_dbms::CDbApi &objReader) const { if(!objReader.isOpen()) { @@ -1072,7 +1072,7 @@ QString CDevSpePointWidget::queryGetDevInfoTagName(const QString &valueType, con } //获取某组设备里的设备名，仅deviceOrGroupType==2时使用 -QString CDevSpePointWidget::queryGetDevInfoDescription(const QString &deviceTagName, kbd_dbms::CDbApi &objReader) const +QString CDevSpePointWidget::queryGetDevInfoDescription(const QString &deviceTagName, iot_dbms::CDbApi &objReader) const { if(!objReader.isOpen()) { @@ -1081,11 +1081,11 @@ QString CDevSpePointWidget::queryGetDevInfoDescription(const QString &deviceTagN QList listColName; listColName.append("DESCRIPTION"); //是objCondition.m_value的组名 - kbd_dbms::CDbCondition objCondition; + iot_dbms::CDbCondition objCondition; objCondition.m_sColName = "TAG_NAME"; //比较的字段名 objCondition.m_value = deviceTagName; //比较的值 - objCondition.m_eCompare = kbd_dbms::CDbCondition::COMPARE_EQ; //比较条件 - objCondition.m_eLogic = kbd_dbms::CDbCondition::LOGIC_AND; //两个比较条件之间的关系 + objCondition.m_eCompare = iot_dbms::CDbCondition::COMPARE_EQ; //比较条件 + objCondition.m_eLogic = iot_dbms::CDbCondition::LOGIC_AND; //两个比较条件之间的关系 QSqlQuery objQuery; if(objReader.select("dev_info", listColName, objCondition, objQuery)) diff --git a/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.h b/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.h index 867c0356..62ba0984 100644 --- a/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.h +++ b/product/src/gui/plugin/DevSpePointWidget/CDevSpePointWidget.h @@ -102,17 +102,17 @@ private: void initialize(); void initStyle(); - QString queryDeviceDesc(const QString &devTag, kbd_dbms::CDbApi &objReader) const; - QString queryDigitalStateText(const QString &point, kbd_dbms::CDbApi &objReader) const; - QString queryGetGroupDescription(const QString &tagName, kbd_dbms::CDbApi &objReader) const; + QString queryDeviceDesc(const QString &devTag, iot_dbms::CDbApi &objReader) const; + QString queryDigitalStateText(const QString &point, iot_dbms::CDbApi &objReader) const; + QString queryGetGroupDescription(const QString &tagName, iot_dbms::CDbApi &objReader) const; QString queryGetCollumnDevInfoTagName(const QString &measureType, const QString &valueType, - const QString &groupTagName, kbd_dbms::CDbApi &objReader) const; - QString queryGetDevInfoTagName(const QString &valueType, const QString &groupTagName, kbd_dbms::CDbApi &objReader) const; - QString queryGetAnalogTagName(const QString &valueType, const QString &deviceName, kbd_dbms::CDbApi &objReader) const; - QString queryGetDevInfoDescription(const QString &deviceTagName, kbd_dbms::CDbApi &objReader) const; + const QString &groupTagName, iot_dbms::CDbApi &objReader) const; + QString queryGetDevInfoTagName(const QString &valueType, const QString &groupTagName, iot_dbms::CDbApi &objReader) const; + QString queryGetAnalogTagName(const QString &valueType, const QString &deviceName, iot_dbms::CDbApi &objReader) const; + QString queryGetDevInfoDescription(const QString &deviceTagName, iot_dbms::CDbApi &objReader) const; private: - kbd_service::CDpcdaForApp *m_pDpcdaForApp; + iot_service::CDpcdaForApp *m_pDpcdaForApp; QTableView * m_pTableView; CRealTableModel * m_pTableModel; bool m_isEditMode; diff --git a/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.cpp b/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.cpp index 4a16bfd9..19edfa72 100644 --- a/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.cpp +++ b/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.cpp @@ -47,7 +47,7 @@ void CRealDataCollect::initMsg() { if(m_pMbComm == NULL) { - m_pMbComm = new kbd_net::CMbCommunicator("DevSpePointWidget"); + m_pMbComm = new iot_net::CMbCommunicator("DevSpePointWidget"); } } @@ -64,7 +64,7 @@ void CRealDataCollect::clearMsg() { if(m_pMbComm) { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while(m_pMbComm->recvMsg(objMsg, 0)) {} } @@ -105,14 +105,14 @@ void CRealDataCollect::recvMessage() try { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; for(int i = 0; i < 6; i++) { if(m_pMbComm->recvMsg(objMsg, 0)) { if(objMsg.isValid()) { - if(objMsg.getMsgType() != kbd_idlfile::MT_DP_CHANGE_DATA) + if(objMsg.getMsgType() != iot_idl::MT_DP_CHANGE_DATA) { continue; } @@ -158,16 +158,16 @@ void CRealDataCollect::processChangeData() } } -int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) +int CRealDataCollect::parserMsg(const iot_net::CMbMessage &msg) { - kbd_idlfile::SRealTimeDataPkg changeDataPackage; + iot_idl::SRealTimeDataPkg changeDataPackage; try { changeDataPackage.ParseFromArray(msg.getDataPtr(),(int)msg.getDataSize()); int aiSize = changeDataPackage.stairtd_size(); if(aiSize > 0) { - kbd_idlfile::SAiRealTimeData aiStru; + iot_idl::SAiRealTimeData aiStru; QString tagName; float value; uint status; @@ -184,7 +184,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int diSize = changeDataPackage.stdirtd_size(); if(diSize > 0) { - kbd_idlfile::SDiRealTimeData diStu; + iot_idl::SDiRealTimeData diStu; QString tagName; int value; uint status; @@ -201,7 +201,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int piSize = changeDataPackage.stpirtd_size(); if(piSize > 0) { - kbd_idlfile::SPiRealTimeData piStu; + iot_idl::SPiRealTimeData piStu; QString tagName; double value; uint status; @@ -218,7 +218,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int miSize = changeDataPackage.stmirtd_size(); if(miSize > 0) { - kbd_idlfile::SMiRealTimeData miStu; + iot_idl::SMiRealTimeData miStu; QString tagName; int value; uint status; diff --git a/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.h b/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.h index c2c036bb..8b0c5dba 100644 --- a/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.h +++ b/product/src/gui/plugin/DevSpePointWidget/CRealDataCollect.h @@ -25,7 +25,7 @@ private: bool addSub(); bool delSub(); - int parserMsg(const kbd_net::CMbMessage &); + int parserMsg(const iot_net::CMbMessage &); private slots: void recvMessage(); @@ -38,7 +38,7 @@ signals: void signal_updateMi(QMap> miMap); private: - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; QTimer * m_pTimer; int m_nTimeCount; QMap> m_aiMap; diff --git a/product/src/gui/plugin/DevSpePointWidget/CRealTableModel.cpp b/product/src/gui/plugin/DevSpePointWidget/CRealTableModel.cpp index ff08b9ea..21730806 100644 --- a/product/src/gui/plugin/DevSpePointWidget/CRealTableModel.cpp +++ b/product/src/gui/plugin/DevSpePointWidget/CRealTableModel.cpp @@ -143,34 +143,34 @@ QVariant CRealTableModel::data(const QModelIndex &index, int role) const QString CRealTableModel::getStateTextNameByValue(const QString &textName, const int &value) const { - kbd_dbms::CRdbAccess objRtdbAccss; + iot_dbms::CRdbAccess objRtdbAccss; QString ret = QString::number(value); if(objRtdbAccss.open("base", "dict_state_text_info")) { - kbd_dbms::CONDINFO condition1; + iot_dbms::CONDINFO condition1; memcpy(condition1.name, "state_text_name", strlen("state_text_name")); condition1.logicalop = ATTRCOND_AND; condition1.relationop = ATTRCOND_EQU; condition1.conditionval = textName.toStdString().c_str(); - kbd_dbms::CONDINFO condition2; + iot_dbms::CONDINFO condition2; memcpy(condition2.name, "actual_value", strlen("actual_value")); condition2.logicalop = ATTRCOND_AND; condition2.relationop = ATTRCOND_EQU; condition2.conditionval = value; - std::vector vecCondInfo; + std::vector vecCondInfo; vecCondInfo.push_back(condition1); vecCondInfo.push_back(condition2); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("display_value"); if(objRtdbAccss.select(vecCondInfo, result, columns)) { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType value; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, value); ret = QString::fromStdString(value.toStdString()); } diff --git a/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h b/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h index cc2defe5..8e6cd5aa 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h +++ b/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h @@ -9,14 +9,14 @@ static QString getRootPath() { - std::string strCurModuleDir = kbd_public::CFileUtil::getCurModuleDir(); + std::string strCurModuleDir = iot_public::CFileUtil::getCurModuleDir(); strCurModuleDir += "../../data/PcpmsDocManage"; return QString::fromStdString(strCurModuleDir); } static bool checkDeletePerm() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { return false; diff --git a/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp b/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp index 94e1fdda..0df7a921 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp +++ b/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp @@ -36,7 +36,7 @@ CDocumentManageWidget::~CDocumentManageWidget() void CDocumentManageWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -45,7 +45,7 @@ void CDocumentManageWidget::initStyle() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("documentManage.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("documentManage.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/EventWidget/CAccidentReviewDialog.cpp b/product/src/gui/plugin/EventWidget/CAccidentReviewDialog.cpp index 62e8c97a..430d4f7a 100644 --- a/product/src/gui/plugin/EventWidget/CAccidentReviewDialog.cpp +++ b/product/src/gui/plugin/EventWidget/CAccidentReviewDialog.cpp @@ -58,7 +58,7 @@ void CAccidentReviewDialog::initView() void CAccidentReviewDialog::initTree() { QMap>> m_mapNav; - readNavJson(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + readNavJson(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/NavigationWidget.json"), m_mapNav); QList> nodeList = m_mapNav.value(-1); for(int nIndex=0; nIndexopen("base", "alarm_level_define"); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); m_pTimer = new QTimer(); m_pTimer->setInterval(1000); connect(m_pTimer, &QTimer::timeout, this, &CEventDataCollect::slotUpdateEvent); @@ -45,8 +45,8 @@ CEventDataCollect::CEventDataCollect() int CEventDataCollect::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); + iot_dbms::CVarType value; m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } @@ -79,12 +79,12 @@ CEventDataCollect::~CEventDataCollect() bool CEventDataCollect::initialize() { m_pTimer->start(); - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; spSysInfo->getLocalNodeInfo(stNodeInfo); - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(stNodeInfo.nLocationId, stLocationInfo); m_nLocationID = stNodeInfo.nLocationId; } @@ -258,7 +258,7 @@ QList CEventDataCollect::getDevGroupTagList() void CEventDataCollect::loadPermInfo() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -287,8 +287,8 @@ void CEventDataCollect::loadPriorityDescription() m_priorityDescriptionMap.clear(); if(m_rtdbAccess->open("base", "alarm_level_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("priority_id"); columns.push_back("priority_name"); @@ -297,8 +297,8 @@ void CEventDataCollect::loadPriorityDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_priorityDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -313,8 +313,8 @@ void CEventDataCollect::loadSubSystemDescription() if(m_rtdbAccess->open("base", "sys_model_sub_system_info")) { LOGERROR("open sys_model_sub_system_info success"); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("sub_system_id"); columns.push_back("description"); @@ -325,8 +325,8 @@ void CEventDataCollect::loadSubSystemDescription() LOGERROR(QString::number( result.getRecordCount()).toStdString().c_str()); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_subSystemDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -344,8 +344,8 @@ void CEventDataCollect::loadLocationDescription() { m_locationDescriptionMap.clear(); m_locationOrderList.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("tag_name"); @@ -358,11 +358,11 @@ void CEventDataCollect::loadLocationDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType area_id; - kbd_dbms::CVarType tag_name; - kbd_dbms::CVarType description; - kbd_dbms::CVarType area_type; - kbd_dbms::CVarType parea_id; + iot_dbms::CVarType area_id; + iot_dbms::CVarType tag_name; + iot_dbms::CVarType description; + iot_dbms::CVarType area_type; + iot_dbms::CVarType parea_id; result.getColumnValue(nIndex, 0, area_id); result.getColumnValue(nIndex, 1, tag_name); result.getColumnValue(nIndex, 2, description); @@ -431,8 +431,8 @@ void CEventDataCollect::loadRegionInfoDescription() m_regionInfoDescriptionMap.clear(); if(m_rtdbAccess->open("base", "region_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("region_id"); columns.push_back("description"); @@ -441,8 +441,8 @@ void CEventDataCollect::loadRegionInfoDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermRegionId.contains(key.toInt())) @@ -459,8 +459,8 @@ void CEventDataCollect::loadAlarmTypeDescription() m_alarmTypeDescriptionMap.clear(); if(m_rtdbAccess->open("base", "alarm_type_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("type_id"); columns.push_back("type_name"); @@ -469,8 +469,8 @@ void CEventDataCollect::loadAlarmTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -484,8 +484,8 @@ void CEventDataCollect::loadDeviceTypeDescription() m_deviceTypeDescriptionMap.clear(); if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("dev_type_id"); columns.push_back("description"); @@ -494,8 +494,8 @@ void CEventDataCollect::loadDeviceTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -509,8 +509,8 @@ void CEventDataCollect::loadAlarmStatusDescription() m_alarmStatusMap.clear(); if(m_rtdbAccess->open("base", "alarm_status_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("status_value"); columns.push_back("display_name"); @@ -519,8 +519,8 @@ void CEventDataCollect::loadAlarmStatusDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmStatusMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -534,8 +534,8 @@ void CEventDataCollect::loadUserName() m_userNameMap.clear(); if(m_rtdbAccess->open("base", "rm_user_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("perm_id"); columns.push_back("perm_name"); @@ -544,8 +544,8 @@ void CEventDataCollect::loadUserName() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_userNameMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -556,7 +556,7 @@ void CEventDataCollect::loadUserName() void CEventDataCollect::loadEventShowStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -592,7 +592,7 @@ void CEventDataCollect::loadEventShowStatusDescription() void CEventDataCollect::loadEventOtherStatusDescription() { m_eventOtherStatusMap.clear(); - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -624,8 +624,8 @@ void CEventDataCollect::loadDeviceGroupDescription() if(m_rtdbAccess->open("base", "dev_group")) { m_deviceGroupDescriptionMap.clear(); - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("tag_name"); columns.push_back("description"); @@ -634,8 +634,8 @@ void CEventDataCollect::loadDeviceGroupDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceGroupDescriptionMap[QString::fromStdString(key.toStdString())] = QString::fromStdString(value.toStdString()); @@ -703,7 +703,7 @@ void CEventDataCollect::slotUpdateEvent() emit sigDevTreeUpdate(); } -void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt) +void CEventDataCollect::handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt) { QMutexLocker locker(msgMutex); LOGINFO("-------------------------handleAllEvtMsg-------------------------"); @@ -711,7 +711,7 @@ void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEv removeCache(nDomainID); for(int nAddMsgIndex(0); nAddMsgIndex < objAllEvt.evt_info_size(); nAddMsgIndex++) { - kbd_idlfile::SEvtInfoToEvtClt msg = objAllEvt.evt_info(nAddMsgIndex); + iot_idl::SEvtInfoToEvtClt msg = objAllEvt.evt_info(nAddMsgIndex); EventMsgPtr event(new CEventMsgInfo()); event->initialize(msg); event->priorityOrder = queryPriorityOrder(event->priority); @@ -730,13 +730,13 @@ void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEv emit sigDevTreeUpdate(); } -void CEventDataCollect::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) +void CEventDataCollect::handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt) { QMutexLocker locker(msgMutex); LOGINFO("-------------------------handleAddEvtMsg-------------------------"); for(int nAddMsgIndex(0); nAddMsgIndex < objAddEvt.evt_info_size(); nAddMsgIndex++) { - kbd_idlfile::SEvtInfoToEvtClt msg = objAddEvt.evt_info(nAddMsgIndex); + iot_idl::SEvtInfoToEvtClt msg = objAddEvt.evt_info(nAddMsgIndex); EventMsgPtr event(new CEventMsgInfo()); event->initialize(msg); event->priorityOrder = queryPriorityOrder(event->priority); @@ -750,7 +750,7 @@ void CEventDataCollect::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) emit sigEventStateChanged(); } -void CEventDataCollect::handleLinkWave2EvtMsg(kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Evt) +void CEventDataCollect::handleLinkWave2EvtMsg(iot_idl::SAlmCltLinkWave2Alm &objWave2Evt) { QMutexLocker locker(msgMutex); QList uuidList; diff --git a/product/src/gui/plugin/EventWidget/CEventDataCollect.h b/product/src/gui/plugin/EventWidget/CEventDataCollect.h index 608801d4..8368d07f 100644 --- a/product/src/gui/plugin/EventWidget/CEventDataCollect.h +++ b/product/src/gui/plugin/EventWidget/CEventDataCollect.h @@ -14,7 +14,7 @@ #define FUNC_SPE_EVENT_VIEW ("FUNC_SPE_EVENT_VIEW") const int OTHERSTATUS = 9999; -class CEventDataCollect : public QObject, public kbd_service::CAlmApiForEvtClt +class CEventDataCollect : public QObject, public iot_service::CAlmApiForEvtClt { Q_OBJECT public: @@ -67,11 +67,11 @@ public: QMap eventShowStatusDescriptionMap(); QMap eventOtherStatusDescriptionMap(); - virtual void handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt); + virtual void handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt); - virtual void handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt); + virtual void handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt); - virtual void handleLinkWave2EvtMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Evt); + virtual void handleLinkWave2EvtMsg( iot_idl::SAlmCltLinkWave2Alm &objWave2Evt); void handleClearRTEvent(); @@ -124,8 +124,8 @@ private: QTimer * m_pTimer; int m_nLocationID; QList m_listEventCache; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; QList m_listPermLocationId; QList m_listPermRegionId; QMap m_priorityOrderMap; diff --git a/product/src/gui/plugin/EventWidget/CEventDelegate.cpp b/product/src/gui/plugin/EventWidget/CEventDelegate.cpp index de761cdf..3de1161c 100644 --- a/product/src/gui/plugin/EventWidget/CEventDelegate.cpp +++ b/product/src/gui/plugin/EventWidget/CEventDelegate.cpp @@ -104,8 +104,8 @@ void CEventDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option button.rect = option.rect; button.rect.adjust(option.rect.width() - 40-40-40, option.rect.height()/2-10, -12-40-40, -(option.rect.height()/2-10)); - std::string style = kbd_public::CFileStyle::getCurStyle(); - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); button.iconSize = QSize(button.rect.width()+2,button.rect.height()+2); button.icon = QIcon(file); button.features = QStyleOptionButton::Flat; @@ -169,8 +169,8 @@ void CEventDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option button.rect = option.rect; button.rect.adjust(option.rect.width() - 40-40-40, option.rect.height()/2-10, -12-40-40, -(option.rect.height()/2-10)); - std::string style = kbd_public::CFileStyle::getCurStyle(); - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); button.iconSize = QSize(button.rect.width()+2,button.rect.height()+2); button.icon = QIcon(file); button.features = QStyleOptionButton::Flat; @@ -211,8 +211,8 @@ bool CEventDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const wave = QString("%1%2%3").arg("\"").arg(wave).arg("\""); LOGINFO("录波文件为:%s",wave.toStdString().c_str()); - const std::string strProc = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("WaveAnalyze") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("WaveAnalyze") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) LOGERROR("未找到可执行文件WaveAnalyze"); else @@ -242,8 +242,8 @@ bool CEventDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const wave = QString("%1%2%3").arg("\"").arg(wave).arg("\""); LOGINFO("录波文件为:%s",wave.toStdString().c_str()); - const std::string strProc = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("WaveAnalyze") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("WaveAnalyze") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) LOGERROR("未找到可执行文件WaveAnalyze"); else @@ -256,7 +256,7 @@ bool CEventDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const } void CEventDelegate::loadColorConfig() { - QString filePath = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); + QString filePath = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); QDomDocument document; QFile file(filePath); if (!file.open(QIODevice::ReadOnly)) diff --git a/product/src/gui/plugin/EventWidget/CEventFilterDialog.cpp b/product/src/gui/plugin/EventWidget/CEventFilterDialog.cpp index d8046905..42e41e5c 100644 --- a/product/src/gui/plugin/EventWidget/CEventFilterDialog.cpp +++ b/product/src/gui/plugin/EventWidget/CEventFilterDialog.cpp @@ -52,7 +52,7 @@ CEventFilterDialog::~CEventFilterDialog() void CEventFilterDialog::initialize(E_ALARM_VIEW view) { m_view=view; - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); ui->level->setSelectionMode(QAbstractItemView::MultiSelection); //ui->location->setSelectionMode(QAbstractItemView::MultiSelection); ui->region->setSelectionMode(QAbstractItemView::MultiSelection); @@ -140,12 +140,12 @@ void CEventFilterDialog::initialize(E_ALARM_VIEW view) ui->type->addItem(CEventDataCollect::instance()->eventShowStatusDescription(alarmStatus)); } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(info.nId <= CN_AppId_COMAPP) { @@ -696,12 +696,12 @@ void CEventFilterDialog::slot_updateCheckTypeState() void CEventFilterDialog::slot_updateDevice(const QString &subSystem) { int nSubSystemId = -1; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(subSystem.toStdString() == info.strDesc) { @@ -711,34 +711,34 @@ void CEventFilterDialog::slot_updateDevice(const QString &subSystem) } ui->deviceType->clear(); - QList values; + QList values; if(nSubSystemId != -1) { - kbd_dbms::CVarType subSystemId = nSubSystemId; + iot_dbms::CVarType subSystemId = nSubSystemId; if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CONDINFO condition; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CONDINFO condition; condition.relationop = ATTRCOND_EQU; memcpy(condition.name, "sub_system",strlen("sub_system")); condition.conditionval = subSystemId; std::vector columns; columns.push_back("description"); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; if(m_rtdbAccess->select(condition, result, columns)) { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType value; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, value); values.append(value); } } } } - foreach (kbd_dbms::CVarType value, values) + foreach (iot_dbms::CVarType value, values) { ui->deviceType->addItem(value.c_str()); } diff --git a/product/src/gui/plugin/EventWidget/CEventFilterDialog.h b/product/src/gui/plugin/EventWidget/CEventFilterDialog.h index afeb0fcc..c0997e9d 100644 --- a/product/src/gui/plugin/EventWidget/CEventFilterDialog.h +++ b/product/src/gui/plugin/EventWidget/CEventFilterDialog.h @@ -91,7 +91,7 @@ private: private: Ui::CEventFilterDialog *ui; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_areaInfoMap; //区域信息 diff --git a/product/src/gui/plugin/EventWidget/CEventForm.cpp b/product/src/gui/plugin/EventWidget/CEventForm.cpp index 605dce46..5d846916 100644 --- a/product/src/gui/plugin/EventWidget/CEventForm.cpp +++ b/product/src/gui/plugin/EventWidget/CEventForm.cpp @@ -77,7 +77,7 @@ CEventForm::CEventForm(QWidget *parent, bool editMode) : connect(ui->closeBtn, &QPushButton::clicked, this, &CEventForm::closeBtnClicked); } QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -87,7 +87,7 @@ CEventForm::CEventForm(QWidget *parent, bool editMode) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("event.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("event.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -1413,7 +1413,7 @@ void CEventForm::loadDeviceGroupFilterWidget() return; } - kbd_dbms::CDbApi objReader(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReader(DB_CONN_MODEL_READ); if(!objReader.open()) { LOGERROR("load deviceGroup info error, database open failed, %s", objReader.getLastErrorString().toStdString().c_str()); diff --git a/product/src/gui/plugin/EventWidget/CEventHisThread.cpp b/product/src/gui/plugin/EventWidget/CEventHisThread.cpp index 1fe91269..2f6ca25a 100644 --- a/product/src/gui/plugin/EventWidget/CEventHisThread.cpp +++ b/product/src/gui/plugin/EventWidget/CEventHisThread.cpp @@ -24,20 +24,20 @@ CEventHisThread::~CEventHisThread() void CEventHisThread::init() { - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_HIS_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_HIS_READ); if(!m_pReadDb->open()) { LOGERROR("打开数据库失败,error:%s",m_pReadDb->getLastErrorString().toStdString().c_str()); } - m_rtdbPriorityOrderAccess = new kbd_dbms::CRdbAccess(); + m_rtdbPriorityOrderAccess = new iot_dbms::CRdbAccess(); m_rtdbPriorityOrderAccess->open("base", "alarm_level_define"); } int CEventHisThread::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); + iot_dbms::CVarType value; m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } @@ -243,7 +243,7 @@ QString CEventHisThread::buildConditionPartStatus() QString CEventHisThread::buildConditionPartLocation() { QList locationFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -292,7 +292,7 @@ QString CEventHisThread::buildConditionPartLocation() QString CEventHisThread::buildConditionPartRegion() { QList regionFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/EventWidget/CEventHisThread.h b/product/src/gui/plugin/EventWidget/CEventHisThread.h index e2856cff..0f495ec4 100644 --- a/product/src/gui/plugin/EventWidget/CEventHisThread.h +++ b/product/src/gui/plugin/EventWidget/CEventHisThread.h @@ -42,8 +42,8 @@ signals: void sigUpdateHisEvent(QList eventSet); private: - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; ST_FILTER m_stFilter; }; diff --git a/product/src/gui/plugin/EventWidget/CEventHistoryModel.cpp b/product/src/gui/plugin/EventWidget/CEventHistoryModel.cpp index f4a237d6..22b1c010 100644 --- a/product/src/gui/plugin/EventWidget/CEventHistoryModel.cpp +++ b/product/src/gui/plugin/EventWidget/CEventHistoryModel.cpp @@ -73,7 +73,7 @@ void CEventHistoryModel::initFilter() void CEventHistoryModel::loadEventHistoryData() { //< 权限判断 - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -140,10 +140,10 @@ QString CEventHistoryModel::bulidCondition() //LOGDEBUG("bulidConditionPartStatus():[%s]",status.toStdString().c_str()); //< 车站 - // kbd_public::SNodeInfo stNodeInfo; - // kbd_public::SLocationInfo stLocationInfo; - // kbd_public::CSysInfoInterfacePtr spSysInfo; - // if (kbd_public::createSysInfoInstance(spSysInfo)) + // iot_public::SNodeInfo stNodeInfo; + // iot_public::SLocationInfo stLocationInfo; + // iot_public::CSysInfoInterfacePtr spSysInfo; + // if (iot_public::createSysInfoInstance(spSysInfo)) // { // spSysInfo->getLocalNodeInfo(stNodeInfo); // spSysInfo->getLocationInfoById(stNodeInfo.nLocationId, stLocationInfo); @@ -273,7 +273,7 @@ QString CEventHistoryModel::buildConditionParaReturnStatus() QString CEventHistoryModel::bulidConditionPartLocation() { QList locationFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -324,7 +324,7 @@ QString CEventHistoryModel::bulidConditionPartLocation() QString CEventHistoryModel::bulidConditionPartRegion() { QList regionFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/EventWidget/CEventMsgInfo.cpp b/product/src/gui/plugin/EventWidget/CEventMsgInfo.cpp index 97e49744..f40b69e8 100644 --- a/product/src/gui/plugin/EventWidget/CEventMsgInfo.cpp +++ b/product/src/gui/plugin/EventWidget/CEventMsgInfo.cpp @@ -47,7 +47,7 @@ CEventMsgInfo::CEventMsgInfo(const CEventMsgInfo &other): alm_status(0), cfm_use dev_group_tag = other.dev_group_tag; } -void CEventMsgInfo::initialize(const kbd_idlfile::SEvtInfoToEvtClt &eventInfo) +void CEventMsgInfo::initialize(const iot_idl::SEvtInfoToEvtClt &eventInfo) { alm_type = eventInfo.alm_type(); E_ALARM_LOGICSTATE logic = (E_ALARM_LOGICSTATE)eventInfo.logic_state(); diff --git a/product/src/gui/plugin/EventWidget/CEventMsgInfo.h b/product/src/gui/plugin/EventWidget/CEventMsgInfo.h index 497723ca..8463f4e9 100644 --- a/product/src/gui/plugin/EventWidget/CEventMsgInfo.h +++ b/product/src/gui/plugin/EventWidget/CEventMsgInfo.h @@ -134,7 +134,7 @@ class CEventMsgInfo public: CEventMsgInfo(); CEventMsgInfo(const CEventMsgInfo &other); - void initialize(const kbd_idlfile::SEvtInfoToEvtClt &eventInfo); + void initialize(const iot_idl::SEvtInfoToEvtClt &eventInfo); bool lessThan(EventMsgPtr info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); bool moreThan(EventMsgPtr info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); bool operator==(const EventMsgPtr &target); diff --git a/product/src/gui/plugin/EventWidget/main.cpp b/product/src/gui/plugin/EventWidget/main.cpp index 172ebbd5..45528df9 100644 --- a/product/src/gui/plugin/EventWidget/main.cpp +++ b/product/src/gui/plugin/EventWidget/main.cpp @@ -11,16 +11,16 @@ int main(int argc, char *argv[]) //<初始化消息总线 - //kbd_public::StartLogSystem(NULL, "HMI", "Alarm_Client"); - kbd_public::StartLogSystem(NULL, "HMI"); - kbd_net::initMsgBus("Event_Client", "1", true); + //iot_public::StartLogSystem(NULL, "HMI", "Alarm_Client"); + iot_public::StartLogSystem(NULL, "HMI"); + iot_net::initMsgBus("Event_Client", "1", true); - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); permMngPtr->PermDllInit(); if(permMngPtr->SysLogin("admin", "kbdct", 1, 12*60*60, "hmi") != 0) { - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return -1; } // CEventPlugin p; @@ -35,8 +35,8 @@ int main(int argc, char *argv[]) //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp index 57359537..27800ac0 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp +++ b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp @@ -11,9 +11,9 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "dbms/db_api_ex/CDbApi.h" -using namespace kbd_dbms; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_dbms; +using namespace iot_public; +using namespace iot_service; CFaultRecallRecordWidget::CFaultRecallRecordWidget(bool editMode, QWidget *parent) : QWidget(parent), @@ -48,7 +48,7 @@ CFaultRecallRecordWidget::~CFaultRecallRecordWidget() void CFaultRecallRecordWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -57,7 +57,7 @@ void CFaultRecallRecordWidget::initStyleSheet() qssfile1.close(); } -// strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; +// strFullPath = iot_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; // QFile qssfile2(QString::fromStdString(strFullPath)); // qssfile2.open(QFile::ReadOnly); // if (qssfile2.isOpen()) @@ -80,7 +80,7 @@ void CFaultRecallRecordWidget::initView() ui->m_treeWidget->setColumnHidden(4,true); } -void CFaultRecallRecordWidget::refeshTree(kbd_dbms::CDbApi* dbifs) +void CFaultRecallRecordWidget::refeshTree(iot_dbms::CDbApi* dbifs) { mItemDataVec.clear(); QSqlQuery query; @@ -123,7 +123,7 @@ bool CFaultRecallRecordWidget::initViewData() { initDateTimeEdit(); - kbd_dbms::CDbApi * pReadDb = new CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi * pReadDb = new CDbApi(DB_CONN_MODEL_READ); if(! pReadDb->open()) { delete pReadDb; @@ -141,7 +141,7 @@ bool CFaultRecallRecordWidget::initViewData() return true; } -void CFaultRecallRecordWidget::readLocationArray(kbd_dbms::CDbApi* dbifs) +void CFaultRecallRecordWidget::readLocationArray(iot_dbms::CDbApi* dbifs) { ui->locationCkb->clear(); @@ -248,7 +248,7 @@ void CFaultRecallRecordWidget::slotDelBtn() return; } - kbd_dbms::CDbApi * pWriteDb = new CDbApi(DB_CONN_MODEL_WRITE); + iot_dbms::CDbApi * pWriteDb = new CDbApi(DB_CONN_MODEL_WRITE); if(! pWriteDb->open()) { slotShowMess(tr("打开数据库失败。")); @@ -313,7 +313,7 @@ void CFaultRecallRecordWidget::slotClearBtn() return; } - kbd_dbms::CDbApi * pWriteDb = new CDbApi(DB_CONN_MODEL_WRITE); + iot_dbms::CDbApi * pWriteDb = new CDbApi(DB_CONN_MODEL_WRITE); if(! pWriteDb->open()) { slotShowMess(tr("打开数据库失败。")); @@ -340,7 +340,7 @@ void CFaultRecallRecordWidget::slotClearBtn() void CFaultRecallRecordWidget::slotRefreshBtn() { - kbd_dbms::CDbApi * pReadDb = new CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi * pReadDb = new CDbApi(DB_CONN_MODEL_READ); if(! pReadDb->open()) { delete pReadDb; diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h index 686f709e..b8bc4908 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h +++ b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h @@ -37,11 +37,11 @@ public: private: void initStyleSheet(); void initView(); - void refeshTree(kbd_dbms::CDbApi* dbifs); + void refeshTree(iot_dbms::CDbApi* dbifs); bool checkUserPerm(); bool initViewData(); - void readLocationArray( kbd_dbms::CDbApi* dbifs); + void readLocationArray( iot_dbms::CDbApi* dbifs); void initDateTimeEdit(); QString getLocationDesc(int locationId); diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp b/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp index 4913c398..482b78d5 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp +++ b/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp @@ -8,12 +8,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); -// kbd_public::StartLogSystem("HMI", "hmi"); -// if (!(kbd_net::initMsgBus("HMI", "HMI"))) +// iot_public::StartLogSystem("HMI", "hmi"); +// if (!(iot_net::initMsgBus("HMI", "HMI"))) // { // return -1; // } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 -// kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); +// iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp index 1181107a..0536a68b 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp @@ -16,7 +16,7 @@ #include "db_api_ex/CDbApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; bool timeCompare(const SFaultRecordInfoPtr p1, const SFaultRecordInfoPtr p2) { return p1->time > p2->time; @@ -31,7 +31,7 @@ FaultRecordWidget::FaultRecordWidget(bool editMode, QWidget *parent) : ui(new Ui::FaultRecordWidget) { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -41,7 +41,7 @@ FaultRecordWidget::FaultRecordWidget(bool editMode, QWidget *parent) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("faultRecord.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("faultRecord.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -347,9 +347,9 @@ void FaultRecordWidget::initModelUi() void FaultRecordWidget::updateDeleteOperatePerm() { - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败！"); return; @@ -357,7 +357,7 @@ void FaultRecordWidget::updateDeleteOperatePerm() spSysInfo->getLocalNodeInfo(stNodeInfo); m_nodeName = stNodeInfo.strName; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -457,8 +457,8 @@ void FaultRecordWidget::open() path = QString("%1%2%3").arg("\"").arg(path).arg("\""); LOGINFO("录波文件为:%s",path.toStdString().c_str()); - const std::string strProc = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("WaveAnalyze") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("WaveAnalyze") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) LOGERROR("未找到可执行文件WaveAnalyze"); else diff --git a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h index e6148435..7bfa6b9d 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h @@ -95,7 +95,7 @@ private: std::string m_nodeName; E_Fault_Mode m_mode; bool m_edit; - kbd_sys::FilesyncApi m_fileApi; + iot_sys::FilesyncApi m_fileApi; QList m_locDescList; QList m_devDescList; }; diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp index d1ecccd8..3e6beb8c 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp @@ -10,9 +10,9 @@ #include "pub_logger_api/logger.h" #include "pub_sysinfo_api/SysInfoApi.h" -using namespace kbd_dbms; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_dbms; +using namespace iot_public; +using namespace iot_service; CHangPanelWidget::CHangPanelWidget(bool editMode, QWidget *parent) : QWidget(parent), @@ -92,7 +92,7 @@ void CHangPanelWidget::setTagType(int actual) void CHangPanelWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -371,7 +371,7 @@ void CHangPanelWidget::updateCount() bool CHangPanelWidget::permCheck(int location, int region) { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); QString mess; if(permMngPtr != NULL) { @@ -424,7 +424,7 @@ void CHangPanelWidget::initMsg() { if(m_communicator == Q_NULLPTR) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); } } @@ -602,7 +602,7 @@ bool CHangPanelWidget::cancelItemHangePanel(const QString &desc, const QString & void CHangPanelWidget::removeHangInfo(const SHangPanelInfo &info) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setMsgType(MT_OPT_COMMON_DOWN); msg.setSubject(info.subSystem, CH_HMI_TO_OPT_OPTCMD_DOWN); STokenSet sOptHangSet; diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h index ce3cf1bf..52f5dd95 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h @@ -94,10 +94,10 @@ signals: private: Ui::CHangPanelWidget *ui; - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; - kbd_net::CMbCommunicator *m_communicator; - kbd_public::CSysInfoInterfacePtr m_pSysInfo; + iot_net::CMbCommunicator *m_communicator; + iot_public::CSysInfoInterfacePtr m_pSysInfo; QMap m_locMap; QList m_locOrder; QMap m_subMap; diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp index 42223e63..f39b1662 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp @@ -2,7 +2,7 @@ #include "Common.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CHangPanelWork::CHangPanelWork(QObject *parent) : QObject(parent) { m_pReadDb = new CDbApi(DB_CONN_MODEL_READ); @@ -74,7 +74,7 @@ void CHangPanelWork::slotSearch(int domainId, int appid) bool CHangPanelWork::readHangPanelInfo() { m_listHangPanel.clear(); - kbd_idlfile::RdbRet objRdbRet; + iot_idl::RdbRet objRdbRet; bool bRet = false; std::vector vecColumn = {"key_id_tag","token_id","opt_time","location_id","sub_system","device","host_name","user_name","user_group","note"}; diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.h b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.h index 4f1b9e0d..73fd7a5c 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.h +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.h @@ -51,8 +51,8 @@ private: private: - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbNetApi m_objRdbNetApi; //< 网络查询对象 + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbNetApi m_objRdbNetApi; //< 网络查询对象 QList m_listHangPanel; QMap m_mapDeviceInfo; diff --git a/product/src/gui/plugin/HangPanelWidget/main.cpp b/product/src/gui/plugin/HangPanelWidget/main.cpp index c59508f4..08a7e14e 100644 --- a/product/src/gui/plugin/HangPanelWidget/main.cpp +++ b/product/src/gui/plugin/HangPanelWidget/main.cpp @@ -8,12 +8,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("HMI", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("HMI", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp b/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp index c289bb78..bac7c931 100644 --- a/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp @@ -15,7 +15,7 @@ CHmiRollWidget::CHmiRollWidget(bool editMode, QVector ptrVec, QWidget *p { Q_UNUSED(ptrVec) QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -25,7 +25,7 @@ CHmiRollWidget::CHmiRollWidget(bool editMode, QVector ptrVec, QWidget *p qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("hmiRoll.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("hmiRoll.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp index d7d0cdb5..73b348d6 100644 --- a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp +++ b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp @@ -47,7 +47,7 @@ void CBrowserWidget::init() QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); m_pView = new QWebEngineView(this); m_pView->settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false); m_pView->page()->profile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies); @@ -97,10 +97,10 @@ void CBrowserWidget::setNicAddr(int appId) std::string ipAddr2 = ""; std::string node1 = ""; std::string node2 = ""; - std::vector> vector = getRunRedundancyInfoByAppid(appId); + std::vector> vector = getRunRedundancyInfoByAppid(appId); for(size_t i=0; i vec = vector.at(i); + std::vector vec = vector.at(i); std::string node_name = vec.at(0).toStdString(); int is_active = vec.at(1).toInt(); int is_master = vec.at(2).toInt(); @@ -166,21 +166,21 @@ std::string CBrowserWidget::getAnotherIp(const std::string &node) return ret; } -std::vector> CBrowserWidget::getRunRedundancyInfoByAppid(int appId) +std::vector> CBrowserWidget::getRunRedundancyInfoByAppid(int appId) { - std::vector> vector; + std::vector> vector; if(m_rtdbAccess->open("base", "sys_run_redundancy_info")) { - kbd_dbms::CONDINFO condition; + iot_dbms::CONDINFO condition; memcpy(condition.name, "app_id", strlen("app_id")); condition.logicalop = ATTRCOND_AND; condition.relationop = ATTRCOND_EQU; condition.conditionval = appId; - std::vector vecCondInfo; + std::vector vecCondInfo; vecCondInfo.push_back(condition); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("node_name"); columns.push_back("is_active"); @@ -195,15 +195,15 @@ std::vector> CBrowserWidget::getRunRedundancyInf { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - std::vector temp; - kbd_dbms::CVarType node_name; - kbd_dbms::CVarType is_active; - kbd_dbms::CVarType is_master; - kbd_dbms::CVarType is_slave; - kbd_dbms::CVarType ip1; - kbd_dbms::CVarType ip1_active; - kbd_dbms::CVarType ip2; - kbd_dbms::CVarType ip2_active; + std::vector temp; + iot_dbms::CVarType node_name; + iot_dbms::CVarType is_active; + iot_dbms::CVarType is_master; + iot_dbms::CVarType is_slave; + iot_dbms::CVarType ip1; + iot_dbms::CVarType ip1_active; + iot_dbms::CVarType ip2; + iot_dbms::CVarType ip2_active; result.getColumnValue(nIndex, 0, node_name); result.getColumnValue(nIndex, 1, is_active); result.getColumnValue(nIndex, 2, is_master); @@ -260,7 +260,7 @@ void CBrowserWidget::slotLoadFinish(bool ok) if (!ok) { LOGINFO("slotLoadFinish fail!"); - std::string path = kbd_public::CFileUtil::getCurModuleDir(); + std::string path = iot_public::CFileUtil::getCurModuleDir(); m_pView->load(QUrl::fromLocalFile(QString::fromStdString(path)+"../../data/report/FAIL_PAGE.html")); } else diff --git a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h index c9aecc48..7cd6026e 100644 --- a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h +++ b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h @@ -15,7 +15,7 @@ #include #include "dbms/rdb_api/CRdbAccess.h" -using namespace kbd_public; +using namespace iot_public; class CBrowserWidget : public QWidget { Q_OBJECT @@ -33,12 +33,12 @@ private: void initSysInfo(); void setNicAddr(int appId); std::string getAnotherIp(const std::string &node); - std::vector > getRunRedundancyInfoByAppid(int appId); + std::vector > getRunRedundancyInfoByAppid(int appId); void slotLoadFinish(bool ok); private: QWebEngineView *m_pView; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; CSysInfoInterfacePtr m_sysInfoPtr; std::string m_ServerNode[2]; std::string m_ServerAddr[2]; diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp index 3f41c624..e73ae633 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp @@ -3,7 +3,7 @@ #include "CAlarmMsgManage.h" #include #include "CAlarmDataCollect.h" -using namespace kbd_service; +using namespace iot_service; CAiAlarmDataCollect * CAiAlarmDataCollect::m_pInstance = NULL; CAiAlarmDataCollect::CAiAlarmDataCollect() : CIntelliAlmApi4Clt(), @@ -11,7 +11,7 @@ CAiAlarmDataCollect::CAiAlarmDataCollect() m_pAlternateTimer(Q_NULLPTR) { m_rtdbMutex = new QMutex(); - m_rtdbPriorityOrderAccess = new kbd_dbms::CRdbAccess(); + m_rtdbPriorityOrderAccess = new iot_dbms::CRdbAccess(); m_rtdbPriorityOrderAccess->open("base", "alarm_level_define"); } @@ -58,25 +58,25 @@ bool CAiAlarmDataCollect::isFaultRecallState() return m_bFaultRecallState; } -bool CAiAlarmDataCollect::requestDelAlm(kbd_idlfile::SIntelliAlmDel &objDelAlm) +bool CAiAlarmDataCollect::requestDelAlm(iot_idl::SIntelliAlmDel &objDelAlm) { LOGDEBUG("请求删除!"); - return kbd_service::CIntelliAlmApi4Clt::requestDelAlm(objDelAlm); + return iot_service::CIntelliAlmApi4Clt::requestDelAlm(objDelAlm); } -bool CAiAlarmDataCollect::requestSeprAlm(kbd_idlfile::SIntelliAlmSepr &objSeprAlm) +bool CAiAlarmDataCollect::requestSeprAlm(iot_idl::SIntelliAlmSepr &objSeprAlm) { LOGDEBUG("请求分离!"); - return kbd_service::CIntelliAlmApi4Clt::requestSeprAlm(objSeprAlm); + return iot_service::CIntelliAlmApi4Clt::requestSeprAlm(objSeprAlm); } -bool CAiAlarmDataCollect::requestMergeAlm(kbd_idlfile::SIntelliAlmMerge &objMergeAlm) +bool CAiAlarmDataCollect::requestMergeAlm(iot_idl::SIntelliAlmMerge &objMergeAlm) { LOGDEBUG("请求合并!"); - return kbd_service::CIntelliAlmApi4Clt::requestMergeAlm(objMergeAlm); + return iot_service::CIntelliAlmApi4Clt::requestMergeAlm(objMergeAlm); } -void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, kbd_idlfile::SIntelliAlmAdd &objAllAlm) +void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, iot_idl::SIntelliAlmAdd &objAllAlm) { LOGINFO("========== AiAlarmDataCollect handleAllAlmMsg =========="); @@ -87,7 +87,7 @@ void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, kbd_idlfile::SIntelliAl int nAlarmCount = objAllAlm.alm_info_size(); for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SIntelliAlmInfo msg = objAllAlm.alm_info(nAddMsgIndex); + iot_idl::SIntelliAlmInfo msg = objAllAlm.alm_info(nAddMsgIndex); AiAlarmMsgPtr alm(new CAiAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -97,7 +97,7 @@ void CAiAlarmDataCollect::handleAllAlmMsg(int nDomainId, kbd_idlfile::SIntelliAl emit sigMsgRefresh(); } -void CAiAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm) +void CAiAlarmDataCollect::handleAddAlmMsg(iot_idl::SIntelliAlmAdd &objAddAlm) { LOGINFO("========== AiAlarmDataCollect handleAddAlmMsg =========="); QMutexLocker locker(m_rtdbMutex); @@ -105,7 +105,7 @@ void CAiAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm int nAlarmCount = objAddAlm.alm_info_size(); for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SIntelliAlmInfo msg = objAddAlm.alm_info(nAddMsgIndex); + iot_idl::SIntelliAlmInfo msg = objAddAlm.alm_info(nAddMsgIndex); AiAlarmMsgPtr alm(new CAiAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -114,7 +114,7 @@ void CAiAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm LOGDEBUG("AiAlarmDataCollect handleAddAlmMsg():count[%d]",nAlarmCount); } -void CAiAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm) +void CAiAlarmDataCollect::handleDelAlmMsg(iot_idl::SIntelliAlmDel &objDelAlm) { LOGINFO("========== AiAlarmDataCollect handleDelAlmMsg =========="); QMutexLocker locker(m_rtdbMutex); @@ -127,7 +127,7 @@ void CAiAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm } } -void CAiAlarmDataCollect::handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm) +void CAiAlarmDataCollect::handleBrokenAlmMsg(iot_idl::SIntelliAlmBroken &objBrokenAlm) { //先保证能够编译通过 LOGINFO("========== AiAlarmDataCollect handleBrokenAlmMsg =========="); @@ -140,7 +140,7 @@ void CAiAlarmDataCollect::handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &obj } } -void CAiAlarmDataCollect::handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objReleaseAlm) +void CAiAlarmDataCollect::handleReleaseAlmMsg(iot_idl::SIntelliAlmRelease &objReleaseAlm) { //先保证能够编译通过 LOGINFO("========== AiAlarmDataCollect handleReleaseAlmMsg =========="); @@ -205,8 +205,8 @@ void CAiAlarmDataCollect::slotSwitchFaultRecallState(bool bFaultRecallState) int CAiAlarmDataCollect::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); - kbd_dbms::CVarType value = -1000; + iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); + iot_dbms::CVarType value = -1000; m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h index 466a3925..37eeca38 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h @@ -11,7 +11,7 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "dbms/rdb_api/CRdbAccess.h" -class CAiAlarmDataCollect : public QObject, public kbd_service::CIntelliAlmApi4Clt +class CAiAlarmDataCollect : public QObject, public iot_service::CIntelliAlmApi4Clt { Q_OBJECT public: @@ -25,21 +25,21 @@ public: bool isFaultRecallState(); - virtual bool requestDelAlm(kbd_idlfile::SIntelliAlmDel &objDelAlm); + virtual bool requestDelAlm(iot_idl::SIntelliAlmDel &objDelAlm); - virtual bool requestSeprAlm(kbd_idlfile::SIntelliAlmSepr &objSeprAlm); + virtual bool requestSeprAlm(iot_idl::SIntelliAlmSepr &objSeprAlm); - virtual bool requestMergeAlm(kbd_idlfile::SIntelliAlmMerge &objMergeAlm); + virtual bool requestMergeAlm(iot_idl::SIntelliAlmMerge &objMergeAlm); - virtual void handleAllAlmMsg(int nDomainId,kbd_idlfile::SIntelliAlmAdd &objAllAlm); + virtual void handleAllAlmMsg(int nDomainId,iot_idl::SIntelliAlmAdd &objAllAlm); - virtual void handleAddAlmMsg(kbd_idlfile::SIntelliAlmAdd &objAddAlm); + virtual void handleAddAlmMsg(iot_idl::SIntelliAlmAdd &objAddAlm); - virtual void handleDelAlmMsg(kbd_idlfile::SIntelliAlmDel &objDelAlm); + virtual void handleDelAlmMsg(iot_idl::SIntelliAlmDel &objDelAlm); - virtual void handleBrokenAlmMsg(kbd_idlfile::SIntelliAlmBroken &objBrokenAlm); + virtual void handleBrokenAlmMsg(iot_idl::SIntelliAlmBroken &objBrokenAlm); - virtual void handleReleaseAlmMsg(kbd_idlfile::SIntelliAlmRelease &objReleaseAlm); + virtual void handleReleaseAlmMsg(iot_idl::SIntelliAlmRelease &objReleaseAlm); signals: //< 启停定时器 void sigTimerShot(const bool bStop); @@ -71,7 +71,7 @@ private: bool m_bFaultRecallState; QMutex *m_rtdbMutex; QTimer * m_pAlternateTimer; - kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; static CAiAlarmDataCollect * m_pInstance; }; diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp index 2a1ec49c..91de5241 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp @@ -66,7 +66,7 @@ void CAiAlarmDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti button.rect.adjust(option.rect.width() - 40, option.rect.height()/2-10, -12, -(option.rect.height()/2-10)); button.iconSize = QSize(button.rect.width()+2,button.rect.height()+2); - button.icon = QIcon(kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video.png").c_str()); + button.icon = QIcon(iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video.png").c_str()); QApplication::style()->drawControl(QStyle::CE_PushButton,&button,painter); painter->restore(); @@ -121,7 +121,7 @@ void CAiAlarmDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti button.rect.adjust(option.rect.width() - 40, option.rect.height()/2-10, -12, -(option.rect.height()/2-10)); button.iconSize = QSize(button.rect.width()+2,button.rect.height()+2); - button.icon = QIcon(kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video.png").c_str()); + button.icon = QIcon(iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video.png").c_str()); QApplication::style()->drawControl(QStyle::CE_PushButton,&button,painter); painter->restore(); @@ -177,7 +177,7 @@ bool CAiAlarmDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, con void CAiAlarmDelegate::loadColorConfig() { - QString filePath = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); + QString filePath = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); QDomDocument document; QFile file(filePath); if (!file.open(QIODevice::ReadOnly)) diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp index b422d914..fe62a0f8 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp @@ -40,7 +40,7 @@ CAiAlarmMsgInfo::CAiAlarmMsgInfo(const CAiAlarmMsgInfo &other) m_needVideoAlm = other.m_needVideoAlm; } -void CAiAlarmMsgInfo::initialize(const kbd_idlfile::SIntelliAlmInfo &alarmInfo) +void CAiAlarmMsgInfo::initialize(const iot_idl::SIntelliAlmInfo &alarmInfo) { logic_state = (E_AiALARM_LOGICSTATE)alarmInfo.logic_state(); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h index 1a616856..924d6a86 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h @@ -21,7 +21,7 @@ class CAiAlarmMsgInfo public: CAiAlarmMsgInfo(); CAiAlarmMsgInfo(const CAiAlarmMsgInfo &other); - void initialize(const kbd_idlfile::SIntelliAlmInfo &alarmInfo); + void initialize(const iot_idl::SIntelliAlmInfo &alarmInfo); //< [优先级越小表示越大]-智能告警窗调用 bool ailessThan(const AlarmMsgPtr &info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp index 11b48290..0596ad0d 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp @@ -6,8 +6,8 @@ #include "CAiAlarmDataCollect.h" #include "dbms/db_sysinfo_api/CDbSysInfo.h" -using namespace kbd_service; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_dbms; CAlarmDataCollect * CAlarmDataCollect::m_pInstance = NULL; CAlarmDataCollect::CAlarmDataCollect() @@ -19,13 +19,13 @@ CAlarmDataCollect::CAlarmDataCollect() m_bIsNeedRemove(false) { m_rtdbMutex = new QMutex(); - m_rtdbPriorityOrderAccess = new kbd_dbms::CRdbAccess(); + m_rtdbPriorityOrderAccess = new iot_dbms::CRdbAccess(); m_rtdbPriorityOrderAccess->open("base", "alarm_level_define"); - m_rtdbAlmLvlDefTab = new kbd_dbms::CRdbAccess(); + m_rtdbAlmLvlDefTab = new iot_dbms::CRdbAccess(); m_rtdbAlmLvlDefTab->open("base","alarm_level_define"); - m_rtdbAlmActDefTab = new kbd_dbms::CRdbAccess(); + m_rtdbAlmActDefTab = new iot_dbms::CRdbAccess(); m_rtdbAlmActDefTab->open("base","alarm_action_define"); } @@ -146,17 +146,17 @@ void CAlarmDataCollect::slotSwitchFaultRecallState(bool bFaultRecallState) m_pInstance->reinit(m_bFaultRecallState); } -bool CAlarmDataCollect::requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +bool CAlarmDataCollect::requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm) { - return kbd_service::CAlmApiForAlmClt::requestCfmAlm(objCfmAlm); + return iot_service::CAlmApiForAlmClt::requestCfmAlm(objCfmAlm); } -bool CAlarmDataCollect::requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +bool CAlarmDataCollect::requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm) { - return kbd_service::CAlmApiForAlmClt::requestDelAlm(objDelAlm); + return iot_service::CAlmApiForAlmClt::requestDelAlm(objDelAlm); } -void CAlarmDataCollect::handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm &objAllAlm) +void CAlarmDataCollect::handleAllAlmMsg(int domainId, iot_idl::SAlmCltAddAlm &objAllAlm) { loadAlmAct(); loadAlmLel(); @@ -173,7 +173,7 @@ void CAlarmDataCollect::handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm int nAlarmCount = objAllAlm.alm_info_size(); for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SAlmInfoToAlmClt msg = objAllAlm.alm_info(nAddMsgIndex); + iot_idl::SAlmInfoToAlmClt msg = objAllAlm.alm_info(nAddMsgIndex); AlarmMsgPtr alm(new CAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -193,7 +193,7 @@ void CAlarmDataCollect::handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm LOGDEBUG("handleAllAlmMsg END[%d] ",nAlarmCount); } -void CAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) +void CAlarmDataCollect::handleAddAlmMsg(iot_idl::SAlmCltAddAlm &objAddAlm) { loadAlmAct(); loadAlmLel(); @@ -207,7 +207,7 @@ void CAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) int nAlarmCount = objAddAlm.alm_info_size(); for(int nAddMsgIndex(0); nAddMsgIndex < nAlarmCount; nAddMsgIndex++) { - kbd_idlfile::SAlmInfoToAlmClt msg = objAddAlm.alm_info(nAddMsgIndex); + iot_idl::SAlmInfoToAlmClt msg = objAddAlm.alm_info(nAddMsgIndex); AlarmMsgPtr alm(new CAlarmMsgInfo()); alm->initialize(msg); alm->priorityOrder = queryPriorityOrder(alm->priority); @@ -227,7 +227,7 @@ void CAlarmDataCollect::handleAddAlmMsg(kbd_idlfile::SAlmCltAddAlm &objAddAlm) } } -void CAlarmDataCollect::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) +void CAlarmDataCollect::handleCfmAlmMsg(iot_idl::SAlmCltCfmAlm &objCfmAlm) { if(!m_referenceCount) { @@ -244,7 +244,7 @@ void CAlarmDataCollect::handleCfmAlmMsg(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm) m_bIsNeedUpdate = true; } -void CAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) +void CAlarmDataCollect::handleDelAlmMsg(iot_idl::SAlmCltDelAlm &objDelAlm) { if(!m_referenceCount) { @@ -262,7 +262,7 @@ void CAlarmDataCollect::handleDelAlmMsg(kbd_idlfile::SAlmCltDelAlm &objDelAlm) m_bIsNeedRemove = true; } -void CAlarmDataCollect::handleReleaseAlmMsg(kbd_idlfile::SAlmCltReleaseAlm &objRelAlm) +void CAlarmDataCollect::handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objRelAlm) { if(!m_referenceCount) { @@ -301,8 +301,8 @@ void CAlarmDataCollect::slotAlarmStateChanged() int CAlarmDataCollect::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); - kbd_dbms::CVarType value = -1000; + iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); + iot_dbms::CVarType value = -1000; m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h index 76e9cf6c..759636a0 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h @@ -11,7 +11,7 @@ #include "net_msg_bus_api/MsgBusApi.h" #include "dbms/rdb_api/CRdbAccess.h" -class CAlarmDataCollect : public QObject, public kbd_service::CAlmApiForAlmClt +class CAlarmDataCollect : public QObject, public iot_service::CAlmApiForAlmClt { Q_OBJECT public: @@ -29,19 +29,19 @@ public: bool isFaultRecallState(); - virtual bool requestCfmAlm(kbd_idlfile::SAlmCltCfmAlm &objCfmAlm); + virtual bool requestCfmAlm(iot_idl::SAlmCltCfmAlm &objCfmAlm); - virtual bool requestDelAlm(kbd_idlfile::SAlmCltDelAlm &objDelAlm); + virtual bool requestDelAlm(iot_idl::SAlmCltDelAlm &objDelAlm); - virtual void handleAllAlmMsg(int domainId, kbd_idlfile::SAlmCltAddAlm &objAllAlm); + virtual void handleAllAlmMsg(int domainId, 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 &objDelAlm); + virtual void handleReleaseAlmMsg(iot_idl::SAlmCltReleaseAlm &objDelAlm); signals: //< 启停定时器 @@ -90,9 +90,9 @@ private: bool m_bFaultRecallState; //是否处于事故追忆 QMutex * m_rtdbMutex; QTimer * m_pAlternateTimer; - kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; - kbd_dbms::CRdbAccess * m_rtdbAlmLvlDefTab; // 告警等级定义表 - kbd_dbms::CRdbAccess * m_rtdbAlmActDefTab; // 告警动作定义表 + iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CRdbAccess * m_rtdbAlmLvlDefTab; // 告警等级定义表 + iot_dbms::CRdbAccess * m_rtdbAlmActDefTab; // 告警动作定义表 bool m_bIsNeedUpdate; //< 是否消息确认（每秒更新） bool m_bIsNeedRemove; //< 是否需要删除（每秒更新） bool m_bIsNeedRelease; //< 是否需要释放（每秒更新）- diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp index 8dbeb80f..a132e02e 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp @@ -19,7 +19,7 @@ CAlarmDelegate::CAlarmDelegate(CAlarmItemModel * model, QObject *parent) void CAlarmDelegate::loadColorConfig() { - QString filePath = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); + QString filePath = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); QDomDocument document; QFile file(filePath); if (!file.open(QIODevice::ReadOnly)) @@ -166,7 +166,7 @@ void CAlarmDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option button.rect.adjust(option.rect.width() - 40, option.rect.height()/2-10, -12, -(option.rect.height()/2-10)); button.iconSize = QSize(button.rect.width()+2,button.rect.height()+2); - button.icon = QIcon(kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video.png").c_str()); + button.icon = QIcon(iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/video.png").c_str()); QApplication::style()->drawControl(QStyle::CE_PushButton,&button,painter); painter->restore(); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp index 987fe2a1..5df2e190 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp @@ -16,7 +16,7 @@ CAlarmFilterDialog::CAlarmFilterDialog(QWidget *parent) : ui->setupUi(this); setObjectName("alarm_dialog"); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -26,7 +26,7 @@ CAlarmFilterDialog::CAlarmFilterDialog(QWidget *parent) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -57,7 +57,7 @@ CAlarmFilterDialog::~CAlarmFilterDialog() void CAlarmFilterDialog::initialize() { - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); ui->level->setSelectionMode(QAbstractItemView::MultiSelection); ui->location->setSelectionMode(QAbstractItemView::MultiSelection); @@ -84,12 +84,12 @@ void CAlarmFilterDialog::initialize() ui->type->addItem(value); } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(info.nId <= CN_AppId_COMAPP) { @@ -556,12 +556,12 @@ void CAlarmFilterDialog::slot_updateCheckTypeState() void CAlarmFilterDialog::slot_updateDevice(const QString &subSystem) { int nSubSystemId = -1; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(subSystem.toStdString() == info.strDesc) { @@ -572,34 +572,34 @@ void CAlarmFilterDialog::slot_updateDevice(const QString &subSystem) ui->deviceType->clear(); - QList values; + QList values; if(nSubSystemId != -1) { - kbd_dbms::CVarType subSystemId = nSubSystemId; + iot_dbms::CVarType subSystemId = nSubSystemId; if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CONDINFO condition; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CONDINFO condition; condition.relationop = ATTRCOND_EQU; memcpy(condition.name, "sub_system", strlen("sub_system")); condition.conditionval = subSystemId; std::vector columns; columns.push_back("description"); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; if(m_rtdbAccess->select(condition, result, columns)) { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType value; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, value); values.append(value); } } } } - foreach (kbd_dbms::CVarType value, values) + foreach (iot_dbms::CVarType value, values) { ui->deviceType->addItem(value.c_str()); } diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h index 1efec399..7861c0f1 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h @@ -96,7 +96,7 @@ private slots: private: Ui::CAlarmFilterDialog *ui; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_priorityMap; QMap m_locationMap; QMap m_regionMap; diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp index 284065a2..18bc4fed 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp @@ -178,7 +178,7 @@ void CAlarmForm::initialize() void CAlarmForm::loadConfig() { - QFile file(kbd_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml",CN_DIR_PLATFORM).c_str()); + QFile file(iot_public::CFileUtil::getPathOfCfgFile("intelli_alm_cfg.xml",CN_DIR_PLATFORM).c_str()); if (!file.open(QFile::ReadWrite)) { LOGERROR("打开智能告警配置文件失败,默认不启动"); @@ -219,9 +219,9 @@ void CAlarmForm::updateAlarmOperatePerm() { m_listRegionId.clear(); m_listLocationId.clear(); - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败！"); return; @@ -229,7 +229,7 @@ void CAlarmForm::updateAlarmOperatePerm() spSysInfo->getLocalNodeInfo(stNodeInfo); m_nodeName = stNodeInfo.strName; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -1150,7 +1150,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event) { QAction * mergeAction = menu.addAction(tr("合并")); connect(mergeAction,&QAction::triggered,[=](){ - QMap pkgMap; + QMap pkgMap; QList listPtr; listPtr.clear(); int permSkip = -1; @@ -1227,10 +1227,10 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event) for(int x(0);xdomain_id; - QMap::iterator it = pkgMap.find(domain_id); + QMap::iterator it = pkgMap.find(domain_id); if( it == pkgMap.end()) { - kbd_idlfile::SIntelliAlmMerge *pkg =new kbd_idlfile::SIntelliAlmMerge(); + iot_idl::SIntelliAlmMerge *pkg =new iot_idl::SIntelliAlmMerge(); pkg->set_domain_id(domain_id); pkgMap[domain_id] = pkg; } @@ -1248,7 +1248,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event) pkgMap.clear(); return ; } - foreach (kbd_idlfile::SIntelliAlmMerge * pkg, pkgMap) + foreach (iot_idl::SIntelliAlmMerge * pkg, pkgMap) { CAiAlarmDataCollect::instance()->requestMergeAlm(*pkg); } @@ -1327,7 +1327,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event) } //拼包 int domain_id = msgList.at(0)->domain_id; - kbd_idlfile::SIntelliAlmSepr *pkg = new kbd_idlfile::SIntelliAlmSepr(); + iot_idl::SIntelliAlmSepr *pkg = new iot_idl::SIntelliAlmSepr(); pkg->set_domain_id(domain_id); for(int index(0);index > > locationInfos; QMap locationMap = m_pModel->locationDescriptionMap(); - kbd_dbms::CDbApi *m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi *m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(m_pReadDb->open()) { QMap::const_iterator iter = locationMap.constBegin(); @@ -1462,7 +1462,7 @@ void CAlarmForm::removeAlarm0() } QList listInfo = m_pModel->getListShowAlarmInfo(); //声明告警删除package - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 int unConfirmSkip = -1; //< 未确认告警是否跳过： 0-单步跳过、1-全部跳过 foreach (QModelIndex index, modelIndexList) @@ -1544,10 +1544,10 @@ void CAlarmForm::removeAlarm0() } //构建告警删除package - QMap::iterator it = pkgMap.find(info->domain_id); + QMap::iterator it = pkgMap.find(info->domain_id); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltDelAlm * pkg = new kbd_idlfile::SAlmCltDelAlm(); + iot_idl::SAlmCltDelAlm * pkg = new iot_idl::SAlmCltDelAlm(); pkg->set_domain_id(info->domain_id); pkgMap[info->domain_id] = pkg; LOGINFO("Bulid Alarm Remove MSG: %s", info->key_id_tag.toStdString().c_str()); @@ -1556,7 +1556,7 @@ void CAlarmForm::removeAlarm0() } //请求删除 - foreach (kbd_idlfile::SAlmCltDelAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltDelAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestDelAlm(*pkg)!= true) { @@ -1579,8 +1579,8 @@ void CAlarmForm::removeAlarm1() QList aimsgList; //选中的智能告警 QList msgList; //选中的原始告警 //声明智能告警删除package - QMap aipkgMap; //Domain-DelPkg; ai - QMap pkgMap; //Domain-DelPkg; alarm + QMap aipkgMap; //Domain-DelPkg; ai + QMap pkgMap; //Domain-DelPkg; alarm int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 int unConfirmSkip = -1; //< 未确认告警是否跳过： 0-单步跳过、1-全部跳过 foreach (QModelIndex index, modelIndexList) @@ -1691,10 +1691,10 @@ void CAlarmForm::removeAlarm1() } } //构建告警删除package - QMap::iterator it = pkgMap.find(info->domain_id); + QMap::iterator it = pkgMap.find(info->domain_id); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltDelAlm * pkg = new kbd_idlfile::SAlmCltDelAlm(); + iot_idl::SAlmCltDelAlm * pkg = new iot_idl::SAlmCltDelAlm(); pkg->set_domain_id(info->domain_id); pkgMap[info->domain_id] = pkg; LOGINFO("Bulid Alarm Remove MSG: %s", info->key_id_tag.toStdString().c_str()); @@ -1776,17 +1776,17 @@ void CAlarmForm::removeAlarm1() } int domain_id = aimsgList.at(aialarm)->domain_id; QString aiuuid = aimsgList.at(aialarm)->uuid_base64; - QMap::iterator it = aipkgMap.find(domain_id); + QMap::iterator it = aipkgMap.find(domain_id); if(it == aipkgMap.end()) { - kbd_idlfile::SIntelliAlmDel * pkg = new kbd_idlfile::SIntelliAlmDel(); + iot_idl::SIntelliAlmDel * pkg = new iot_idl::SIntelliAlmDel(); pkg->set_domain_id(domain_id); aipkgMap[domain_id] = pkg; } aipkgMap.value(domain_id)->add_uuid_base64(aiuuid.toStdString()); } //请求删除 - foreach (kbd_idlfile::SAlmCltDelAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltDelAlm * pkg, pkgMap) { if(CAlarmDataCollect::instance()->requestDelAlm(*pkg)!= true) { @@ -1796,7 +1796,7 @@ void CAlarmForm::removeAlarm1() qDeleteAll(pkgMap); pkgMap.clear(); //请求删除 - foreach (kbd_idlfile::SIntelliAlmDel * pkg, aipkgMap) + foreach (iot_idl::SIntelliAlmDel * pkg, aipkgMap) { CAiAlarmDataCollect::instance()->requestDelAlm(*pkg); } @@ -1820,7 +1820,7 @@ void CAlarmForm::confirmAlarm0() } //构建告警确认package - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 foreach (QModelIndex index, modelIndexList) @@ -1868,10 +1868,10 @@ void CAlarmForm::confirmAlarm0() if(E_ALS_ALARM == info->logic_state || E_ALS_RETURN == info->logic_state) { QString key = QString::number(info->domain_id); - QMap::iterator it = pkgMap.find(key); + QMap::iterator it = pkgMap.find(key); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_nodeName); pkg->set_user_id(m_userId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -1889,7 +1889,7 @@ void CAlarmForm::confirmAlarm0() } //请求确认 - foreach (kbd_idlfile::SAlmCltCfmAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltCfmAlm * pkg, pkgMap) { CAlarmDataCollect::instance()->requestCfmAlm(*pkg); } @@ -1910,7 +1910,7 @@ void CAlarmForm::confirmAlarm1() QList msgList; //选中的原始告警 QList uuidList; //构建告警确认package - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; int permSkip = -1; //< 不具备确认权限时是否跳过： 0-单步跳过、1-全部跳过 foreach (QModelIndex index, modelIndexList) { @@ -1986,10 +1986,10 @@ void CAlarmForm::confirmAlarm1() E_ALS_ALARM_DEL == msgList.at(alarmNum)->logic_state || E_ALS_RETURN_DEL == msgList.at(alarmNum)->logic_state) { QString key = QString(msgList.at(alarmNum)->domain_id); - QMap::iterator it= pkgMap.find(key); + QMap::iterator it= pkgMap.find(key); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_nodeName); pkg->set_user_id(m_userId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -2003,7 +2003,7 @@ void CAlarmForm::confirmAlarm1() pkgMap.value(key)->add_uuid_base64(msgList.at(alarmNum)->uuid_base64.toStdString()); } } - foreach (kbd_idlfile::SAlmCltCfmAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltCfmAlm * pkg, pkgMap) { CAlarmDataCollect::instance()->requestCfmAlm(*pkg); } diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp index 36d50cec..fcbb95e2 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp @@ -16,7 +16,7 @@ CAlarmInhibitDialog::CAlarmInhibitDialog(QWidget *parent) : { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -26,7 +26,7 @@ CAlarmInhibitDialog::CAlarmInhibitDialog(QWidget *parent) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp index 5cb7ecca..ce3e8d59 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp @@ -18,7 +18,7 @@ ///////////////////////////////////////////////////////////////////////////// -using namespace kbd_public; +using namespace iot_public; using namespace std; const int DOCK_ROW_COUNT = 3; const int MAX_ROW_COUNT = 15000; @@ -33,7 +33,7 @@ CAlarmItemModel::CAlarmItemModel(E_Alarm_Mode mode, QObject *parent) m_rtdbAccess(Q_NULLPTR) { m_nTotalSize = 0; - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); m_alternateFlag = true; m_header <PermDllInit(); @@ -916,8 +916,8 @@ void CAlarmItemModel::loadPriorityDescription() { if(m_rtdbAccess->open("base", "alarm_level_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("priority_id"); columns.push_back("priority_name"); @@ -926,8 +926,8 @@ void CAlarmItemModel::loadPriorityDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_priorityDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -940,8 +940,8 @@ void CAlarmItemModel::loadLocationDescription() { if(m_rtdbAccess->open("base", "sys_model_location_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("description"); @@ -951,8 +951,8 @@ void CAlarmItemModel::loadLocationDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermLocationId.contains(key.toInt())) @@ -968,8 +968,8 @@ void CAlarmItemModel::loadRegionDescription() { if(m_rtdbAccess->open("base", "region_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("region_id"); columns.push_back("description"); @@ -978,8 +978,8 @@ void CAlarmItemModel::loadRegionDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermRegionId.contains(key.toInt())) @@ -996,8 +996,8 @@ void CAlarmItemModel::loadAlarmTypeDescription() { if(m_rtdbAccess->open("base", "alarm_type_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("type_id"); columns.push_back("type_name"); @@ -1006,8 +1006,8 @@ void CAlarmItemModel::loadAlarmTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -1020,8 +1020,8 @@ void CAlarmItemModel::loadAlarmStatusDescription() { if(m_rtdbAccess->open("base", "alarm_status_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("status_value"); columns.push_back("display_name"); @@ -1030,8 +1030,8 @@ void CAlarmItemModel::loadAlarmStatusDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmStatusDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -1045,8 +1045,8 @@ void CAlarmItemModel::loadDeviceTypeDescription() { if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("dev_type_id"); columns.push_back("description"); @@ -1055,8 +1055,8 @@ void CAlarmItemModel::loadDeviceTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -1069,8 +1069,8 @@ void CAlarmItemModel::loadDeviceGroupDescription() { if(m_rtdbAccess->open("base", "dev_group")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("tag_name"); columns.push_back("description"); @@ -1079,8 +1079,8 @@ void CAlarmItemModel::loadDeviceGroupDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceGroupDescriptionMap[QString::fromStdString(key.toStdString())] = QString::fromStdString(value.toStdString()); @@ -1091,7 +1091,7 @@ void CAlarmItemModel::loadDeviceGroupDescription() void CAlarmItemModel::loadAlarmShowStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -1126,7 +1126,7 @@ void CAlarmItemModel::loadAlarmShowStatusDescription() void CAlarmItemModel::loadAlarmOtherStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h index 468da10a..8708d8e8 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h @@ -187,7 +187,7 @@ private: QList m_listPermLocationId; QList m_listPermRegionId; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_priorityDescriptionMap; QMap m_locationDescriptionMap; QMap m_regionDescriptionMap; diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp index 1855493c..1c91f29c 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp @@ -16,7 +16,7 @@ const int MAX_AUDIO_COUNT = 100; -using namespace kbd_public; +using namespace iot_public; CAlarmMediaPlayer *CAlarmMediaPlayer::instance() { static CAlarmMediaPlayer player; @@ -26,7 +26,7 @@ CAlarmMediaPlayer *CAlarmMediaPlayer::instance() CAlarmMediaPlayer::CAlarmMediaPlayer() :m_bHaveValidAudioDev(false),m_pMediaPlayer(Q_NULLPTR),m_pTimerCheckAudioDev(Q_NULLPTR) { - QDir dir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir dir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); dir.cdUp(); dir.cdUp(); dir.cd("data"); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp index d8bcb734..b53a5a11 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp @@ -69,7 +69,7 @@ CAlarmMsgInfo::CAlarmMsgInfo(const CAlarmMsgInfo &other) } -void CAlarmMsgInfo::initialize(const kbd_idlfile::SAlmInfoToAlmClt &alarmInfo) +void CAlarmMsgInfo::initialize(const iot_idl::SAlmInfoToAlmClt &alarmInfo) { alm_type = alarmInfo.alm_type(); alm_status = alarmInfo.alm_status(); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h index 0252d592..9bed1e75 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h @@ -29,7 +29,7 @@ class CAlarmMsgInfo public: CAlarmMsgInfo(); CAlarmMsgInfo(const CAlarmMsgInfo &other); - void initialize(const kbd_idlfile::SAlmInfoToAlmClt &alarmInfo); + void initialize(const iot_idl::SAlmInfoToAlmClt &alarmInfo); int getCameraInfoByTag(const QString &tag); //< [优先级越小表示越大]-原始告警窗调用 diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp index 420e16c3..69d740c2 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp @@ -17,7 +17,7 @@ #include "pub_utility_api/CharUtil.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; using namespace std; CAlarmMsgManage *CAlarmMsgManage::pInstance = NULL; @@ -60,18 +60,18 @@ CAlarmMsgManage::CAlarmMsgManage() m_regionDescriptionMap.clear(); m_alarmTypeDescriptionMap.clear(); m_alarmStatusDescriptionMap.clear(); - m_rtdbAlarmActionAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAlarmActionAccess = new iot_dbms::CRdbAccess(); m_rtdbAlarmActionAccess->open("base", "alarm_level_define"); - m_rtdbLocationDescriptionAccess = new kbd_dbms::CRdbAccess(); + m_rtdbLocationDescriptionAccess = new iot_dbms::CRdbAccess(); m_rtdbLocationDescriptionAccess->open("base", "sys_model_location_info"); - m_rtdbAppDescriptionAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAppDescriptionAccess = new iot_dbms::CRdbAccess(); m_rtdbAppDescriptionAccess->open("base", "sys_model_app_info"); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); - m_dbInterface = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_dbInterface = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); loadPermInfo(); } @@ -612,8 +612,8 @@ void CAlarmMsgManage::loadPriorityDescription() { if(m_rtdbAccess->open("base", "alarm_level_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("priority_id"); columns.push_back("priority_name"); @@ -622,8 +622,8 @@ void CAlarmMsgManage::loadPriorityDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_priorityDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -636,8 +636,8 @@ void CAlarmMsgManage::loadLocationDescription() { if(m_rtdbAccess->open("base", "sys_model_location_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("description"); @@ -647,8 +647,8 @@ void CAlarmMsgManage::loadLocationDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); // if(m_listPermLocationId.contains(key.toInt())) @@ -664,8 +664,8 @@ void CAlarmMsgManage::loadRegionDescription() { if(m_rtdbAccess->open("base", "region_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("region_id"); columns.push_back("description"); @@ -674,8 +674,8 @@ void CAlarmMsgManage::loadRegionDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); // if(m_listPermRegionId.contains(key.toInt())) @@ -692,8 +692,8 @@ void CAlarmMsgManage::loadAlarmTypeDescription() { if(m_rtdbAccess->open("base", "alarm_type_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("type_id"); columns.push_back("type_name"); @@ -702,8 +702,8 @@ void CAlarmMsgManage::loadAlarmTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -716,8 +716,8 @@ void CAlarmMsgManage::loadAlarmStatusDescription() { if(m_rtdbAccess->open("base", "alarm_status_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("status_value"); columns.push_back("display_name"); @@ -726,8 +726,8 @@ void CAlarmMsgManage::loadAlarmStatusDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmStatusDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -740,8 +740,8 @@ void CAlarmMsgManage::loadDeviceTypeDescription() { if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("dev_type_id"); columns.push_back("description"); @@ -750,8 +750,8 @@ void CAlarmMsgManage::loadDeviceTypeDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -764,8 +764,8 @@ void CAlarmMsgManage::loadDeviceGroupDescription() { if(m_rtdbAccess->open("base", "dev_group")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("tag_name"); columns.push_back("description"); @@ -774,8 +774,8 @@ void CAlarmMsgManage::loadDeviceGroupDescription() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceGroupDescriptionMap[QString::fromStdString(key.toStdString())] = QString::fromStdString(value.toStdString()); @@ -786,7 +786,7 @@ void CAlarmMsgManage::loadDeviceGroupDescription() void CAlarmMsgManage::loadAlarmShowStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -821,7 +821,7 @@ void CAlarmMsgManage::loadAlarmShowStatusDescription() void CAlarmMsgManage::loadAlarmOtherStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -1678,31 +1678,31 @@ QList CAlarmMsgManage::findMsgsByKeyIdTag(const QString &key_id_tag int CAlarmMsgManage::queryAlarmAction(const int &priority) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAlarmActionAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbAlarmActionAccess); + iot_dbms::CVarType value; m_rtdbAlarmActionAccess->getColumnValueByKey((void*)&priority, "alarm_actions",value); return value.toInt(); } QString CAlarmMsgManage::queryLocationDescription(int id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbLocationDescriptionAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbLocationDescriptionAccess); + iot_dbms::CVarType value; m_rtdbLocationDescriptionAccess->getColumnValueByKey((void*)&id, "description", value); return value.c_str(); } QString CAlarmMsgManage::queryAppDescription(int id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAppDescriptionAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbAppDescriptionAccess); + iot_dbms::CVarType value; m_rtdbAppDescriptionAccess->getColumnValueByKey((void*)&id, "description", value); return value.c_str(); } void CAlarmMsgManage::loadPermInfo() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h index 0e2193ea..15ce0615 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h @@ -420,11 +420,11 @@ public: int getAlmTotal(); private: QMutex * mutex; - kbd_dbms::CRdbAccess * m_rtdbAlarmActionAccess; - kbd_dbms::CRdbAccess * m_rtdbLocationDescriptionAccess; - kbd_dbms::CRdbAccess * m_rtdbAppDescriptionAccess; - //kbd_dbms::CRdbAccess * m_rtdbDeviceAccess; - kbd_dbms::CDbApi * m_dbInterface; + iot_dbms::CRdbAccess * m_rtdbAlarmActionAccess; + iot_dbms::CRdbAccess * m_rtdbLocationDescriptionAccess; + iot_dbms::CRdbAccess * m_rtdbAppDescriptionAccess; + //iot_dbms::CRdbAccess * m_rtdbDeviceAccess; + iot_dbms::CDbApi * m_dbInterface; int m_nNDelComAlarmCount; //< 未删除未确认数量 N--not Del--delete Com--confirm int m_nDelNComAlarmCount; //< 已删除未确认数量 QHash m_infos; @@ -454,7 +454,7 @@ private: QHash > > m_alarmDGPDev; //< <设备组,<告警等级,设备> > QHash > m_alarmLPAlm; //< <车站id,<告警等级,告警数量> > - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_priorityDescriptionMap; QMap m_locationDescriptionMap; QMap m_regionDescriptionMap; diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp index eed2c2d2..7e97aa36 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp @@ -32,7 +32,7 @@ CAlarmPlugin::CAlarmPlugin(QWidget *parent, bool editMode) m_pModel(Q_NULLPTR) { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -42,7 +42,7 @@ CAlarmPlugin::CAlarmPlugin(QWidget *parent, bool editMode) qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarm.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -252,7 +252,7 @@ int CAlarmPlugin::confirmAlarm(const QList &msgs) return -1; } //< 可能有部分告警没有确认权限 - QMap pkgMap; //Domain-DelPkg; + QMap pkgMap; //Domain-DelPkg; for(int nIndex(0); nIndex < msgs.size(); nIndex++) { AlarmMsgPtr info = msgs.at(nIndex); @@ -278,10 +278,10 @@ int CAlarmPlugin::confirmAlarm(const QList &msgs) } if(regionEnable && locationEnable) { - QMap::iterator it = pkgMap.find(info->domain_id); + QMap::iterator it = pkgMap.find(info->domain_id); if(it == pkgMap.end()) { - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_currentNodeName); pkg->set_user_id(m_currentUsrId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -297,7 +297,7 @@ int CAlarmPlugin::confirmAlarm(const QList &msgs) } } //请求确认 - foreach (kbd_idlfile::SAlmCltCfmAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltCfmAlm * pkg, pkgMap) { CAlarmDataCollect::instance()->requestCfmAlm(*pkg); } @@ -318,7 +318,7 @@ int CAlarmPlugin::removeAlarm(const QList &msgs) return -1; } //< 可能有部分告警没有删除权限 - QMap pkgMap; + QMap pkgMap; for(int nIndex(0); nIndex < msgs.size(); nIndex++) { AlarmMsgPtr info = msgs.at(nIndex); @@ -344,10 +344,10 @@ int CAlarmPlugin::removeAlarm(const QList &msgs) } if(regionEnable && locationEnable) { - QMap::iterator it = pkgMap.find(info->domain_id); + QMap::iterator it = pkgMap.find(info->domain_id); if( it == pkgMap.end()) { - kbd_idlfile::SAlmCltDelAlm * pkg = new kbd_idlfile::SAlmCltDelAlm(); + iot_idl::SAlmCltDelAlm * pkg = new iot_idl::SAlmCltDelAlm(); pkg->set_domain_id(info->domain_id); pkgMap[info->domain_id] = pkg; } @@ -355,7 +355,7 @@ int CAlarmPlugin::removeAlarm(const QList &msgs) } } //请求删除 - foreach (kbd_idlfile::SAlmCltDelAlm * pkg, pkgMap) + foreach (iot_idl::SAlmCltDelAlm * pkg, pkgMap) { CAlarmDataCollect::instance()->requestDelAlm(*pkg); } @@ -881,9 +881,9 @@ void CAlarmPlugin::updateAlarmOperatePerm() m_vecRegionId.clear(); m_vecLocationId.clear(); - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败！") return; @@ -891,7 +891,7 @@ void CAlarmPlugin::updateAlarmOperatePerm() spSysInfo->getLocalNodeInfo(stNodeInfo); m_currentNodeName = stNodeInfo.strName; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp index 3879e1c1..eb501e34 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp @@ -302,7 +302,7 @@ void CAlarmWidget::confirmAlarm(const int &row) return; } - kbd_idlfile::SAlmCltCfmAlm * pkg = new kbd_idlfile::SAlmCltCfmAlm(); + iot_idl::SAlmCltCfmAlm * pkg = new iot_idl::SAlmCltCfmAlm(); pkg->set_node_name(m_nodeName); pkg->set_user_id(m_userId); pkg->set_confirm_time(QDateTime::currentMSecsSinceEpoch()); @@ -320,9 +320,9 @@ void CAlarmWidget::confirmAlarm(const int &row) bool CAlarmWidget::updateAlarmOperatePerm() { - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败！"); return false; @@ -330,7 +330,7 @@ bool CAlarmWidget::updateAlarmOperatePerm() spSysInfo->getLocalNodeInfo(stNodeInfo); m_nodeName = stNodeInfo.strName; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/ISCSAlarmWidget/main.cpp b/product/src/gui/plugin/ISCSAlarmWidget/main.cpp index 4d354f15..5576ff4c 100644 --- a/product/src/gui/plugin/ISCSAlarmWidget/main.cpp +++ b/product/src/gui/plugin/ISCSAlarmWidget/main.cpp @@ -10,12 +10,12 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); //<初始化消息总线 - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -35,8 +35,8 @@ int main(int argc, char *argv[]) } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp index de320d66..1fa35ed7 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp +++ b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp @@ -16,7 +16,7 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/CharUtil.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; CEventDataCollect * CEventDataCollect::m_pInstance = NULL; CEventDataCollect * CEventDataCollect::instance() @@ -33,11 +33,11 @@ CEventDataCollect::CEventDataCollect() { msgMutex = new QMutex(); - m_dbHisReadApi = new kbd_dbms::CDbApi(DB_CONN_HIS_READ); + m_dbHisReadApi = new iot_dbms::CDbApi(DB_CONN_HIS_READ); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); - m_rtdbPriorityOrderAccess = new kbd_dbms::CRdbAccess(); + m_rtdbPriorityOrderAccess = new iot_dbms::CRdbAccess(); m_rtdbPriorityOrderAccess->open("base", "alarm_level_define"); m_pTimer = new QTimer(); @@ -77,12 +77,12 @@ CEventDataCollect::~CEventDataCollect() bool CEventDataCollect::initialize() { m_pTimer->start(); - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; spSysInfo->getLocalNodeInfo(stNodeInfo); - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(stNodeInfo.nLocationId, stLocationInfo); m_nLocationID = stNodeInfo.nLocationId; } @@ -219,7 +219,7 @@ QList CEventDataCollect::alarmOtherList() void CEventDataCollect::loadPermInfo() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { @@ -249,8 +249,8 @@ QMap CEventDataCollect::priorityDescriptionMap() m_priorityDescriptionMap.clear(); if(m_rtdbAccess->open("base", "alarm_level_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("priority_id"); columns.push_back("priority_name"); @@ -259,8 +259,8 @@ QMap CEventDataCollect::priorityDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_priorityDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -275,8 +275,8 @@ QMap CEventDataCollect::locationDescriptionMap() m_locationDescriptionMap.clear(); if(m_rtdbAccess->open("base", "sys_model_location_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("description"); @@ -286,8 +286,8 @@ QMap CEventDataCollect::locationDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermLocationId.contains(key.toInt())) @@ -305,8 +305,8 @@ QMap CEventDataCollect::regionInfoDescriptionMap() m_regionInfoDescriptionMap.clear(); if(m_rtdbAccess->open("base", "region_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("region_id"); columns.push_back("description"); @@ -315,8 +315,8 @@ QMap CEventDataCollect::regionInfoDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermRegionId.contains(key.toInt())) @@ -334,8 +334,8 @@ QMap CEventDataCollect::alarmTypeDescriptionMap() m_alarmTypeDescriptionMap.clear(); if(m_rtdbAccess->open("base", "alarm_type_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("type_id"); columns.push_back("type_name"); @@ -344,8 +344,8 @@ QMap CEventDataCollect::alarmTypeDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -361,8 +361,8 @@ QMap CEventDataCollect::deviceTypeDescriptionMap() m_deviceTypeDescriptionMap.clear(); if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("dev_type_id"); columns.push_back("description"); @@ -371,8 +371,8 @@ QMap CEventDataCollect::deviceTypeDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -387,8 +387,8 @@ QMap CEventDataCollect::alarmStatusMap() m_alarmStatusMap.clear(); if(m_rtdbAccess->open("base", "alarm_status_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("status_value"); columns.push_back("display_name"); @@ -397,8 +397,8 @@ QMap CEventDataCollect::alarmStatusMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmStatusMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -413,8 +413,8 @@ QMap CEventDataCollect::userNameMap() m_userNameMap.clear(); if(m_rtdbAccess->open("base", "rm_user_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("perm_id"); columns.push_back("perm_name"); @@ -423,8 +423,8 @@ QMap CEventDataCollect::userNameMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_userNameMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -436,7 +436,7 @@ QMap CEventDataCollect::userNameMap() QMap CEventDataCollect::eventShowStatusDescriptionMap() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -473,7 +473,7 @@ QMap CEventDataCollect::eventShowStatusDescriptionMap() QMap CEventDataCollect::eventOtherStatusDescriptionMap() { m_eventOtherStatusMap.clear(); - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -617,13 +617,13 @@ void CEventDataCollect::slotUpdateEvent() m_listEventCache.clear(); } -void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt) +void CEventDataCollect::handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt) { QMutexLocker locker(msgMutex); CEventMsgManage::instance()->removeEventMsgByDomainID(nDomainID); for(int nAddMsgIndex(0); nAddMsgIndex < objAllEvt.evt_info_size(); nAddMsgIndex++) { - kbd_idlfile::SEvtInfoToEvtClt msg = objAllEvt.evt_info(nAddMsgIndex); + iot_idl::SEvtInfoToEvtClt msg = objAllEvt.evt_info(nAddMsgIndex); EventMsgPtr event(new CEventMsgInfo()); event->initialize(msg); event->priorityOrder = queryPriorityOrder(event->priority); @@ -641,12 +641,12 @@ void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEv emit sigEventStateChanged(); } -void CEventDataCollect::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) +void CEventDataCollect::handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt) { QMutexLocker locker(msgMutex); for(int nAddMsgIndex(0); nAddMsgIndex < objAddEvt.evt_info_size(); nAddMsgIndex++) { - kbd_idlfile::SEvtInfoToEvtClt msg = objAddEvt.evt_info(nAddMsgIndex); + iot_idl::SEvtInfoToEvtClt msg = objAddEvt.evt_info(nAddMsgIndex); EventMsgPtr event(new CEventMsgInfo()); event->initialize(msg); event->priorityOrder = queryPriorityOrder(event->priority); @@ -774,8 +774,8 @@ void CEventDataCollect::queryHistoryEvent(const QStringList &tables, const QStri int CEventDataCollect::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); + iot_dbms::CVarType value; m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h index 4c73ae21..a39a0107 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h +++ b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h @@ -13,7 +13,7 @@ #define FUNC_SPE_EVENT_VIEW ("FUNC_SPE_EVENT_VIEW") #define LIMIT_HIS_RECORD 10000 const int OTHERSTATUS = 9999; -class CEventDataCollect : public QObject, public kbd_service::CAlmApiForEvtClt +class CEventDataCollect : public QObject, public iot_service::CAlmApiForEvtClt { Q_OBJECT public: @@ -61,9 +61,9 @@ public: QMap eventShowStatusDescriptionMap(); QMap eventOtherStatusDescriptionMap(); - virtual void handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt); + virtual void handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt); - virtual void handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt); + virtual void handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt); void handleClearRTEvent(); @@ -99,9 +99,9 @@ private: QTimer * m_pTimer; int m_nLocationID; QList m_listEventCache; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; - kbd_dbms::CDbApi * m_dbHisReadApi; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CDbApi * m_dbHisReadApi; QList m_listPermLocationId; QList m_listPermRegionId; QMap m_priorityOrderMap; diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp index 2bd0ceba..ebedce7a 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp +++ b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp @@ -27,7 +27,7 @@ CEventFilterDialog::~CEventFilterDialog() void CEventFilterDialog::initialize() { - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); ui->level->setSelectionMode(QAbstractItemView::MultiSelection); ui->location->setSelectionMode(QAbstractItemView::MultiSelection); ui->region->setSelectionMode(QAbstractItemView::MultiSelection); @@ -57,12 +57,12 @@ void CEventFilterDialog::initialize() ui->type->addItem(CEventDataCollect::instance()->alarmTypeDescription(alarmType)); } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(info.nId <= CN_AppId_COMAPP) { @@ -482,12 +482,12 @@ void CEventFilterDialog::slot_updateCheckTypeState() void CEventFilterDialog::slot_updateDevice(const QString &subSystem) { int nSubSystemId = -1; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(subSystem.toStdString() == info.strDesc) { @@ -497,34 +497,34 @@ void CEventFilterDialog::slot_updateDevice(const QString &subSystem) } ui->deviceType->clear(); - QList values; + QList values; if(nSubSystemId != -1) { - kbd_dbms::CVarType subSystemId = nSubSystemId; + iot_dbms::CVarType subSystemId = nSubSystemId; if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CONDINFO condition; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CONDINFO condition; condition.relationop = ATTRCOND_EQU; memcpy(condition.name, "sub_system", strlen("sub_system")); condition.conditionval = subSystemId; std::vector columns; columns.push_back("description"); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; if(m_rtdbAccess->select(condition, result, columns)) { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType value; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, value); values.append(value); } } } } - foreach (kbd_dbms::CVarType value, values) + foreach (iot_dbms::CVarType value, values) { ui->deviceType->addItem(value.c_str()); } diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h index dcaa2902..453b6ab2 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h +++ b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h @@ -70,7 +70,7 @@ private slots: private: Ui::CEventFilterDialog *ui; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; }; #endif // CEVENTFILTERDIALOG_H diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp index b8bf042c..88d5f5a0 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp +++ b/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp @@ -55,7 +55,7 @@ CEventForm::CEventForm(QWidget *parent, bool editMode) : ui->eventView->setColumnWidth(5, 150); } QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -65,7 +65,7 @@ CEventForm::CEventForm(QWidget *parent, bool editMode) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("event.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("event.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp index 02b1eeb0..113226bc 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp +++ b/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp @@ -61,7 +61,7 @@ void CEventHistoryModel::initFilter() void CEventHistoryModel::loadEventHistoryData() { //< 权限判断 - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -117,10 +117,10 @@ QString CEventHistoryModel::bulidCondition() LOGDEBUG("bulidConditionPartStatus():[%s]",status.toStdString().c_str()); //< 车站 - // kbd_public::SNodeInfo stNodeInfo; - // kbd_public::SLocationInfo stLocationInfo; - // kbd_public::CSysInfoInterfacePtr spSysInfo; - // if (kbd_public::createSysInfoInstance(spSysInfo)) + // iot_public::SNodeInfo stNodeInfo; + // iot_public::SLocationInfo stLocationInfo; + // iot_public::CSysInfoInterfacePtr spSysInfo; + // if (iot_public::createSysInfoInstance(spSysInfo)) // { // spSysInfo->getLocalNodeInfo(stNodeInfo); // spSysInfo->getLocationInfoById(stNodeInfo.nLocationId, stLocationInfo); @@ -233,7 +233,7 @@ QString CEventHistoryModel::bulidConditionPartType() QString CEventHistoryModel::bulidConditionPartLocation() { QList locationFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -284,7 +284,7 @@ QString CEventHistoryModel::bulidConditionPartLocation() QString CEventHistoryModel::bulidConditionPartRegion() { QList regionFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp index d16b2b52..43b97a3e 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp +++ b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp @@ -32,7 +32,7 @@ CEventMsgInfo::CEventMsgInfo(const CEventMsgInfo &other) deleted = other.deleted; } -void CEventMsgInfo::initialize(const kbd_idlfile::SEvtInfoToEvtClt &eventInfo) +void CEventMsgInfo::initialize(const iot_idl::SEvtInfoToEvtClt &eventInfo) { alm_type = eventInfo.alm_type(); time_stamp = eventInfo.time_stamp(); diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h index cf58951c..76c54454 100644 --- a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h +++ b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h @@ -34,7 +34,7 @@ class CEventMsgInfo public: CEventMsgInfo(); CEventMsgInfo(const CEventMsgInfo &other); - void initialize(const kbd_idlfile::SEvtInfoToEvtClt &eventInfo); + void initialize(const iot_idl::SEvtInfoToEvtClt &eventInfo); bool lessThan(EventMsgPtr info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); bool moreThan(EventMsgPtr info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); diff --git a/product/src/gui/plugin/ISCSEventWidget/main.cpp b/product/src/gui/plugin/ISCSEventWidget/main.cpp index 31f26e40..3fc3ad58 100644 --- a/product/src/gui/plugin/ISCSEventWidget/main.cpp +++ b/product/src/gui/plugin/ISCSEventWidget/main.cpp @@ -11,16 +11,16 @@ int main(int argc, char *argv[]) //<初始化消息总线 - //kbd_public::StartLogSystem(NULL, "HMI", "Alarm_Client"); - kbd_public::StartLogSystem(NULL, "HMI"); - kbd_net::initMsgBus("Alarm_Client", "1", true); + //iot_public::StartLogSystem(NULL, "HMI", "Alarm_Client"); + iot_public::StartLogSystem(NULL, "HMI"); + iot_net::initMsgBus("Alarm_Client", "1", true); - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); permMngPtr->PermDllInit(); if(permMngPtr->SysLogin("2", "2", 1, 12*60*60, "hmi") != 0) { - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return -1; } // CEventPlugin p; @@ -35,8 +35,8 @@ int main(int argc, char *argv[]) //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp index befe5880..4c0984f5 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp @@ -3,7 +3,7 @@ #include "sample_server_api/SampleDefine.h" #include "CTrendInfoManage.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CHisDataManage::CHisDataManage(QObject *parent) : QObject(parent), @@ -52,10 +52,10 @@ void CHisDataManage::release() delete this; } -bool CHisDataManage::getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr) +bool CHisDataManage::getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr) { //< 不使用getOneUseableConn()返回的正式库测试 - // ptr.reset(new kbd_dbms::CTsdbConn("127.0.0.1", -1, "iscs6000", "", "")); + // ptr.reset(new iot_dbms::CTsdbConn("127.0.0.1", -1, "iscs6000", "", "")); // return true; if(m_tsdbConnPtr != NULL) { @@ -135,7 +135,7 @@ void CHisDataManage::queryHistoryOriginalData(std::vector *vecMpK double nIntervalSecs = SAMPLE_CYC_MIN * 60 * 1000; std::vector *> *vecResult = new std::vector *>(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { for(size_t nIndex(0); nIndex < vecMpKey->size(); nIndex++) @@ -143,7 +143,7 @@ void CHisDataManage::queryHistoryOriginalData(std::vector *vecMpK vecResult->push_back(new std::vector()); } if(!getHisSamplePoint(*tsdbConnPtr, 10000, *vecMpKey, lower - nIntervalSecs, upper + nIntervalSecs, - NULL,NULL,kbd_dbms::CM_NULL,0,kbd_dbms::FM_NULL_METHOD,*vecResult)) + NULL,NULL,iot_dbms::CM_NULL,0,iot_dbms::FM_NULL_METHOD,*vecResult)) { LOGINFO("TrendCurve CHisDataManage::queryHistoryOriginalData: 查询超时！"); } @@ -172,7 +172,7 @@ void CHisDataManage::queryHistoryPolymericData(std::vector *vecMp double nIntervalSecs = SAMPLE_CYC_MIN * 60 * 1000; std::vector *> *vecResult = new std::vector *>(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { std::vector vecNotHaveStatus; @@ -206,7 +206,7 @@ void CHisDataManage::queryHistoryPolymericData(std::vector *vecMp void CHisDataManage::queryHistoryEvents(std::vector *vecMpKey, double lower, double upper, std::vector *> *vecResult, const QString &tag) { - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h index fca321d5..8e9b4ef7 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h +++ b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h @@ -23,7 +23,7 @@ enum E_His_Type struct MeasurementPoint { - kbd_dbms::EnMeasPiontType type; //< 测点类型 + iot_dbms::EnMeasPiontType type; //< 测点类型 const QString strTagName; //< 测点TAG名 }; @@ -36,14 +36,14 @@ struct TsdbCommand lower = -1.; upper = -1.; nGroupByMinute = -1; - method = kbd_dbms::CM_NULL; + method = iot_dbms::CM_NULL; } E_His_Type type; - std::vector * pVecMpKey; + std::vector * pVecMpKey; double lower; double upper; int nGroupByMinute; - kbd_dbms::EnComputeMethod method; + iot_dbms::EnComputeMethod method; }; class CHisDataManage : public QObject @@ -56,48 +56,48 @@ public: bool isTsdbExuting(); signals: - void sigupdateHisOriginalData(std::vector *vecMpKey, - std::vector *> *vecResult, + void sigupdateHisOriginalData(std::vector *vecMpKey, + std::vector *> *vecResult, E_Data_Type type = E_HISTORY); - void sigHistoryPolymericData(std::vector *vecMpKey, - std::vector *> *vecResult, + void sigHistoryPolymericData(std::vector *vecMpKey, + std::vector *> *vecResult, int nGroupByMinute); - void sigHistoryEvent(std::vector *vecMpKey, - std::vector *> *vecResult, + void sigHistoryEvent(std::vector *vecMpKey, + std::vector *> *vecResult, const QString &tag); public slots: void release(); - void postTsdbCommandQueue(E_His_Type type, std::vector *vecMpKey, + void postTsdbCommandQueue(E_His_Type type, std::vector *vecMpKey, double lower, double upper, int nGroupByMinute = -1, - kbd_dbms::EnComputeMethod method = kbd_dbms::CM_NULL); + iot_dbms::EnComputeMethod method = iot_dbms::CM_NULL); - void queryHistoryOriginalData(std::vector *vecMpKey, + void queryHistoryOriginalData(std::vector *vecMpKey, double lower, double upper, E_Data_Type type = E_HISTORY); - void queryHistoryPolymericData(std::vector *vecMpKey, + void queryHistoryPolymericData(std::vector *vecMpKey, double lower, double upper, int nGroupByMinute, - kbd_dbms::EnComputeMethod method); + iot_dbms::EnComputeMethod method); - void queryHistoryEvents(std::vector *vecMpKey, + void queryHistoryEvents(std::vector *vecMpKey, double lower, double upper, - std::vector *> *vecResult, + std::vector *> *vecResult, const QString &tag); protected: - bool getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr); + bool getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr); void checkTsdbCommandQueue(); private: bool m_TsdbExcuting; bool m_bHasPendingCommand; - kbd_dbms::CTsdbConnPtr m_tsdbConnPtr; + iot_dbms::CTsdbConnPtr m_tsdbConnPtr; QList m_listCommand; QMutex m_mutex; diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp index fd3dcde4..3f79ef1b 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp @@ -5,7 +5,7 @@ CHisEventManage::CHisEventManage(QObject *parent) : QObject(parent), m_pReadDb(Q_NULLPTR) { - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_HIS_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_HIS_READ); m_pReadDb->open(); } diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h index fd98be45..91fa60dd 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h +++ b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h @@ -19,7 +19,7 @@ signals: void updateHisEvent(const QString &tag, const qint64 &time, QStringList contents); private: - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; }; #endif // CHISEVENTMANAGE_H diff --git a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp index 62967356..a76979dd 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp @@ -9,7 +9,7 @@ #include "./widgets/CEditCollectWidget.h" #include "./widgets/CToolTip.h" -using namespace kbd_dbms; +using namespace iot_dbms; CPlotWidget::CPlotWidget(QWidget *parent) : QWidget(parent), @@ -31,9 +31,9 @@ CPlotWidget::CPlotWidget(QWidget *parent) : ui->setupUi(this); setContentsMargins(1, 1, 1, 1); qRegisterMetaType< E_Data_Type >("E_Data_Type"); - qRegisterMetaType< kbd_dbms::EnComputeMethod >("kbd_dbms::EnComputeMethod"); - qRegisterMetaType< std::vector >("std::vector"); - qRegisterMetaType< std::vector *> >("std::vector *>"); + qRegisterMetaType< iot_dbms::EnComputeMethod >("iot_dbms::EnComputeMethod"); + qRegisterMetaType< std::vector >("std::vector"); + qRegisterMetaType< std::vector *> >("std::vector *>"); } CPlotWidget::~CPlotWidget() @@ -194,7 +194,7 @@ void CPlotWidget::initialize() connect(m_pTimer, &QTimer::timeout, this, &CPlotWidget::realTimeElapsed); } - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); m_rtDataCollect = new CRealTimeDataCollect(this); connect(m_rtDataCollect, &CRealTimeDataCollect::finished, m_rtDataCollect, &CRealTimeDataCollect::deleteLater); connect(m_rtDataCollect, &CRealTimeDataCollect::realTimeTrendDataArrived, this, &CPlotWidget::recvRealTimeTrendData, Qt::QueuedConnection); @@ -1064,7 +1064,7 @@ void CPlotWidget::updateHistoryCurveRecord(double lower, double upper) } else { - emit sigQueryHistoryPolymericData(vecMpKey, lower, upper, currentGroupByMinute(), kbd_dbms::CM_FIRST); + emit sigQueryHistoryPolymericData(vecMpKey, lower, upper, currentGroupByMinute(), iot_dbms::CM_FIRST); } } else @@ -1075,7 +1075,7 @@ void CPlotWidget::updateHistoryCurveRecord(double lower, double upper) } else { - m_pHisDataManage->postTsdbCommandQueue(E_POLYMERIC, vecMpKey, lower, upper, currentGroupByMinute(), kbd_dbms::CM_FIRST); + m_pHisDataManage->postTsdbCommandQueue(E_POLYMERIC, vecMpKey, lower, upper, currentGroupByMinute(), iot_dbms::CM_FIRST); } } } @@ -1316,7 +1316,7 @@ void CPlotWidget::updateSelectGraph(const QString &graphName) ui->plot->replot(QCustomPlot::rpQueuedReplot); } -void CPlotWidget::updatePhaseTracer(std::vector *vecMpKey, std::vector *> *vecResult, const QString &tag) +void CPlotWidget::updatePhaseTracer(std::vector *vecMpKey, std::vector *> *vecResult, const QString &tag) { ui->plot->clearItems(); m_listTracer.clear(); @@ -1334,8 +1334,8 @@ void CPlotWidget::updatePhaseTracer(std::vector *vecMpK QMultiMap< double, QStringList > map; for(size_t tagIndex(0); tagIndex < vecResult->size(); tagIndex++) { - std::vector *evetVector = vecResult->at(tagIndex); - std::vector::iterator iter = evetVector->begin(); + std::vector *evetVector = vecResult->at(tagIndex); + std::vector::iterator iter = evetVector->begin(); for(; iter != evetVector->end(); iter++) { QStringList list; @@ -1386,7 +1386,7 @@ void CPlotWidget::updatePhaseTracer(std::vector *vecMpK //< 释放结果集 - std::vector *>::iterator res = vecResult->begin(); + std::vector *>::iterator res = vecResult->begin(); while(res != vecResult->end()) { delete (*res); diff --git a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h index eec98073..e17ac478 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h +++ b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h @@ -105,16 +105,16 @@ signals: void releaseHisDataThread(); void releaseHisEventThread(); - void sigQueryHistoryOriginalData(std::vector *vecMpKey, + void sigQueryHistoryOriginalData(std::vector *vecMpKey, double lower, double upper, E_Data_Type type = E_HISTORY); - void sigQueryHistoryPolymericData(std::vector *vecMpKey, - double lower, double upper, int nGroupByMinute, kbd_dbms::EnComputeMethod method); + void sigQueryHistoryPolymericData(std::vector *vecMpKey, + double lower, double upper, int nGroupByMinute, iot_dbms::EnComputeMethod method); - void sigQueryHistoryEvent(std::vector *vecMpKey, + void sigQueryHistoryEvent(std::vector *vecMpKey, double lower, double upper, - std::vector *> *vecResult, + std::vector *> *vecResult, const QString &tag); protected: @@ -137,22 +137,22 @@ private slots: void updateHistoryCurveRecord(double lower, double upper); - void updateHisOriginalData(std::vector *vecMpKey, - std::vector *> *vecResult, + void updateHisOriginalData(std::vector *vecMpKey, + std::vector *> *vecResult, E_Data_Type type = E_HISTORY); - void updateHisPolymericData(std::vector *vecMpKey, - std::vector *> *vecResult, + void updateHisPolymericData(std::vector *vecMpKey, + std::vector *> *vecResult, int nGroupByMinute); - void updateHistoryGraph(std::vector *vecMpKey, + void updateHistoryGraph(std::vector *vecMpKey, std::vector< QSharedPointer > &vecContainer, std::vector< QSharedPointer > &vecRange); void updateSelectGraph(const QString &graphName); - void updatePhaseTracer(std::vector *vecMpKey, - std::vector *> *vecResult, + void updatePhaseTracer(std::vector *vecMpKey, + std::vector *> *vecResult, const QString &tag); void updateGraphEvent(const QString &tag, const qint64 &time, QStringList contents); @@ -175,7 +175,7 @@ private slots: void slotDateTimeChanged(const QDateTime &dateTime); private: - kbd_dbms::EnMeasPiontType getMeasType(const QString &type); + iot_dbms::EnMeasPiontType getMeasType(const QString &type); E_Trend_Type getRangeType(const QCPRange &range); @@ -199,7 +199,7 @@ private: bool checkStatus(const _Tp &var, const int &nInvalid); template - bool checkStatus(const kbd_dbms::SVarHisSamplePoint &var, const int &nInvalid); + bool checkStatus(const iot_dbms::SVarHisSamplePoint &var, const int &nInvalid); private: Ui::CPlotWidget *ui; @@ -211,7 +211,7 @@ private: CTrendGraph * m_pTrendGraph; QCPItemText * m_trendTitle; double m_rtRange; - kbd_service::CDpcdaForApp * m_pDpcdaForApp; + iot_service::CDpcdaForApp * m_pDpcdaForApp; CRealTimeDataCollect * m_rtDataCollect; QSharedPointer m_ptrPlotTricker; QThread * m_pHisDataThread; diff --git a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp index 832a692d..d958e89e 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp @@ -5,9 +5,9 @@ #include "CTrendInfoManage.h" #include -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CRealTimeDataCollect::CRealTimeDataCollect(QObject *parent) : QThread(parent) @@ -22,15 +22,15 @@ CRealTimeDataCollect::~CRealTimeDataCollect() void CRealTimeDataCollect::run() { - kbd_public::CSysInfoInterfacePtr sysInfo; - kbd_public::createSysInfoInstance(sysInfo); + iot_public::CSysInfoInterfacePtr sysInfo; + iot_public::createSysInfoInstance(sysInfo); // 初始化通讯器 CMbCommunicator * pCommunicator = new CMbCommunicator(); pCommunicator->addSub(0, CH_SCADA_TO_HMI_DATA_CHANGE); while(!isInterruptionRequested()) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; if (pCommunicator && pCommunicator->recvMsg(msg, 100) && !isInterruptionRequested()) { parseTrendDataMessage(msg); @@ -49,35 +49,35 @@ void CRealTimeDataCollect::parseTrendDataMessage(const CMbMessage &msg) int msgType = msg.getMsgType(); if(MT_DP_CHANGE_DATA == msgType) { - kbd_idlfile::SRealTimeDataPkg chgDataPkg; + iot_idl::SRealTimeDataPkg chgDataPkg; try { chgDataPkg.ParseFromArray(msg.getDataPtr(), (int)msg.getDataSize()); int aiSize = chgDataPkg.stairtd_size(); for(int i = 0;i < aiSize; i++) { - const kbd_idlfile::SAiRealTimeData &aiStru = chgDataPkg.stairtd(i); + const iot_idl::SAiRealTimeData &aiStru = chgDataPkg.stairtd(i); msgNotify(aiStru.strtagname(), aiStru.fvalue()); } int diSize = chgDataPkg.stdirtd_size(); for(int i = 0;i < diSize; i++) { - const kbd_idlfile::SDiRealTimeData &diStru = chgDataPkg.stdirtd(i); + const iot_idl::SDiRealTimeData &diStru = chgDataPkg.stdirtd(i); msgNotify(diStru.strtagname(), diStru.nvalue()); } int piSize = chgDataPkg.stpirtd_size(); for(int i = 0;i < piSize; i++) { - const kbd_idlfile::SPiRealTimeData &piStru = chgDataPkg.stpirtd(i); + const iot_idl::SPiRealTimeData &piStru = chgDataPkg.stpirtd(i); msgNotify(piStru.strtagname(), (qint64)piStru.dvalue()); } int miSize = chgDataPkg.stmirtd_size(); for(int i = 0;i < miSize; i++) { - const kbd_idlfile::SMiRealTimeData &miStru = chgDataPkg.stmirtd(i); + const iot_idl::SMiRealTimeData &miStru = chgDataPkg.stmirtd(i); msgNotify(miStru.strtagname(), miStru.nvalue()); } } diff --git a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h index 13a78164..40e55ab3 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h +++ b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h @@ -37,7 +37,7 @@ private: * @brief parseTrendDataMessage 解析实时数据 * @param msg */ - void parseTrendDataMessage(const kbd_net::CMbMessage &msg); + void parseTrendDataMessage(const iot_net::CMbMessage &msg); void msgNotify(const std::string &strTagName, const QVariant &value); }; diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp index 8c17290d..cb61387b 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp @@ -5,7 +5,7 @@ #include "GraphTool/Retriever/CRetriever.h" #include "pub_utility_api/FileUtil.h" -using namespace kbd_dbms; +using namespace iot_dbms; CTrendEditDialog::CTrendEditDialog(QWidget *parent) : QDialog(parent), diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp index c076e5af..55ffd044 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp @@ -59,7 +59,7 @@ void CTrendFavTreeWidget::collectGraph(const QString &title, const CTrendGraph & void CTrendFavTreeWidget::contextMenuEvent(QContextMenuEvent *event) { // bool bIsEditable = false; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL) { return; @@ -354,7 +354,7 @@ void CTrendFavTreeWidget::loadTrendGraph(const QString &filePath) QString strFileName; if(filePath.isEmpty()) { - strFileName = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/trendgraph.xml"); + strFileName = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/trendgraph.xml"); } else { @@ -463,13 +463,13 @@ void CTrendFavTreeWidget::savaTrendGraph(const QString &filePath) } else { - QString strTrendDir = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model"); + QString strTrendDir = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model"); QDir dir; if(!dir.exists(strTrendDir)) { dir.mkdir(strTrendDir); } - QString strTrendFile = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/trendgraph.xml"); + QString strTrendFile = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/trendgraph.xml"); file.setFileName(strTrendFile); } diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp index 663e8fc4..c526298c 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp @@ -3,7 +3,7 @@ #include "public/pub_sysinfo_api/SysInfoApi.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CTrendInfoManage *CTrendInfoManage::m_pInstance = NULL; @@ -26,7 +26,7 @@ CTrendInfoManage::CTrendInfoManage() } //< 实时库 - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); m_listTagInfo.reserve(5000); @@ -171,16 +171,16 @@ QString CTrendInfoManage::getSubSystemDesc(int id) bool CTrendInfoManage::checkTrendEditPerm() { - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { LOGERROR("创建系统信息访问库实例失败!"); return false; } spSysInfo->getLocalNodeInfo(stNodeInfo); - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { if(0 == permMngPtr->PermDllInit()) @@ -221,7 +221,7 @@ void CTrendInfoManage::reloadData() void CTrendInfoManage::loadRTLocation() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -243,8 +243,8 @@ void CTrendInfoManage::loadRTLocation() id_value.second = "description"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back(id_value.first); columns.push_back(id_value.second); @@ -255,8 +255,8 @@ void CTrendInfoManage::loadRTLocation() m_locationInfo.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); @@ -283,8 +283,8 @@ void CTrendInfoManage::loadRTSubsystem() id_value.second = "description"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back(id_value.first); columns.push_back(id_value.second); @@ -294,8 +294,8 @@ void CTrendInfoManage::loadRTSubsystem() m_subSystemInfo.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_subSystemInfo[key.toInt()] = QString::fromStdString(value.toStdString()); diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h index f11030b5..2bd0870f 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h +++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h @@ -61,8 +61,8 @@ private: void loadStateDefine(); private: - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_subSystemInfo; QMap m_locationInfo; //< LocationID-LocationDesc QMap > m_devGroupInfo; //< LocationID- 新增设备组 diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp index d29c8bac..8c6dc6d4 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp @@ -29,7 +29,7 @@ CTrendWindow::CTrendWindow(bool editMode, QVector ptrVec, QWidget *paren { Q_UNUSED(ptrVec) QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -39,7 +39,7 @@ CTrendWindow::CTrendWindow(bool editMode, QVector ptrVec, QWidget *paren qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("trendCurves.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("trendCurves.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/ISCSTrendCurves/main.cpp b/product/src/gui/plugin/ISCSTrendCurves/main.cpp index 41b5cd88..ee72bb87 100644 --- a/product/src/gui/plugin/ISCSTrendCurves/main.cpp +++ b/product/src/gui/plugin/ISCSTrendCurves/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) return -1; } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); { LOGINFO("===========================Trend Curve==========================="); @@ -37,10 +37,10 @@ int main(int argc, char *argv[]) app.exec(); } - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp b/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp index 7044f34d..4ebded0f 100644 --- a/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp +++ b/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp @@ -45,7 +45,7 @@ InverseTimeLimit::InverseTimeLimit(bool editMode, QWidget *parent) : #endif QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) diff --git a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp index 3ea670a4..9a47d122 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp @@ -5,7 +5,7 @@ CRdbAccessUtilty::CRdbAccessUtilty(int nDomainId,int nAppId) { - m_pNetRdbApi = new kbd_dbms::CRdbNetApi(); + m_pNetRdbApi = new iot_dbms::CRdbNetApi(); m_pNetRdbApi->connect(nDomainId,nAppId); @@ -84,7 +84,7 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::string &pointType, CCamInfo &outCamInfo) { - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector vecKey,vecColumn; vecKey.push_back(pointtag); @@ -109,7 +109,7 @@ bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::s bool CRdbAccessUtilty::queryCameraInfoTable(CCamInfo &outCamInfo) { - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector vecKey,vecColumn; vecKey.push_back(outCamInfo.camTag()); @@ -141,17 +141,17 @@ bool CRdbAccessUtilty::queryCameraInfoTable(CCamInfo &outCamInfo) bool CRdbAccessUtilty::queryPresetTable(CCamInfo &outCamInfo) { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("cctv_orientation"); msgQuery.add_strselectcolnamearr("tag_name"); msgQuery.add_strselectcolnamearr("description"); msgQuery.add_strselectcolnamearr("preset_token"); - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("camera_tag_name"); @@ -159,7 +159,7 @@ bool CRdbAccessUtilty::queryPresetTable(CCamInfo &outCamInfo) pCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(outCamInfo.camTag().c_str()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet; bRet = m_pNetRdbApi->query(msgQuery, retMsg); diff --git a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h index a534f4e7..6089d695 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h +++ b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h @@ -28,7 +28,7 @@ private: bool queryPresetTable(CCamInfo &outCamInfo); - kbd_dbms::CRdbNetApi *m_pNetRdbApi; //网络实时数据库接口指针 + iot_dbms::CRdbNetApi *m_pNetRdbApi; //网络实时数据库接口指针 }; #endif // CRDBACCESSUTILTY_H diff --git a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp index d3869c91..b4b74fc4 100644 --- a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp @@ -45,7 +45,7 @@ using namespace QtAV; -using namespace kbd_net; +using namespace iot_net; IpcPlusWidget::IpcPlusWidget(bool editMode, QWidget *parent) : QWidget(parent), m_player(Q_NULLPTR), @@ -60,7 +60,7 @@ IpcPlusWidget::IpcPlusWidget(bool editMode, QWidget *parent) : init(); setCapturePath(); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -70,7 +70,7 @@ IpcPlusWidget::IpcPlusWidget(bool editMode, QWidget *parent) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("ipcPlus.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("ipcPlus.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h index 9905fe5b..fa3bdf07 100644 --- a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h +++ b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h @@ -121,7 +121,7 @@ private: std::string m_strNodeName; std::string m_strAppName; - kbd_net::CMbCommunicator m_com; + iot_net::CMbCommunicator m_com; //< 摄像头相关信息 QString m_pointTag; //< 摄像头关联点 diff --git a/product/src/gui/plugin/IpcPlusWidget/main.cpp b/product/src/gui/plugin/IpcPlusWidget/main.cpp index 632397de..2482f1f1 100644 --- a/product/src/gui/plugin/IpcPlusWidget/main.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/main.cpp @@ -5,8 +5,8 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp b/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp index 3e528aa0..7d36e031 100644 --- a/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp @@ -11,7 +11,7 @@ CIpcViewerMsgBusMng::CIpcViewerMsgBusMng() bool CIpcViewerMsgBusMng::sendMsgToDomain(int nMessageType, int nChannel, const std::string &strMessage) { - using namespace kbd_net; + using namespace iot_net; bool bRet = false; CMbMessage objMsg; diff --git a/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.h b/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.h index f560dd68..b8ca99f6 100644 --- a/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.h +++ b/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.h @@ -14,7 +14,7 @@ public: void setNodeInfo(int nDomainId,int nAppid); private: - kbd_net::CMbCommunicator m_objCommon; + iot_net::CMbCommunicator m_objCommon; int m_nDomainid; int m_nAppid; }; diff --git a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp index 6a9f6dff..e8e42841 100644 --- a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp @@ -5,7 +5,7 @@ CRdbAccessUtilty::CRdbAccessUtilty(int nDomainId,int nAppId) { - m_pNetRdbApi = new kbd_dbms::CRdbNetApi(); + m_pNetRdbApi = new iot_dbms::CRdbNetApi(); m_pNetRdbApi->connect(nDomainId,nAppId); @@ -84,7 +84,7 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::string &pointType, CCamInfo &outCamInfo) { - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector vecKey,vecColumn; vecKey.push_back(pointtag); @@ -109,7 +109,7 @@ bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::s bool CRdbAccessUtilty::queryCameraInfoTable(CCamInfo &outCamInfo) { - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; std::vector vecKey,vecColumn; vecKey.push_back(outCamInfo.camTag()); @@ -143,17 +143,17 @@ bool CRdbAccessUtilty::queryCameraInfoTable(CCamInfo &outCamInfo) bool CRdbAccessUtilty::queryPresetTable(CCamInfo &outCamInfo) { - using namespace kbd_dbms; - using namespace kbd_idlfile; + using namespace iot_dbms; + using namespace iot_idl; - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("cctv_orientation"); msgQuery.add_strselectcolnamearr("tag_name"); msgQuery.add_strselectcolnamearr("description"); msgQuery.add_strselectcolnamearr("preset_token"); - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("camera_tag_name"); @@ -161,7 +161,7 @@ bool CRdbAccessUtilty::queryPresetTable(CCamInfo &outCamInfo) pCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(outCamInfo.camTag().c_str()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool bRet; bRet = m_pNetRdbApi->query(msgQuery, retMsg); diff --git a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h index 8fdb0905..5d49c6da 100644 --- a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h +++ b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h @@ -32,7 +32,7 @@ private: bool queryPresetTable(CCamInfo &outCamInfo); - kbd_dbms::CRdbNetApi *m_pNetRdbApi; //网络实时数据库接口指针 + iot_dbms::CRdbNetApi *m_pNetRdbApi; //网络实时数据库接口指针 }; #endif // CRDBACCESSUTILTY_H diff --git a/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp b/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp index 2bf8f0d2..e9779bf6 100644 --- a/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp @@ -225,7 +225,7 @@ void IpcViewerWidget::initUi() void IpcViewerWidget::initStylesheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -235,7 +235,7 @@ void IpcViewerWidget::initStylesheet() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("ipcViewer.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("ipcViewer.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/IpcViewerWidget/main.cpp b/product/src/gui/plugin/IpcViewerWidget/main.cpp index 7c2a90d8..42d12706 100644 --- a/product/src/gui/plugin/IpcViewerWidget/main.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/main.cpp @@ -13,7 +13,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } @@ -35,6 +35,6 @@ int main(int argc, char *argv[]) int result = a.exec(); //<释放消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return result; } diff --git a/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp b/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp index c9552604..15237e91 100644 --- a/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp +++ b/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp @@ -48,7 +48,7 @@ using namespace QtAV; -using namespace kbd_net; +using namespace iot_net; const int kSyncInterval = 10000; @@ -806,7 +806,7 @@ void VideoWall::intiPtzUi() void VideoWall::loadPtzUiQss() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -816,7 +816,7 @@ void VideoWall::loadPtzUiQss() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("ipcPlus.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("ipcPlus.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/IpcWallWidget/VideoWall.h b/product/src/gui/plugin/IpcWallWidget/VideoWall.h index 5afd0239..095ad357 100644 --- a/product/src/gui/plugin/IpcWallWidget/VideoWall.h +++ b/product/src/gui/plugin/IpcWallWidget/VideoWall.h @@ -143,7 +143,7 @@ private: int curNo; QPushButton *m_play,*m_pause; - kbd_net::CMbCommunicator m_com; + iot_net::CMbCommunicator m_com; QPushButton *m_cap; //抓图 diff --git a/product/src/gui/plugin/IpcWallWidget/main.cpp b/product/src/gui/plugin/IpcWallWidget/main.cpp index ec50bab8..3eb3ac30 100644 --- a/product/src/gui/plugin/IpcWallWidget/main.cpp +++ b/product/src/gui/plugin/IpcWallWidget/main.cpp @@ -44,9 +44,9 @@ void append(QVariantList &list1,QVariantList &list2,QVariantList &list3) int main(int argc, char *argv[]) { QGuiApplication::setAttribute(Qt::AA_UseDesktopOpenGL); - kbd_public::StartLogSystem("BASE","ipcwall"); + iot_public::StartLogSystem("BASE","ipcwall"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } @@ -82,8 +82,8 @@ int main(int argc, char *argv[]) result = a.exec(); } } - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); //<释放消息总线 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return 0; } diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp index 88b42f5c..e1afcda1 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp @@ -10,7 +10,7 @@ #include #include -using namespace kbd_public; +using namespace iot_public; CLimitOptWidget::CLimitOptWidget(QWidget *parent, bool editModel) : QWidget(parent), @@ -73,7 +73,7 @@ void CLimitOptWidget::addPoints(const QStringList &tagList) vecColumnP.push_back("is_limit"); vecColumnP.push_back("location_id"); vecColumnP.push_back("region_id"); - kbd_idlfile::RdbRet objRetl; + iot_idl::RdbRet objRetl; if(false == m_objRdbNetApi.queryByKey("analog", vecKeyP, vecColumnP, objRetl)) { LOGINFO("限值设置添加测点：查询模拟量测点失败 [%s]", tagName.toStdString().c_str()); @@ -98,7 +98,7 @@ void CLimitOptWidget::addPoints(const QStringList &tagList) std::vector vecColumnD; vecColumnD.push_back("description"); vecColumnD.push_back("group_tag_name"); - kbd_idlfile::RdbRet objRetlD; + iot_idl::RdbRet objRetlD; if(false == m_objRdbNetApi.queryByKey("dev_info", vecKeyD, vecColumnD, objRetlD)) { LOGINFO("限值设置添加测点：查询设备信息失败 [%s]", tagName.toStdString().c_str()); @@ -127,7 +127,7 @@ void CLimitOptWidget::addPoints(const QStringList &tagList) vecColumnLimit.push_back("limit_low2"); vecColumnLimit.push_back("limit_up3"); vecColumnLimit.push_back("limit_low3"); - kbd_idlfile::RdbRet objRetLimit; + iot_idl::RdbRet objRetLimit; if(false == m_objRdbNetApi.queryByKey("analog_limit_info", vecKeyLimit, vecColumnLimit, objRetLimit)) { LOGINFO("限值设置添加测点：查询模拟量越限信息失败 [%s]", tagName.toStdString().c_str()); @@ -308,7 +308,7 @@ void CLimitOptWidget::slotCancelClicked() void CLimitOptWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -501,7 +501,7 @@ void CLimitOptWidget::initSysInfo() void CLimitOptWidget::initPermMng() { - kbd_service::CPermMngApiPtr ptrPermMng = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr ptrPermMng = iot_service::getPermMngInstance("base"); if(ptrPermMng == NULL || (PERM_NORMAL != ptrPermMng->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -539,7 +539,7 @@ void CLimitOptWidget::loadLocDomainMap() LOGERROR("限值设置加载厂站信息失败: [%s]", m_objRdbApi.getErrorMsg().c_str()); return; } - kbd_dbms::CRdbQueryResult oResult; + iot_dbms::CRdbQueryResult oResult; std::vector vecSelectColumn; vecSelectColumn.push_back("tag_name"); vecSelectColumn.push_back("domain_id"); @@ -554,8 +554,8 @@ void CLimitOptWidget::loadLocDomainMap() m_locDomainMap.clear(); for(int nIndex(0); nIndex < oResult.getRecordCount(); nIndex++) { - kbd_dbms::CVarType tag_name; - kbd_dbms::CVarType domain_id; + iot_dbms::CVarType tag_name; + iot_dbms::CVarType domain_id; oResult.getColumnValue(nIndex, 0, tag_name); oResult.getColumnValue(nIndex, 1, domain_id); m_locDomainMap.insert(QString::fromStdString(tag_name.toStdString()), domain_id.toInt()); @@ -588,11 +588,11 @@ QString CLimitOptWidget::getDevGroupDesc(const QString &devGroupTag) LOGERROR("限值设置查询dev_group失败: [%s]", m_objRdbApi.getErrorMsg().c_str()); return ""; } - kbd_dbms::CONDINFO oCondInfo; + iot_dbms::CONDINFO oCondInfo; oCondInfo.relationop = ATTRCOND_EQU; memcpy(oCondInfo.name, "tag_name", strlen("tag_name")); oCondInfo.conditionval = devGroupTag.toStdString(); - kbd_dbms::CRdbQueryResult oResult; + iot_dbms::CRdbQueryResult oResult; std::string sSelectColumn = "description"; if(false == m_objRdbApi.select(oCondInfo, oResult, sSelectColumn)) { @@ -604,7 +604,7 @@ QString CLimitOptWidget::getDevGroupDesc(const QString &devGroupTag) for(int nIndex(0); nIndex < oResult.getRecordCount(); nIndex++) { - kbd_dbms::CVarType description; + iot_dbms::CVarType description; oResult.getColumnValue(nIndex, 0, description); return QString::fromStdString(description.toStdString()); } diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h index 0e5d45fd..80de6b5b 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h @@ -89,9 +89,9 @@ private: private: Ui::CLimitOptWidget *ui; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; - kbd_dbms::CRdbAccess m_objRdbApi; - kbd_dbms::CRdbNetApi m_objRdbNetApi; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_dbms::CRdbAccess m_objRdbApi; + iot_dbms::CRdbNetApi m_objRdbNetApi; CLimitOptWork *m_pLimitOptWork; QMap m_locDomainMap; std::vector m_vecPermRegionId; diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp index 22bdb62e..b255fbad 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp @@ -5,9 +5,9 @@ #include "alarm_server_api/CAlmApiForApp.h" #include "public/pub_utility_api/TimeUtil.h" -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_service; +using namespace iot_dbms; CLimitOptWork::CLimitOptWork(QObject *parent) : QObject(parent), @@ -94,7 +94,7 @@ bool CLimitOptWork::initSysApi() m_pAlmApi = new CAlmApiForApp(stNodeInfo.nDomainId, stAppInfo.nId); m_pAlmApi->resumeThread(); LOGINFO("CAlmApiForApp domain: %d, app: %d", stNodeInfo.nDomainId, stAppInfo.nId); - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); return true; } @@ -137,7 +137,7 @@ bool CLimitOptWork::updateLimitPara(const QMap, QList, QList > >::const_iterator iter = limitPara.constBegin(); for(; iter != limitPara.constEnd(); iter++) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; msg.setMsgType(MT_OPT_AI_LIMIT_SET_DOWN); msg.setSubject(iter.key().second, CH_HMI_TO_OPT_OPTCMD_DOWN); @@ -200,13 +200,13 @@ bool CLimitOptWork::createReqHead(SOptReqHead &head, const int &nDomainId, const bool CLimitOptWork::sendAlarm(const QString &alarm, int isLimit) { - kbd_idlfile::SAppAddAlm stAppAddAlarm; - kbd_idlfile::SAlmInfoFromApp &stAlmInfoFromApp = *(stAppAddAlarm.add_alm_info()); + iot_idl::SAppAddAlm stAppAddAlarm; + iot_idl::SAlmInfoFromApp &stAlmInfoFromApp = *(stAppAddAlarm.add_alm_info()); stAlmInfoFromApp.set_alm_type(ALM_TYPE_OPERATE); stAlmInfoFromApp.set_time_stamp(getUTCTimeMsec()); stAlmInfoFromApp.set_status(ALM_STAT_OPT_MODEL_MODIFY); stAlmInfoFromApp.set_location_id(m_nLocationId); - stAlmInfoFromApp.set_alm_style(kbd_idlfile::enAlmStyle::AS_EVENT_ONLY); + stAlmInfoFromApp.set_alm_style(iot_idl::enAlmStyle::AS_EVENT_ONLY); stAlmInfoFromApp.set_region_id(-1); //< 责任区ID,HMI 系统操作责任区统一为-1,系统事件 std::string strAlias = ""; @@ -242,7 +242,7 @@ bool CLimitOptWork::sendAlarm(const QString &alarm, int isLimit) alarmDesc += tr("操作主机: "); alarmDesc += QString::fromStdString(m_strName); - kbd_idlfile::SAlmKeyword stAlmKeyword; + iot_idl::SAlmKeyword stAlmKeyword; stAlmKeyword.set_id(ALM_KEY_ALM_DESC); stAlmKeyword.set_value(alarmDesc.toStdString().c_str()); stAlmInfoFromApp.add_alm_keyword()->CopyFrom(stAlmKeyword); diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h index 5ba6080c..2cffcc30 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h @@ -40,10 +40,10 @@ private: bool sendAlarm(const QString &alarm, int isLimit); private: - kbd_net::CMbCommunicator *m_communicator; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; - kbd_service::CPermMngApiPtr m_ptrPermMng; - kbd_service::CAlmApiForApp *m_pAlmApi; + iot_net::CMbCommunicator *m_communicator; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_service::CPermMngApiPtr m_ptrPermMng; + iot_service::CAlmApiForApp *m_pAlmApi; bool m_isInit; int m_nDomainId; int m_nLocationId; diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp index 56360385..929018a1 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp @@ -7,8 +7,8 @@ #include #include -using namespace kbd_dbms; -using namespace kbd_idlfile::linkage; +using namespace iot_dbms; +using namespace iot_idl::linkage; CLinkCtrlDataManage::CLinkCtrlDataManage(QObject *parent) : QObject(parent), @@ -49,9 +49,9 @@ CLinkCtrlDataManage::~CLinkCtrlDataManage() QList CLinkCtrlDataManage::queryLinkCtrlList() { - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { spSysInfo->getLocalNodeInfo(stNodeInfo); } @@ -227,7 +227,7 @@ void CLinkCtrlDataManage::requestLinkOperation(const int &nDomainID, const QStri int nLevel = -1; int nLoginSec = -1; std::string strInstanceName = ""; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -252,9 +252,9 @@ void CLinkCtrlDataManage::requestLinkOperation(const int &nDomainID, const QStri head->set_source_tag("hmi"); head->set_msg_type((enLcsMsgType)E_LinkOperate_Message); - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { spSysInfo->getLocalNodeInfo(stNodeInfo); } @@ -324,7 +324,7 @@ void CLinkCtrlDataManage::requestLinkOperation(const int &nDomainID, const QStri } -bool CLinkCtrlDataManage::receiveLinkOperateAck(kbd_idlfile::linkage::LinkOperateMessageAck &msg) +bool CLinkCtrlDataManage::receiveLinkOperateAck(iot_idl::linkage::LinkOperateMessageAck &msg) { if (msg.has_execute_status()) { @@ -341,14 +341,14 @@ bool CLinkCtrlDataManage::receiveLinkOperateAck(kbd_idlfile::linkage::LinkOperat return true; } -bool CLinkCtrlDataManage::recvUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessage &msg) +bool CLinkCtrlDataManage::recvUserInterveneRequest(iot_idl::linkage::UiRequestMessage &msg) { - kbd_idlfile::linkage::UiRequestMessage * requestMessage = new kbd_idlfile::linkage::UiRequestMessage(msg); + iot_idl::linkage::UiRequestMessage * requestMessage = new iot_idl::linkage::UiRequestMessage(msg); emit sigRecvLinkUserInterveneRequest(requestMessage); return true; } -void CLinkCtrlDataManage::replyUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessageAck &msg) +void CLinkCtrlDataManage::replyUserInterveneRequest(iot_idl::linkage::UiRequestMessageAck &msg) { try { @@ -361,7 +361,7 @@ void CLinkCtrlDataManage::replyUserInterveneRequest(kbd_idlfile::linkage::UiRequ } -bool CLinkCtrlDataManage::recvLinkStartRequest(kbd_idlfile::linkage::LinkStartRequestMessage &msg) +bool CLinkCtrlDataManage::recvLinkStartRequest(iot_idl::linkage::LinkStartRequestMessage &msg) { quint64 triggerTime = msg.trigger_time(); LinkNodeStatusParameter * linkNodeParameter = msg.mutable_nodelist(); @@ -371,7 +371,7 @@ bool CLinkCtrlDataManage::recvLinkStartRequest(kbd_idlfile::linkage::LinkStartRe return true; } -bool CLinkCtrlDataManage::recvLinkStateChange(kbd_idlfile::linkage::StatusChangeMessage &msg) +bool CLinkCtrlDataManage::recvLinkStateChange(iot_idl::linkage::StatusChangeMessage &msg) { try { diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h index ee9b9d3a..ecafcc3b 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h @@ -45,15 +45,15 @@ public: const QList &nodeList, const E_LINK_OPERATETYPE & type); - bool receiveLinkOperateAck(kbd_idlfile::linkage::LinkOperateMessageAck &msg); + bool receiveLinkOperateAck(iot_idl::linkage::LinkOperateMessageAck &msg); - bool recvUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessage &msg); + bool recvUserInterveneRequest(iot_idl::linkage::UiRequestMessage &msg); - void replyUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessageAck &msg); + void replyUserInterveneRequest(iot_idl::linkage::UiRequestMessageAck &msg); - bool recvLinkStartRequest(kbd_idlfile::linkage::LinkStartRequestMessage &msg); + bool recvLinkStartRequest(iot_idl::linkage::LinkStartRequestMessage &msg); - bool recvLinkStateChange(kbd_idlfile::linkage::StatusChangeMessage &msg); + bool recvLinkStateChange(iot_idl::linkage::StatusChangeMessage &msg); signals: void sigRequestLinkOperationFail(const QString &strLinkName, const E_LINK_OPERATETYPE &type, const int &nErrorCode, const QString &strErrorCode); @@ -61,13 +61,13 @@ signals: void sigUpdateLinkAgeState(const QString &strLinkName, int state, quint64 triggerTime, quint64 timeFlag); void sigUpdateFunctionState(const QString &strLinkName, const QString &strFunctionName, const int &state); void sigUpdateActionState(const QString &strLinkName, const QString &strFunctionName, const QString &strActionName, const int &state); - void sigRecvLinkUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessage *msg); + void sigRecvLinkUserInterveneRequest(iot_idl::linkage::UiRequestMessage *msg); private: QTimer * m_Timer; CLinkCtrlMessageHandle * m_linkCtrlMsgHandle; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbNetApi * m_rdbNetApi; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbNetApi * m_rdbNetApi; }; #endif // CLINKCTRLDATAMANAGE_H diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp index 115c9774..5eb5977f 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp @@ -12,25 +12,25 @@ CLinkCtrlMessageHandle::~CLinkCtrlMessageHandle() stop(); } -bool CLinkCtrlMessageHandle::handleLinkOperateResponse(kbd_idlfile::linkage::LinkOperateMessageAck &msg) +bool CLinkCtrlMessageHandle::handleLinkOperateResponse(iot_idl::linkage::LinkOperateMessageAck &msg) { qDebug() << "receiveLinkOperateAck "; return m_linkCtrlDataManage->receiveLinkOperateAck(msg); } -bool CLinkCtrlMessageHandle::handleUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessage &msg) +bool CLinkCtrlMessageHandle::handleUserInterveneRequest(iot_idl::linkage::UiRequestMessage &msg) { qDebug() << "recvUserInterveneRequest "; return m_linkCtrlDataManage->recvUserInterveneRequest(msg); } -bool CLinkCtrlMessageHandle::handleLinkStartRequest(kbd_idlfile::linkage::LinkStartRequestMessage &msg) +bool CLinkCtrlMessageHandle::handleLinkStartRequest(iot_idl::linkage::LinkStartRequestMessage &msg) { qDebug() << "recvLinkStartRequest "; return m_linkCtrlDataManage->recvLinkStartRequest(msg); } -bool CLinkCtrlMessageHandle::handleLinkStateChange(kbd_idlfile::linkage::StatusChangeMessage &msg) +bool CLinkCtrlMessageHandle::handleLinkStateChange(iot_idl::linkage::StatusChangeMessage &msg) { return true; qDebug() << "recvLinkStateChange "; diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h index fc6c7a37..7a75332f 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h @@ -12,23 +12,23 @@ public: ~CLinkCtrlMessageHandle(); //1 hmi->server 发起的请求联动操作 - //bool linkOperateRequest(kbd_idlfile::LinkOperateMessage& msg); + //bool linkOperateRequest(iot_idl::LinkOperateMessage& msg); //2 server->hmi 请求联动操作的应答 - virtual bool handleLinkOperateResponse(kbd_idlfile::linkage::LinkOperateMessageAck& msg); + virtual bool handleLinkOperateResponse(iot_idl::linkage::LinkOperateMessageAck& msg); //1 server->hmi 发起的人工干预 请求 - virtual bool handleUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessage& msg); + virtual bool handleUserInterveneRequest(iot_idl::linkage::UiRequestMessage& msg); //2 hmi ->server 人工干预应答 - //bool userInterveneResponse(kbd_idlfile::UiRequestMessageAck& msg); + //bool userInterveneResponse(iot_idl::UiRequestMessageAck& msg); //server->hmi 请求联动操作 应答 server 发起的 半自动请求开始 - virtual bool handleLinkStartRequest(kbd_idlfile::linkage::LinkStartRequestMessage& msg); + virtual bool handleLinkStartRequest(iot_idl::linkage::LinkStartRequestMessage& msg); //server->hmi 联动状态更新 - virtual bool handleLinkStateChange(kbd_idlfile::linkage::StatusChangeMessage& msg); + virtual bool handleLinkStateChange(iot_idl::linkage::StatusChangeMessage& msg); private: CLinkCtrlDataManage * m_linkCtrlDataManage; diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp index 9b6eb8fa..fc89da46 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp @@ -6,8 +6,8 @@ #include #include -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CLinkCtrlStateManage::CLinkCtrlStateManage(QObject *parent) : QObject(parent) @@ -61,7 +61,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() } while(m_rdbNetApi->checkStatus()) { - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (m_rdbNetApi->getRet(&retMsg)) { if(retMsg.msgrecord_size() != 0) @@ -110,12 +110,12 @@ void CLinkCtrlStateManage::updateLinkAgeState() bool bValid = false; if ( m_nDomainID <= 0 || m_nAppID <= 0 ) { - kbd_public::CSysInfoInterfacePtr spSysInfo; - if ( kbd_public::createSysInfoInstance( spSysInfo )) + iot_public::CSysInfoInterfacePtr spSysInfo; + if ( iot_public::createSysInfoInstance( spSysInfo )) { - kbd_public::SNodeInfo nodeInfo; + iot_public::SNodeInfo nodeInfo; spSysInfo->getLocalNodeInfo( nodeInfo ); - kbd_public::SAppInfo appInfo; + iot_public::SAppInfo appInfo; spSysInfo->getAppInfoByName(COMAPP, appInfo ); m_nDomainID = nodeInfo.nDomainId; @@ -135,7 +135,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() m_rdbNetApi->connect(m_nDomainID, m_nAppID); foreach (S_LINKCTRL_INFO linkage, m_linkAgeList) { - kbd_idlfile::RdbQuery query; + iot_idl::RdbQuery query; query.set_strtablename("linkage_running"); std::string *pStatusColName = query.add_strselectcolnamearr(); *pStatusColName = "status"; @@ -152,7 +152,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() std::string *pActionNameColName = query.add_strselectcolnamearr(); *pActionNameColName = "action_name"; - kbd_idlfile::RdbCondition *pLinkAgeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkAgeCondtion = query.add_msgcondition(); pLinkAgeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkAgeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkAgeCondtion->set_strcolumnname("linkage_name"); @@ -162,7 +162,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() if(E_Node_LinkCtrl == linkage.nodeType) { - kbd_idlfile::RdbCondition *pLinkNodeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkNodeCondtion = query.add_msgcondition(); pLinkNodeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkNodeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkNodeCondtion->set_strcolumnname("node_type"); @@ -170,7 +170,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() pLinkNodeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pLinkNodeCondValue->set_nvalue((int)E_Node_LinkCtrl); -// kbd_idlfile::RdbCondition *pLinkTypeCondtion = query.add_msgcondition(); +// iot_idl::RdbCondition *pLinkTypeCondtion = query.add_msgcondition(); // pLinkTypeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); // pLinkTypeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); // pLinkTypeCondtion->set_strcolumnname("link_type"); @@ -178,12 +178,12 @@ void CLinkCtrlStateManage::updateLinkAgeState() // pLinkTypeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); // pLinkTypeCondValue->set_nvalue((int)E_Node_Function); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; m_rdbNetApi->query(query, retMsg, true); } else if(E_Node_Function == linkage.nodeType) { - kbd_idlfile::RdbCondition *pFuncCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pFuncCondtion = query.add_msgcondition(); pFuncCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pFuncCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pFuncCondtion->set_strcolumnname("func_name"); @@ -191,7 +191,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() pFuncCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pFuncCondValue->set_strvalue(linkage.funcName.toStdString()); - kbd_idlfile::RdbCondition *pLinkNodeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkNodeCondtion = query.add_msgcondition(); pLinkNodeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkNodeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkNodeCondtion->set_strcolumnname("node_type"); @@ -199,7 +199,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() pLinkNodeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pLinkNodeCondValue->set_nvalue((int)E_Node_Function); -// kbd_idlfile::RdbCondition *pLinkTypeCondtion = query.add_msgcondition(); +// iot_idl::RdbCondition *pLinkTypeCondtion = query.add_msgcondition(); // pLinkTypeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); // pLinkTypeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); // pLinkTypeCondtion->set_strcolumnname("link_type"); @@ -207,12 +207,12 @@ void CLinkCtrlStateManage::updateLinkAgeState() // pLinkTypeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); // pLinkTypeCondValue->set_nvalue((int)E_Node_LinkCtrl); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; m_rdbNetApi->query(query, retMsg, true); } else if(E_Node_Action == linkage.nodeType) { - kbd_idlfile::RdbCondition *pFuncCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pFuncCondtion = query.add_msgcondition(); pFuncCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pFuncCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pFuncCondtion->set_strcolumnname("func_name"); @@ -220,7 +220,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() pFuncCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pFuncCondValue->set_strvalue(linkage.funcName.toStdString()); - kbd_idlfile::RdbCondition *pActionCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pActionCondtion = query.add_msgcondition(); pActionCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pActionCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pActionCondtion->set_strcolumnname("action_name"); @@ -228,7 +228,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() pActionCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pActionCondValue->set_strvalue(linkage.actionName.toStdString()); - kbd_idlfile::RdbCondition *pLinkNodeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkNodeCondtion = query.add_msgcondition(); pLinkNodeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkNodeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkNodeCondtion->set_strcolumnname("node_type"); @@ -236,7 +236,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() pLinkNodeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pLinkNodeCondValue->set_nvalue((int)E_Node_Action); -// kbd_idlfile::RdbCondition *pLinkTypeCondtion = query.add_msgcondition(); +// iot_idl::RdbCondition *pLinkTypeCondtion = query.add_msgcondition(); // pLinkTypeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); // pLinkTypeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); // pLinkTypeCondtion->set_strcolumnname("link_type"); @@ -244,7 +244,7 @@ void CLinkCtrlStateManage::updateLinkAgeState() // pLinkTypeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); // pLinkTypeCondValue->set_nvalue((int)E_Node_LinkCtrl); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; m_rdbNetApi->query(query, retMsg, true); } } diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h index a777fe0d..74b70381 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h @@ -32,7 +32,7 @@ private: int m_nDomainID{-1}; int m_nAppID{-1}; QTimer * m_Timer{nullptr}; - kbd_dbms::CRdbNetApi * m_rdbNetApi{nullptr}; + iot_dbms::CRdbNetApi * m_rdbNetApi{nullptr}; QMutex mutex; QList m_linkAgeList; diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp index aefa37e6..11e6c407 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp @@ -25,9 +25,9 @@ #include -using namespace kbd_public; -using namespace kbd_dbms; -using namespace kbd_idlfile::linkage; +using namespace iot_public; +using namespace iot_dbms; +using namespace iot_idl::linkage; using boost::property_tree::ptree; using namespace std; @@ -49,11 +49,11 @@ CLinkCtrlWidget::CLinkCtrlWidget(QWidget *parent, bool editMode) : { qRegisterMetaType("E_LINK_OPERATETYPE"); qRegisterMetaType >("LISTLINKCTRL"); - qRegisterMetaType("kbd_idlfile::linkage::UiRequestMessage"); + qRegisterMetaType("iot_idl::linkage::UiRequestMessage"); initialize(); } QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -63,7 +63,7 @@ CLinkCtrlWidget::CLinkCtrlWidget(QWidget *parent, bool editMode) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("linkCtrl.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("linkCtrl.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -236,7 +236,7 @@ void CLinkCtrlWidget::logout() bool CLinkCtrlWidget::getLinkCtrlPerm() { //<权限处理 - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -268,9 +268,9 @@ void CLinkCtrlWidget::slotExecution() index = index.sibling(index.row(), 0); QString strLinkAgeName = m_pLinkCtrlTableModel->value(index).toString(); - kbd_public::CSysInfoInterfacePtr spSysInfo; - kbd_public::SLocationInfo stLocationInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + iot_public::SLocationInfo stLocationInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { foreach (S_LINKCTRL_INFO info, m_linkCtrlList) { @@ -311,9 +311,9 @@ void CLinkCtrlWidget::slotSingleStep() index = index.sibling(index.row(), 0); QString strLinkAgeName = m_pLinkCtrlTableModel->value(index).toString(); - kbd_public::CSysInfoInterfacePtr spSysInfo; - kbd_public::SLocationInfo stLocationInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + iot_public::SLocationInfo stLocationInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { foreach(S_LINKCTRL_INFO info, m_linkCtrlList) { @@ -355,9 +355,9 @@ void CLinkCtrlWidget::slotPause() index = index.sibling(index.row(), 0); QString strLinkAgeName = m_pLinkCtrlTableModel->value(index).toString(); - kbd_public::CSysInfoInterfacePtr spSysInfo; - kbd_public::SLocationInfo stLocationInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + iot_public::SLocationInfo stLocationInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { foreach(S_LINKCTRL_INFO info, m_linkCtrlList) { @@ -394,9 +394,9 @@ void CLinkCtrlWidget::slotTermination() index = index.sibling(index.row(), 0); QString strLinkAgeName = m_pLinkCtrlTableModel->value(index).toString(); - kbd_public::CSysInfoInterfacePtr spSysInfo; - kbd_public::SLocationInfo stLocationInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + iot_public::SLocationInfo stLocationInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { foreach(S_LINKCTRL_INFO info, m_linkCtrlList) { @@ -642,7 +642,7 @@ void CLinkCtrlWidget::handleUserInterveneRequest(UiRequestMessage &msg) } - kbd_idlfile::linkage::UiRequestMessageAck msgAck; + iot_idl::linkage::UiRequestMessageAck msgAck; if(!buildUserInterveneReplyMsg(msg, type, msgAck)) { return; @@ -845,11 +845,11 @@ void CLinkCtrlWidget::updateUiButtonState(const E_LCS_STATUS type) } } -bool CLinkCtrlWidget::buildUserInterveneReplyMsg(const kbd_idlfile::linkage::UiRequestMessage &sourceMsg, const E_UIOPERATE_TYPE &type, UiRequestMessageAck &msgAck) +bool CLinkCtrlWidget::buildUserInterveneReplyMsg(const iot_idl::linkage::UiRequestMessage &sourceMsg, const E_UIOPERATE_TYPE &type, UiRequestMessageAck &msgAck) { - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { spSysInfo->getLocalNodeInfo(stNodeInfo); } @@ -865,7 +865,7 @@ bool CLinkCtrlWidget::buildUserInterveneReplyMsg(const kbd_idlfile::linkage::UiR int nLevel = -1; int nLoginSec = -1; std::string strInstanceName = ""; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -998,7 +998,7 @@ int CLinkCtrlWidget::readLinkTypeDescXml() std::string linkTypeStr; //< 读取LINKAGE_SETTING配置文件，获取联动类型 - std::string path = kbd_public::CFileUtil::getPathOfResFile("model_studio/setting/table/LINKAGE_SETTING.xml"); + std::string path = iot_public::CFileUtil::getPathOfResFile("model_studio/setting/table/LINKAGE_SETTING.xml"); if(readXml(path,linkTypeStr)==kbdFailed) { LOGERROR("readLinkTypeDescXml load [zh] LINKAGE_SETTING.xml error"); diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h index 01410ea5..d4b6213e 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h @@ -56,7 +56,7 @@ protected slots: void slotLinkCtrlCheckStateChanged(const QString functionName, const QString actionName, const int checkedState); void slotRequestLinkOperationFail(const QString &strLinkDescription, const E_LINK_OPERATETYPE &type, const int &nErrorCode, const QString &strErrorCode); - void slotRecvLinkUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessage *msg); + void slotRecvLinkUserInterveneRequest(iot_idl::linkage::UiRequestMessage *msg); void slotLinkAgeStart(const QString &strLinkName, const int &state, const quint64 &triggerTime); //< triggerTime 为0不刷新此值 @@ -73,8 +73,8 @@ private slots: private: bool getLinkCtrlPerm(); void updateUiButtonState(const E_LCS_STATUS type); - void handleUserInterveneRequest(kbd_idlfile::linkage::UiRequestMessage &msg); - bool buildUserInterveneReplyMsg(const kbd_idlfile::linkage::UiRequestMessage &sourceMsg, const E_UIOPERATE_TYPE &type, kbd_idlfile::linkage::UiRequestMessageAck &msgAck); + void handleUserInterveneRequest(iot_idl::linkage::UiRequestMessage &msg); + bool buildUserInterveneReplyMsg(const iot_idl::linkage::UiRequestMessage &sourceMsg, const E_UIOPERATE_TYPE &type, iot_idl::linkage::UiRequestMessageAck &msgAck); void loadLinkReport(); void updateHistoryActionData(); int readLinkTypeDescXml(); @@ -103,6 +103,6 @@ private: Q_DECLARE_METATYPE(E_LINK_OPERATETYPE) Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(kbd_idlfile::linkage::UiRequestMessage) +Q_DECLARE_METATYPE(iot_idl::linkage::UiRequestMessage) #endif // CLINKCTRLWIDGET_H diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp index c1f949bc..92d51ef6 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp @@ -3,8 +3,8 @@ #include "../../idl_files/LinkageMessage.pb.h" #include "../../idl_files/RdbServerMessage.pb.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CLinkDBInterface::CLinkDBInterface() : m_timer(NULL) @@ -56,8 +56,8 @@ QString CLinkDBInterface::queryLocationName(const int nLocationID) std::string strTableName = "sys_model_location_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("description"); @@ -93,8 +93,8 @@ QString CLinkDBInterface::queryUserName(const int nUserID) std::string strTableName = "rm_user_def"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("perm_name"); @@ -128,8 +128,8 @@ QStringList CLinkDBInterface::queryAllLocationName() std::string strTableName = "sys_model_location_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("description"); std::string sOrderColumn = "location_no"; @@ -156,8 +156,8 @@ QMap CLinkDBInterface::queryUserIDMap() std::string strTableName = "rm_user_def"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("perm_id"); columns.push_back("perm_alias"); @@ -237,7 +237,7 @@ QString CLinkDBInterface::queryStateName(const QString &strStateTextName, const std::string strTableName = "dict_state_text_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); std::vector vecCondInfo; CONDINFO conditionName; @@ -255,7 +255,7 @@ QString CLinkDBInterface::queryStateName(const QString &strStateTextName, const vecCondInfo.push_back(conditionState); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("display_value"); @@ -279,13 +279,13 @@ QString CLinkDBInterface::queryStateName(const QString &strStateTextName, const QList CLinkDBInterface::queryRunLinkNodeList() { QList LinkList; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { return LinkList; } - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; spSysInfo->getLocalNodeInfo(stNodeInfo); bool res = m_dbInterface->open(); if(res) @@ -500,27 +500,27 @@ void CLinkDBInterface::updataLinkState(QList &listLink) { //query state QMutexLocker locker(&mutex); - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - kbd_public::SAppInfo appInfo; + iot_public::SAppInfo appInfo; spSysInfo->getAppInfoByName(COMAPP, appInfo); for(int nIndex(0); nIndex < listLink.size(); nIndex++) { if(E_Node_Link == listLink.at(nIndex).nodeType) { - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(listLink.at(nIndex).locationID, stLocationInfo); m_rdbNetApi->connect(stLocationInfo.nDomainId, appInfo.nId); try { - kbd_idlfile::RdbQuery query; + iot_idl::RdbQuery query; query.set_strtablename("Link_running"); std::string *pStatusColName = query.add_strselectcolnamearr(); *pStatusColName = "status"; - kbd_idlfile::RdbCondition *pLinkNodeTypeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkNodeTypeCondtion = query.add_msgcondition(); pLinkNodeTypeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkNodeTypeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkNodeTypeCondtion->set_strcolumnname("node_type"); @@ -529,7 +529,7 @@ void CLinkDBInterface::updataLinkState(QList &listLink) pSeqNodeTypeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pSeqNodeTypeCondValue->set_nvalue((int)E_Node_Link); - kbd_idlfile::RdbCondition *pLinkNameCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkNameCondtion = query.add_msgcondition(); pLinkNameCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkNameCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkNameCondtion->set_strcolumnname("seq_name"); @@ -538,7 +538,7 @@ void CLinkDBInterface::updataLinkState(QList &listLink) pSeqNameCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pSeqNameCondValue->set_strvalue(listLink.at(nIndex).seqName.toStdString()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (m_rdbNetApi->query(query, retMsg)) { if(retMsg.msgrecord_size() != 0) @@ -568,7 +568,7 @@ void CLinkDBInterface::updataLinkExecuteState() while(m_rdbNetApi->checkStatus()) { - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (m_rdbNetApi->getRet(&retMsg)) { if(retMsg.msgrecord_size() != 0) @@ -580,8 +580,8 @@ void CLinkDBInterface::updataLinkExecuteState() } } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { for(int nIndex(0); nIndex < m_listLink.size(); nIndex++) { @@ -592,13 +592,13 @@ void CLinkDBInterface::updataLinkExecuteState() continue; } - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(m_listLink.at(nIndex).locationID, stLocationInfo); - kbd_public::SAppInfo appInfo; + iot_public::SAppInfo appInfo; spSysInfo->getAppInfoByName(COMAPP, appInfo); m_rdbNetApi->connect(stLocationInfo.nDomainId, appInfo.nId); - kbd_idlfile::RdbQuery query; + iot_idl::RdbQuery query; query.set_strtablename("Link_running"); std::string *pSeqColName = query.add_strselectcolnamearr(); @@ -607,7 +607,7 @@ void CLinkDBInterface::updataLinkExecuteState() std::string *pStatusColName = query.add_strselectcolnamearr(); *pStatusColName = "status"; - kbd_idlfile::RdbCondition *pLinkNodeTypeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkNodeTypeCondtion = query.add_msgcondition(); pLinkNodeTypeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkNodeTypeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkNodeTypeCondtion->set_strcolumnname("node_type"); @@ -616,7 +616,7 @@ void CLinkDBInterface::updataLinkExecuteState() pSeqNodeTypeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pSeqNodeTypeCondValue->set_nvalue((int)E_Node_Link); - kbd_idlfile::RdbCondition *pLinkNameCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pLinkNameCondtion = query.add_msgcondition(); pLinkNameCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pLinkNameCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pLinkNameCondtion->set_strcolumnname("seq_name"); @@ -625,7 +625,7 @@ void CLinkDBInterface::updataLinkExecuteState() pSeqNameCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pSeqNameCondValue->set_strvalue(m_listLink.at(nIndex).seqName.toStdString()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; m_rdbNetApi->query(query, retMsg, true); } } diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h index 0bc3e639..ec8b075c 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h @@ -64,9 +64,9 @@ private: QMutex linkmutex; QTimer * m_timer; //QList m_listLink; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccessEx * m_rtdbAccessEx; - kbd_dbms::CRdbNetApi * m_rdbNetApi; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccessEx * m_rtdbAccessEx; + iot_dbms::CRdbNetApi * m_rdbNetApi; }; #endif // CLINKDBINTERFACE_H diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp index df211552..cabc9d3f 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp @@ -5,7 +5,7 @@ #include "CLinkageForHmiApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::linkage; +using namespace iot_idl::linkage; kbd_application::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl( int appid, @@ -56,7 +56,7 @@ void CLinkageForHmiApiImpl::afterSuspend() } void CLinkageForHmiApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; if (!m_objRecvLinkCMb.recvMsg(m_objRecvMsg)) { return; @@ -66,10 +66,10 @@ void CLinkageForHmiApiImpl::execute() } bool CLinkageForHmiApiImpl::recvMsgLink( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; if (msg.getMsgType() != MT_LINKAGE_CTRL_HMI_UP) { @@ -143,7 +143,7 @@ bool CLinkageForHmiApiImpl::recvMsgLink( return false; } -bool CLinkageForHmiApiImpl::sendToLink(kbd_net::CMbMessage& msg, int domain) +bool CLinkageForHmiApiImpl::sendToLink(iot_net::CMbMessage& msg, int domain) { LOGINFO("sendMsgToDomain domain[%d] appid[%d] msgType[%d] Subject[%d]", domain, @@ -160,7 +160,7 @@ bool CLinkageForHmiApiImpl::linkOperateRequest( LinkOperateMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumLinkOperateMessage); objMessage.setData(msg.SerializeAsString()); return sendToLink(objMessage, domain); @@ -170,7 +170,7 @@ bool CLinkageForHmiApiImpl::userInterveneResponse( UiRequestMessageAck& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumUiRequestMessageAck); objMessage.setData(msg.SerializeAsString()); return sendToLink(objMessage, domain); diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h index 1be3bec7..cc9fbc42 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h +++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h @@ -7,10 +7,10 @@ #include "application/linkage_server_api/CLinkageForHmiApi.h" namespace kbd_application { - using namespace kbd_idlfile::linkage; + using namespace iot_idl::linkage; class CLinkageForHmiApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CLinkageForHmiApiImpl(int appid, CLinkageForHmiApi* api); @@ -47,15 +47,15 @@ namespace kbd_application { bool handleLinkStateChange( StatusChangeMessage& msg); - bool sendToLink(kbd_net::CMbMessage& msg, int domain); + bool sendToLink(iot_net::CMbMessage& msg, int domain); - bool recvMsgLink(kbd_net::CMbMessage& msg); + bool recvMsgLink(iot_net::CMbMessage& msg); private: CLinkageForHmiApi* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendLinkCMb;//发送 linkage - kbd_net::CMbCommunicator m_objRecvLinkCMb;//接收 linkage + iot_net::CMbCommunicator m_objSendLinkCMb;//发送 linkage + iot_net::CMbCommunicator m_objRecvLinkCMb;//接收 linkage const int m_nServerAppId; }; diff --git a/product/src/gui/plugin/LinkCtrlWidget/main.cpp b/product/src/gui/plugin/LinkCtrlWidget/main.cpp index 564fbcf9..56c725fe 100644 --- a/product/src/gui/plugin/LinkCtrlWidget/main.cpp +++ b/product/src/gui/plugin/LinkCtrlWidget/main.cpp @@ -10,8 +10,8 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); - kbd_public::StartLogSystem(NULL, "HMI", "LinkCtrl"); - kbd_net::initMsgBus("Alarm_Client", "1", true); + iot_public::StartLogSystem(NULL, "HMI", "LinkCtrl"); + iot_net::initMsgBus("Alarm_Client", "1", true); { CLinkCtrlWidget w; @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp b/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp index af6b44ce..fdd7828c 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp +++ b/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp @@ -36,7 +36,7 @@ CMediaWidget::CMediaWidget(bool editMode,QWidget *parent) : connect(ui->label,&Label::ccdPlay,this,&CMediaWidget::slotCCDPlay,Qt::QueuedConnection); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -46,7 +46,7 @@ CMediaWidget::CMediaWidget(bool editMode,QWidget *parent) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("media.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("media.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/MediaWidget/main.cpp b/product/src/gui/plugin/MediaWidget/main.cpp index d561bcfc..2dbe94dd 100644 --- a/product/src/gui/plugin/MediaWidget/main.cpp +++ b/product/src/gui/plugin/MediaWidget/main.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("", "hmi"); + iot_public::StartLogSystem("", "hmi"); { CMediaWidget w(false,NULL); @@ -19,6 +19,6 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp b/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp index 7a039e5c..e5f157cb 100644 --- a/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp +++ b/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp @@ -219,7 +219,7 @@ void CNavigationConfigDialog::updateItemIconPath() QTreeWidgetItem * item = ui->navigationWidget->currentItem(); if(item) { - std::string defaultPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string defaultPath = iot_public::CFileUtil::getCurModuleDir(); QString strIconFilePath = QString::fromStdString(defaultPath) + QString("..%1..%1data%1back_pixmap%1").arg(QDir::separator()); QString strFileName = QFileDialog::getOpenFileName(this, tr("打开"), strIconFilePath, "*.jpg; *.png"); if(strFileName.isEmpty()) @@ -247,7 +247,7 @@ void CNavigationConfigDialog::updateItemDataPath() QTreeWidgetItem * item = ui->navigationWidget->currentItem(); if(item) { - QString strGraphFilePath = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()); + QString strGraphFilePath = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()); QString filter = ""; if(ui->itemOptTypeComb->currentData().toInt() == CNavigationWidget::SWITCH_GRAPH) { diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp b/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp index 142b8863..1406e0ed 100644 --- a/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp +++ b/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp @@ -58,7 +58,7 @@ void CNavigationWidget::initialize() connect(this, &CNavigationWidget::currentItemChanged, this, &CNavigationWidget::itemSelectedChanged); connect(this, &CNavigationWidget::itemClicked, this, &CNavigationWidget::itemSelected); - std::string currentPath = kbd_public::CFileUtil::getCurModuleDir(); + std::string currentPath = iot_public::CFileUtil::getCurModuleDir(); m_strFileHomePath = QString::fromStdString(currentPath) + QString("..%1..%1data%1").arg(QDir::separator()); m_mapEnable.insert(Enable, tr("是")); m_mapEnable.insert(Disable, tr("否")); @@ -389,7 +389,7 @@ int CNavigationWidget::slotImport() QXlsx::CellRange cellRange = xlsx.currentWorksheet()->dimension(); QDir iconDir(m_strFileHomePath + "back_pixmap" + QDir::separator()); QDir dataDir(m_strFileHomePath + "pic" + QDir::separator()); - QDir exeDir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir exeDir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); QMultiMap numberMap; int nItemNumber = 0; for(int row=cellRange.firstRow()+1; row<=cellRange.lastRow(); row++) @@ -468,7 +468,7 @@ void CNavigationWidget::slotExport() QDir iconDir(m_strFileHomePath + "back_pixmap" + QDir::separator()); QDir dataDir(m_strFileHomePath + "pic" + QDir::separator()); - QDir exeDir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir exeDir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); int row = 2; for (int nIndex(0); nIndex < topLevelItemCount(); ++nIndex) { @@ -868,7 +868,7 @@ void CNavigationWidget::read(const QString &strFileName) { QDir iconDir(m_strFileHomePath + "back_pixmap" + QDir::separator()); QDir dataDir(m_strFileHomePath + "pic" + QDir::separator()); - QDir exeDir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir exeDir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); QJsonArray itemArray = root.value("items").toArray(); int nItemNumber = 0; for(int nIndex(0); nIndex< itemArray.size(); nIndex++) @@ -1028,7 +1028,7 @@ void CNavigationWidget::write(const QString &strFileName) //< Items QDir iconDir(m_strFileHomePath + "back_pixmap" + QDir::separator()); QDir dataDir(m_strFileHomePath + "pic" + QDir::separator()); - QDir exeDir(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir())); + QDir exeDir(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir())); QJsonArray itemsArray; for (int nIndex(0); nIndex < topLevelItemCount(); ++nIndex) { diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp b/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp index 1b94118f..0ad08a02 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp @@ -767,7 +767,7 @@ void COperationOrderForm::on_m_table_cellChanged(int row, int column) bool COperationOrderForm::omPermCheck() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); diff --git a/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp b/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp index 5d4aa79d..862960f1 100644 --- a/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp @@ -28,7 +28,7 @@ COrderManageWidget::~COrderManageWidget() void COrderManageWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -38,7 +38,7 @@ void COrderManageWidget::initStyleSheet() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("orderManage.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("orderManage.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -244,7 +244,7 @@ void COrderManageWidget::showEvent(QShowEvent *event) bool COrderManageWidget::omPermCheck() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); diff --git a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp index 642124cd..3fb394ce 100644 --- a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp +++ b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp @@ -5,12 +5,12 @@ CSqlDbCtrl::CSqlDbCtrl( EDbConnType eType) { - m_pDbApi = new kbd_dbms::CDbApi(eType); + m_pDbApi = new iot_dbms::CDbApi(eType); m_pDbApi->open(); -// m_pDbApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); +// m_pDbApi = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); // m_pDbApi->open(); -// m_pDbApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); +// m_pDbApi = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); // m_pDbApi->open(); } diff --git a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h index ca0f6892..aa2ed2bf 100644 --- a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h +++ b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h @@ -43,7 +43,7 @@ public: QString readSignatureData(int perm_id); private: - kbd_dbms::CDbApi * m_pDbApi; + iot_dbms::CDbApi * m_pDbApi; }; #endif // CSQLDBCTRL_H diff --git a/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp b/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp index 7d913377..55dcde00 100644 --- a/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp +++ b/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp @@ -34,7 +34,7 @@ Mainwindow::~Mainwindow() void Mainwindow::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -44,7 +44,7 @@ void Mainwindow::initStyleSheet() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("orderManage.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("orderManage.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/OrderManageWidget/main.cpp b/product/src/gui/plugin/OrderManageWidget/main.cpp index d8664dd1..1be4da3c 100644 --- a/product/src/gui/plugin/OrderManageWidget/main.cpp +++ b/product/src/gui/plugin/OrderManageWidget/main.cpp @@ -10,12 +10,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); -// kbd_public::StartLogSystem("HMI", "hmi"); -// if (!(kbd_net::initMsgBus("HMI", "HMI"))) +// iot_public::StartLogSystem("HMI", "hmi"); +// if (!(iot_net::initMsgBus("HMI", "HMI"))) // { // return -1; // } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -32,7 +32,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 -// kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); +// iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp index 121dc84d..4d3155be 100644 --- a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp +++ b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.cpp @@ -2,7 +2,7 @@ #include "service/perm_mng_api/PermMngApi.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbInterfaceMng *CDbInterfaceMng::m_pInstance = NULL; @@ -332,7 +332,7 @@ CDbInterfaceMng::CDbInterfaceMng() m_pWriteDb = new CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); loadRTLocation(); loadDevGroupInfo(); @@ -361,7 +361,7 @@ void CDbInterfaceMng::loadRTLocation() m_locationInfo[id] = desc; m_locOrderList.push_back(id); } -// kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); +// iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); // if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) // { // LOGERROR("权限接口初始化失败!"); @@ -383,8 +383,8 @@ void CDbInterfaceMng::loadRTLocation() // id_value.second = "description"; // if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back(id_value.first); // columns.push_back(id_value.second); @@ -394,8 +394,8 @@ void CDbInterfaceMng::loadRTLocation() // m_locationInfo.clear(); // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); diff --git a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h index a03ce00b..84c3d85a 100644 --- a/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h +++ b/product/src/gui/plugin/PointLockWidget/CDbInterfaceMng.h @@ -72,8 +72,8 @@ private: private: static CDbInterfaceMng * m_pInstance; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CDbApi * m_pWriteDb; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi * m_pWriteDb; QMap m_locationInfo; QList m_locOrderList; diff --git a/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp index 285619f4..1d0cd5ed 100644 --- a/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp +++ b/product/src/gui/plugin/PointLockWidget/CPointLockWidget.cpp @@ -256,7 +256,7 @@ void CPointLockWidget::listItemClicked(QListWidgetItem *item) void CPointLockWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -270,7 +270,7 @@ void CPointLockWidget::initStyle() qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("devgrouplock.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("devgrouplock.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/PointRealDataWidget/CDbInterface.cpp b/product/src/gui/plugin/PointRealDataWidget/CDbInterface.cpp index 3009376a..b72ae60c 100644 --- a/product/src/gui/plugin/PointRealDataWidget/CDbInterface.cpp +++ b/product/src/gui/plugin/PointRealDataWidget/CDbInterface.cpp @@ -1,7 +1,7 @@ #include "CDbInterface.h" #include "public/pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbInterface *CDbInterface::m_pInstance = NULL; @@ -10,8 +10,8 @@ CDbInterface::CDbInterface() m_pReadDb = new CDbApi(DB_CONN_MODEL_READ); m_pReadDb->open(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); - m_rtdbNetAcs = new kbd_dbms::CRdbNetApi(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); + m_rtdbNetAcs = new iot_dbms::CRdbNetApi(); readUnitInfo(); } @@ -273,7 +273,7 @@ bool CDbInterface::readPointValue(SRealData &sRealData) std::string sTable = sRealData.table_name.toStdString(); std::string sKey = sRealData.tag_name.toStdString(); std::string sColumn= sRealData.column.toStdString(); - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; if(m_rtdbNetAcs->queryByKey(sTable, sKey, sColumn, objRet)) { diff --git a/product/src/gui/plugin/PointRealDataWidget/CDbInterface.h b/product/src/gui/plugin/PointRealDataWidget/CDbInterface.h index f5771199..96ab1527 100644 --- a/product/src/gui/plugin/PointRealDataWidget/CDbInterface.h +++ b/product/src/gui/plugin/PointRealDataWidget/CDbInterface.h @@ -29,9 +29,9 @@ private: private: static CDbInterface * m_pInstance; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CRdbNetApi * m_rtdbNetAcs; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbNetApi * m_rtdbNetAcs; QMap m_mapDevGroup; QMap m_mapDevice; QMap m_mapUnit; diff --git a/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.cpp b/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.cpp index 4fdf4808..4173b497 100644 --- a/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.cpp +++ b/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.cpp @@ -65,7 +65,7 @@ void CPointRealDataWidget::initialize() connect(CRealDataCollect::instance(), &CRealDataCollect::signal_updateDi, this, &CPointRealDataWidget::slotUpdateDi); connect(CRealDataCollect::instance(), &CRealDataCollect::signal_updatePi, this, &CPointRealDataWidget::slotUpdatePi); connect(CRealDataCollect::instance(), &CRealDataCollect::signal_updateMi, this, &CPointRealDataWidget::slotUpdateMi); - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); m_pTimer = new QTimer(this); connect(m_pTimer, &QTimer::timeout, this, &CPointRealDataWidget::onTimer); diff --git a/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.h b/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.h index f75c8fdc..7d408317 100644 --- a/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.h +++ b/product/src/gui/plugin/PointRealDataWidget/CPointRealDataWidget.h @@ -132,7 +132,7 @@ private: bool m_isRtdbNormal; EN_AppContext m_objAppContext; QTimer * m_pTimer; - kbd_service::CDpcdaForApp *m_pDpcdaForApp; + iot_service::CDpcdaForApp *m_pDpcdaForApp; QMap m_tableMap; QMap > m_groupMap; QMap m_tagMap; diff --git a/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.cpp b/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.cpp index 2413d21b..e74798c9 100644 --- a/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.cpp +++ b/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.cpp @@ -66,7 +66,7 @@ void CRealDataCollect::initMsg() { if(m_pMbComm == NULL) { - m_pMbComm = new kbd_net::CMbCommunicator("PointRealDataWidget"); + m_pMbComm = new iot_net::CMbCommunicator("PointRealDataWidget"); } } @@ -83,7 +83,7 @@ void CRealDataCollect::clearMsg() { if(m_pMbComm) { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while(m_pMbComm->recvMsg(objMsg, 0)) {} } @@ -146,14 +146,14 @@ void CRealDataCollect::recvMessage() try { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; for(int i = 0; i < 6; i++) { if(m_pMbComm->recvMsg(objMsg, 0)) { if(objMsg.isValid()) { - if(objMsg.getMsgType() != kbd_idlfile::MT_DP_CHANGE_DATA) + if(objMsg.getMsgType() != iot_idl::MT_DP_CHANGE_DATA) { continue; } @@ -200,16 +200,16 @@ void CRealDataCollect::processChangeData() } } -int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) +int CRealDataCollect::parserMsg(const iot_net::CMbMessage &msg) { - kbd_idlfile::SRealTimeDataPkg changeDataPackage; + iot_idl::SRealTimeDataPkg changeDataPackage; try { changeDataPackage.ParseFromArray(msg.getDataPtr(),(int)msg.getDataSize()); int aiSize = changeDataPackage.stairtd_size(); if(aiSize > 0) { - kbd_idlfile::SAiRealTimeData aiStru; + iot_idl::SAiRealTimeData aiStru; QString tagName; float value; uint status; @@ -227,7 +227,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int diSize = changeDataPackage.stdirtd_size(); if(diSize > 0) { - kbd_idlfile::SDiRealTimeData diStu; + iot_idl::SDiRealTimeData diStu; QString tagName; int value; uint status; @@ -245,7 +245,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int piSize = changeDataPackage.stpirtd_size(); if(piSize > 0) { - kbd_idlfile::SPiRealTimeData piStu; + iot_idl::SPiRealTimeData piStu; QString tagName; double value; uint status; @@ -263,7 +263,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int miSize = changeDataPackage.stmirtd_size(); if(miSize > 0) { - kbd_idlfile::SMiRealTimeData miStu; + iot_idl::SMiRealTimeData miStu; QString tagName; int value; uint status; diff --git a/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.h b/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.h index 27cd862c..666b4d4b 100644 --- a/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.h +++ b/product/src/gui/plugin/PointRealDataWidget/CRealDataCollect.h @@ -28,7 +28,7 @@ private: bool addSub(); bool delSub(); - int parserMsg(const kbd_net::CMbMessage &); + int parserMsg(const iot_net::CMbMessage &); private slots: void recvMessage(); @@ -41,7 +41,7 @@ signals: void signal_updateMi(QMap> miMap); private: - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; QTimer * m_pTimer; int m_nTimeCount; EN_AppContext m_objAppContext; diff --git a/product/src/gui/plugin/PointRealDataWidget/main.cpp b/product/src/gui/plugin/PointRealDataWidget/main.cpp index aa768df3..0594e7a8 100644 --- a/product/src/gui/plugin/PointRealDataWidget/main.cpp +++ b/product/src/gui/plugin/PointRealDataWidget/main.cpp @@ -4,7 +4,7 @@ int main(int argc, char *argv[]) { - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } @@ -17,6 +17,6 @@ int main(int argc, char *argv[]) a.exec(); } - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); return 0; } diff --git a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp index 91b41653..93051873 100644 --- a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp +++ b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp @@ -2,7 +2,7 @@ #include "service/perm_mng_api/PermMngApi.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbInterfaceMng *CDbInterfaceMng::m_pInstance = NULL; @@ -328,7 +328,7 @@ CDbInterfaceMng::CDbInterfaceMng() m_pWriteDb = new CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); loadRTLocation(); loadDevGroupInfo(); @@ -355,7 +355,7 @@ void CDbInterfaceMng::loadRTLocation() QString desc = query.value(1).toString(); m_locationInfo[id] = desc; } -// kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); +// iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); // if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) // { // LOGERROR("权限接口初始化失败!"); @@ -377,8 +377,8 @@ void CDbInterfaceMng::loadRTLocation() // id_value.second = "description"; // if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back(id_value.first); // columns.push_back(id_value.second); @@ -388,8 +388,8 @@ void CDbInterfaceMng::loadRTLocation() // m_locationInfo.clear(); // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); diff --git a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h index 88cacd65..005f7803 100644 --- a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h +++ b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h @@ -70,8 +70,8 @@ private: private: static CDbInterfaceMng * m_pInstance; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CDbApi * m_pWriteDb; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi * m_pWriteDb; QMap m_locationInfo; //< LocationID-LocationDesc QMap > > m_devGroupInfoMap; //为了设备组号排序 diff --git a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp index 6e05077c..1e1b8b26 100644 --- a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp +++ b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp @@ -20,7 +20,7 @@ PointsLockWidget::PointsLockWidget(QWidget *parent, bool editMode) : ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -34,7 +34,7 @@ PointsLockWidget::PointsLockWidget(QWidget *parent, bool editMode) : qDebug() << "public.qss 无法打开!"; } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("devgrouplock.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("devgrouplock.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp b/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp index 4d99ca17..85b2c694 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp +++ b/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp @@ -2,7 +2,7 @@ #include "pub_logger_api/logger.h" #include "pub_sysinfo_api/SysInfoApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbMng *CDbMng::m_pInstance = NULL; @@ -301,8 +301,8 @@ QList CDbMng::getSetting() LOGERROR("getSetting():数据库读模型打开失败!"); return setList; } - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if(!kbd_public::createSysInfoInstance(sysInfoPtr)) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if(!iot_public::createSysInfoInstance(sysInfoPtr)) { LOGERROR("getSetting():创建系统信息访问库实例失败!"); return setList; @@ -346,7 +346,7 @@ QList CDbMng::getSetting() relaySetting.locDesc = query.value(22).toString(); relaySetting.keyIdTag = QString("%1.%2.%3").arg("fes_const").arg(relaySetting.tagName).arg("value"); - kbd_public::SAppInfo stAppInfo; + iot_public::SAppInfo stAppInfo; if(kbdSuccess != sysInfoPtr->getAppInfoBySubsystemId(relaySetting.subSystem, stAppInfo)) { relaySetting.nAppId = relaySetting.subSystem; @@ -403,7 +403,7 @@ CDbMng::CDbMng() { m_pReadDb = new CDbApi(DB_CONN_MODEL_READ); m_pReadDb->open(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); m_locMap.clear(); m_rtuMap.clear(); m_devMap.clear(); diff --git a/product/src/gui/plugin/RelaySettingWidget/CDbMng.h b/product/src/gui/plugin/RelaySettingWidget/CDbMng.h index e69bebab..f2292576 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CDbMng.h +++ b/product/src/gui/plugin/RelaySettingWidget/CDbMng.h @@ -30,8 +30,8 @@ private: private: static CDbMng * m_pInstance; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_locMap; QMap m_rtuMap; diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp index 8c2acdf8..04d988c9 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp +++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp @@ -41,7 +41,7 @@ void CRelaySettingMsgMng::slotcmd(const QList &keyList, const QList &keyList, const QListrecvMsg(msg, 50)) { if(msg.getMsgType() != MT_OPT_COMMON_UP) @@ -129,7 +129,7 @@ void CRelaySettingMsgMng::initMsg() { if(m_communicator == Q_NULLPTR) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); } } @@ -157,7 +157,7 @@ bool CRelaySettingMsgMng::delSub(int appID, int channel) { m_communicator->delSub(appID, channel); } - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; while (m_communicator->recvMsg(msg, 0)) { } diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h index 8785d233..3f06b3b1 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h +++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h @@ -12,8 +12,8 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "perm_mng_api/PermMngApi.h" -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; class CRelaySettingMsgMng : public QObject { @@ -65,10 +65,10 @@ private: void affirmTest(RelayCmdReply &relayCmdReply,const QString &cmd); void editGroupTest(RelayCmdReply &relayCmdReply,const QString &cmd); private: - kbd_net::CMbCommunicator *m_communicator; + iot_net::CMbCommunicator *m_communicator; QTimer *m_timer; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; CPermMngApiPtr m_permMng; std::string m_curRtu; diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp index 40c4f98c..ffedd724 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp +++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp @@ -60,7 +60,7 @@ CRelaySettingWidget::~CRelaySettingWidget() void CRelaySettingWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -70,7 +70,7 @@ void CRelaySettingWidget::initStyleSheet() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -1577,7 +1577,7 @@ void CRelaySettingWidget::setFilterGroup(const QString &groupPoints) QString CRelaySettingWidget::getFesDevByKeyIdTag(const QString &keyIdTag) { QString retStr; - kbd_dbms::CDbApi* m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi* m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { return retStr; diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h index 0c79ba42..8c68c54f 100644 --- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h +++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h @@ -31,8 +31,8 @@ enum EN_RELAY_TREE_TYPE EN_RELAY_TREE_CHANL = 20002 }; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; class CRelaySettingWidget : public QWidget { @@ -193,9 +193,9 @@ signals: private: Ui::CRelaySettingWidget *ui; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; CPermMngApiPtr m_permMng; - kbd_public::SNodeInfo m_nodeInfo; + iot_public::SNodeInfo m_nodeInfo; QMap m_locMap; QMap m_rtuMap; diff --git a/product/src/gui/plugin/RelaySettingWidget/main.cpp b/product/src/gui/plugin/RelaySettingWidget/main.cpp index fb02fad8..a53b4757 100644 --- a/product/src/gui/plugin/RelaySettingWidget/main.cpp +++ b/product/src/gui/plugin/RelaySettingWidget/main.cpp @@ -7,13 +7,13 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - kbd_public::StartLogSystem("HMI", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("HMI", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/ReportApp/CReportWidget.h b/product/src/gui/plugin/ReportApp/CReportWidget.h index ae86fba7..1710b05d 100644 --- a/product/src/gui/plugin/ReportApp/CReportWidget.h +++ b/product/src/gui/plugin/ReportApp/CReportWidget.h @@ -20,8 +20,8 @@ //#include //#include -//using namespace kbd_service; -//using namespace kbd_public; +//using namespace iot_service; +//using namespace iot_public; class CReportWebView; class CReportStackedWidget; diff --git a/product/src/gui/plugin/ReportWidget/CReportWidget.cpp b/product/src/gui/plugin/ReportWidget/CReportWidget.cpp index e7391471..4289522b 100644 --- a/product/src/gui/plugin/ReportWidget/CReportWidget.cpp +++ b/product/src/gui/plugin/ReportWidget/CReportWidget.cpp @@ -49,7 +49,7 @@ CReportWidget::~CReportWidget() void CReportWidget::init() { - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); QCoreApplication::setAttribute(Qt::AA_UseOpenGLES); stackedWidget = new CReportStackedWidget(this); QHBoxLayout* hlay = new QHBoxLayout(this); @@ -140,10 +140,10 @@ void CReportWidget::setNicAddr(int appId) std::string ipAddr2 = ""; std::string node1 = ""; std::string node2 = ""; - std::vector> vector = getRunRedundancyInfoByAppid(appId); + std::vector> vector = getRunRedundancyInfoByAppid(appId); for(size_t i=0; i vec = vector.at(i); + std::vector vec = vector.at(i); std::string node_name = vec.at(0).toStdString(); int is_active = vec.at(1).toInt(); int is_master = vec.at(2).toInt(); @@ -209,21 +209,21 @@ std::string CReportWidget::getAnotherIp(const std::string &node) return ret; } -std::vector> CReportWidget::getRunRedundancyInfoByAppid(int appId) +std::vector> CReportWidget::getRunRedundancyInfoByAppid(int appId) { - std::vector> vector; + std::vector> vector; if(m_rtdbAccess->open("base", "sys_run_redundancy_info")) { - kbd_dbms::CONDINFO condition; + iot_dbms::CONDINFO condition; memcpy(condition.name, "app_id", strlen("app_id")); condition.logicalop = ATTRCOND_AND; condition.relationop = ATTRCOND_EQU; condition.conditionval = appId; - std::vector vecCondInfo; + std::vector vecCondInfo; vecCondInfo.push_back(condition); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("node_name"); columns.push_back("is_active"); @@ -238,15 +238,15 @@ std::vector> CReportWidget::getRunRedundancyInfo { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - std::vector temp; - kbd_dbms::CVarType node_name; - kbd_dbms::CVarType is_active; - kbd_dbms::CVarType is_master; - kbd_dbms::CVarType is_slave; - kbd_dbms::CVarType ip1; - kbd_dbms::CVarType ip1_active; - kbd_dbms::CVarType ip2; - kbd_dbms::CVarType ip2_active; + std::vector temp; + iot_dbms::CVarType node_name; + iot_dbms::CVarType is_active; + iot_dbms::CVarType is_master; + iot_dbms::CVarType is_slave; + iot_dbms::CVarType ip1; + iot_dbms::CVarType ip1_active; + iot_dbms::CVarType ip2; + iot_dbms::CVarType ip2_active; result.getColumnValue(nIndex, 0, node_name); result.getColumnValue(nIndex, 1, is_active); result.getColumnValue(nIndex, 2, is_master); @@ -273,7 +273,7 @@ std::vector> CReportWidget::getRunRedundancyInfo void CReportWidget::updateUserInfo() { - m_permMngPtr = kbd_service::getPermMngInstance("base"); + m_permMngPtr = iot_service::getPermMngInstance("base"); m_permMngPtr->PermDllInit(); if (m_permMngPtr != NULL) { @@ -291,7 +291,7 @@ void CReportWidget::updateUserInfo() void CReportWidget::loadPage() { m_isHTML = true; - std::string style = std::move(kbd_public::CFileStyle::getCurStyle()); + std::string style = std::move(iot_public::CFileStyle::getCurStyle()); if(m_browserMode == ViewMode) { QString urlstr ="http://"+QString::fromStdString(m_ServerAddr[m_addrNum])+m_strView; @@ -306,7 +306,7 @@ void CReportWidget::loadPage() { if(!checkReportEditPerm()) { - std::string path = kbd_public::CFileUtil::getCurModuleDir(); + std::string path = iot_public::CFileUtil::getCurModuleDir(); stackedWidget->view->load(QUrl::fromLocalFile(QString::fromStdString(path)+"../../data/report/PERM_FORBIT_EDIT.html")); return; } @@ -335,7 +335,7 @@ void CReportWidget::slotLoadFinish(bool ok) { if (!ok) { - std::string path = kbd_public::CFileUtil::getCurModuleDir(); + std::string path = iot_public::CFileUtil::getCurModuleDir(); stackedWidget->view->load(QUrl::fromLocalFile(QString::fromStdString(path)+"../../data/report/FAIL_PAGE.html")); if(m_changeAddr && !m_addrNum) m_updateTimer->start(); @@ -367,7 +367,7 @@ void CReportWidget::UserChanged() bool CReportWidget::checkReportEditPerm() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/ReportWidget/CReportWidget.h b/product/src/gui/plugin/ReportWidget/CReportWidget.h index c5b3d48f..fb39c222 100644 --- a/product/src/gui/plugin/ReportWidget/CReportWidget.h +++ b/product/src/gui/plugin/ReportWidget/CReportWidget.h @@ -20,8 +20,8 @@ #include #include "dbms/rdb_api/CRdbAccess.h" -using namespace kbd_service; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_public; class CReportWebView; class CReportStackedWidget; @@ -48,7 +48,7 @@ private: void initSysInfo(); void setNicAddr(int appId); std::string getAnotherIp(const std::string &node); - std::vector > getRunRedundancyInfoByAppid(int appId); + std::vector > getRunRedundancyInfoByAppid(int appId); void updateUserInfo(); void loadPage(); void slotLoadFinish(bool ok); @@ -58,7 +58,7 @@ private: private: CReportStackedWidget *stackedWidget; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; CPermMngApiPtr m_permMngPtr; CSysInfoInterfacePtr m_sysInfoPtr; QTimer * m_updateTimer; diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp index a28a0fac..94c5fdfd 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp @@ -12,9 +12,9 @@ #include #include "operate_server_api/JsonOptCommand.h" -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_public; using namespace std; CRobotCtrlWidget::CRobotCtrlWidget(QWidget *parent) : QWidget(parent), @@ -36,7 +36,7 @@ CRobotCtrlWidget::CRobotCtrlWidget(QWidget *parent) : connect(m_queryThread,&QThread::started,this,&CRobotCtrlWidget::initOnTime,Qt::QueuedConnection); connect(m_queryThread,&QThread::finished,m_queryThread,&QThread::deleteLater,Qt::QueuedConnection); - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { LOGERROR("数据库打开失败!"); @@ -75,10 +75,10 @@ CRobotCtrlWidget::~CRobotCtrlWidget() void CRobotCtrlWidget::initGif() { - m_movie_0.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/free.gif").c_str()); - m_movie_1.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/overlook.gif").c_str()); - m_movie_2.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/charge.gif").c_str()); - m_movie_3.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/overhaul.gif").c_str()); + m_movie_0.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/free.gif").c_str()); + m_movie_1.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/overlook.gif").c_str()); + m_movie_2.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/charge.gif").c_str()); + m_movie_3.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/overhaul.gif").c_str()); ui->label_free->setContentsMargins(0,0,0,0); ui->label_free->setMovie(&m_movie_0); diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h index e29764fc..37c2bed0 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h @@ -69,13 +69,13 @@ private: void sub(); void unSub(); - void dealOptMsg(const kbd_net::CMbMessage &objMsg); + void dealOptMsg(const iot_net::CMbMessage &objMsg); - void parseMsg(const kbd_net::CMbMessage &objMsg); + void parseMsg(const iot_net::CMbMessage &objMsg); private: Ui::CRobotCtrlWidget *ui; - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; QMap m_diMap; //< QMap m_numMap; //< <设备点号,描述> QMap m_robotInfoMap; //< @@ -91,10 +91,10 @@ private: QThread *m_queryThread; OnTimeQueryThread *m_query; - kbd_public::SNodeInfo m_stLocalNodeInfo; //本机节点信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //本机节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 - kbd_net::CMbCommunicator m_objCommon; + iot_net::CMbCommunicator m_objCommon; QString m_tag; int m_timeOutTimes; QTimer *m_timer; //等待超时定时器 diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp index f8068609..5b29a5ba 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp @@ -6,7 +6,7 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CRobotFileCollect::CRobotFileCollect(QObject *parent): QObject(parent), @@ -47,7 +47,7 @@ void CRobotFileCollect::release() void CRobotFileCollect::loadConfig() { CCommonConfigParse config; - const std::string file = kbd_public::CFileUtil::getPathOfCfgFile("robot_config.xml"); + const std::string file = iot_public::CFileUtil::getPathOfCfgFile("robot_config.xml"); std::string loadFilePath; config.load(file); int error = config.getStringValue("robot_config","loadFilePath",loadFilePath); diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp index 7ecc8789..b345a771 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp @@ -24,7 +24,7 @@ CRobotWidget::CRobotWidget(bool editMode, QWidget *parent) : ui(new Ui::CRobotWidget) { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -34,7 +34,7 @@ CRobotWidget::CRobotWidget(bool editMode, QWidget *parent) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("robot.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("robot.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp index 443c62e8..a04d7680 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp @@ -42,7 +42,7 @@ void OnTimeQueryThread::slotQuery() vecKey.push_back(it.key().toStdString()); std::vector vecColumn; vecColumn.push_back("value"); - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; rdb_net_api.connect(it.value()->m_domain,it.value()->m_sub); if(m_outTimeCount > 20) { diff --git a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h index aadecd3f..407ba602 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h +++ b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h @@ -23,7 +23,7 @@ public slots: private: QMap m_map; QTimer *m_timer; - kbd_dbms::CRdbNetApi rdb_net_api; + iot_dbms::CRdbNetApi rdb_net_api; QMap m_infoMap; QMutex *m_mutex; int m_outTimeCount; diff --git a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp index bd55e7ff..b198e9aa 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp @@ -6,7 +6,7 @@ #include "pub_logger_api/logger.h" #include "common/Common.h" -using namespace kbd_dbms; +using namespace iot_dbms; SWitchButton::SWitchButton(QWidget *parent) : QWidget(parent), @@ -22,8 +22,8 @@ SWitchButton::SWitchButton(QWidget *parent) { // 鼠标滑过光标形状 - 手型 setCursor(Qt::PointingHandCursor); - m_pWirteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); - m_rtdbTable = new kbd_dbms::CRdbAccess(); + m_pWirteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_rtdbTable = new iot_dbms::CRdbAccess(); m_rtdbTable->open(CN_AppId_BASE, "alarm_link_enable_info"); // 连接信号槽 m_load = new QTimer(); diff --git a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h index 0e090e0a..53bf971b 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h +++ b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h @@ -77,8 +77,8 @@ private: QTimer *m_load; - kbd_dbms::CDbApi * m_pWirteDb; - kbd_dbms::CRdbAccess * m_rtdbTable; + iot_dbms::CDbApi * m_pWirteDb; + iot_dbms::CRdbAccess * m_rtdbTable; }; #endif // SWITCHBUTTON_H diff --git a/product/src/gui/plugin/RobotCtrlWidget/main.cpp b/product/src/gui/plugin/RobotCtrlWidget/main.cpp index 8fa5504d..9a7de17d 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/main.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/main.cpp @@ -6,8 +6,8 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp index 01af8e73..282f17e9 100644 --- a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp +++ b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp @@ -11,9 +11,9 @@ #include #include "operate_server_api/JsonOptCommand.h" -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_public; using namespace std; CRobotCtrlWidget::CRobotCtrlWidget(QWidget *parent) : QWidget(parent), @@ -45,7 +45,7 @@ CRobotCtrlWidget::CRobotCtrlWidget(QWidget *parent) : connect(m_recvThread,&QThread::finished,m_recvThread,&QThread::deleteLater,Qt::QueuedConnection); connect(m_recv,&OnTimeRecvThread::sigCtrlResult,this,&CRobotCtrlWidget::showMessDialog,Qt::QueuedConnection); - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { LOGERROR("打开数据库失败!error:%s",m_pReadDb->getLastErrorString().toStdString().c_str()); @@ -90,10 +90,10 @@ CRobotCtrlWidget::~CRobotCtrlWidget() void CRobotCtrlWidget::initGif() { - m_movie_0.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/free.gif").c_str()); - m_movie_1.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/overlook.gif").c_str()); - m_movie_2.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/charge.gif").c_str()); - m_movie_3.setFileName(kbd_public::CFileUtil::getPathOfResFile("gui/icon/robot/overhaul.gif").c_str()); + m_movie_0.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/free.gif").c_str()); + m_movie_1.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/overlook.gif").c_str()); + m_movie_2.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/charge.gif").c_str()); + m_movie_3.setFileName(iot_public::CFileUtil::getPathOfResFile("gui/icon/robot/overhaul.gif").c_str()); ui->label_free->setContentsMargins(0,0,0,0); ui->label_free->setMovie(&m_movie_0); diff --git a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h index 6df2d5aa..d202c810 100644 --- a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h +++ b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h @@ -66,13 +66,13 @@ private: void sub(); void unSub(); - void dealOptMsg(const kbd_net::CMbMessage &objMsg); + void dealOptMsg(const iot_net::CMbMessage &objMsg); - void parseMsg(const kbd_net::CMbMessage &objMsg); + void parseMsg(const iot_net::CMbMessage &objMsg); private: Ui::CRobotCtrlWidget *ui; - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; QMap m_diMap; //< QMap m_numMap; //< <设备点号,描述> @@ -92,10 +92,10 @@ private: OnTimeRecvThread *m_recv; - kbd_public::SNodeInfo m_stLocalNodeInfo; //本机节点信息 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //本机节点信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 - kbd_net::CMbCommunicator m_objCommon; + iot_net::CMbCommunicator m_objCommon; QString m_tag; int m_timeOutTimes; QTimer *m_timer; //等待超时定时器 diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp index 6b1edafc..4a6b410a 100644 --- a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp +++ b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp @@ -6,7 +6,7 @@ #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/CommonConfigParse.h" -using namespace kbd_public; +using namespace iot_public; CRobotFileCollect::CRobotFileCollect(QObject *parent): QObject(parent), @@ -47,7 +47,7 @@ void CRobotFileCollect::release() void CRobotFileCollect::loadConfig() { CCommonConfigParse config; - const std::string file = kbd_public::CFileUtil::getPathOfCfgFile("robot_config.xml"); + const std::string file = iot_public::CFileUtil::getPathOfCfgFile("robot_config.xml"); std::string loadFilePath; config.load(file); int error = config.getStringValue("robot_config","loadFilePath",loadFilePath); diff --git a/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp b/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp index 459310b4..7e1e838c 100644 --- a/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp +++ b/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp @@ -28,7 +28,7 @@ CRobotWidget::CRobotWidget(bool editMode, QWidget *parent) : ui(new Ui::CRobotWidget) { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -38,7 +38,7 @@ CRobotWidget::CRobotWidget(bool editMode, QWidget *parent) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("robot.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("robot.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp index 443c62e8..a04d7680 100644 --- a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp +++ b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp @@ -42,7 +42,7 @@ void OnTimeQueryThread::slotQuery() vecKey.push_back(it.key().toStdString()); std::vector vecColumn; vecColumn.push_back("value"); - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; rdb_net_api.connect(it.value()->m_domain,it.value()->m_sub); if(m_outTimeCount > 20) { diff --git a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h index aadecd3f..407ba602 100644 --- a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h +++ b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h @@ -23,7 +23,7 @@ public slots: private: QMap m_map; QTimer *m_timer; - kbd_dbms::CRdbNetApi rdb_net_api; + iot_dbms::CRdbNetApi rdb_net_api; QMap m_infoMap; QMutex *m_mutex; int m_outTimeCount; diff --git a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp index 8e32d011..d0834b73 100644 --- a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp +++ b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp @@ -7,9 +7,9 @@ #include "pub_utility_api/CommonConfigParse.h" #include #include "Common.h" -using namespace kbd_net; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_net; +using namespace iot_idl; +using namespace iot_public; using namespace std; OnTimeRecvThread::OnTimeRecvThread(QObject *parent) : @@ -27,7 +27,7 @@ OnTimeRecvThread::~OnTimeRecvThread() void OnTimeRecvThread::loadConfig() { CCommonConfigParse config; - const std::string file = kbd_public::CFileUtil::getPathOfCfgFile("robot_config.xml"); + const std::string file = iot_public::CFileUtil::getPathOfCfgFile("robot_config.xml"); int error = config.load(file); if(error != kbdSuccess) { @@ -78,15 +78,15 @@ void OnTimeRecvThread::slotAlmLinkOpen(bool bo) m_check = !bo; bool bRet = false; //拼凑命令 - ::kbd_idlfile::HmiCtrlRobot ctrlMsg; - ctrlMsg.set_entype(::kbd_idlfile::MT_HMI_CTRL_ROBOT); - ctrlMsg.set_encontent(bo?(::kbd_idlfile::MT_START):(::kbd_idlfile::MT_STOP)); + ::iot_idl::HmiCtrlRobot ctrlMsg; + ctrlMsg.set_entype(::iot_idl::MT_HMI_CTRL_ROBOT); + ctrlMsg.set_encontent(bo?(::iot_idl::MT_START):(::iot_idl::MT_STOP)); ctrlMsg.set_ntime(QDateTime::currentMSecsSinceEpoch()); string msg; ctrlMsg.SerializeToString(&msg); //发送命令 CMbMessage objMsg; - objMsg.setMsgType(::kbd_idlfile::MT_HMI_CTRL_ROBOT); + objMsg.setMsgType(::iot_idl::MT_HMI_CTRL_ROBOT); objMsg.setSubject(CN_AppId_BASE,CH_HMI_TO_ALCMD_DOWN); objMsg.setData(msg); init(); @@ -96,7 +96,7 @@ void OnTimeRecvThread::slotAlmLinkOpen(bool bo) QString text = tr("告警联动控制命令下发失败!"); emit sigCtrlResult(text); LOGERROR("告警联动控制-Message[MsgType='%d', Channel='%d'] send fail .", - ::kbd_idlfile::MT_HMI_CTRL_ROBOT,CH_HMI_TO_ALCMD_DOWN); + ::iot_idl::MT_HMI_CTRL_ROBOT,CH_HMI_TO_ALCMD_DOWN); }else { emit sigSetSwitchButtonUsed(false,false); @@ -107,10 +107,10 @@ void OnTimeRecvThread::slotAlmLinkOpen(bool bo) void OnTimeRecvThread::parseMsg(const CMbMessage &objMsg) { - ::kbd_idlfile::HmiCtrlRobot hmiCtrlRobot; + ::iot_idl::HmiCtrlRobot hmiCtrlRobot; if(hmiCtrlRobot.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { - if(hmiCtrlRobot.encontent() == kbd_idlfile::MT_STOP) + if(hmiCtrlRobot.encontent() == iot_idl::MT_STOP) { emit sigSetSwitchButtonUsed(true,false); }else diff --git a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h index 38c93e75..51aad887 100644 --- a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h +++ b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h @@ -21,13 +21,13 @@ public slots: void slotAlmLinkOpen(bool bo); private: - void parseMsg(const kbd_net::CMbMessage &objMsg); + void parseMsg(const iot_net::CMbMessage &objMsg); void unSub(); void clearMsg(); private: - kbd_net::CMbCommunicator m_objCommon; + iot_net::CMbCommunicator m_objCommon; bool m_check; int m_outTime; }; diff --git a/product/src/gui/plugin/RobotWidget/main.cpp b/product/src/gui/plugin/RobotWidget/main.cpp index 8fa5504d..9a7de17d 100644 --- a/product/src/gui/plugin/RobotWidget/main.cpp +++ b/product/src/gui/plugin/RobotWidget/main.cpp @@ -6,8 +6,8 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp b/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp index 681802e1..0151e91f 100644 --- a/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp +++ b/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp @@ -1,9 +1,9 @@ #include "CDutyDefineDialog.h" #include "ui_CDutyDefineDialog.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; CDutyDefineDialog::CDutyDefineDialog( QWidget *parent ) : QDialog(parent), @@ -54,7 +54,7 @@ bool CDutyDefineDialog::checkUserPerm() void CDutyDefineDialog::loadData() { - kbd_dbms::CDbApi* pDb = new CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi* pDb = new CDbApi(DB_CONN_MODEL_READ); if ( !pDb->open() ) { LOGERROR("initialize or open database failed!"); @@ -166,7 +166,7 @@ void CDutyDefineDialog::slotPushButtonSaveClicked( bool ) } // 创建数据库访问对象 - kbd_dbms::CDbApi* pDb = new CDbApi(DB_CONN_MODEL_WRITE); + iot_dbms::CDbApi* pDb = new CDbApi(DB_CONN_MODEL_WRITE); if ( !pDb->open() ) { LOGERROR("initialize or open database failed!"); diff --git a/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp b/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp index 069c4373..03a0400d 100644 --- a/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp +++ b/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp @@ -3,9 +3,9 @@ #include #include "pub_utility_api/FileStyle.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; CDutySetting::CDutySetting(QWidget *parent, bool editMode) : QWidget(parent), @@ -121,7 +121,7 @@ void CDutySetting::initQSS() { // 加载qss文件 QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -131,7 +131,7 @@ void CDutySetting::initQSS() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("duty_setting.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("duty_setting.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -677,15 +677,15 @@ void CDutySetting::sendOptEvent( QString sMsg ) if ( m_pAlmApiForApp == NULL ) return; - kbd_idlfile::SAppAddAlm stAppAddAlarm; - kbd_idlfile::SAlmInfoFromApp &stAlmInfoFromApp = *(stAppAddAlarm.add_alm_info()); + iot_idl::SAppAddAlm stAppAddAlarm; + iot_idl::SAlmInfoFromApp &stAlmInfoFromApp = *(stAppAddAlarm.add_alm_info()); stAlmInfoFromApp.set_alm_type(ALM_TYPE_OPERATE); stAlmInfoFromApp.set_time_stamp( QDateTime::currentMSecsSinceEpoch() ); stAlmInfoFromApp.set_status(ALM_STAT_OPT_DUTY); stAlmInfoFromApp.set_location_id(m_nLocationId); - stAlmInfoFromApp.set_alm_style(::kbd_idlfile::enAlmStyle::AS_EVENT_ONLY); + stAlmInfoFromApp.set_alm_style(::iot_idl::enAlmStyle::AS_EVENT_ONLY); - kbd_idlfile::SAlmKeyword stAlmKeyword; + iot_idl::SAlmKeyword stAlmKeyword; stAlmKeyword.set_id(ALM_KEY_ALM_DESC); stAlmKeyword.set_value( sMsg.toStdString().c_str() ); stAlmInfoFromApp.add_alm_keyword()->CopyFrom(stAlmKeyword); diff --git a/product/src/gui/plugin/ScheduleWidget/CDutySetting.h b/product/src/gui/plugin/ScheduleWidget/CDutySetting.h index 3e488ef1..09ec8de8 100644 --- a/product/src/gui/plugin/ScheduleWidget/CDutySetting.h +++ b/product/src/gui/plugin/ScheduleWidget/CDutySetting.h @@ -65,13 +65,13 @@ public slots: private: Ui::CDutySetting *ui; - kbd_dbms::CDbApi* m_pDb; // 数据库接口 + iot_dbms::CDbApi* m_pDb; // 数据库接口 QDate m_startDate; CDragListWidget* m_pDragWdiget; QList m_listDutyDefine; QList m_listDropListWidget; - kbd_service::CAlmApiForApp* m_pAlmApiForApp; - kbd_service::CPermMngApiPtr m_ptrPermMng; + iot_service::CAlmApiForApp* m_pAlmApiForApp; + iot_service::CPermMngApiPtr m_ptrPermMng; int m_nLocationId; bool m_bEditMode;// 是否编辑态 QTimer *m_chkUserTimer; diff --git a/product/src/gui/plugin/ScheduleWidget/main.cpp b/product/src/gui/plugin/ScheduleWidget/main.cpp index 5d563292..477b1566 100644 --- a/product/src/gui/plugin/ScheduleWidget/main.cpp +++ b/product/src/gui/plugin/ScheduleWidget/main.cpp @@ -8,15 +8,15 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); - kbd_public::StartLogSystem( "", "" ); - kbd_net::initMsgBus("duty_setting","duty_setting xxx"); + iot_public::StartLogSystem( "", "" ); + iot_net::initMsgBus("duty_setting","duty_setting xxx"); CDutySetting w( 0, false ); w.show(); int nRet = a.exec(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return nRet; } diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp index c119d9e1..0f2768cf 100644 --- a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp +++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp @@ -3,8 +3,8 @@ #include "../../idl_files/SequenceMessage.pb.h" #include "../../idl_files/RdbServerMessage.pb.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CSequenceDBInterface::CSequenceDBInterface(CDbApi *dbRead) : m_timer(NULL), @@ -48,8 +48,8 @@ QString CSequenceDBInterface::queryLocationName(const int nLocationID) std::string strTableName = "sys_model_location_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("description"); @@ -84,8 +84,8 @@ QString CSequenceDBInterface::queryUserName(const int nUserID) std::string strTableName = "rm_user_def"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("perm_alias"); @@ -118,8 +118,8 @@ QStringList CSequenceDBInterface::queryAllLocationName() std::string strTableName = "sys_model_location_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("description"); @@ -147,8 +147,8 @@ QMap CSequenceDBInterface::queryUserIDMap() std::string strTableName = "rm_user_def"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("perm_id"); columns.push_back("perm_alias"); @@ -227,7 +227,7 @@ QString CSequenceDBInterface::queryStateName(const QString &strStateTextName, co std::string strTableName = "dict_state_text_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); std::vector vecCondInfo; CONDINFO conditionName; @@ -245,7 +245,7 @@ QString CSequenceDBInterface::queryStateName(const QString &strStateTextName, co vecCondInfo.push_back(conditionState); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("display_value"); @@ -267,13 +267,13 @@ QString CSequenceDBInterface::queryStateName(const QString &strStateTextName, co QList CSequenceDBInterface::queryRunSequenceNodeList() { QList sequenceList; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { return sequenceList; } - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; spSysInfo->getLocalNodeInfo(stNodeInfo); if(!m_pReadDb->isOpen()) { @@ -483,27 +483,27 @@ void CSequenceDBInterface::updataSequenctState(QList &listSequence) { //query state QMutexLocker locker(&mutex); - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - kbd_public::SAppInfo appInfo; + iot_public::SAppInfo appInfo; spSysInfo->getAppInfoByName(COMAPP, appInfo); for(int nIndex(0); nIndex < listSequence.size(); nIndex++) { if(E_Node_Sequence == listSequence.at(nIndex).nodeType) { - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(listSequence.at(nIndex).locationID, stLocationInfo); m_rdbNetApi->connect(stLocationInfo.nDomainId, appInfo.nId); try { - kbd_idlfile::RdbQuery query; + iot_idl::RdbQuery query; query.set_strtablename("sequence_running"); std::string *pStatusColName = query.add_strselectcolnamearr(); *pStatusColName = "status"; - kbd_idlfile::RdbCondition *pSequenceNodeTypeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pSequenceNodeTypeCondtion = query.add_msgcondition(); pSequenceNodeTypeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pSequenceNodeTypeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pSequenceNodeTypeCondtion->set_strcolumnname("node_type"); @@ -512,7 +512,7 @@ void CSequenceDBInterface::updataSequenctState(QList &listSequence) pSeqNodeTypeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pSeqNodeTypeCondValue->set_nvalue((int)E_Node_Sequence); - kbd_idlfile::RdbCondition *pSequenceNameCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pSequenceNameCondtion = query.add_msgcondition(); pSequenceNameCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pSequenceNameCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pSequenceNameCondtion->set_strcolumnname("seq_name"); @@ -521,7 +521,7 @@ void CSequenceDBInterface::updataSequenctState(QList &listSequence) pSeqNameCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pSeqNameCondValue->set_strvalue(listSequence.at(nIndex).seqName.toStdString()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (m_rdbNetApi->query(query, retMsg)) { if(retMsg.msgrecord_size() != 0) @@ -551,7 +551,7 @@ void CSequenceDBInterface::updataSequenceExecuteState() while(m_rdbNetApi->checkStatus()) { - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (m_rdbNetApi->getRet(&retMsg)) { if(retMsg.msgrecord_size() != 0) @@ -563,21 +563,21 @@ void CSequenceDBInterface::updataSequenceExecuteState() } } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { for(int nIndex(0); nIndex < m_listSequence.size(); nIndex++) { if(E_Node_Sequence == m_listSequence.at(nIndex).nodeType) { - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(m_listSequence.at(nIndex).locationID, stLocationInfo); - kbd_public::SAppInfo appInfo; + iot_public::SAppInfo appInfo; spSysInfo->getAppInfoByName(COMAPP, appInfo); m_rdbNetApi->connect(stLocationInfo.nDomainId, appInfo.nId); - kbd_idlfile::RdbQuery query; + iot_idl::RdbQuery query; query.set_strtablename("sequence_running"); std::string *pSeqColName = query.add_strselectcolnamearr(); @@ -586,7 +586,7 @@ void CSequenceDBInterface::updataSequenceExecuteState() std::string *pStatusColName = query.add_strselectcolnamearr(); *pStatusColName = "status"; - kbd_idlfile::RdbCondition *pSequenceNodeTypeCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pSequenceNodeTypeCondtion = query.add_msgcondition(); pSequenceNodeTypeCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pSequenceNodeTypeCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pSequenceNodeTypeCondtion->set_strcolumnname("node_type"); @@ -595,7 +595,7 @@ void CSequenceDBInterface::updataSequenceExecuteState() pSeqNodeTypeCondValue->set_edatatype(DataType::CN_DATATYPE_INT32); pSeqNodeTypeCondValue->set_nvalue((int)E_Node_Sequence); - kbd_idlfile::RdbCondition *pSequenceNameCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pSequenceNameCondtion = query.add_msgcondition(); pSequenceNameCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pSequenceNameCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pSequenceNameCondtion->set_strcolumnname("seq_name"); @@ -604,7 +604,7 @@ void CSequenceDBInterface::updataSequenceExecuteState() pSeqNameCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pSeqNameCondValue->set_strvalue(m_listSequence.at(nIndex).seqName.toStdString()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; m_rdbNetApi->query(query, retMsg, true); } } diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h index 578a5c44..1be9ef28 100644 --- a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h +++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h @@ -20,7 +20,7 @@ class CSequenceDBInterface : public QObject { Q_OBJECT public: - CSequenceDBInterface(kbd_dbms::CDbApi *dbRead); + CSequenceDBInterface(iot_dbms::CDbApi *dbRead); ~CSequenceDBInterface(); @@ -64,9 +64,9 @@ private: QMutex mutex; QTimer * m_timer; QList m_listSequence; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccessEx * m_rtdbAccessEx; - kbd_dbms::CRdbNetApi * m_rdbNetApi; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccessEx * m_rtdbAccessEx; + iot_dbms::CRdbNetApi * m_rdbNetApi; }; #endif // CSEQUENCEDBINTERFACE_H diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp index f7eb192b..f796b9a1 100644 --- a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp +++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp @@ -18,7 +18,7 @@ #include "pub_utility_api/FileStyle.h" #include -using namespace kbd_dbms; +using namespace iot_dbms; CSequenceManageWidget::CSequenceManageWidget(QWidget *parent, bool editMode) : QWidget(parent), ui(new Ui::CSequenceManageWidget), @@ -36,7 +36,7 @@ CSequenceManageWidget::CSequenceManageWidget(QWidget *parent, bool editMode) : ui->listWidget->setCurrentRow(1); } QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -46,7 +46,7 @@ CSequenceManageWidget::CSequenceManageWidget(QWidget *parent, bool editMode) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("sequence.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("sequence.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -250,7 +250,7 @@ void CSequenceManageWidget::updateActionRunData() bool CSequenceManageWidget::getSeqCtrlPerm() { //<权限处理 - kbd_service::CPermMngApiPtr permManage = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permManage = iot_service::getPermMngInstance("base"); permManage->PermDllInit(); int nLevel; diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h index 1707f483..92f7c214 100644 --- a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h +++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h @@ -59,7 +59,7 @@ private: CHistorySequenceModel * m_historySequenceModel; CHistoryActionModel * m_historyActionModel; - kbd_dbms::CDbApi * m_pReadDb; + iot_dbms::CDbApi * m_pReadDb; QList m_listHistroySequence; History_Filter_Condition m_historyCondition; bool m_isGuard; diff --git a/product/src/gui/plugin/SequenceManageWidget/main.cpp b/product/src/gui/plugin/SequenceManageWidget/main.cpp index 641af7f2..a5167b44 100644 --- a/product/src/gui/plugin/SequenceManageWidget/main.cpp +++ b/product/src/gui/plugin/SequenceManageWidget/main.cpp @@ -7,9 +7,9 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem(QString("log_hmi.properties").toUtf8().data(), + iot_public::StartLogSystem(QString("log_hmi.properties").toUtf8().data(), "hmi", "sequence"); - kbd_net::initMsgBus("Sequence", "1", true); + iot_net::initMsgBus("Sequence", "1", true); { CSequenceManageWidget w; @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp index 6de9b3ed..464a50cb 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp @@ -2,7 +2,7 @@ #include "CSeqForHmiApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; CSeqForHmiApi::CSeqForHmiApi(int appid) { m_pImpl = new CSeqForHmiApiImpl(appid, this); diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp index b7985d25..a68936e5 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp @@ -5,7 +5,7 @@ #include "CSeqForHmiApiImpl.h" using namespace kbd_application; -using namespace kbd_idlfile::sequence; +using namespace iot_idl::sequence; kbd_application::CSeqForHmiApiImpl::CSeqForHmiApiImpl( int appid, CSeqForHmiApi* api) : @@ -55,7 +55,7 @@ void CSeqForHmiApiImpl::afterSuspend() } void CSeqForHmiApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; if (!m_objRecvSeqCMb.recvMsg(m_objRecvMsg)) { return; @@ -65,10 +65,10 @@ void CSeqForHmiApiImpl::execute() } bool CSeqForHmiApiImpl::recvMsgSeq( - kbd_net::CMbMessage& msg) + iot_net::CMbMessage& msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; if (msg.getMsgType() != MT_SEQAGE_CTRL_HMI_UP) { @@ -130,7 +130,7 @@ bool CSeqForHmiApiImpl::recvMsgSeq( return false; } -bool CSeqForHmiApiImpl::sendToSeq(kbd_net::CMbMessage& msg, int domain) +bool CSeqForHmiApiImpl::sendToSeq(iot_net::CMbMessage& msg, int domain) { LOGINFO("sendMsgToDomain domain[%d] appid[%d] msgType[%d] Subject[%d]", domain, @@ -147,7 +147,7 @@ bool CSeqForHmiApiImpl::seqOperateRequest( SeqOperateMessage& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumSeqOperateMessage); objMessage.setData(msg.SerializeAsString()); return sendToSeq(objMessage, domain); @@ -157,7 +157,7 @@ bool CSeqForHmiApiImpl::userInterveneResponse( UiRequestMessageAck& msg) { int domain = msg.pkg_head().target_domain(); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(enumUiRequestMessageAck); objMessage.setData(msg.SerializeAsString()); return sendToSeq(objMessage, domain); diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h index e3353ad3..74f2f094 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h +++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h @@ -7,9 +7,9 @@ #include "application/sequence_server_api/CSeqForHmiApi.h" namespace kbd_application { - using namespace kbd_idlfile::sequence; + using namespace iot_idl::sequence; class CSeqForHmiApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: CSeqForHmiApiImpl(int appid, CSeqForHmiApi* api); @@ -43,15 +43,15 @@ namespace kbd_application { bool handleSeqStateChange( StatusChangeMessage& msg); - bool sendToSeq(kbd_net::CMbMessage& msg, int domain); + bool sendToSeq(iot_net::CMbMessage& msg, int domain); - bool recvMsgSeq(kbd_net::CMbMessage& msg); + bool recvMsgSeq(iot_net::CMbMessage& msg); private: CSeqForHmiApi* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendSeqCMb;//发送 sequence - kbd_net::CMbCommunicator m_objRecvSeqCMb;//接收 sequence + iot_net::CMbCommunicator m_objSendSeqCMb;//发送 sequence + iot_net::CMbCommunicator m_objRecvSeqCMb;//接收 sequence const int m_nServerAppid; }; diff --git a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp index 6949da54..9c7f5881 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp @@ -67,7 +67,7 @@ void CSeqPermDialog::initView(bool guard) bool CSeqPermDialog::initPermMng() { - m_ptrPermMng = kbd_service::getPermMngInstance("base"); + m_ptrPermMng = iot_service::getPermMngInstance("base"); int result = m_ptrPermMng->PermDllInit(); if(result < 0) { diff --git a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h index 285c2b95..d3db29dd 100644 --- a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h +++ b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h @@ -46,7 +46,7 @@ private slots: private: Ui::CSeqPermDialog * ui; - kbd_service::CPermMngApiPtr m_ptrPermMng; + iot_service::CPermMngApiPtr m_ptrPermMng; bool m_isGuard; int m_nUserId; std::string m_strUsrName; diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp index bb43bbdb..db74ff26 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp @@ -3,8 +3,8 @@ #include "../../idl_files/SequenceMessage.pb.h" #include "../../idl_files/RdbServerMessage.pb.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CSequenceDataManage::CSequenceDataManage(QObject *parent, CDbApi *dbRead) : QObject(parent), @@ -50,14 +50,14 @@ void CSequenceDataManage::initRdbDataBase() m_rtdbAccessEx = new CRdbAccessEx(); } -void CSequenceDataManage::recvSequenceResponse(kbd_idlfile::sequence::SeqOperateMessageAck &msg) +void CSequenceDataManage::recvSequenceResponse(iot_idl::sequence::SeqOperateMessageAck &msg) { if(msg.has_seq_node()) { - kbd_idlfile::sequence::SeqNodeStatusParameter* sequenceNode = msg.mutable_seq_node(); + iot_idl::sequence::SeqNodeStatusParameter* sequenceNode = msg.mutable_seq_node(); QString seqName = QString::fromStdString(sequenceNode->seq_name()); E_SEQ_OPERATE type = (E_SEQ_OPERATE)msg.opreate_type(); - kbd_idlfile::sequence::ExecuteStatusParameter * status = msg.mutable_execute_status(); + iot_idl::sequence::ExecuteStatusParameter * status = msg.mutable_execute_status(); //< status->statuscode() 状态码 0为成功 非零为错误状态 if(!status->statuscode()) @@ -68,7 +68,7 @@ void CSequenceDataManage::recvSequenceResponse(kbd_idlfile::sequence::SeqOperate { if(status->has_erro_param()) { - kbd_idlfile::sequence::ErrorParameter * error = status->mutable_erro_param(); + iot_idl::sequence::ErrorParameter * error = status->mutable_erro_param(); QString strErrorInfo = QString::fromStdString(error->errordescription()); emit sigRecvSequenceResponseErrorMsg(seqName, type, strErrorInfo); } @@ -76,17 +76,17 @@ void CSequenceDataManage::recvSequenceResponse(kbd_idlfile::sequence::SeqOperate } } -void CSequenceDataManage::recvUserInterveneRequest(kbd_idlfile::sequence::UiRequestMessage &msg) +void CSequenceDataManage::recvUserInterveneRequest(iot_idl::sequence::UiRequestMessage &msg) { - kbd_idlfile::sequence::UiRequestMessage * requestMessage = new kbd_idlfile::sequence::UiRequestMessage(msg); + iot_idl::sequence::UiRequestMessage * requestMessage = new iot_idl::sequence::UiRequestMessage(msg); emit sigRecvUserInterveneRequest(requestMessage); } -void CSequenceDataManage::recvSeqStateChange(kbd_idlfile::sequence::StatusChangeMessage &msg) +void CSequenceDataManage::recvSeqStateChange(iot_idl::sequence::StatusChangeMessage &msg) { for(int nIndex(0); nIndex < msg.execute_status_size(); nIndex++) { - kbd_idlfile::sequence::ExecuteStatusParameter statusParameter = msg.execute_status(nIndex); + iot_idl::sequence::ExecuteStatusParameter statusParameter = msg.execute_status(nIndex); if(statusParameter.statuscode() != 0) { QString strSeqName = QString::fromStdString(msg.mutable_nodelist()->seq_name()); @@ -96,7 +96,7 @@ void CSequenceDataManage::recvSeqStateChange(kbd_idlfile::sequence::StatusChange } } - kbd_idlfile::sequence::SeqNodeStatusParameter sequence = msg.nodelist(); + iot_idl::sequence::SeqNodeStatusParameter sequence = msg.nodelist(); QString strSeqName = QString::fromStdString(sequence.seq_name()); if(sequence.nodelist_size() == 0) { @@ -107,7 +107,7 @@ void CSequenceDataManage::recvSeqStateChange(kbd_idlfile::sequence::StatusChange { for(int nIndex(0); nIndex < sequence.nodelist_size(); nIndex++) { - kbd_idlfile::sequence::FucNodeStatusParameter funcNode = sequence.nodelist(nIndex); + iot_idl::sequence::FucNodeStatusParameter funcNode = sequence.nodelist(nIndex); QString strFuncName = QString::fromStdString(funcNode.fuc_name()); if(funcNode.nodelist_size() == 0) { @@ -118,7 +118,7 @@ void CSequenceDataManage::recvSeqStateChange(kbd_idlfile::sequence::StatusChange { for(int nActionIndex(0); nActionIndex < funcNode.nodelist_size(); nActionIndex++) { - kbd_idlfile::sequence::ActionNodeStatusParameter actionNode = funcNode.nodelist(nActionIndex); + iot_idl::sequence::ActionNodeStatusParameter actionNode = funcNode.nodelist(nActionIndex); QString strActionName = QString::fromStdString(actionNode.action_name()); E_EXECUTING_STATE actionState = (E_EXECUTING_STATE)actionNode.node_state(); emit sigRecvActionStateChanged(strSeqName, strFuncName, strActionName,actionState); @@ -136,8 +136,8 @@ QString CSequenceDataManage::queryLocationName(const int &nLocationID) std::string strTableName = "sys_model_location_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("description"); @@ -223,7 +223,7 @@ QString CSequenceDataManage::queryStateName(const QString &strStateTextName, con std::string strTableName = "dict_state_text_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); std::vector vecCondInfo; CONDINFO conditionName; @@ -241,7 +241,7 @@ QString CSequenceDataManage::queryStateName(const QString &strStateTextName, con vecCondInfo.push_back(conditionState); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("display_value"); @@ -263,8 +263,8 @@ QString CSequenceDataManage::queryStateName(const QString &strStateTextName, con QList CSequenceDataManage::querySequenceList(const QStringList &seqNameList) { QList sequenceList; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (!kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (!iot_public::createSysInfoInstance(spSysInfo)) { return sequenceList; } diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h index 70683600..efdf5253 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h +++ b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h @@ -20,18 +20,18 @@ class CSequenceDataManage : public QObject Q_OBJECT public: - explicit CSequenceDataManage(QObject *parent = nullptr, kbd_dbms::CDbApi *dbRead = NULL); + explicit CSequenceDataManage(QObject *parent = nullptr, iot_dbms::CDbApi *dbRead = NULL); ~CSequenceDataManage(); void initDataBase(); void initRdbDataBase(); - void recvSequenceResponse(kbd_idlfile::sequence::SeqOperateMessageAck &msg); + void recvSequenceResponse(iot_idl::sequence::SeqOperateMessageAck &msg); - void recvUserInterveneRequest(kbd_idlfile::sequence::UiRequestMessage &msg); + void recvUserInterveneRequest(iot_idl::sequence::UiRequestMessage &msg); - void recvSeqStateChange(kbd_idlfile::sequence::StatusChangeMessage &msg); + void recvSeqStateChange(iot_idl::sequence::StatusChangeMessage &msg); QString queryLocationName(const int &nLocationID); @@ -50,12 +50,12 @@ signals: void sigRecvSequenceStateChanged(const QString &seqName, const E_EXECUTING_STATE &state); void sigRecvFunctionStateChanged(const QString &seqName, const QString &funcName, const E_EXECUTING_STATE &state); void sigRecvActionStateChanged(const QString &seqName, const QString &funcName, const QString &actionName, const E_EXECUTING_STATE &state); - void sigRecvUserInterveneRequest(const kbd_idlfile::sequence::UiRequestMessage *msg); + void sigRecvUserInterveneRequest(const iot_idl::sequence::UiRequestMessage *msg); private: QMutex mutex; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccessEx * m_rtdbAccessEx; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccessEx * m_rtdbAccessEx; bool m_isInitDb; }; diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp index a3a6be71..7a8d0815 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp @@ -16,7 +16,7 @@ void CSequenceMsgHandle::setDataManager(CSequenceDataManage *mng) m_seqDataManage = mng; } -bool CSequenceMsgHandle::handleSeqOperateResponse(kbd_idlfile::sequence::SeqOperateMessageAck &msg) +bool CSequenceMsgHandle::handleSeqOperateResponse(iot_idl::sequence::SeqOperateMessageAck &msg) { if(NULL != m_seqDataManage) { @@ -25,7 +25,7 @@ bool CSequenceMsgHandle::handleSeqOperateResponse(kbd_idlfile::sequence::SeqOper return true; } -bool CSequenceMsgHandle::handleUserInterveneRequest(kbd_idlfile::sequence::UiRequestMessage &msg) +bool CSequenceMsgHandle::handleUserInterveneRequest(iot_idl::sequence::UiRequestMessage &msg) { if(NULL != m_seqDataManage) { @@ -34,7 +34,7 @@ bool CSequenceMsgHandle::handleUserInterveneRequest(kbd_idlfile::sequence::UiReq return true; } -bool CSequenceMsgHandle::handleSeqStateChange(kbd_idlfile::sequence::StatusChangeMessage &msg) +bool CSequenceMsgHandle::handleSeqStateChange(iot_idl::sequence::StatusChangeMessage &msg) { //< 不再接收顺控状态变化消息 Q_UNUSED(msg) diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h index d7de59bd..fc656eee 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h +++ b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h @@ -14,20 +14,20 @@ public: void setDataManager(CSequenceDataManage * mng); //<1 hmi->server 发起的请求顺控操作 - //bool seqOperateRequest(kbd_idlfile::SeqOperateMessage& msg); + //bool seqOperateRequest(iot_idl::SeqOperateMessage& msg); //<2 server->hmi 请求顺控操作 的 应答 - virtual bool handleSeqOperateResponse(kbd_idlfile::sequence::SeqOperateMessageAck& msg); + virtual bool handleSeqOperateResponse(iot_idl::sequence::SeqOperateMessageAck& msg); //<1 server->hmi 发起的人工干预 请求 - virtual bool handleUserInterveneRequest(kbd_idlfile::sequence::UiRequestMessage& msg); + virtual bool handleUserInterveneRequest(iot_idl::sequence::UiRequestMessage& msg); //<2 hmi ->server 人工干预应答 - //bool userInterveneResponse(kbd_idlfile::sequence::UiRequestMessageAck& msg); + //bool userInterveneResponse(iot_idl::sequence::UiRequestMessageAck& msg); //server->hmi 顺控状态更新 - virtual bool handleSeqStateChange(kbd_idlfile::sequence::StatusChangeMessage& msg); + virtual bool handleSeqStateChange(iot_idl::sequence::StatusChangeMessage& msg); private: CSequenceDataManage * m_seqDataManage; diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp index a8f308d5..144f0ee2 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp @@ -4,8 +4,8 @@ #include "../../idl_files/RdbServerMessage.pb.h" #include -using namespace kbd_dbms; -using namespace kbd_idlfile; +using namespace iot_dbms; +using namespace iot_idl; CSequenceStateManage::CSequenceStateManage(QObject *parent, CDbApi *dbRead) : QObject(parent), @@ -133,7 +133,7 @@ void CSequenceStateManage::updataSequenceState() QMutexLocker locker(&mutex); while(m_tagRdbNetApi->checkStatus()) { - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (m_tagRdbNetApi->getRet(&retMsg)) { for (int nIndex(0); nIndex < retMsg.msgrecord_size(); nIndex++) @@ -155,8 +155,8 @@ void CSequenceStateManage::updataSequenceState() } } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { foreach (Sequence sequence, m_listSequence) { @@ -168,15 +168,15 @@ void CSequenceStateManage::updataSequenceState() { continue; } - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(sequence.locationID, stLocationInfo); - kbd_public::SAppInfo appInfo; + iot_public::SAppInfo appInfo; spSysInfo->getAppInfoBySubsystemId(sequence.subSystemID, appInfo); m_tagRdbNetApi->connect(stLocationInfo.nDomainId, appInfo.nId); QString strTableName = sequence.tagInfo.section(".", 0, 0); - kbd_idlfile::RdbQuery query; + iot_idl::RdbQuery query; query.set_strtablename(strTableName.toStdString()); std::string *pTagColName = query.add_strselectcolnamearr(); @@ -184,7 +184,7 @@ void CSequenceStateManage::updataSequenceState() std::string *pValColName = query.add_strselectcolnamearr(); *pValColName = "value"; - kbd_idlfile::RdbCondition *pCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pCondtion = query.add_msgcondition(); pCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("tag_name"); @@ -195,7 +195,7 @@ void CSequenceStateManage::updataSequenceState() pCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(tagName.toStdString()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; m_tagRdbNetApi->query(query, retMsg, true); } } @@ -207,7 +207,7 @@ void CSequenceStateManage::updataSequenceExecuteState() while(m_seqRdbNetApi->checkStatus()) { - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; if (m_seqRdbNetApi->getRet(&retMsg)) { for (int nIndex(0); nIndex < retMsg.msgrecord_size(); nIndex++) @@ -256,16 +256,16 @@ void CSequenceStateManage::updataSequenceExecuteState() return; } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(nLocationID, stLocationInfo); - kbd_public::SAppInfo appInfo; + iot_public::SAppInfo appInfo; spSysInfo->getAppInfoByName(COMAPP, appInfo); m_seqRdbNetApi->connect(stLocationInfo.nDomainId, appInfo.nId); - kbd_idlfile::RdbQuery query; + iot_idl::RdbQuery query; query.set_strtablename("sequence_running"); std::string *pSeqColName = query.add_strselectcolnamearr(); @@ -281,7 +281,7 @@ void CSequenceStateManage::updataSequenceExecuteState() std::string *pTimeFlagColName = query.add_strselectcolnamearr(); *pTimeFlagColName = "timeflag"; - kbd_idlfile::RdbCondition *pSequenceNameCondtion = query.add_msgcondition(); + iot_idl::RdbCondition *pSequenceNameCondtion = query.add_msgcondition(); pSequenceNameCondtion->set_enlogic(ENConditionLogic::enumCondAnd); pSequenceNameCondtion->set_enrelation(ENConditionRelation::enumCondEqual); pSequenceNameCondtion->set_strcolumnname("seq_name"); @@ -290,7 +290,7 @@ void CSequenceStateManage::updataSequenceExecuteState() pSeqNameCondValue->set_edatatype(DataType::CN_DATATYPE_STRING); pSeqNameCondValue->set_strvalue(strSeqName.toStdString()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; m_seqRdbNetApi->query(query, retMsg, true); } } @@ -327,8 +327,8 @@ void CSequenceStateManage::loadStateNameMap() std::string strTableName = "dict_state_text_info"; if(m_rtdbAccessEx->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccessEx); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccessEx); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("state_text_name"); columns.push_back("actual_value"); diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h index 22b13aa8..033d7fe9 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h +++ b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h @@ -18,7 +18,7 @@ class CSequenceStateManage : public QObject { Q_OBJECT public: - explicit CSequenceStateManage(QObject *parent = nullptr, kbd_dbms::CDbApi *dbRead = NULL); + explicit CSequenceStateManage(QObject *parent = nullptr, iot_dbms::CDbApi *dbRead = NULL); ~CSequenceStateManage(); signals: @@ -46,10 +46,10 @@ private: QMutex mutex; QTimer * m_timer; - kbd_dbms::CDbApi * m_pReadDb; - kbd_dbms::CRdbAccessEx * m_rtdbAccessEx; - kbd_dbms::CRdbNetApi * m_tagRdbNetApi; - kbd_dbms::CRdbNetApi * m_seqRdbNetApi; + iot_dbms::CDbApi * m_pReadDb; + iot_dbms::CRdbAccessEx * m_rtdbAccessEx; + iot_dbms::CRdbNetApi * m_tagRdbNetApi; + iot_dbms::CRdbNetApi * m_seqRdbNetApi; QList m_listSequence; QHash< QString, QMap > m_stateDescript; diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp index 868e110f..5f99172a 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp +++ b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp @@ -30,14 +30,14 @@ CSequenceWidget::CSequenceWidget(QWidget *parent, bool editMode) : ui->setupUi(this); qRegisterMetaType("E_SEQ_OPERATE"); qRegisterMetaType("E_EXECUTING_STATE"); - qRegisterMetaType("kbd_idlfile::sequence::UiRequestMessage"); + qRegisterMetaType("iot_idl::sequence::UiRequestMessage"); qRegisterMetaType >("SEQUENCELIST"); m_nUserId = -1; m_strUsrName = ""; m_nUserGrpId = -1; QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -47,7 +47,7 @@ CSequenceWidget::CSequenceWidget(QWidget *parent, bool editMode) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("sequence.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("sequence.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -164,7 +164,7 @@ void CSequenceWidget::release() } -void CSequenceWidget::initialize(int seqMode, QStringList listSequenceName, kbd_dbms::CDbApi *dbRead) +void CSequenceWidget::initialize(int seqMode, QStringList listSequenceName, iot_dbms::CDbApi *dbRead) { if(m_editMode) { @@ -477,7 +477,7 @@ void CSequenceWidget::slotRecvActionStateChanged(const QString &seqName, const Q -void CSequenceWidget::slotRecvUserInterveneRequest(const kbd_idlfile::sequence::UiRequestMessage *msg) +void CSequenceWidget::slotRecvUserInterveneRequest(const iot_idl::sequence::UiRequestMessage *msg) { if(!getSeqCtrlPerm()) { @@ -487,21 +487,21 @@ void CSequenceWidget::slotRecvUserInterveneRequest(const kbd_idlfile::sequence:: delete msg; } -void CSequenceWidget::handleUserInterveneRequest(const kbd_idlfile::sequence::UiRequestMessage &msg) +void CSequenceWidget::handleUserInterveneRequest(const iot_idl::sequence::UiRequestMessage &msg) { if(NULL != m_userInterveneRequestDialog) { return; } std::string strErrorDescription = ""; - kbd_idlfile::sequence::ExecuteStatusParameter executeStatueParameter = msg.execute_status(); + iot_idl::sequence::ExecuteStatusParameter executeStatueParameter = msg.execute_status(); if(0 != executeStatueParameter.statuscode() && executeStatueParameter.has_erro_param()) { - kbd_idlfile::sequence::ErrorParameter paramter = executeStatueParameter.erro_param(); + iot_idl::sequence::ErrorParameter paramter = executeStatueParameter.erro_param(); strErrorDescription = paramter.errordescription(); } - kbd_idlfile::sequence::SeqNodeStatusParameter sequence = msg.nodelist(); + iot_idl::sequence::SeqNodeStatusParameter sequence = msg.nodelist(); QString sequenceDescription = QString::fromStdString(sequence.seq_desc()); // foreach (Sequence locatSequence, m_listSequence) // { @@ -516,11 +516,11 @@ void CSequenceWidget::handleUserInterveneRequest(const kbd_idlfile::sequence::Ui for(int nSeqIndex(0); nSeqIndex < sequence.nodelist_size(); nSeqIndex++) { - kbd_idlfile::sequence::FucNodeStatusParameter function = sequence.nodelist(nSeqIndex); + iot_idl::sequence::FucNodeStatusParameter function = sequence.nodelist(nSeqIndex); QString functionDescription = QString::fromStdString(function.fuc_desc()); for(int nFuncIndex(0); nFuncIndex < function.nodelist_size(); nFuncIndex++) { - kbd_idlfile::sequence::ActionNodeStatusParameter action = function.nodelist(nFuncIndex); + iot_idl::sequence::ActionNodeStatusParameter action = function.nodelist(nFuncIndex); QString actionDescription = QString::fromStdString(action.action_desc()); QString content = QString("%1: [%2]\n%3: [%4]\n%5: [%6]\n").arg(tr("顺控名称")).arg(sequenceDescription).arg(tr("功能名称")).arg(functionDescription).arg(tr("动作名称")).arg(actionDescription); QString description = QString("%1 %2").arg(QString::fromStdString(strErrorDescription)).arg(tr("请求人工干预!")); @@ -543,33 +543,33 @@ void CSequenceWidget::handleUserInterveneRequest(const kbd_idlfile::sequence::Ui { type = E_Action_Skip; } - kbd_idlfile::sequence::UiRequestMessageAck uiRequestMessageAck; - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_idl::sequence::UiRequestMessageAck uiRequestMessageAck; + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { spSysInfo->getLocalNodeInfo(stNodeInfo); } - kbd_idlfile::sequence::SeqPkgHead * head = uiRequestMessageAck.mutable_pkg_head(); + iot_idl::sequence::SeqPkgHead * head = uiRequestMessageAck.mutable_pkg_head(); head->set_source_tag("hmi"); - head->set_msg_type(kbd_idlfile::sequence::enumSeqOperateMessage); + head->set_msg_type(iot_idl::sequence::enumSeqOperateMessage); head->set_source_domain(stNodeInfo.nDomainId); - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(msg.pkg_head().source_domain(), stLocationInfo); head->set_target_domain(stLocationInfo.nDomainId); head->set_para1(0); head->set_para2(0); - kbd_idlfile::sequence::ActorParameter* actor = uiRequestMessageAck.mutable_actor(); + iot_idl::sequence::ActorParameter* actor = uiRequestMessageAck.mutable_actor(); actor->set_user_id(m_nUserId); actor->set_user_groupid(m_nUserGrpId); actor->set_host_name(stNodeInfo.strName); actor->set_user_name(m_strUsrName); - kbd_idlfile::sequence::SeqNodeStatusParameter msgNodeParameter = msg.nodelist(); - kbd_idlfile::sequence::SeqNodeStatusParameter* seqNodeStatusParameter = uiRequestMessageAck.mutable_nodelist(); + iot_idl::sequence::SeqNodeStatusParameter msgNodeParameter = msg.nodelist(); + iot_idl::sequence::SeqNodeStatusParameter* seqNodeStatusParameter = uiRequestMessageAck.mutable_nodelist(); *seqNodeStatusParameter = msgNodeParameter; - uiRequestMessageAck.set_optype((kbd_idlfile::sequence::ENUiOperateType)type); + uiRequestMessageAck.set_optype((iot_idl::sequence::ENUiOperateType)type); m_seqMsgHandle->userInterveneResponse(uiRequestMessageAck); } } @@ -602,7 +602,7 @@ void CSequenceWidget::slotUpdateSequenceTimeFlag(const QString &seqName, const i // { // if(m_listSequence[nIndex].timeFlag != time) // { -// kbd_idlfile::sequence::SeqOperateMessage msg = buildSequenceRequest(m_listSequence[nIndex], E_Seq_Stop); +// iot_idl::sequence::SeqOperateMessage msg = buildSequenceRequest(m_listSequence[nIndex], E_Seq_Stop); // msg.mutable_seq_node()->set_timeflag(time); // m_seqMsgHandle->seqOperateRequest(msg); // } @@ -625,7 +625,7 @@ void CSequenceWidget::seqExecute() if(E_Node_Sequence == sequence.nodeType) { model->updateSequenceState(sequence.seqName, E_Exec_Reset); - kbd_idlfile::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, E_Seq_Start); + iot_idl::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, E_Seq_Start); m_seqMsgHandle->seqOperateRequest(msg); LOGINFO("SequenceMsgHandle send sequence OperateRequest! msgName: %s, msgType: E_Seq_Start", sequence.seqName.toStdString().c_str()); } @@ -652,7 +652,7 @@ void CSequenceWidget::seqExecute() { if(E_Node_Sequence == sequence.nodeType) { - kbd_idlfile::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, type); + iot_idl::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, type); m_seqMsgHandle->seqOperateRequest(msg); LOGINFO("SequenceMsgHandle send sequence OperateRequest! msgName: %s, msgType: E_Seq_Start", sequence.seqName.toStdString().c_str()); } @@ -697,7 +697,7 @@ void CSequenceWidget::slotPause() { if(E_Node_Sequence == sequence.nodeType) { - kbd_idlfile::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, type); + iot_idl::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, type); m_seqMsgHandle->seqOperateRequest(msg); LOGINFO("SequenceMsgHandle send sequence OperateRequest! msgName: %s, msgType: Pause/Continue", sequence.seqName.toStdString().c_str()); } @@ -725,7 +725,7 @@ void CSequenceWidget::slotPause() if(E_Node_Sequence == sequence.nodeType) { - kbd_idlfile::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, type); + iot_idl::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, type); m_seqMsgHandle->seqOperateRequest(msg); LOGINFO("SequenceMsgHandle send sequence OperateRequest! msgName: %s, msgType: Pause/Continue", sequence.seqName.toStdString().c_str()); @@ -758,7 +758,7 @@ void CSequenceWidget::slotStop() { if(E_Node_Sequence == sequence.nodeType) { - kbd_idlfile::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, E_Seq_Stop); + iot_idl::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, E_Seq_Stop); m_seqMsgHandle->seqOperateRequest(msg); LOGINFO("SequenceMsgHandle send sequence OperateRequest! msgName: %s, msgType: E_Seq_Stop", sequence.seqName.toStdString().c_str()); } @@ -772,7 +772,7 @@ void CSequenceWidget::slotStop() if(E_Node_Sequence == sequence.nodeType) { - kbd_idlfile::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, E_Seq_Stop); + iot_idl::sequence::SeqOperateMessage msg = buildSequenceRequest(sequence, E_Seq_Stop); m_seqMsgHandle->seqOperateRequest(msg); LOGINFO("SequenceMsgHandle send sequence OperateRequest! msgName: %s, msgType: E_Seq_Stop", sequence.seqName.toStdString().c_str()); @@ -783,22 +783,22 @@ void CSequenceWidget::slotStop() notify(tr("等待终止...")); } -kbd_idlfile::sequence::SeqOperateMessage CSequenceWidget::buildSequenceRequest(const Sequence &sequence, const E_SEQ_OPERATE &type) +iot_idl::sequence::SeqOperateMessage CSequenceWidget::buildSequenceRequest(const Sequence &sequence, const E_SEQ_OPERATE &type) { - kbd_public::SNodeInfo stNodeInfo; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::SNodeInfo stNodeInfo; + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { spSysInfo->getLocalNodeInfo(stNodeInfo); } - kbd_idlfile::sequence::SeqOperateMessage sequenceRequestMsg; - kbd_idlfile::sequence::SeqPkgHead * head = sequenceRequestMsg.mutable_pkg_head(); + iot_idl::sequence::SeqOperateMessage sequenceRequestMsg; + iot_idl::sequence::SeqPkgHead * head = sequenceRequestMsg.mutable_pkg_head(); head->set_source_tag("hmi"); - head->set_msg_type(kbd_idlfile::sequence::enumSeqOperateMessage); + head->set_msg_type(iot_idl::sequence::enumSeqOperateMessage); head->set_source_domain(stNodeInfo.nDomainId); - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(sequence.locationID, stLocationInfo); head->set_target_domain(stLocationInfo.nDomainId); @@ -807,13 +807,13 @@ kbd_idlfile::sequence::SeqOperateMessage CSequenceWidget::buildSequenceRequest(c head->set_para1(0); head->set_para2(0); - kbd_idlfile::sequence::SeqNodeStatusParameter* node = sequenceRequestMsg.mutable_seq_node(); + iot_idl::sequence::SeqNodeStatusParameter* node = sequenceRequestMsg.mutable_seq_node(); node->set_seq_name(sequence.seqName.toStdString()); node->set_seq_desc(sequence.seqDescription.toStdString()); - kbd_idlfile::sequence::ENSeqNodeCheckStatus checkState = (E_Mode_Action == m_seqMode) ? kbd_idlfile::sequence::enumnodePartiallyChecked : kbd_idlfile::sequence::enumNodeChecked; + iot_idl::sequence::ENSeqNodeCheckStatus checkState = (E_Mode_Action == m_seqMode) ? iot_idl::sequence::enumnodePartiallyChecked : iot_idl::sequence::enumNodeChecked; node->set_check_state(checkState); node->set_timeflag(sequence.timeFlag); - node->set_node_state((kbd_idlfile::sequence::ENSeqStatus)sequence.executeState); + node->set_node_state((iot_idl::sequence::ENSeqStatus)sequence.executeState); if(E_Mode_Action == m_seqMode) { @@ -824,23 +824,23 @@ kbd_idlfile::sequence::SeqOperateMessage CSequenceWidget::buildSequenceRequest(c { if(E_Node_Function == sequenceFunc.nodeType) { - kbd_idlfile::sequence::FucNodeStatusParameter* func = node->add_nodelist(); + iot_idl::sequence::FucNodeStatusParameter* func = node->add_nodelist(); func->set_fuc_name(sequenceFunc.funcName.toStdString()); func->set_fuc_desc(sequenceFunc.funcDescription.toStdString()); - func->set_check_state(kbd_idlfile::sequence::enumnodePartiallyChecked); + func->set_check_state(iot_idl::sequence::enumnodePartiallyChecked); func->set_timeflag(sequenceFunc.timeFlag); - func->set_node_state((kbd_idlfile::sequence::ENSeqStatus)sequenceFunc.executeState); + func->set_node_state((iot_idl::sequence::ENSeqStatus)sequenceFunc.executeState); QList listSequence = model->sequenceData(); foreach (Sequence sequenceAction, listSequence) { if(E_Node_Action == sequenceAction.nodeType && sequenceFunc.funcName == sequenceAction.funcName) { - kbd_idlfile::sequence::ActionNodeStatusParameter* action = func->add_nodelist(); + iot_idl::sequence::ActionNodeStatusParameter* action = func->add_nodelist(); action->set_action_name(sequenceAction.actionName.toStdString()); action->set_action_desc(sequenceAction.actionDescription.toStdString()); - action->set_check_state((kbd_idlfile::sequence::ENSeqNodeCheckStatus)sequenceAction.checkState); + action->set_check_state((iot_idl::sequence::ENSeqNodeCheckStatus)sequenceAction.checkState); action->set_timeflag(sequenceAction.timeFlag); - action->set_node_state((kbd_idlfile::sequence::ENSeqStatus)sequenceAction.executeState); + action->set_node_state((iot_idl::sequence::ENSeqStatus)sequenceAction.executeState); } } } @@ -848,12 +848,12 @@ kbd_idlfile::sequence::SeqOperateMessage CSequenceWidget::buildSequenceRequest(c } } - kbd_idlfile::sequence::ActorParameter* actor = sequenceRequestMsg.mutable_actor(); + iot_idl::sequence::ActorParameter* actor = sequenceRequestMsg.mutable_actor(); actor->set_user_id(m_nUserId); actor->set_user_groupid(m_nUserGrpId); actor->set_host_name(stNodeInfo.strName); actor->set_user_name(m_strUsrName); - sequenceRequestMsg.set_opreate_type((kbd_idlfile::sequence::ENSeqOperateType)type); + sequenceRequestMsg.set_opreate_type((iot_idl::sequence::ENSeqOperateType)type); return sequenceRequestMsg; } @@ -914,7 +914,7 @@ void CSequenceWidget::notify(const QString &strTips) bool CSequenceWidget::getSeqCtrlPerm() { //<权限处理 - kbd_service::CPermMngApiPtr permManage = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permManage = iot_service::getPermMngInstance("base"); permManage->PermDllInit(); int nLevel; diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h index d8cca031..e21d6e04 100644 --- a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h +++ b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h @@ -48,7 +48,7 @@ public: void release(); public slots: - void initialize(int seqMode = -1, QStringList listSequenceName = QStringList(), kbd_dbms::CDbApi *dbRead = NULL); + void initialize(int seqMode = -1, QStringList listSequenceName = QStringList(), iot_dbms::CDbApi *dbRead = NULL); void loadSequenceData(QStringList listSequenceName); @@ -71,14 +71,14 @@ protected slots: void slotRecvSequenceStateChanged(const QString &seqName, const E_EXECUTING_STATE &state); void slotRecvFunctionStateChanged(const QString &seqName, const QString &funcName, const E_EXECUTING_STATE &state); void slotRecvActionStateChanged(const QString &seqName, const QString &funcName, const QString &actionName, const E_EXECUTING_STATE &state); - void slotRecvUserInterveneRequest(const kbd_idlfile::sequence::UiRequestMessage *msg); + void slotRecvUserInterveneRequest(const iot_idl::sequence::UiRequestMessage *msg); void slotUpdateActionActualState(const QString &seqName, const QString &funcName, const QString &actionName, const QString &state); void slotUpdateSequenceTimeFlag(const QString &seqName, const int &time); private: void seqExecute(); - kbd_idlfile::sequence::SeqOperateMessage buildSequenceRequest(const Sequence &sequence, const E_SEQ_OPERATE &type); - void handleUserInterveneRequest(const kbd_idlfile::sequence::UiRequestMessage &msg); + iot_idl::sequence::SeqOperateMessage buildSequenceRequest(const Sequence &sequence, const E_SEQ_OPERATE &type); + void handleUserInterveneRequest(const iot_idl::sequence::UiRequestMessage &msg); QString operateDescription(const E_SEQ_OPERATE &type); QString stateDescription(const E_EXECUTING_STATE &state); void notify(const QString &strTips); @@ -112,7 +112,7 @@ private: bool m_isGuard; }; -Q_DECLARE_METATYPE(kbd_idlfile::sequence::UiRequestMessage) +Q_DECLARE_METATYPE(iot_idl::sequence::UiRequestMessage) Q_DECLARE_METATYPE(QList) #endif // CSEQUENCEWIDGET_H diff --git a/product/src/gui/plugin/SequenceWidget/main.cpp b/product/src/gui/plugin/SequenceWidget/main.cpp index 87cd0da3..37b25da6 100644 --- a/product/src/gui/plugin/SequenceWidget/main.cpp +++ b/product/src/gui/plugin/SequenceWidget/main.cpp @@ -7,11 +7,11 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - kbd_public::StartLogSystem(QString("log_hmi.properties").toUtf8().data(), + iot_public::StartLogSystem(QString("log_hmi.properties").toUtf8().data(), "hmi", "sequence"); - kbd_net::initMsgBus("Sequence", "1", true); - LOGINFO("kbd_net::initMsgBus"); + iot_net::initMsgBus("Sequence", "1", true); + LOGINFO("iot_net::initMsgBus"); { CSequenceWidget w(0, false); w.initialize(E_Mode_Action, QStringList() << "dfzsd"); @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp index 517c503a..c1d8da74 100644 --- a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp +++ b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp @@ -95,7 +95,7 @@ QList CDataManage::getDevInfoBySerial(const QString &serial) CDataManage::CDataManage() { - kbd_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); + iot_dbms::CDbApi objReadDb(DB_CONN_MODEL_READ); if(!objReadDb.open()) { return; @@ -108,7 +108,7 @@ CDataManage::CDataManage() loadFesDigitalTx(&objReadDb); } -void CDataManage::loadLocation(kbd_dbms::CDbApi *pReadDb) +void CDataManage::loadLocation(iot_dbms::CDbApi *pReadDb) { QSqlQuery objQuery; QList listColName; @@ -125,7 +125,7 @@ void CDataManage::loadLocation(kbd_dbms::CDbApi *pReadDb) } } -void CDataManage::loadChan(kbd_dbms::CDbApi *pReadDb) +void CDataManage::loadChan(iot_dbms::CDbApi *pReadDb) { QSqlQuery objQuery; QList listColName; @@ -142,15 +142,15 @@ void CDataManage::loadChan(kbd_dbms::CDbApi *pReadDb) } } -void CDataManage::loadRtu(kbd_dbms::CDbApi *pReadDb) +void CDataManage::loadRtu(iot_dbms::CDbApi *pReadDb) { QSqlQuery objQuery; QList listColName; listColName << "TAG_NAME"; listColName << "DESCRIPTION"; listColName << "CHAN_TAG"; - QList listOrderBy; - listOrderBy << kbd_dbms::CDbOrder("RTU_NO", kbd_dbms::CDbOrder::ORDER_ASC); + QList listOrderBy; + listOrderBy << iot_dbms::CDbOrder("RTU_NO", iot_dbms::CDbOrder::ORDER_ASC); if(!pReadDb->select("fes_rtu_para", listColName, listOrderBy, objQuery)) { @@ -172,7 +172,7 @@ void CDataManage::loadRtu(kbd_dbms::CDbApi *pReadDb) } } -void CDataManage::loadFesDevInfo(kbd_dbms::CDbApi *pReadDb) +void CDataManage::loadFesDevInfo(iot_dbms::CDbApi *pReadDb) { QSqlQuery objQuery; QList listColName; @@ -199,7 +199,7 @@ void CDataManage::loadFesDevInfo(kbd_dbms::CDbApi *pReadDb) } } -void CDataManage::loadFesDigitalTx(kbd_dbms::CDbApi *pReadDb) +void CDataManage::loadFesDigitalTx(iot_dbms::CDbApi *pReadDb) { QSqlQuery objQuery; diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h index 1c85e1e4..113f34a2 100644 --- a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h +++ b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h @@ -25,11 +25,11 @@ public: private: CDataManage(); - void loadLocation(kbd_dbms::CDbApi *pReadDb); - void loadChan(kbd_dbms::CDbApi *pReadDb); - void loadRtu(kbd_dbms::CDbApi *pReadDb); - void loadFesDevInfo(kbd_dbms::CDbApi *pReadDb); - void loadFesDigitalTx(kbd_dbms::CDbApi *pReadDb); + void loadLocation(iot_dbms::CDbApi *pReadDb); + void loadChan(iot_dbms::CDbApi *pReadDb); + void loadRtu(iot_dbms::CDbApi *pReadDb); + void loadFesDevInfo(iot_dbms::CDbApi *pReadDb); + void loadFesDigitalTx(iot_dbms::CDbApi *pReadDb); private: static CDataManage * m_pInstance; diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp index 7958e34c..fac8e7ff 100644 --- a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp +++ b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp @@ -48,7 +48,7 @@ void CRealDataCollect::initMsg() { if(m_pMbComm == NULL) { - m_pMbComm = new kbd_net::CMbCommunicator("SerialDevStatusWidget"); + m_pMbComm = new iot_net::CMbCommunicator("SerialDevStatusWidget"); } } @@ -65,7 +65,7 @@ void CRealDataCollect::clearMsg() { if(m_pMbComm) { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while(m_pMbComm->recvMsg(objMsg, 0)) {} } @@ -106,14 +106,14 @@ void CRealDataCollect::recvMessage() try { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; for(int i = 0; i < 6; i++) { if(m_pMbComm->recvMsg(objMsg, 0)) { if(objMsg.isValid()) { - if(objMsg.getMsgType() != kbd_idlfile::MT_DP_CHANGE_DATA) + if(objMsg.getMsgType() != iot_idl::MT_DP_CHANGE_DATA) { continue; } @@ -165,16 +165,16 @@ void CRealDataCollect::processChangeData() } } -int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) +int CRealDataCollect::parserMsg(const iot_net::CMbMessage &msg) { - kbd_idlfile::SRealTimeDataPkg changeDataPackage; + iot_idl::SRealTimeDataPkg changeDataPackage; try { changeDataPackage.ParseFromArray(msg.getDataPtr(),(int)msg.getDataSize()); int aiSize = changeDataPackage.stairtd_size(); if(aiSize > 0) { - kbd_idlfile::SAiRealTimeData aiStru; + iot_idl::SAiRealTimeData aiStru; QString tagName; float value; uint status; @@ -191,7 +191,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int diSize = changeDataPackage.stdirtd_size(); if(diSize > 0) { - kbd_idlfile::SDiRealTimeData diStu; + iot_idl::SDiRealTimeData diStu; QString tagName; int value; uint status; @@ -208,7 +208,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int piSize = changeDataPackage.stpirtd_size(); if(piSize > 0) { - kbd_idlfile::SPiRealTimeData piStu; + iot_idl::SPiRealTimeData piStu; QString tagName; double value; uint status; @@ -225,7 +225,7 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int miSize = changeDataPackage.stmirtd_size(); if(miSize > 0) { - kbd_idlfile::SMiRealTimeData miStu; + iot_idl::SMiRealTimeData miStu; QString tagName; int value; uint status; @@ -242,44 +242,44 @@ int CRealDataCollect::parserMsg(const kbd_net::CMbMessage &msg) int utSize = changeDataPackage.sttblrtd_size(); if(utSize > 0) { - kbd_idlfile::STableRealTimeData uiStu; + iot_idl::STableRealTimeData uiStu; QString tagName; QVariant value; for(int i = 0;i < utSize; i++) { uiStu = changeDataPackage.sttblrtd(i); tagName = QString::fromStdString(uiStu.strtagname()); - kbd_idlfile::SVariable temp = uiStu.varvalue(); - if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_BOOL) + iot_idl::SVariable temp = uiStu.varvalue(); + if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_BOOL) { value = QVariant::fromValue(temp.bvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_UINT32) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_UINT32) { value = QVariant::fromValue(temp.uvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_INT32) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_INT32) { value = QVariant::fromValue(temp.nvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_UINT64) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_UINT64) { value = QVariant::fromValue(temp.ulvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_INT64) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_INT64) { value = QVariant::fromValue(temp.lvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_FLOAT) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_FLOAT) { value = QVariant::fromValue(temp.fvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_DOUBLE) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_DOUBLE) { value = QVariant::fromValue(temp.dvalue()); } - else if(temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_STRING || - temp.edatatype() == kbd_idlfile::DataType::CN_DATATYPE_BYTES) + else if(temp.edatatype() == iot_idl::DataType::CN_DATATYPE_STRING || + temp.edatatype() == iot_idl::DataType::CN_DATATYPE_BYTES) { QString str = QString::fromStdString(temp.strvalue()); value = QVariant::fromValue(str); diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h index 8ed824f3..1c28a8c9 100644 --- a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h +++ b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h @@ -26,7 +26,7 @@ private: bool addSub(); bool delSub(); - int parserMsg(const kbd_net::CMbMessage &); + int parserMsg(const iot_net::CMbMessage &); private slots: void recvMessage(); @@ -40,7 +40,7 @@ signals: void signal_updateUi(QMap uiMap); private: - kbd_net::CMbCommunicator *m_pMbComm; + iot_net::CMbCommunicator *m_pMbComm; QTimer * m_pTimer; int m_nTimeCount; QMap> m_aiMap; diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp index 68906176..e9ac5cc8 100644 --- a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp +++ b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp @@ -141,7 +141,7 @@ void CSerialDevStatusWidget::soltExportExcel() void CSerialDevStatusWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -150,7 +150,7 @@ void CSerialDevStatusWidget::initStyle() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("serialStatus.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("serialStatus.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -245,7 +245,7 @@ void CSerialDevStatusWidget::initData() void CSerialDevStatusWidget::initConnect() { - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); connect(m_pTreeWidget, &QTreeWidget::itemClicked, this, &CSerialDevStatusWidget::slotItemClicked); connect(CRealDataCollect::instance(), &CRealDataCollect::signal_updateDi, this, &CSerialDevStatusWidget::slotUpdateDi); diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h index c97b3ee6..ab1af11b 100644 --- a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h +++ b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h @@ -48,7 +48,7 @@ private: QTableView * m_pTableView; CSeriaDevTableModel * m_pTableModel; QPushButton * m_btnExport; - kbd_service::CDpcdaForApp *m_pDpcdaForApp; + iot_service::CDpcdaForApp *m_pDpcdaForApp; QMap m_serialStatusMap; }; diff --git a/product/src/gui/plugin/SerialDevStatusWidget/main.cpp b/product/src/gui/plugin/SerialDevStatusWidget/main.cpp index e8d3a8da..171aa3c1 100644 --- a/product/src/gui/plugin/SerialDevStatusWidget/main.cpp +++ b/product/src/gui/plugin/SerialDevStatusWidget/main.cpp @@ -6,13 +6,13 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); { QApplication a(argc, argv); @@ -22,10 +22,10 @@ int main(int argc, char *argv[]) a.exec(); } - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp b/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp index 3c7bccb8..90d1a645 100644 --- a/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/CRecordWidget.cpp @@ -2,7 +2,7 @@ #include "ui_CRecordWidget.h" #include -CRecordWidget::CRecordWidget(QWidget *parent, kbd_dbms::CDbApi *dbRead, kbd_dbms::CDbApi *dbWrite) : +CRecordWidget::CRecordWidget(QWidget *parent, iot_dbms::CDbApi *dbRead, iot_dbms::CDbApi *dbWrite) : QDialog(parent), ui(new Ui::CRecordWidget), m_pReadDb(dbRead), diff --git a/product/src/gui/plugin/ShiftWidget/CRecordWidget.h b/product/src/gui/plugin/ShiftWidget/CRecordWidget.h index 04c4adff..8d333388 100644 --- a/product/src/gui/plugin/ShiftWidget/CRecordWidget.h +++ b/product/src/gui/plugin/ShiftWidget/CRecordWidget.h @@ -14,7 +14,7 @@ class CRecordWidget : public QDialog Q_OBJECT public: - explicit CRecordWidget(QWidget *parent = 0, kbd_dbms::CDbApi *dbRead = NULL, kbd_dbms::CDbApi *dbWrite = NULL); + explicit CRecordWidget(QWidget *parent = 0, iot_dbms::CDbApi *dbRead = NULL, iot_dbms::CDbApi *dbWrite = NULL); ~CRecordWidget(); void Init(); @@ -24,8 +24,8 @@ private slots: private: Ui::CRecordWidget *ui; - kbd_dbms::CDbApi *m_pReadDb; - kbd_dbms::CDbApi *m_pWriteDb; + iot_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pWriteDb; std::vector Records; }; diff --git a/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp b/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp index 856e8027..bf298af3 100644 --- a/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/CShiftWidget.cpp @@ -6,7 +6,7 @@ #include #include #include "pub_utility_api/FileStyle.h" -//using namespace kbd_dbms; +//using namespace iot_dbms; CShiftWidget::CShiftWidget(QWidget *parent, bool editMode) : QWidget(parent), @@ -17,7 +17,7 @@ CShiftWidget::CShiftWidget(QWidget *parent, bool editMode) : { ui->setupUi(this); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -27,7 +27,7 @@ CShiftWidget::CShiftWidget(QWidget *parent, bool editMode) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("shift.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("shift.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -96,10 +96,10 @@ CShiftWidget::~CShiftWidget() void CShiftWidget::InitDb() { - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); m_pReadDb->open(); - m_pWriteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_pWriteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); } diff --git a/product/src/gui/plugin/ShiftWidget/CShiftWidget.h b/product/src/gui/plugin/ShiftWidget/CShiftWidget.h index 56806ba3..62307f36 100644 --- a/product/src/gui/plugin/ShiftWidget/CShiftWidget.h +++ b/product/src/gui/plugin/ShiftWidget/CShiftWidget.h @@ -50,8 +50,8 @@ private: bool m_isEditMode; - kbd_dbms::CDbApi *m_pReadDb; - kbd_dbms::CDbApi *m_pWriteDb; + iot_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pWriteDb; std::vector Records; std::vector Records_Inquire; diff --git a/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp b/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp index f7e2ae43..d106d5a2 100644 --- a/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/HandoverWidget.cpp @@ -9,9 +9,9 @@ #include "Common.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; -HandoverWidget::HandoverWidget(QWidget *parent,kbd_dbms::CDbApi *dbRead,kbd_dbms::CDbApi *dbWrite,bool isFarm,QString begin_time) : +HandoverWidget::HandoverWidget(QWidget *parent,iot_dbms::CDbApi *dbRead,iot_dbms::CDbApi *dbWrite,bool isFarm,QString begin_time) : QDialog(parent), ui(new Ui::HandoverWidget), m_pReadDb(dbRead), @@ -443,7 +443,7 @@ void HandoverWidget::on_ConfirmButton_clicked() return; } - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { if(PERM_NORMAL>permMngPtr->CheckUserValid(ui->NameEdit->text().toStdString().data(),ui->PasswordEdit->text().toStdString().data())) @@ -560,7 +560,7 @@ void HandoverWidget::on_SignInButton_clicked() return; } - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { if(PERM_NORMAL != permMngPtr->CheckUserValid(ui->NameEdit->text().toStdString().data(),ui->PasswordEdit->text().toStdString().data())) diff --git a/product/src/gui/plugin/ShiftWidget/HandoverWidget.h b/product/src/gui/plugin/ShiftWidget/HandoverWidget.h index 242de582..6438f114 100644 --- a/product/src/gui/plugin/ShiftWidget/HandoverWidget.h +++ b/product/src/gui/plugin/ShiftWidget/HandoverWidget.h @@ -7,7 +7,7 @@ #include "perm_mng_api/PermMngApi.h" #include "QueryThread.h" -using namespace kbd_service; +using namespace iot_service; namespace Ui { class HandoverWidget; @@ -18,7 +18,7 @@ class HandoverWidget : public QDialog Q_OBJECT public: - explicit HandoverWidget(QWidget *parent = 0,kbd_dbms::CDbApi *dbRead = NULL,kbd_dbms::CDbApi *dbWrite = NULL,bool isFarm = true,QString begin_time=""); + explicit HandoverWidget(QWidget *parent = 0,iot_dbms::CDbApi *dbRead = NULL,iot_dbms::CDbApi *dbWrite = NULL,bool isFarm = true,QString begin_time=""); ~HandoverWidget(); void Init(); @@ -59,8 +59,8 @@ protected slots: private: Ui::HandoverWidget *ui; - kbd_dbms::CDbApi *m_pReadDb; - kbd_dbms::CDbApi *m_pWriteDb; + iot_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pWriteDb; bool m_isFarm; QString m_begin_time; diff --git a/product/src/gui/plugin/ShiftWidget/QueryThread.cpp b/product/src/gui/plugin/ShiftWidget/QueryThread.cpp index 9cc5bf25..875fdc94 100644 --- a/product/src/gui/plugin/ShiftWidget/QueryThread.cpp +++ b/product/src/gui/plugin/ShiftWidget/QueryThread.cpp @@ -3,7 +3,7 @@ #include "Common.h" #include "pub_logger_api/logger.h" -using namespace kbd_public; +using namespace iot_public; QueryThread::QueryThread() { @@ -11,7 +11,7 @@ QueryThread::QueryThread() isEvent=false; isEvent_Operate=false; loadXml(); - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_HIS_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_HIS_READ); m_pReadDb->open(); } diff --git a/product/src/gui/plugin/ShiftWidget/QueryThread.h b/product/src/gui/plugin/ShiftWidget/QueryThread.h index 2b20727f..a4b78698 100644 --- a/product/src/gui/plugin/ShiftWidget/QueryThread.h +++ b/product/src/gui/plugin/ShiftWidget/QueryThread.h @@ -35,7 +35,7 @@ private: std::vector m_Events; std::vector m_Events_Operates; - kbd_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pReadDb; QList m_keyAlmLevelList; }; diff --git a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp index c07ba82e..8a940419 100644 --- a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp +++ b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.cpp @@ -2,7 +2,7 @@ #include "ui_SelectGroupWidget.h" #include -SelectGroupWidget::SelectGroupWidget(QWidget *parent, kbd_dbms::CDbApi *dbRead, kbd_dbms::CDbApi *dbWrite) : +SelectGroupWidget::SelectGroupWidget(QWidget *parent, iot_dbms::CDbApi *dbRead, iot_dbms::CDbApi *dbWrite) : QDialog(parent), m_pReadDb(dbRead), m_pWriteDb(dbWrite), diff --git a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h index a9f980e1..db1beb3c 100644 --- a/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h +++ b/product/src/gui/plugin/ShiftWidget/SelectGroupWidget.h @@ -14,7 +14,7 @@ class SelectGroupWidget : public QDialog Q_OBJECT public: - explicit SelectGroupWidget(QWidget *parent = 0,kbd_dbms::CDbApi *dbRead = NULL,kbd_dbms::CDbApi *dbWrite = NULL); + explicit SelectGroupWidget(QWidget *parent = 0,iot_dbms::CDbApi *dbRead = NULL,iot_dbms::CDbApi *dbWrite = NULL); ~SelectGroupWidget(); private slots: void on_OkButton_clicked(); @@ -25,8 +25,8 @@ private: private: Ui::SelectGroupWidget *ui; - kbd_dbms::CDbApi *m_pReadDb; - kbd_dbms::CDbApi *m_pWriteDb; + iot_dbms::CDbApi *m_pReadDb; + iot_dbms::CDbApi *m_pWriteDb; std::vector m_Groups; std::vector m_Date_Groups; std::vector Users; diff --git a/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp b/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp index 15d765d8..65bc2cd6 100644 --- a/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp +++ b/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp @@ -11,9 +11,9 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "dbms/db_api_ex/CDbApi.h" -using namespace kbd_dbms; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_dbms; +using namespace iot_public; +using namespace iot_service; CSimOptWidget::CSimOptWidget(bool editMode, QWidget *parent) : QWidget(parent), @@ -43,7 +43,7 @@ CSimOptWidget::~CSimOptWidget() void CSimOptWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -52,7 +52,7 @@ void CSimOptWidget::initStyleSheet() qssfile1.close(); } -// strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; +// strFullPath = iot_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; // QFile qssfile2(QString::fromStdString(strFullPath)); // qssfile2.open(QFile::ReadOnly); // if (qssfile2.isOpen()) @@ -73,7 +73,7 @@ void CSimOptWidget::initView() bool CSimOptWidget::permCheck(int location, int region) { -// kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); +// iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); // QString mess; // if(permMngPtr != NULL) // { @@ -146,7 +146,7 @@ bool CSimOptWidget::checkFilterFilePath(const QString &file) void CSimOptWidget::refeshTree() { - kbd_dbms::CDbApi * m_pReadDb = new CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi * m_pReadDb = new CDbApi(DB_CONN_MODEL_READ); if(! m_pReadDb->open()) { delete m_pReadDb; @@ -177,7 +177,7 @@ void CSimOptWidget::refeshTree() bool CSimOptWidget::checkUserPerm() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); diff --git a/product/src/gui/plugin/SimOptWidget/main.cpp b/product/src/gui/plugin/SimOptWidget/main.cpp index 2132d997..87b39849 100644 --- a/product/src/gui/plugin/SimOptWidget/main.cpp +++ b/product/src/gui/plugin/SimOptWidget/main.cpp @@ -8,12 +8,12 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); -// kbd_public::StartLogSystem("HMI", "hmi"); -// if (!(kbd_net::initMsgBus("HMI", "HMI"))) +// iot_public::StartLogSystem("HMI", "hmi"); +// if (!(iot_net::initMsgBus("HMI", "HMI"))) // { // return -1; // } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) a.exec(); } //<释放消息总线 -// kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); +// iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.cpp b/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.cpp index 8c2acdf8..04d988c9 100644 --- a/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.cpp +++ b/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.cpp @@ -41,7 +41,7 @@ void CRelaySettingMsgMng::slotcmd(const QList &keyList, const QList &keyList, const QListrecvMsg(msg, 50)) { if(msg.getMsgType() != MT_OPT_COMMON_UP) @@ -129,7 +129,7 @@ void CRelaySettingMsgMng::initMsg() { if(m_communicator == Q_NULLPTR) { - m_communicator = new kbd_net::CMbCommunicator(); + m_communicator = new iot_net::CMbCommunicator(); } } @@ -157,7 +157,7 @@ bool CRelaySettingMsgMng::delSub(int appID, int channel) { m_communicator->delSub(appID, channel); } - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; while (m_communicator->recvMsg(msg, 0)) { } diff --git a/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.h b/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.h index 8785d233..3f06b3b1 100644 --- a/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.h +++ b/product/src/gui/plugin/TelBookWidget/CRelaySettingMsgMng.h @@ -12,8 +12,8 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "perm_mng_api/PermMngApi.h" -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; class CRelaySettingMsgMng : public QObject { @@ -65,10 +65,10 @@ private: void affirmTest(RelayCmdReply &relayCmdReply,const QString &cmd); void editGroupTest(RelayCmdReply &relayCmdReply,const QString &cmd); private: - kbd_net::CMbCommunicator *m_communicator; + iot_net::CMbCommunicator *m_communicator; QTimer *m_timer; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; CPermMngApiPtr m_permMng; std::string m_curRtu; diff --git a/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp b/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp index 9dc157c5..521c7ddd 100644 --- a/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp +++ b/product/src/gui/plugin/TelBookWidget/CTelBookWidget.cpp @@ -39,7 +39,7 @@ CTelBookWidget::~CTelBookWidget() void CTelBookWidget::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -49,7 +49,7 @@ void CTelBookWidget::initStyleSheet() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("relaySetting.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/TelBookWidget/CTelBookWidget.h b/product/src/gui/plugin/TelBookWidget/CTelBookWidget.h index 872a8604..25049c59 100644 --- a/product/src/gui/plugin/TelBookWidget/CTelBookWidget.h +++ b/product/src/gui/plugin/TelBookWidget/CTelBookWidget.h @@ -31,8 +31,8 @@ enum EN_RELAY_TREE_TYPE EN_RELAY_TREE_CHANL = 20002 }; -using namespace kbd_public; -using namespace kbd_service; +using namespace iot_public; +using namespace iot_service; class CTelBookWidget : public QWidget { diff --git a/product/src/gui/plugin/TelBookWidget/main.cpp b/product/src/gui/plugin/TelBookWidget/main.cpp index fb02fad8..a53b4757 100644 --- a/product/src/gui/plugin/TelBookWidget/main.cpp +++ b/product/src/gui/plugin/TelBookWidget/main.cpp @@ -7,13 +7,13 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - kbd_public::StartLogSystem("HMI", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("HMI", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) } //<释放消息总线 - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/TrendCurves/CHisDataManage.cpp b/product/src/gui/plugin/TrendCurves/CHisDataManage.cpp index 8259b9ec..2bca4f53 100644 --- a/product/src/gui/plugin/TrendCurves/CHisDataManage.cpp +++ b/product/src/gui/plugin/TrendCurves/CHisDataManage.cpp @@ -3,7 +3,7 @@ #include "sample_server_api/SampleDefine.h" #include "CTrendInfoManage.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; int CHisDataManage::m_nProcessNumber = 0; @@ -98,10 +98,10 @@ void CHisDataManage::release() delete this; } -bool CHisDataManage::getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr) +bool CHisDataManage::getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr) { //< 不使用getOneUseableConn()返回的正式库测试 - // ptr.reset(new kbd_dbms::CTsdbConn("127.0.0.1", -1, "iscs6000", "", "")); + // ptr.reset(new iot_dbms::CTsdbConn("127.0.0.1", -1, "iscs6000", "", "")); // return true; if(m_tsdbConnPtr != NULL) { @@ -196,7 +196,7 @@ void CHisDataManage::queryHistoryOriginalData(std::vector *vecMpK double nIntervalSecs = SAMPLE_CYC_MIN * 60 * 1000; std::vector *> *vecResult = new std::vector *>(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { for(size_t nIndex(0); nIndex < vecMpKey->size(); nIndex++) @@ -235,7 +235,7 @@ void CHisDataManage::queryHistoryPolymericData(std::vector *vecMp double nIntervalSecs = SAMPLE_CYC_MIN * 60 * 1000; std::vector *> *vecResult = new std::vector *>(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { for(size_t nIndex(0); nIndex < vecMpKey->size(); nIndex++) @@ -271,9 +271,9 @@ void CHisDataManage::queryHistoryComputeData(std::vector *vecMpKe m_TsdbExcuting = true; } - std::vector *> *> > cmResult; + std::vector *> *> > cmResult; - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { for(size_t nCmIndex(0); nCmIndex < vecCM.size(); nCmIndex++) @@ -289,7 +289,7 @@ void CHisDataManage::queryHistoryComputeData(std::vector *vecMpKe { LOGINFO("TrendCurve CHisDataManage::queryHistoryComputeData: 查询超时！"); } - std::pair *> *> tmp; + std::pair *> *> tmp; tmp.first = vecCM[nCmIndex]; tmp.second = vecResult; cmResult.push_back(tmp); @@ -319,7 +319,7 @@ void CHisDataManage::queryHistoryEvents(std::vector *vecMpKey, do std::vector *> *vecResult = new std::vector *>(); - kbd_dbms::CTsdbConnPtr tsdbConnPtr; + iot_dbms::CTsdbConnPtr tsdbConnPtr; if(getValidTsdbConnPtr(tsdbConnPtr)) { for(size_t nIndex(0); nIndex < vecMpKey->size(); nIndex++) diff --git a/product/src/gui/plugin/TrendCurves/CHisDataManage.h b/product/src/gui/plugin/TrendCurves/CHisDataManage.h index b05f74b6..780cbdbc 100644 --- a/product/src/gui/plugin/TrendCurves/CHisDataManage.h +++ b/product/src/gui/plugin/TrendCurves/CHisDataManage.h @@ -25,7 +25,7 @@ enum E_His_Type struct MeasurementPoint { - kbd_dbms::EnMeasPiontType type; //< 测点类型 + iot_dbms::EnMeasPiontType type; //< 测点类型 const QString strTagName; //< 测点TAG名 }; @@ -38,14 +38,14 @@ struct TsdbCommand lower = -1.; upper = -1.; nGroupBySec = -1; - vecMethod = std::vector{kbd_dbms::CM_NULL}; + vecMethod = std::vector{iot_dbms::CM_NULL}; } E_His_Type type; - std::vector * pVecMpKey; + std::vector * pVecMpKey; double lower; double upper; int nGroupBySec; - std::vector vecMethod; + std::vector vecMethod; }; class CHisDataManage : public QObject @@ -58,50 +58,50 @@ public: bool isTsdbExuting(); signals: - void sigupdateHisOriginalData(std::vector *vecMpKey, - std::vector *> *vecResult, + void sigupdateHisOriginalData(std::vector *vecMpKey, + std::vector *> *vecResult, E_Data_Type type = E_HISTORY); - void sigHistoryPolymericData(std::vector *vecMpKey, - std::vector *> *vecResult, + void sigHistoryPolymericData(std::vector *vecMpKey, + std::vector *> *vecResult, int nGroupBySec); - void sigHistoryComputeData(std::vector *vecMpKey, - std::vector *> *> > cmResult); + void sigHistoryComputeData(std::vector *vecMpKey, + std::vector *> *> > cmResult); - void sigHistoryEvent(std::vector *vecMpKey, - std::vector *> *vecResult); + void sigHistoryEvent(std::vector *vecMpKey, + std::vector *> *vecResult); void sigHisSearch(bool enable); public slots: void release(); - void postTsdbCommandQueue(E_His_Type type, std::vector *vecMpKey, + void postTsdbCommandQueue(E_His_Type type, std::vector *vecMpKey, double lower, double upper, int nGroupBySec = -1, - std::vector vecCM = std::vector{kbd_dbms::CM_NULL}); + std::vector vecCM = std::vector{iot_dbms::CM_NULL}); - void queryHistoryOriginalData(std::vector *vecMpKey, + void queryHistoryOriginalData(std::vector *vecMpKey, double lower, double upper, E_Data_Type type = E_HISTORY); - void queryHistoryPolymericData(std::vector *vecMpKey, + void queryHistoryPolymericData(std::vector *vecMpKey, double lower, double upper, int nGroupBySec, - const kbd_dbms::EnComputeMethod &enCm); + const iot_dbms::EnComputeMethod &enCm); - void queryHistoryComputeData(std::vector *vecMpKey, + void queryHistoryComputeData(std::vector *vecMpKey, double lower, double upper, - const std::vector &vecCM); + const std::vector &vecCM); - void queryHistoryEvents(std::vector *vecMpKey, + void queryHistoryEvents(std::vector *vecMpKey, double lower, double upper, - const kbd_dbms::EnComputeMethod &enCM, + const iot_dbms::EnComputeMethod &enCM, int nGroupBySec); protected: - bool getValidTsdbConnPtr(kbd_dbms::CTsdbConnPtr &ptr); + bool getValidTsdbConnPtr(iot_dbms::CTsdbConnPtr &ptr); void checkTsdbCommandQueue(); void checkTsdbCommandQueue(bool &bHasPend, QList &listCommand); @@ -110,7 +110,7 @@ private: bool m_bHasPendingCommandCurve; bool m_bHasPendingCommandEvent; bool m_bHasPendingCommandCompute; - kbd_dbms::CTsdbConnPtr m_tsdbConnPtr; + iot_dbms::CTsdbConnPtr m_tsdbConnPtr; QList m_listCommandCurve; QList m_listCommandEvent; diff --git a/product/src/gui/plugin/TrendCurves/CHisEventManage.h b/product/src/gui/plugin/TrendCurves/CHisEventManage.h index c3b8ddde..c9dabc8a 100644 --- a/product/src/gui/plugin/TrendCurves/CHisEventManage.h +++ b/product/src/gui/plugin/TrendCurves/CHisEventManage.h @@ -3,7 +3,7 @@ #include "dbms/db_api_ex/CDbApi.h" -using namespace kbd_dbms; +using namespace iot_dbms; class CHisEventManage : public QObject { Q_OBJECT diff --git a/product/src/gui/plugin/TrendCurves/CPlotWidget.cpp b/product/src/gui/plugin/TrendCurves/CPlotWidget.cpp index ef56875b..437724b9 100644 --- a/product/src/gui/plugin/TrendCurves/CPlotWidget.cpp +++ b/product/src/gui/plugin/TrendCurves/CPlotWidget.cpp @@ -13,7 +13,7 @@ #include "CMyListWidget.h" #include "model_excel/xlsx/xlsxdocument.h" -using namespace kbd_dbms; +using namespace iot_dbms; CPlotWidget::CPlotWidget(QWidget *parent) : QWidget(parent), @@ -45,12 +45,12 @@ CPlotWidget::CPlotWidget(QWidget *parent) : setContentsMargins(1, 1, 1, 1); qRegisterMetaType< E_Point_Type >("E_Point_Type"); qRegisterMetaType< E_Data_Type >("E_Data_Type"); - qRegisterMetaType< kbd_dbms::EnComputeMethod >("kbd_dbms::EnComputeMethod"); - qRegisterMetaType< std::vector >("std::vector"); - qRegisterMetaType< std::vector >("std::vector"); - qRegisterMetaType< std::vector *> >("std::vector *>"); - qRegisterMetaType< std::vector *> *> > >( - "std::vector *> *> >"); + qRegisterMetaType< iot_dbms::EnComputeMethod >("iot_dbms::EnComputeMethod"); + qRegisterMetaType< std::vector >("std::vector"); + qRegisterMetaType< std::vector >("std::vector"); + qRegisterMetaType< std::vector *> >("std::vector *>"); + qRegisterMetaType< std::vector *> *> > >( + "std::vector *> *> >"); } CPlotWidget::~CPlotWidget() @@ -253,7 +253,7 @@ void CPlotWidget::initialize() connect(m_pTimer, &QTimer::timeout, this, &CPlotWidget::realTimeElapsed); } - m_pDpcdaForApp = new kbd_service::CDpcdaForApp(); + m_pDpcdaForApp = new iot_service::CDpcdaForApp(); m_rtDataCollect = new CRealTimeDataCollect(this); connect(m_rtDataCollect, &CRealTimeDataCollect::finished, m_rtDataCollect, &CRealTimeDataCollect::deleteLater); connect(m_rtDataCollect, &CRealTimeDataCollect::realTimeTrendDataArrived, this, &CPlotWidget::recvRealTimeTrendData, Qt::QueuedConnection); @@ -1403,7 +1403,7 @@ void CPlotWidget::updateHistoryCurveRecord(double lower, double upper) } else { - emit sigQueryHistoryPolymericData(vecMpKey, lower, upper, currentGroupByMinute() * 60, kbd_dbms::CM_FIRST); + emit sigQueryHistoryPolymericData(vecMpKey, lower, upper, currentGroupByMinute() * 60, iot_dbms::CM_FIRST); } } else @@ -1414,12 +1414,12 @@ void CPlotWidget::updateHistoryCurveRecord(double lower, double upper) } else { - m_pHisDataManage->postTsdbCommandQueue(E_POLYMERIC, vecMpKey, lower, upper, currentGroupByMinute() * 60, std::vector{kbd_dbms::CM_FIRST}); + m_pHisDataManage->postTsdbCommandQueue(E_POLYMERIC, vecMpKey, lower, upper, currentGroupByMinute() * 60, std::vector{iot_dbms::CM_FIRST}); } } QPair range = getFatureDataTime(m_type, ui->date->dateTime()); - std::vector vecMethod{kbd_dbms::CM_MAX, kbd_dbms::CM_MIN}; + std::vector vecMethod{iot_dbms::CM_MAX, iot_dbms::CM_MIN}; updateComputeValue(range.first, range.second, vecMethod); } @@ -1795,7 +1795,7 @@ void CPlotWidget::updateCurveHisData(double lower, double upper, QCPGraph *graph m_pTrendGraph->setCurveHisDataValue(graph->name(), max, min, maxTime, minTime, average, accuml, *range); } -void CPlotWidget::updatePhaseTracer(std::vector *vecMpKey, std::vector *> *vecResult) +void CPlotWidget::updatePhaseTracer(std::vector *vecMpKey, std::vector *> *vecResult) { ui->plot->clearItems(); m_listTracer.clear(); @@ -1804,8 +1804,8 @@ void CPlotWidget::updatePhaseTracer(std::vector *vecMpK { for(size_t tagIndex(0); tagIndex < vecResult->size(); tagIndex++) { - std::vector *evetVector = vecResult->at(tagIndex); - std::vector::iterator iter = evetVector->begin(); + std::vector *evetVector = vecResult->at(tagIndex); + std::vector::iterator iter = evetVector->begin(); for(; iter != evetVector->end(); iter++) { if(m_alarmStatusList.contains(iter->m_nAlmStatus)) @@ -1866,7 +1866,7 @@ void CPlotWidget::updatePhaseTracer(std::vector *vecMpK hidePoint.clear(); } //< 释放结果集 - std::vector *>::iterator res = vecResult->begin(); + std::vector *>::iterator res = vecResult->begin(); while(res != vecResult->end()) { delete (*res); @@ -3159,11 +3159,11 @@ void CPlotWidget::groupQueryHistoryEvent() { if(g_groupByDuration == 0) { - emit sigQueryHistoryEvent(vecMpKey, ui->plot->xAxis->range().lower, ui->plot->xAxis->range().upper, kbd_dbms::CM_NULL, g_groupByDuration); + emit sigQueryHistoryEvent(vecMpKey, ui->plot->xAxis->range().lower, ui->plot->xAxis->range().upper, iot_dbms::CM_NULL, g_groupByDuration); } else { - emit sigQueryHistoryEvent(vecMpKey, ui->plot->xAxis->range().lower, ui->plot->xAxis->range().upper, kbd_dbms::CM_SAMPLE, g_groupByDuration); + emit sigQueryHistoryEvent(vecMpKey, ui->plot->xAxis->range().lower, ui->plot->xAxis->range().upper, iot_dbms::CM_SAMPLE, g_groupByDuration); } } else @@ -3171,12 +3171,12 @@ void CPlotWidget::groupQueryHistoryEvent() if(g_groupByDuration == 0) { m_pHisDataManage->postTsdbCommandQueue(E_EVENTPOINT, vecMpKey, ui->plot->xAxis->range().lower, ui->plot->xAxis->range().upper, g_groupByDuration, - std::vector{kbd_dbms::CM_NULL}); + std::vector{iot_dbms::CM_NULL}); } else { m_pHisDataManage->postTsdbCommandQueue(E_EVENTPOINT, vecMpKey, ui->plot->xAxis->range().lower, ui->plot->xAxis->range().upper, g_groupByDuration, - std::vector{kbd_dbms::CM_SAMPLE}); + std::vector{iot_dbms::CM_SAMPLE}); } } @@ -3547,7 +3547,7 @@ void CPlotWidget::slotCustomSearch(bool isForce) } enableSearch(false); - std::vector vecMethod{kbd_dbms::CM_MAX, kbd_dbms::CM_MIN}; + std::vector vecMethod{iot_dbms::CM_MAX, iot_dbms::CM_MIN}; updateComputeValue(lower, upper, vecMethod); std::vector * vecMpKey = new std::vector(); for(int nIndex(0); nIndex < ui->plot->graphCount(); ++nIndex) @@ -3566,12 +3566,12 @@ void CPlotWidget::slotCustomSearch(bool isForce) double nIntervalSecs = SAMPLE_CYC_MIN * 60 * 1000; // if(!m_pHisDataManage->isTsdbExuting()) // { -// emit sigQueryHistoryPolymericData(vecMpKey, lower + nIntervalSecs, upper - nIntervalSecs, sec, kbd_dbms::CM_FIRST); +// emit sigQueryHistoryPolymericData(vecMpKey, lower + nIntervalSecs, upper - nIntervalSecs, sec, iot_dbms::CM_FIRST); // } // else { //< 添加多条曲线时，可能存在顺序混乱，导致显示列缺失，因此都使用post的方式查询 - m_pHisDataManage->postTsdbCommandQueue(E_POLYMERIC, vecMpKey, lower + nIntervalSecs, upper - nIntervalSecs, sec, std::vector{kbd_dbms::CM_FIRST}); + m_pHisDataManage->postTsdbCommandQueue(E_POLYMERIC, vecMpKey, lower + nIntervalSecs, upper - nIntervalSecs, sec, std::vector{iot_dbms::CM_FIRST}); } } diff --git a/product/src/gui/plugin/TrendCurves/CPlotWidget.h b/product/src/gui/plugin/TrendCurves/CPlotWidget.h index 6f2a4305..5c21b2e0 100644 --- a/product/src/gui/plugin/TrendCurves/CPlotWidget.h +++ b/product/src/gui/plugin/TrendCurves/CPlotWidget.h @@ -123,20 +123,20 @@ signals: void releaseHisDataThread(); void releaseHisEventThread(); - void sigQueryHistoryOriginalData(std::vector *vecMpKey, + void sigQueryHistoryOriginalData(std::vector *vecMpKey, double lower, double upper, E_Data_Type type = E_HISTORY); - void sigQueryHistoryPolymericData(std::vector *vecMpKey, - double lower, double upper, int nGroupByMinute, kbd_dbms::EnComputeMethod method); + void sigQueryHistoryPolymericData(std::vector *vecMpKey, + double lower, double upper, int nGroupByMinute, iot_dbms::EnComputeMethod method); - void sigQueryHistoryComputeData(std::vector *vecMpKey, + void sigQueryHistoryComputeData(std::vector *vecMpKey, double lower, double upper, - std::vector method); + std::vector method); - void sigQueryHistoryEvent(std::vector *vecMpKey, + void sigQueryHistoryEvent(std::vector *vecMpKey, double lower, double upper, - kbd_dbms::EnComputeMethod enCM, + iot_dbms::EnComputeMethod enCM, int nGroupByMinute); void sigAddCollect(int x, int y); void sigHideCollect(); @@ -165,7 +165,7 @@ private slots: void updateTrendShowMode(int nIndex, bool updateXAxisRange = true); - void updateComputeValue(double lower, double upper, std::vector vecMethod); + void updateComputeValue(double lower, double upper, std::vector vecMethod); void updateCurves(); @@ -173,22 +173,22 @@ private slots: void updateHistoryCurveRecord(double lower, double upper); - void updateHisOriginalData(std::vector *vecMpKey, - std::vector *> *vecResult, + void updateHisOriginalData(std::vector *vecMpKey, + std::vector *> *vecResult, E_Data_Type type = E_HISTORY); - void updateHisPolymericData(std::vector *vecMpKey, - std::vector *> *vecResult, + void updateHisPolymericData(std::vector *vecMpKey, + std::vector *> *vecResult, int nGroupBySec); - void updateHisComputeData(std::vector *vecMpKey, - std::vector *> *> > cmResult); + void updateHisComputeData(std::vector *vecMpKey, + std::vector *> *> > cmResult); - void updateHistoryGraph(std::vector *vecMpKey, + void updateHistoryGraph(std::vector *vecMpKey, std::vector< QSharedPointer > &vecContainer, std::vector< QSharedPointer > &vecRange); - void updateHistoryData(std::vector *vecMpKey, + void updateHistoryData(std::vector *vecMpKey, std::vector< QSharedPointer > &vecContainer, std::vector< QSharedPointer > &vecRange); @@ -197,8 +197,8 @@ private slots: QSharedPointer container, QSharedPointer range); - void updatePhaseTracer(std::vector *vecMpKey, - std::vector *> *vecResult); + void updatePhaseTracer(std::vector *vecMpKey, + std::vector *> *vecResult); void updateGraphEvent(const qint64 &time, QStringList contents); void updateAxisFormat(bool updateXAxisRange); @@ -241,7 +241,7 @@ private slots: private: void installMousePressEventFilter(); - kbd_dbms::EnMeasPiontType getMeasType(const QString &type); + iot_dbms::EnMeasPiontType getMeasType(const QString &type); E_Trend_Type getRangeType(const QCPRange &range); @@ -258,7 +258,7 @@ private: void setSliderRange(double lower, double upper, bool setValue = false); template - void updateHisData(std::vector *vecMpKey, + void updateHisData(std::vector *vecMpKey, std::vector*> *vecResult, std::vector< QSharedPointer > &vecRange, std::vector< QSharedPointer > &vecContainer, @@ -270,9 +270,9 @@ private: bool checkStatus(const _Tp &var, const int &nInvalid); template - bool checkStatus(const kbd_dbms::SVarHisSamplePoint &var, const int &nInvalid); + bool checkStatus(const iot_dbms::SVarHisSamplePoint &var, const int &nInvalid); - void setCurveStatisData(const QString &tag, kbd_dbms::EnComputeMethod method, bool reset, const double &value = 0, const double &time = 0); + void setCurveStatisData(const QString &tag, iot_dbms::EnComputeMethod method, bool reset, const double &value = 0, const double &time = 0); bool isMutation(const double &preValue, const double &curValue); @@ -301,7 +301,7 @@ private: CTrendGraph * m_pTrendGraph; QCPItemText * m_trendTitle; double m_rtRange; - kbd_service::CDpcdaForApp * m_pDpcdaForApp; + iot_service::CDpcdaForApp * m_pDpcdaForApp; CRealTimeDataCollect * m_rtDataCollect; QSharedPointer m_ptrPlotTricker; QThread * m_pHisDataThread; diff --git a/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.cpp b/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.cpp index 71635bb6..e19b6bf4 100644 --- a/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.cpp +++ b/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.cpp @@ -4,9 +4,9 @@ #include "pub_logger_api/logger.h" #include -using namespace kbd_net; -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_net; +using namespace iot_public; +using namespace iot_idl; CRealTimeDataCollect::CRealTimeDataCollect(QObject *parent) : QThread(parent) @@ -21,15 +21,15 @@ CRealTimeDataCollect::~CRealTimeDataCollect() void CRealTimeDataCollect::run() { - kbd_public::CSysInfoInterfacePtr sysInfo; - kbd_public::createSysInfoInstance(sysInfo); + iot_public::CSysInfoInterfacePtr sysInfo; + iot_public::createSysInfoInstance(sysInfo); // 初始化通讯器 CMbCommunicator * pCommunicator = new CMbCommunicator(); pCommunicator->addSub(0, CH_SCADA_TO_HMI_DATA_CHANGE); while(!isInterruptionRequested()) { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; if (pCommunicator && pCommunicator->recvMsg(msg, 100) && !isInterruptionRequested()) { parseTrendDataMessage(msg); @@ -48,35 +48,35 @@ void CRealTimeDataCollect::parseTrendDataMessage(const CMbMessage &msg) int msgType = msg.getMsgType(); if(MT_DP_CHANGE_DATA == msgType) { - kbd_idlfile::SRealTimeDataPkg chgDataPkg; + iot_idl::SRealTimeDataPkg chgDataPkg; try { chgDataPkg.ParseFromArray(msg.getDataPtr(), (int)msg.getDataSize()); int aiSize = chgDataPkg.stairtd_size(); for(int i = 0;i < aiSize; i++) { - const kbd_idlfile::SAiRealTimeData &aiStru = chgDataPkg.stairtd(i); + const iot_idl::SAiRealTimeData &aiStru = chgDataPkg.stairtd(i); msgNotify(aiStru.strtagname(), aiStru.fvalue(), aiStru.ustatus(), E_ANALOG); } int diSize = chgDataPkg.stdirtd_size(); for(int i = 0;i < diSize; i++) { - const kbd_idlfile::SDiRealTimeData &diStru = chgDataPkg.stdirtd(i); + const iot_idl::SDiRealTimeData &diStru = chgDataPkg.stdirtd(i); msgNotify(diStru.strtagname(), diStru.nvalue(), diStru.ustatus(), E_DIGITAL); } int piSize = chgDataPkg.stpirtd_size(); for(int i = 0;i < piSize; i++) { - const kbd_idlfile::SPiRealTimeData &piStru = chgDataPkg.stpirtd(i); + const iot_idl::SPiRealTimeData &piStru = chgDataPkg.stpirtd(i); msgNotify(piStru.strtagname(), (qint64)piStru.dvalue(), piStru.ustatus(), E_ACCUML); } int miSize = chgDataPkg.stmirtd_size(); for(int i = 0;i < miSize; i++) { - const kbd_idlfile::SMiRealTimeData &miStru = chgDataPkg.stmirtd(i); + const iot_idl::SMiRealTimeData &miStru = chgDataPkg.stmirtd(i); msgNotify(miStru.strtagname(), miStru.nvalue(), miStru.ustatus(), E_MIX); } } diff --git a/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.h b/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.h index 43ac69c1..e3894dfb 100644 --- a/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.h +++ b/product/src/gui/plugin/TrendCurves/CRealTimeDataCollect.h @@ -38,7 +38,7 @@ private: * @brief parseTrendDataMessage 解析实时数据 * @param msg */ - void parseTrendDataMessage(const kbd_net::CMbMessage &msg); + void parseTrendDataMessage(const iot_net::CMbMessage &msg); void msgNotify(const std::string &strTagName, const QVariant &value, const int &status, E_Point_Type pointType); }; diff --git a/product/src/gui/plugin/TrendCurves/CTrendEditDialog.cpp b/product/src/gui/plugin/TrendCurves/CTrendEditDialog.cpp index c1bb3889..c15a1f74 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendEditDialog.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendEditDialog.cpp @@ -5,7 +5,7 @@ #include "GraphTool/Retriever/CRetriever.h" #include "pub_utility_api/FileUtil.h" -using namespace kbd_dbms; +using namespace iot_dbms; CTrendEditDialog::CTrendEditDialog(QWidget *parent) : QDialog(parent), diff --git a/product/src/gui/plugin/TrendCurves/CTrendFavTreeWidget.cpp b/product/src/gui/plugin/TrendCurves/CTrendFavTreeWidget.cpp index 8efe9df3..90fc64be 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendFavTreeWidget.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendFavTreeWidget.cpp @@ -62,7 +62,7 @@ void CTrendFavTreeWidget::contextMenuEvent(QContextMenuEvent *event) { //< 权限处理--暂不处理 // bool bIsEditable = false; -// kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); +// iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); // if(permMngPtr == NULL) // { // return; @@ -233,7 +233,7 @@ void CTrendFavTreeWidget::loadTrendGraph(const QString &filePath) QString strFileName; if(filePath.isEmpty()) { - strFileName = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/trendgraph.xml"); + strFileName = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/trendgraph.xml"); } else { @@ -317,13 +317,13 @@ void CTrendFavTreeWidget::savaTrendGraph(const QString &filePath, const QListgetLocalNodeInfo(stNodeInfo); - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { if(0 == permMngPtr->PermDllInit()) @@ -257,7 +257,7 @@ QMap CTrendInfoManage::getAlarmOtherStatus() void CTrendInfoManage::loadRTLocation() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -279,8 +279,8 @@ void CTrendInfoManage::loadRTLocation() id_value.second = "description"; if(m_rtdbAccess->open(strApplicationName.c_str(), strTableName.c_str())) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back(id_value.first); columns.push_back(id_value.second); @@ -293,8 +293,8 @@ void CTrendInfoManage::loadRTLocation() m_locationOrderList.clear(); for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); @@ -466,7 +466,7 @@ void CTrendInfoManage::loadStateDefine() { if(m_rtdbAccess->open("base", "dict_menu_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); CRdbQueryResult result; std::vector columns; @@ -491,8 +491,8 @@ void CTrendInfoManage::loadAlarmStatusDefine() { if(m_rtdbAccess->open("base", "alarm_status_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.emplace_back("status_value"); columns.emplace_back("display_name"); @@ -501,8 +501,8 @@ void CTrendInfoManage::loadAlarmStatusDefine() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmStatusDefineMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -514,7 +514,7 @@ void CTrendInfoManage::loadAlarmStatusDefine() void CTrendInfoManage::loadAlarmStatus() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -552,7 +552,7 @@ void CTrendInfoManage::loadAlarmStatus() void CTrendInfoManage::loadAlarmOtherStatus() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try diff --git a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.h b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.h index aa985046..df7d03e3 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.h +++ b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.h @@ -66,10 +66,10 @@ private: CTrendInfoManage(); void loadRTLocation(); - void loadDevGroupInfo(kbd_dbms::CDbApi *pReadDb); //新增设备组 - void loadDeviceInfo(kbd_dbms::CDbApi *pReadDb); //新增设备组时修改 - void loadTagInfo(kbd_dbms::CDbApi *pReadDb); - void loadUnit(kbd_dbms::CDbApi *pReadDb); + void loadDevGroupInfo(iot_dbms::CDbApi *pReadDb); //新增设备组 + void loadDeviceInfo(iot_dbms::CDbApi *pReadDb); //新增设备组时修改 + void loadTagInfo(iot_dbms::CDbApi *pReadDb); + void loadUnit(iot_dbms::CDbApi *pReadDb); void loadStateDefine(); void loadAlarmStatusDefine(); void loadAlarmStatus(); @@ -77,7 +77,7 @@ private: void initInvalidStatus(); private: - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; QMap m_locationInfo; //< LocationID-LocationDesc QMap > m_devGroupInfo; //< LocationID- 新增设备组 QMap > > m_devGroupInfoMap; diff --git a/product/src/gui/plugin/TrendCurves/CTrendWindow.cpp b/product/src/gui/plugin/TrendCurves/CTrendWindow.cpp index 5bb78b99..5ac3bae5 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendWindow.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendWindow.cpp @@ -32,7 +32,7 @@ CTrendWindow::CTrendWindow(bool editMode, QVector ptrVec, QWidget *paren Q_UNUSED(ptrVec) QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -42,7 +42,7 @@ CTrendWindow::CTrendWindow(bool editMode, QVector ptrVec, QWidget *paren qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("trendCurves.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("trendCurves.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -84,7 +84,7 @@ void CTrendWindow::initialize(const int &mode) if(m_plotWidget) { QString strColorConfig; - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("curveColor.cfg") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("curveColor.cfg") ; QFile colorFile(QString::fromStdString(strFullPath)); if (colorFile.open(QIODevice::ReadOnly)) { diff --git a/product/src/gui/plugin/TrendCurves/main.cpp b/product/src/gui/plugin/TrendCurves/main.cpp index 41b5cd88..ee72bb87 100644 --- a/product/src/gui/plugin/TrendCurves/main.cpp +++ b/product/src/gui/plugin/TrendCurves/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) return -1; } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); { LOGINFO("===========================Trend Curve==========================="); @@ -37,10 +37,10 @@ int main(int argc, char *argv[]) app.exec(); } - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp b/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp index d9599648..da391ec2 100644 --- a/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp +++ b/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp @@ -33,7 +33,7 @@ UserManageWidget::UserManageWidget(QWidget *parent, bool editMode) : ui(new Ui::UserManageWidget) { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -43,7 +43,7 @@ UserManageWidget::UserManageWidget(QWidget *parent, bool editMode) : qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("usermng.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("usermng.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) @@ -137,7 +137,7 @@ void UserManageWidget::init() void UserManageWidget::initPerm() { - m_ptrPerm = kbd_service::getPermMngInstance("base"); + m_ptrPerm = iot_service::getPermMngInstance("base"); if(!m_ptrPerm || m_ptrPerm->PermDllInit() != 0) { QMessageBox::warning(this, tr("提示"), tr("用户管理插件用户权限认证库调用失败!"), QMessageBox::Ok); diff --git a/product/src/gui/plugin/UserManageWidget/UserManageWidget.h b/product/src/gui/plugin/UserManageWidget/UserManageWidget.h index 95e55dcb..afb91ab7 100644 --- a/product/src/gui/plugin/UserManageWidget/UserManageWidget.h +++ b/product/src/gui/plugin/UserManageWidget/UserManageWidget.h @@ -52,7 +52,7 @@ private: private: Ui::UserManageWidget *ui; - kbd_service::CPermMngApiPtr m_ptrPerm; + iot_service::CPermMngApiPtr m_ptrPerm; KbdUserWidget *m_stack; UserDbOpt *m_dbOpt; bool m_bIsEditMode; diff --git a/product/src/gui/plugin/UserManageWidget/main.cpp b/product/src/gui/plugin/UserManageWidget/main.cpp index 086152e9..0279a18a 100644 --- a/product/src/gui/plugin/UserManageWidget/main.cpp +++ b/product/src/gui/plugin/UserManageWidget/main.cpp @@ -10,10 +10,10 @@ int main(int argc, char *argv[]) std::string name="admin"; std::string password ="kbdct"; - kbd_public::StartLogSystem("HMI", "hmi"); - kbd_net::initMsgBus("HMI", "HMI"); + iot_public::StartLogSystem("HMI", "hmi"); + iot_net::initMsgBus("HMI", "HMI"); int group =1; - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) w.show(); a.exec(); } - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp index f75b8996..2f4bff1c 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp @@ -21,14 +21,14 @@ CFileTableWidget::~CFileTableWidget() QString CFileTableWidget::getRootPath() { - std::string strCurModuleDir = kbd_public::CFileUtil::getCurModuleDir(); + std::string strCurModuleDir = iot_public::CFileUtil::getCurModuleDir(); strCurModuleDir += "../../data/rec"; return QString::fromStdString(strCurModuleDir); } bool CFileTableWidget::checkDeletePerm() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { return false; diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp index 12c88599..c6fa7bce 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp @@ -144,7 +144,7 @@ void CWaveAnalyzeWidget::showComtradeFile() void CWaveAnalyzeWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -153,7 +153,7 @@ void CWaveAnalyzeWidget::initStyle() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("waveAnalyze.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("waveAnalyze.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp index bcd75b92..96abe7cd 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp @@ -3,13 +3,13 @@ #include "pub_logger_api/logger.h" #include "CBiCookieManage.h" -using namespace kbd_service; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_public; CBiCookieManage::CBiCookieManage() : m_strNode(""), m_nDomainId(CN_InvalidDomainId) { - m_ptrPermMngApi = kbd_service::getPermMngInstance("base"); + m_ptrPermMngApi = iot_service::getPermMngInstance("base"); if(PERM_NORMAL != m_ptrPermMngApi->PermDllInit()) { LOGERROR("权限接口初始化失败!"); @@ -60,7 +60,7 @@ bool CBiCookieManage::createCookie(QString &strCookie, int &nUserId) bool CBiCookieManage::isAuthExist(const QString &strCookie) { - kbd_idlfile::RdbRet objRet; + iot_idl::RdbRet objRet; bool bRet = m_objRdbNetApi.queryByKey(WEB_AUTH, strCookie.toStdString(), WEB_AUTH_EXPIRED_TIME, objRet); if(false == bRet) { @@ -82,7 +82,7 @@ bool CBiCookieManage::isAuthExist(const QString &strCookie) bool CBiCookieManage::addWebAuth(const QString &strCookie, const int &nUserId) { - kbd_idlfile::RdbInsert rdbInsert; + iot_idl::RdbInsert rdbInsert; rdbInsert.set_strtablename(WEB_AUTH); rdbInsert.add_strcolumnname(WEB_AUTH_ID); @@ -92,17 +92,17 @@ bool CBiCookieManage::addWebAuth(const QString &strCookie, const int &nUserId) 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(strCookie.toStdString()); 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); QDateTime expired = QDateTime::currentDateTime().addDays(EXPIRED_TIME); int64 expiredDate = expired.toMSecsSinceEpoch(); 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; @@ -126,14 +126,14 @@ bool CBiCookieManage::addWebAuth(const QString &strCookie, const int &nUserId) bool CBiCookieManage::removeWebAuth(const QString &strCookie) { - 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(WEB_AUTH_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(strCookie.toStdString()); bool bRet = false; diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h index 745761c6..79d010c7 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h +++ b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h @@ -29,8 +29,8 @@ public: private: std::string m_strNode; int m_nDomainId; - kbd_service::CPermMngApiPtr m_ptrPermMngApi; - kbd_dbms::CRdbNetApi m_objRdbNetApi; + iot_service::CPermMngApiPtr m_ptrPermMngApi; + iot_dbms::CRdbNetApi m_objRdbNetApi; }; #endif // CBICOOKIEMANAGE_H diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp index dfea62af..ccdeb62d 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp @@ -12,7 +12,7 @@ CBiTabWidget::CBiTabWidget(QWidget *parent) m_strCookie("") { m_networkCookie.setName("id"); - m_strStyle = std::move(kbd_public::CFileStyle::getCurStyle()); + m_strStyle = std::move(iot_public::CFileStyle::getCurStyle()); } void CBiTabWidget::setUrl(const QUrl &url) diff --git a/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp index 5fd29c0f..029df467 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp @@ -138,7 +138,7 @@ void CBrowserWidget::initialize() void CBrowserWidget::initStyle() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -147,7 +147,7 @@ void CBrowserWidget::initStyle() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("WebBrowserWidget.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("WebBrowserWidget.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp index 5cb4f670..be42a272 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp @@ -7,7 +7,7 @@ CEnergyTabWidget::CEnergyTabWidget(QWidget *parent) : CWebTabWidget(parent) { - m_strStyle = std::move(kbd_public::CFileStyle::getCurStyle()); + m_strStyle = std::move(iot_public::CFileStyle::getCurStyle()); } void CEnergyTabWidget::setUrl(const QUrl &url) diff --git a/product/src/gui/plugin/WebBrowserWidget/main.cpp b/product/src/gui/plugin/WebBrowserWidget/main.cpp index 5df611bd..8b6cc07e 100644 --- a/product/src/gui/plugin/WebBrowserWidget/main.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { qputenv("QTWEBENGINE_REMOTE_DEBUGGING", "5566"); - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -30,8 +30,8 @@ int main(int argc, char *argv[]) w.loadHtml("http://192.168.77.189:1120/platform/pageManage"); app.exec(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/gui/plugin/WorkTicket/CWorkTicketManage.cpp b/product/src/gui/plugin/WorkTicket/CWorkTicketManage.cpp index 2b6a8f0f..ba316035 100644 --- a/product/src/gui/plugin/WorkTicket/CWorkTicketManage.cpp +++ b/product/src/gui/plugin/WorkTicket/CWorkTicketManage.cpp @@ -96,7 +96,7 @@ void CWorkTicketManage::readTempInfo() bool CWorkTicketManage::omPermCheck() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { //LOGERROR("权限接口初始化失败!"); @@ -171,7 +171,7 @@ void CWorkTicketManage::on_m_delete_clicked() void CWorkTicketManage::initStyleSheet() { QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -181,7 +181,7 @@ void CWorkTicketManage::initStyleSheet() qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("workTicket.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("workTicket.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp index 0d95acdc..7580ccb9 100644 --- a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp +++ b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp @@ -31,7 +31,7 @@ WorkTicketWidget::WorkTicketWidget(QWidget *parent) : QDialog(parent) m_editFilePath = ""; m_tempFilePath = ""; initLayout(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); // initTableModel(); } @@ -235,7 +235,7 @@ QString WorkTicketWidget::copyHisToHistory(const QString &tempFileName) bool WorkTicketWidget::updateUser() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); @@ -253,7 +253,7 @@ bool WorkTicketWidget::updateUser() bool WorkTicketWidget::omPermCheck() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr == NULL || (PERM_NORMAL != permMngPtr->PermDllInit())) { LOGERROR("权限接口初始化失败!"); diff --git a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h index 60d59b13..3b00ad4e 100644 --- a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h +++ b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h @@ -12,8 +12,8 @@ namespace QXlsx { class QPushButton; class QCheckBox; -using namespace kbd_service; -using namespace kbd_dbms; +using namespace iot_service; +using namespace iot_dbms; class WorkTicketWidget : public QDialog { Q_OBJECT @@ -66,8 +66,8 @@ private: QCheckBox *m_sign; QPushButton *m_save; QPushButton *m_btPrint; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_sys::FilesyncApi m_fileApi; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_sys::FilesyncApi m_fileApi; private slots: void onSave(); diff --git a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp index 81908828..f95ead38 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp @@ -25,7 +25,7 @@ A_GLOBAL_CFG CCfgParser::g_global_cfg; bool CCfgParser::g_isValid=false; -bool CCfgParser::loadGlobal(kbd_public::CCommonConfigParse &cfg) +bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) { if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == kbdFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == kbdFailed){ LOGERROR( " default_user option parser err"); return false;} @@ -51,7 +51,7 @@ bool CCfgParser::isValid() bool CCfgParser::loadCfg(const std::string &cfgPath) { - kbd_public::CCommonConfigParse cfgP; + iot_public::CCommonConfigParse cfgP; if( cfgP.load(cfgPath) == kbdFailed) { LOGERROR("config failed to load, please check config syntax!"); diff --git a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h index 0944244c..1bb838ed 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h +++ b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h @@ -31,9 +31,9 @@ class CCfgParser public: static A_GLOBAL_CFG g_global_cfg; static bool isValid(); - static bool loadCfg(const std::string& cfgPath = kbd_public::CFileUtil::getPathOfCfgFile(IDONG_CFG_FILENAME)); + static bool loadCfg(const std::string& cfgPath = iot_public::CFileUtil::getPathOfCfgFile(IDONG_CFG_FILENAME)); private: - static bool loadGlobal( kbd_public::CCommonConfigParse &cfg); + static bool loadGlobal( iot_public::CCommonConfigParse &cfg); static bool g_isValid; }; diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp index 69ef7885..be92262f 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp @@ -58,7 +58,7 @@ CReportWidget::~CReportWidget() void CReportWidget::init() { -// m_rtdbAccess = new kbd_dbms::CRdbAccess(); +// m_rtdbAccess = new iot_dbms::CRdbAccess(); QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); stackedWidget = new CReportStackedWidget(this); @@ -113,10 +113,10 @@ void CReportWidget::setNicAddr(int appId) std::string ipAddr2 = ""; std::string node1 = ""; std::string node2 = ""; - std::vector> vector = getRunRedundancyInfoByAppid(appId); + std::vector> vector = getRunRedundancyInfoByAppid(appId); for(int i=0; i vec = vector.at(i); + std::vector vec = vector.at(i); std::string node_name = vec.at(0).toStdString(); int is_active = vec.at(1).toInt(); int is_master = vec.at(2).toInt(); @@ -182,21 +182,21 @@ std::string CReportWidget::getAnotherIp(const std::string &node) return ret; } -std::vector> CReportWidget::getRunRedundancyInfoByAppid(int appId) +std::vector> CReportWidget::getRunRedundancyInfoByAppid(int appId) { - std::vector> vector; + std::vector> vector; if(m_rtdbAccess->open("base", "sys_run_redundancy_info")) { - kbd_dbms::CONDINFO condition; + iot_dbms::CONDINFO condition; memcpy(condition.name, "app_id", strlen("app_id")); condition.logicalop = ATTRCOND_AND; condition.relationop = ATTRCOND_EQU; condition.conditionval = appId; - std::vector vecCondInfo; + std::vector vecCondInfo; vecCondInfo.push_back(condition); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("node_name"); columns.push_back("is_active"); @@ -211,15 +211,15 @@ std::vector> CReportWidget::getRunRedundancyInfo { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - std::vector temp; - kbd_dbms::CVarType node_name; - kbd_dbms::CVarType is_active; - kbd_dbms::CVarType is_master; - kbd_dbms::CVarType is_slave; - kbd_dbms::CVarType ip1; - kbd_dbms::CVarType ip1_active; - kbd_dbms::CVarType ip2; - kbd_dbms::CVarType ip2_active; + std::vector temp; + iot_dbms::CVarType node_name; + iot_dbms::CVarType is_active; + iot_dbms::CVarType is_master; + iot_dbms::CVarType is_slave; + iot_dbms::CVarType ip1; + iot_dbms::CVarType ip1_active; + iot_dbms::CVarType ip2; + iot_dbms::CVarType ip2_active; result.getColumnValue(nIndex, 0, node_name); result.getColumnValue(nIndex, 1, is_active); result.getColumnValue(nIndex, 2, is_master); @@ -246,7 +246,7 @@ std::vector> CReportWidget::getRunRedundancyInfo void CReportWidget::updateUserInfo() { - m_permMngPtr = kbd_service::getPermMngInstance("base"); + m_permMngPtr = iot_service::getPermMngInstance("base"); m_permMngPtr->PermDllInit(); if (m_permMngPtr != NULL) { @@ -277,7 +277,7 @@ void CReportWidget::loadPage() { if(!checkReportEditPerm()) { - std::string path = kbd_public::CFileUtil::getCurModuleDir(); + std::string path = iot_public::CFileUtil::getCurModuleDir(); stackedWidget->view->load(QUrl::fromLocalFile(QString::fromStdString(path)+"../../data/report/PERM_FORBIT_EDIT.html")); return; } @@ -303,7 +303,7 @@ void CReportWidget::slotLoadFinish(bool ok) { if (!ok) { - stackedWidget->view->load(QUrl::fromLocalFile(QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + stackedWidget->view->load(QUrl::fromLocalFile(QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + CCfgParser::g_global_cfg.local_static_page_path.c_str() + CCfgParser::g_global_cfg.err_page.c_str() )); } @@ -408,7 +408,7 @@ void CReportWidget::UserChanged() bool CReportWidget::checkReportEditPerm() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h index 9b323b0d..e5fc10f7 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h +++ b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h @@ -22,8 +22,8 @@ #include "dbms/rdb_api/CRdbAccess.h" #include "idong_common.h" -using namespace kbd_service; -using namespace kbd_public; +using namespace iot_service; +using namespace iot_public; class CReportWebView; class CReportStackedWidget; @@ -46,14 +46,14 @@ public slots: void loadPageByName(const QString &name); private: - bool parseSiteMap(const std::string& jsonDir= kbd_public::CFileUtil::getCurModuleDir() + CN_FilePath_Model, + bool parseSiteMap(const std::string& jsonDir= iot_public::CFileUtil::getCurModuleDir() + CN_FilePath_Model, const std::string& jsonFileName = IDONG_SITEMAP_FILENAME); QString getFirstUrl(const QString& baseUrl); QString getUrl(const QString& baseUrl); CReportStackedWidget *stackedWidget; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; CPermMngApiPtr m_permMngPtr; CSysInfoInterfacePtr m_sysInfoPtr; QTimer * m_updateTimer; @@ -68,7 +68,7 @@ private: void initSysInfo(); void setNicAddr(int appId); std::string getAnotherIp(const std::string &node); - std::vector > getRunRedundancyInfoByAppid(int appId); + std::vector > getRunRedundancyInfoByAppid(int appId); void updateUserInfo(); void loadPage(); void slotLoadFinish(bool ok); diff --git a/product/src/idl_files/AlarmLinkMessage.pb.cc b/product/src/idl_files/AlarmLinkMessage.pb.cc index e3f48867..289c9324 100644 --- a/product/src/idl_files/AlarmLinkMessage.pb.cc +++ b/product/src/idl_files/AlarmLinkMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -84,7 +84,7 @@ void protobuf_AddDesc_AlarmLinkMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\026AlarmLinkMessage.proto\022\013kbd_idlfile\"{\n" + "\n\026AlarmLinkMessage.proto\022\013iot_idl\"{\n" "\014HmiCtrlRobot\022*\n\006enType\030\001 \002(\0162\032.kbd_idlf" "ile.enMessageType\0220\n\tenContent\030\002 \002(\0162\035.k" "bd_idlfile.enMessageContent\022\r\n\005nTime\030\003 \001" @@ -144,7 +144,7 @@ const int HmiCtrlRobot::kNTimeFieldNumber; HmiCtrlRobot::HmiCtrlRobot() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(constructor:iot_idl.HmiCtrlRobot) } void HmiCtrlRobot::InitAsDefaultInstance() { @@ -154,7 +154,7 @@ HmiCtrlRobot::HmiCtrlRobot(const HmiCtrlRobot& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(copy_constructor:iot_idl.HmiCtrlRobot) } void HmiCtrlRobot::SharedCtor() { @@ -166,7 +166,7 @@ void HmiCtrlRobot::SharedCtor() { } HmiCtrlRobot::~HmiCtrlRobot() { - // @@protoc_insertion_point(destructor:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(destructor:iot_idl.HmiCtrlRobot) SharedDtor(); } @@ -210,21 +210,21 @@ bool HmiCtrlRobot::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(parse_start:iot_idl.HmiCtrlRobot) 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.enMessageType enType = 1; + // required .iot_idl.enMessageType enType = 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::enMessageType_IsValid(value)) { - set_entype(static_cast< ::kbd_idlfile::enMessageType >(value)); + if (::iot_idl::enMessageType_IsValid(value)) { + set_entype(static_cast< ::iot_idl::enMessageType >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -235,7 +235,7 @@ bool HmiCtrlRobot::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.enMessageContent enContent = 2; + // required .iot_idl.enMessageContent enContent = 2; case 2: { if (tag == 16) { parse_enContent: @@ -243,8 +243,8 @@ bool HmiCtrlRobot::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enMessageContent_IsValid(value)) { - set_encontent(static_cast< ::kbd_idlfile::enMessageContent >(value)); + if (::iot_idl::enMessageContent_IsValid(value)) { + set_encontent(static_cast< ::iot_idl::enMessageContent >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -284,24 +284,24 @@ bool HmiCtrlRobot::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(parse_success:iot_idl.HmiCtrlRobot) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(parse_failure:iot_idl.HmiCtrlRobot) return false; #undef DO_ } void HmiCtrlRobot::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.HmiCtrlRobot) - // required .kbd_idlfile.enMessageType enType = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.HmiCtrlRobot) + // required .iot_idl.enMessageType enType = 1; if (has_entype()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->entype(), output); } - // required .kbd_idlfile.enMessageContent enContent = 2; + // required .iot_idl.enMessageContent enContent = 2; if (has_encontent()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->encontent(), output); @@ -316,19 +316,19 @@ void HmiCtrlRobot::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(serialize_end:iot_idl.HmiCtrlRobot) } ::google::protobuf::uint8* HmiCtrlRobot::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.HmiCtrlRobot) - // required .kbd_idlfile.enMessageType enType = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.HmiCtrlRobot) + // required .iot_idl.enMessageType enType = 1; if (has_entype()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->entype(), target); } - // required .kbd_idlfile.enMessageContent enContent = 2; + // required .iot_idl.enMessageContent enContent = 2; if (has_encontent()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->encontent(), target); @@ -343,7 +343,7 @@ void HmiCtrlRobot::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.HmiCtrlRobot) return target; } @@ -351,13 +351,13 @@ int HmiCtrlRobot::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.enMessageType enType = 1; + // required .iot_idl.enMessageType enType = 1; if (has_entype()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->entype()); } - // required .kbd_idlfile.enMessageContent enContent = 2; + // required .iot_idl.enMessageContent enContent = 2; if (has_encontent()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->encontent()); @@ -450,6 +450,6 @@ void HmiCtrlRobot::Swap(HmiCtrlRobot* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/AlarmLinkMessage.pb.h b/product/src/idl_files/AlarmLinkMessage.pb.h index 215e51d6..45dccde3 100644 --- a/product/src/idl_files/AlarmLinkMessage.pb.h +++ b/product/src/idl_files/AlarmLinkMessage.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_AlarmLinkMessage_2eproto(); @@ -129,19 +129,19 @@ class IDL_FILES_EXPORT HmiCtrlRobot : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.enMessageType enType = 1; + // required .iot_idl.enMessageType enType = 1; inline bool has_entype() const; inline void clear_entype(); static const int kEnTypeFieldNumber = 1; - inline ::kbd_idlfile::enMessageType entype() const; - inline void set_entype(::kbd_idlfile::enMessageType value); + inline ::iot_idl::enMessageType entype() const; + inline void set_entype(::iot_idl::enMessageType value); - // required .kbd_idlfile.enMessageContent enContent = 2; + // required .iot_idl.enMessageContent enContent = 2; inline bool has_encontent() const; inline void clear_encontent(); static const int kEnContentFieldNumber = 2; - inline ::kbd_idlfile::enMessageContent encontent() const; - inline void set_encontent(::kbd_idlfile::enMessageContent value); + inline ::iot_idl::enMessageContent encontent() const; + inline void set_encontent(::iot_idl::enMessageContent value); // optional uint64 nTime = 3; inline bool has_ntime() const; @@ -150,7 +150,7 @@ class IDL_FILES_EXPORT HmiCtrlRobot : public ::google::protobuf::Message { inline ::google::protobuf::uint64 ntime() const; inline void set_ntime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.HmiCtrlRobot) + // @@protoc_insertion_point(class_scope:iot_idl.HmiCtrlRobot) private: inline void set_has_entype(); inline void clear_has_entype(); @@ -180,7 +180,7 @@ class IDL_FILES_EXPORT HmiCtrlRobot : public ::google::protobuf::Message { // HmiCtrlRobot -// required .kbd_idlfile.enMessageType enType = 1; +// required .iot_idl.enMessageType enType = 1; inline bool HmiCtrlRobot::has_entype() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -194,18 +194,18 @@ inline void HmiCtrlRobot::clear_entype() { entype_ = 1; clear_has_entype(); } -inline ::kbd_idlfile::enMessageType HmiCtrlRobot::entype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.HmiCtrlRobot.enType) - return static_cast< ::kbd_idlfile::enMessageType >(entype_); +inline ::iot_idl::enMessageType HmiCtrlRobot::entype() const { + // @@protoc_insertion_point(field_get:iot_idl.HmiCtrlRobot.enType) + return static_cast< ::iot_idl::enMessageType >(entype_); } -inline void HmiCtrlRobot::set_entype(::kbd_idlfile::enMessageType value) { - assert(::kbd_idlfile::enMessageType_IsValid(value)); +inline void HmiCtrlRobot::set_entype(::iot_idl::enMessageType value) { + assert(::iot_idl::enMessageType_IsValid(value)); set_has_entype(); entype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.HmiCtrlRobot.enType) + // @@protoc_insertion_point(field_set:iot_idl.HmiCtrlRobot.enType) } -// required .kbd_idlfile.enMessageContent enContent = 2; +// required .iot_idl.enMessageContent enContent = 2; inline bool HmiCtrlRobot::has_encontent() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -219,15 +219,15 @@ inline void HmiCtrlRobot::clear_encontent() { encontent_ = 1; clear_has_encontent(); } -inline ::kbd_idlfile::enMessageContent HmiCtrlRobot::encontent() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.HmiCtrlRobot.enContent) - return static_cast< ::kbd_idlfile::enMessageContent >(encontent_); +inline ::iot_idl::enMessageContent HmiCtrlRobot::encontent() const { + // @@protoc_insertion_point(field_get:iot_idl.HmiCtrlRobot.enContent) + return static_cast< ::iot_idl::enMessageContent >(encontent_); } -inline void HmiCtrlRobot::set_encontent(::kbd_idlfile::enMessageContent value) { - assert(::kbd_idlfile::enMessageContent_IsValid(value)); +inline void HmiCtrlRobot::set_encontent(::iot_idl::enMessageContent value) { + assert(::iot_idl::enMessageContent_IsValid(value)); set_has_encontent(); encontent_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.HmiCtrlRobot.enContent) + // @@protoc_insertion_point(field_set:iot_idl.HmiCtrlRobot.enContent) } // optional uint64 nTime = 3; @@ -245,33 +245,33 @@ inline void HmiCtrlRobot::clear_ntime() { clear_has_ntime(); } inline ::google::protobuf::uint64 HmiCtrlRobot::ntime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.HmiCtrlRobot.nTime) + // @@protoc_insertion_point(field_get:iot_idl.HmiCtrlRobot.nTime) return ntime_; } inline void HmiCtrlRobot::set_ntime(::google::protobuf::uint64 value) { set_has_ntime(); ntime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.HmiCtrlRobot.nTime) + // @@protoc_insertion_point(field_set:iot_idl.HmiCtrlRobot.nTime) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enMessageType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enMessageType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enMessageType>() { - return ::kbd_idlfile::enMessageType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enMessageType>() { + return ::iot_idl::enMessageType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enMessageContent> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enMessageContent> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enMessageContent>() { - return ::kbd_idlfile::enMessageContent_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enMessageContent>() { + return ::iot_idl::enMessageContent_descriptor(); } } // namespace google diff --git a/product/src/idl_files/AlarmLinkMessage.proto b/product/src/idl_files/AlarmLinkMessage.proto index 51387c8f..2b33614c 100644 --- a/product/src/idl_files/AlarmLinkMessage.proto +++ b/product/src/idl_files/AlarmLinkMessage.proto @@ -5,7 +5,7 @@ //====================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; enum enMessageType { diff --git a/product/src/idl_files/FesDataMessage.pb.cc b/product/src/idl_files/FesDataMessage.pb.cc index dace1bae..bc14ae9f 100644 --- a/product/src/idl_files/FesDataMessage.pb.cc +++ b/product/src/idl_files/FesDataMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -85,7 +85,7 @@ void protobuf_AddDesc_FesDataMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024FesDataMessage.proto\022\013kbd_idlfile\"\255\001\n\017" + "\n\024FesDataMessage.proto\022\013iot_idl\"\255\001\n\017" "SFesWaveFormPkg\022\024\n\014strFesSource\030\001 \002(\t\022\024\n" "\014nPackageType\030\002 \002(\005\022\023\n\013ulMessageID\030\003 \002(\004" "\022\023\n\013strfileName\030\004 \002(\t\022\021\n\tnFileSize\030\005 \002(\005" @@ -121,7 +121,7 @@ const int SFesWaveFormPkg::kStrDataFieldNumber; SFesWaveFormPkg::SFesWaveFormPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesWaveFormPkg) } void SFesWaveFormPkg::InitAsDefaultInstance() { @@ -131,7 +131,7 @@ SFesWaveFormPkg::SFesWaveFormPkg(const SFesWaveFormPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesWaveFormPkg) } void SFesWaveFormPkg::SharedCtor() { @@ -149,7 +149,7 @@ void SFesWaveFormPkg::SharedCtor() { } SFesWaveFormPkg::~SFesWaveFormPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesWaveFormPkg) SharedDtor(); } @@ -230,7 +230,7 @@ bool SFesWaveFormPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesWaveFormPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -371,17 +371,17 @@ bool SFesWaveFormPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesWaveFormPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesWaveFormPkg) return false; #undef DO_ } void SFesWaveFormPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesWaveFormPkg) // required string strFesSource = 1; if (has_strfessource()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -437,12 +437,12 @@ void SFesWaveFormPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesWaveFormPkg) } ::google::protobuf::uint8* SFesWaveFormPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesWaveFormPkg) // required string strFesSource = 1; if (has_strfessource()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -501,7 +501,7 @@ void SFesWaveFormPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesWaveFormPkg) return target; } @@ -665,6 +665,6 @@ void SFesWaveFormPkg::Swap(SFesWaveFormPkg* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/FesDataMessage.pb.h b/product/src/idl_files/FesDataMessage.pb.h index 100661e1..7caa52fb 100644 --- a/product/src/idl_files/FesDataMessage.pb.h +++ b/product/src/idl_files/FesDataMessage.pb.h @@ -26,7 +26,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_FesDataMessage_2eproto(); @@ -161,7 +161,7 @@ class IDL_FILES_EXPORT SFesWaveFormPkg : public ::google::protobuf::Message { inline ::std::string* release_strdata(); inline void set_allocated_strdata(::std::string* strdata); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesWaveFormPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesWaveFormPkg) private: inline void set_has_strfessource(); inline void clear_has_strfessource(); @@ -223,7 +223,7 @@ inline void SFesWaveFormPkg::clear_strfessource() { clear_has_strfessource(); } inline const ::std::string& SFesWaveFormPkg::strfessource() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.strFesSource) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.strFesSource) return *strfessource_; } inline void SFesWaveFormPkg::set_strfessource(const ::std::string& value) { @@ -232,7 +232,7 @@ inline void SFesWaveFormPkg::set_strfessource(const ::std::string& value) { strfessource_ = new ::std::string; } strfessource_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.strFesSource) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.strFesSource) } inline void SFesWaveFormPkg::set_strfessource(const char* value) { set_has_strfessource(); @@ -240,7 +240,7 @@ inline void SFesWaveFormPkg::set_strfessource(const char* value) { strfessource_ = new ::std::string; } strfessource_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesWaveFormPkg.strFesSource) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesWaveFormPkg.strFesSource) } inline void SFesWaveFormPkg::set_strfessource(const char* value, size_t size) { set_has_strfessource(); @@ -248,14 +248,14 @@ inline void SFesWaveFormPkg::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.SFesWaveFormPkg.strFesSource) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesWaveFormPkg.strFesSource) } inline ::std::string* SFesWaveFormPkg::mutable_strfessource() { set_has_strfessource(); if (strfessource_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strfessource_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesWaveFormPkg.strFesSource) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesWaveFormPkg.strFesSource) return strfessource_; } inline ::std::string* SFesWaveFormPkg::release_strfessource() { @@ -279,7 +279,7 @@ inline void SFesWaveFormPkg::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.SFesWaveFormPkg.strFesSource) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesWaveFormPkg.strFesSource) } // required int32 nPackageType = 2; @@ -297,13 +297,13 @@ inline void SFesWaveFormPkg::clear_npackagetype() { clear_has_npackagetype(); } inline ::google::protobuf::int32 SFesWaveFormPkg::npackagetype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.nPackageType) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.nPackageType) return npackagetype_; } inline void SFesWaveFormPkg::set_npackagetype(::google::protobuf::int32 value) { set_has_npackagetype(); npackagetype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.nPackageType) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.nPackageType) } // required uint64 ulMessageID = 3; @@ -321,13 +321,13 @@ inline void SFesWaveFormPkg::clear_ulmessageid() { clear_has_ulmessageid(); } inline ::google::protobuf::uint64 SFesWaveFormPkg::ulmessageid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.ulMessageID) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.ulMessageID) return ulmessageid_; } inline void SFesWaveFormPkg::set_ulmessageid(::google::protobuf::uint64 value) { set_has_ulmessageid(); ulmessageid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.ulMessageID) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.ulMessageID) } // required string strfileName = 4; @@ -347,7 +347,7 @@ inline void SFesWaveFormPkg::clear_strfilename() { clear_has_strfilename(); } inline const ::std::string& SFesWaveFormPkg::strfilename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.strfileName) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.strfileName) return *strfilename_; } inline void SFesWaveFormPkg::set_strfilename(const ::std::string& value) { @@ -356,7 +356,7 @@ inline void SFesWaveFormPkg::set_strfilename(const ::std::string& value) { strfilename_ = new ::std::string; } strfilename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.strfileName) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.strfileName) } inline void SFesWaveFormPkg::set_strfilename(const char* value) { set_has_strfilename(); @@ -364,7 +364,7 @@ inline void SFesWaveFormPkg::set_strfilename(const char* value) { strfilename_ = new ::std::string; } strfilename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesWaveFormPkg.strfileName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesWaveFormPkg.strfileName) } inline void SFesWaveFormPkg::set_strfilename(const char* value, size_t size) { set_has_strfilename(); @@ -372,14 +372,14 @@ inline void SFesWaveFormPkg::set_strfilename(const char* value, size_t size) { strfilename_ = new ::std::string; } strfilename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesWaveFormPkg.strfileName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesWaveFormPkg.strfileName) } inline ::std::string* SFesWaveFormPkg::mutable_strfilename() { set_has_strfilename(); if (strfilename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strfilename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesWaveFormPkg.strfileName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesWaveFormPkg.strfileName) return strfilename_; } inline ::std::string* SFesWaveFormPkg::release_strfilename() { @@ -403,7 +403,7 @@ inline void SFesWaveFormPkg::set_allocated_strfilename(::std::string* strfilenam clear_has_strfilename(); strfilename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesWaveFormPkg.strfileName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesWaveFormPkg.strfileName) } // required int32 nFileSize = 5; @@ -421,13 +421,13 @@ inline void SFesWaveFormPkg::clear_nfilesize() { clear_has_nfilesize(); } inline ::google::protobuf::int32 SFesWaveFormPkg::nfilesize() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.nFileSize) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.nFileSize) return nfilesize_; } inline void SFesWaveFormPkg::set_nfilesize(::google::protobuf::int32 value) { set_has_nfilesize(); nfilesize_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.nFileSize) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.nFileSize) } // required int32 nSeqNo = 6; @@ -445,13 +445,13 @@ inline void SFesWaveFormPkg::clear_nseqno() { clear_has_nseqno(); } inline ::google::protobuf::int32 SFesWaveFormPkg::nseqno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.nSeqNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.nSeqNo) return nseqno_; } inline void SFesWaveFormPkg::set_nseqno(::google::protobuf::int32 value) { set_has_nseqno(); nseqno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.nSeqNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.nSeqNo) } // required int32 nDataLen = 7; @@ -469,13 +469,13 @@ inline void SFesWaveFormPkg::clear_ndatalen() { clear_has_ndatalen(); } inline ::google::protobuf::int32 SFesWaveFormPkg::ndatalen() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.nDataLen) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.nDataLen) return ndatalen_; } inline void SFesWaveFormPkg::set_ndatalen(::google::protobuf::int32 value) { set_has_ndatalen(); ndatalen_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.nDataLen) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.nDataLen) } // required bytes strData = 8; @@ -495,7 +495,7 @@ inline void SFesWaveFormPkg::clear_strdata() { clear_has_strdata(); } inline const ::std::string& SFesWaveFormPkg::strdata() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWaveFormPkg.strData) + // @@protoc_insertion_point(field_get:iot_idl.SFesWaveFormPkg.strData) return *strdata_; } inline void SFesWaveFormPkg::set_strdata(const ::std::string& value) { @@ -504,7 +504,7 @@ inline void SFesWaveFormPkg::set_strdata(const ::std::string& value) { strdata_ = new ::std::string; } strdata_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWaveFormPkg.strData) + // @@protoc_insertion_point(field_set:iot_idl.SFesWaveFormPkg.strData) } inline void SFesWaveFormPkg::set_strdata(const char* value) { set_has_strdata(); @@ -512,7 +512,7 @@ inline void SFesWaveFormPkg::set_strdata(const char* value) { strdata_ = new ::std::string; } strdata_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesWaveFormPkg.strData) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesWaveFormPkg.strData) } inline void SFesWaveFormPkg::set_strdata(const void* value, size_t size) { set_has_strdata(); @@ -520,14 +520,14 @@ inline void SFesWaveFormPkg::set_strdata(const void* value, size_t size) { strdata_ = new ::std::string; } strdata_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesWaveFormPkg.strData) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesWaveFormPkg.strData) } inline ::std::string* SFesWaveFormPkg::mutable_strdata() { set_has_strdata(); if (strdata_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strdata_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesWaveFormPkg.strData) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesWaveFormPkg.strData) return strdata_; } inline ::std::string* SFesWaveFormPkg::release_strdata() { @@ -551,13 +551,13 @@ inline void SFesWaveFormPkg::set_allocated_strdata(::std::string* strdata) { clear_has_strdata(); strdata_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesWaveFormPkg.strData) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesWaveFormPkg.strData) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { diff --git a/product/src/idl_files/FesDataMessage.proto b/product/src/idl_files/FesDataMessage.proto index b47c793f..709c1253 100644 --- a/product/src/idl_files/FesDataMessage.proto +++ b/product/src/idl_files/FesDataMessage.proto @@ -4,7 +4,7 @@ // @author thxiao //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // Fes waveform Data Pagkage //======================================================================================== diff --git a/product/src/idl_files/FesFwMessage.pb.cc b/product/src/idl_files/FesFwMessage.pb.cc index 8d8b7876..de3ecdc7 100644 --- a/product/src/idl_files/FesFwMessage.pb.cc +++ b/product/src/idl_files/FesFwMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -342,7 +342,7 @@ void protobuf_AddDesc_FesFwMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\022FesFwMessage.proto\022\013kbd_idlfile\"\200\002\n\rSF" + "\n\022FesFwMessage.proto\022\013iot_idl\"\200\002\n\rSF" "esFwCtrlCmd\022\024\n\014nFwSubSystem\030\001 \002(\005\022\020\n\010nFw" "RtuNo\030\002 \002(\005\022\022\n\nnFwPointNo\030\003 \002(\005\022\022\n\nnSubS" "ystem\030\004 \002(\005\022\016\n\006nRtuNo\030\005 \002(\005\022\020\n\010nPointNo\030" @@ -351,7 +351,7 @@ void protobuf_AddDesc_FesFwMessage_2eproto() { "\022\020\n\010ulParam1\030\013 \002(\004\022\020\n\010ulParam2\030\014 \002(\004\022\016\n\006" "fParam\030\r \002(\002\"v\n\rSFesFwCtrlPkg\022\020\n\010nDataNu" "m\030\001 \002(\005\022\021\n\tnResPara1\030\002 \001(\005\022\021\n\tnResPara2\030" - "\003 \001(\005\022-\n\tstCtrlCmd\030\004 \003(\0132\032.kbd_idlfile.S" + "\003 \001(\005\022-\n\tstCtrlCmd\030\004 \003(\0132\032.iot_idl.S" "FesFwCtrlCmd\"\321\001\n\023SFesFwDefCmdPkgHead\022\022\n\n" "nMessageID\030\001 \002(\005\022\020\n\010nDataNum\030\002 \002(\005\022\024\n\014nF" "wSubSystem\030\003 \002(\005\022\020\n\010nFwRtuNo\030\004 \002(\005\022\022\n\nnS" @@ -361,7 +361,7 @@ void protobuf_AddDesc_FesFwMessage_2eproto() { "\022\020\n\010nstrName\030\001 \002(\t\022\021\n\tnStrValue\030\002 \002(\t\"p\n" "\017SFesFwDefCmdPkg\0220\n\006stHead\030\001 \002(\0132 .kbd_i" "dlfile.SFesFwDefCmdPkgHead\022+\n\010stDefCmd\030\002" - " \003(\0132\031.kbd_idlfile.SFesFwDefCmd\"R\n\rSFesF" + " \003(\0132\031.iot_idl.SFesFwDefCmd\"R\n\rSFesF" "wAiValue\022\020\n\010nPointNo\030\001 \002(\005\022\016\n\006fValue\030\002 \002" "(\002\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006ulTime\030\004 \002(\004\"R\n\rS" "FesFwDiValue\022\020\n\010nPointNo\030\001 \002(\005\022\016\n\006nValue" @@ -373,7 +373,7 @@ void protobuf_AddDesc_FesFwMessage_2eproto() { "me\030\004 \002(\004\"G\n\014SFesWfStatus\022\021\n\tnSrcRtuNo\030\001 " "\002(\005\022\023\n\013nSrcPointNo\030\002 \002(\005\022\017\n\007nStatus\030\003 \002(" "\r\"B\n\021SFesWfDoStatusPkg\022-\n\nstDoStatus\030\001 \003" - "(\0132\031.kbd_idlfile.SFesWfStatus*\352\001\n\022enFesF" + "(\0132\031.iot_idl.SFesWfStatus*\352\001\n\022enFesF" "wCtrlMsgType\022\023\n\017MT_FESFW_DO_REQ\020\001\022\024\n\020MT_" "FESFW_DO_RESP\020\002\022\023\n\017MT_FESFW_AO_REQ\020\003\022\024\n\020" "MT_FESFW_AO_RESP\020\004\022\023\n\017MT_FESFW_MO_REQ\020\005\022" @@ -477,7 +477,7 @@ const int SFesFwCtrlCmd::kFParamFieldNumber; SFesFwCtrlCmd::SFesFwCtrlCmd() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwCtrlCmd) } void SFesFwCtrlCmd::InitAsDefaultInstance() { @@ -487,7 +487,7 @@ SFesFwCtrlCmd::SFesFwCtrlCmd(const SFesFwCtrlCmd& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwCtrlCmd) } void SFesFwCtrlCmd::SharedCtor() { @@ -509,7 +509,7 @@ void SFesFwCtrlCmd::SharedCtor() { } SFesFwCtrlCmd::~SFesFwCtrlCmd() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwCtrlCmd) SharedDtor(); } @@ -568,7 +568,7 @@ bool SFesFwCtrlCmd::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwCtrlCmd) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -782,17 +782,17 @@ bool SFesFwCtrlCmd::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwCtrlCmd) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwCtrlCmd) return false; #undef DO_ } void SFesFwCtrlCmd::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwCtrlCmd) // required int32 nFwSubSystem = 1; if (has_nfwsubsystem()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nfwsubsystem(), output); @@ -862,12 +862,12 @@ void SFesFwCtrlCmd::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwCtrlCmd) } ::google::protobuf::uint8* SFesFwCtrlCmd::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwCtrlCmd) // required int32 nFwSubSystem = 1; if (has_nfwsubsystem()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nfwsubsystem(), target); @@ -937,7 +937,7 @@ void SFesFwCtrlCmd::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwCtrlCmd) return target; } @@ -1166,7 +1166,7 @@ const int SFesFwCtrlPkg::kStCtrlCmdFieldNumber; SFesFwCtrlPkg::SFesFwCtrlPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwCtrlPkg) } void SFesFwCtrlPkg::InitAsDefaultInstance() { @@ -1176,7 +1176,7 @@ SFesFwCtrlPkg::SFesFwCtrlPkg(const SFesFwCtrlPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwCtrlPkg) } void SFesFwCtrlPkg::SharedCtor() { @@ -1188,7 +1188,7 @@ void SFesFwCtrlPkg::SharedCtor() { } SFesFwCtrlPkg::~SFesFwCtrlPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwCtrlPkg) SharedDtor(); } @@ -1246,7 +1246,7 @@ bool SFesFwCtrlPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwCtrlPkg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1296,7 +1296,7 @@ bool SFesFwCtrlPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesFwCtrlCmd stCtrlCmd = 4; + // repeated .iot_idl.SFesFwCtrlCmd stCtrlCmd = 4; case 4: { if (tag == 34) { parse_stCtrlCmd: @@ -1324,17 +1324,17 @@ bool SFesFwCtrlPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwCtrlPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwCtrlPkg) return false; #undef DO_ } void SFesFwCtrlPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwCtrlPkg) // required int32 nDataNum = 1; if (has_ndatanum()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->ndatanum(), output); @@ -1350,7 +1350,7 @@ void SFesFwCtrlPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->nrespara2(), output); } - // repeated .kbd_idlfile.SFesFwCtrlCmd stCtrlCmd = 4; + // repeated .iot_idl.SFesFwCtrlCmd stCtrlCmd = 4; for (int i = 0; i < this->stctrlcmd_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->stctrlcmd(i), output); @@ -1360,12 +1360,12 @@ void SFesFwCtrlPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwCtrlPkg) } ::google::protobuf::uint8* SFesFwCtrlPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwCtrlPkg) // required int32 nDataNum = 1; if (has_ndatanum()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->ndatanum(), target); @@ -1381,7 +1381,7 @@ void SFesFwCtrlPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->nrespara2(), target); } - // repeated .kbd_idlfile.SFesFwCtrlCmd stCtrlCmd = 4; + // repeated .iot_idl.SFesFwCtrlCmd stCtrlCmd = 4; for (int i = 0; i < this->stctrlcmd_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1392,7 +1392,7 @@ void SFesFwCtrlPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwCtrlPkg) return target; } @@ -1422,7 +1422,7 @@ int SFesFwCtrlPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesFwCtrlCmd stCtrlCmd = 4; + // repeated .iot_idl.SFesFwCtrlCmd stCtrlCmd = 4; total_size += 1 * this->stctrlcmd_size(); for (int i = 0; i < this->stctrlcmd_size(); i++) { total_size += @@ -1528,7 +1528,7 @@ const int SFesFwDefCmdPkgHead::kNResPara2FieldNumber; SFesFwDefCmdPkgHead::SFesFwDefCmdPkgHead() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwDefCmdPkgHead) } void SFesFwDefCmdPkgHead::InitAsDefaultInstance() { @@ -1538,7 +1538,7 @@ SFesFwDefCmdPkgHead::SFesFwDefCmdPkgHead(const SFesFwDefCmdPkgHead& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwDefCmdPkgHead) } void SFesFwDefCmdPkgHead::SharedCtor() { @@ -1557,7 +1557,7 @@ void SFesFwDefCmdPkgHead::SharedCtor() { } SFesFwDefCmdPkgHead::~SFesFwDefCmdPkgHead() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwDefCmdPkgHead) SharedDtor(); } @@ -1614,7 +1614,7 @@ bool SFesFwDefCmdPkgHead::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwDefCmdPkgHead) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1783,17 +1783,17 @@ bool SFesFwDefCmdPkgHead::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwDefCmdPkgHead) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwDefCmdPkgHead) return false; #undef DO_ } void SFesFwDefCmdPkgHead::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwDefCmdPkgHead) // required int32 nMessageID = 1; if (has_nmessageid()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nmessageid(), output); @@ -1848,12 +1848,12 @@ void SFesFwDefCmdPkgHead::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwDefCmdPkgHead) } ::google::protobuf::uint8* SFesFwDefCmdPkgHead::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwDefCmdPkgHead) // required int32 nMessageID = 1; if (has_nmessageid()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nmessageid(), target); @@ -1908,7 +1908,7 @@ void SFesFwDefCmdPkgHead::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwDefCmdPkgHead) return target; } @@ -2106,7 +2106,7 @@ const int SFesFwDefCmd::kNStrValueFieldNumber; SFesFwDefCmd::SFesFwDefCmd() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwDefCmd) } void SFesFwDefCmd::InitAsDefaultInstance() { @@ -2116,7 +2116,7 @@ SFesFwDefCmd::SFesFwDefCmd(const SFesFwDefCmd& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwDefCmd) } void SFesFwDefCmd::SharedCtor() { @@ -2128,7 +2128,7 @@ void SFesFwDefCmd::SharedCtor() { } SFesFwDefCmd::~SFesFwDefCmd() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwDefCmd) SharedDtor(); } @@ -2185,7 +2185,7 @@ bool SFesFwDefCmd::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwDefCmd) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2238,17 +2238,17 @@ bool SFesFwDefCmd::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwDefCmd) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwDefCmd) return false; #undef DO_ } void SFesFwDefCmd::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwDefCmd) // required string nstrName = 1; if (has_nstrname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2273,12 +2273,12 @@ void SFesFwDefCmd::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwDefCmd) } ::google::protobuf::uint8* SFesFwDefCmd::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwDefCmd) // required string nstrName = 1; if (has_nstrname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2305,7 +2305,7 @@ void SFesFwDefCmd::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwDefCmd) return target; } @@ -2411,18 +2411,18 @@ const int SFesFwDefCmdPkg::kStDefCmdFieldNumber; SFesFwDefCmdPkg::SFesFwDefCmdPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwDefCmdPkg) } void SFesFwDefCmdPkg::InitAsDefaultInstance() { - sthead_ = const_cast< ::kbd_idlfile::SFesFwDefCmdPkgHead*>(&::kbd_idlfile::SFesFwDefCmdPkgHead::default_instance()); + sthead_ = const_cast< ::iot_idl::SFesFwDefCmdPkgHead*>(&::iot_idl::SFesFwDefCmdPkgHead::default_instance()); } SFesFwDefCmdPkg::SFesFwDefCmdPkg(const SFesFwDefCmdPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwDefCmdPkg) } void SFesFwDefCmdPkg::SharedCtor() { @@ -2432,7 +2432,7 @@ void SFesFwDefCmdPkg::SharedCtor() { } SFesFwDefCmdPkg::~SFesFwDefCmdPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwDefCmdPkg) SharedDtor(); } @@ -2465,7 +2465,7 @@ SFesFwDefCmdPkg* SFesFwDefCmdPkg::New() const { void SFesFwDefCmdPkg::Clear() { if (has_sthead()) { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesFwDefCmdPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesFwDefCmdPkgHead::Clear(); } stdefcmd_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -2476,13 +2476,13 @@ bool SFesFwDefCmdPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwDefCmdPkg) 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.SFesFwDefCmdPkgHead stHead = 1; + // required .iot_idl.SFesFwDefCmdPkgHead stHead = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -2494,7 +2494,7 @@ bool SFesFwDefCmdPkg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SFesFwDefCmd stDefCmd = 2; + // repeated .iot_idl.SFesFwDefCmd stDefCmd = 2; case 2: { if (tag == 18) { parse_stDefCmd: @@ -2522,24 +2522,24 @@ bool SFesFwDefCmdPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwDefCmdPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwDefCmdPkg) return false; #undef DO_ } void SFesFwDefCmdPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwDefCmdPkg) - // required .kbd_idlfile.SFesFwDefCmdPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwDefCmdPkg) + // required .iot_idl.SFesFwDefCmdPkgHead stHead = 1; if (has_sthead()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->sthead(), output); } - // repeated .kbd_idlfile.SFesFwDefCmd stDefCmd = 2; + // repeated .iot_idl.SFesFwDefCmd stDefCmd = 2; for (int i = 0; i < this->stdefcmd_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->stdefcmd(i), output); @@ -2549,20 +2549,20 @@ void SFesFwDefCmdPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwDefCmdPkg) } ::google::protobuf::uint8* SFesFwDefCmdPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwDefCmdPkg) - // required .kbd_idlfile.SFesFwDefCmdPkgHead stHead = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwDefCmdPkg) + // required .iot_idl.SFesFwDefCmdPkgHead stHead = 1; if (has_sthead()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->sthead(), target); } - // repeated .kbd_idlfile.SFesFwDefCmd stDefCmd = 2; + // repeated .iot_idl.SFesFwDefCmd stDefCmd = 2; for (int i = 0; i < this->stdefcmd_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2573,7 +2573,7 @@ void SFesFwDefCmdPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwDefCmdPkg) return target; } @@ -2581,7 +2581,7 @@ int SFesFwDefCmdPkg::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.SFesFwDefCmdPkgHead stHead = 1; + // required .iot_idl.SFesFwDefCmdPkgHead stHead = 1; if (has_sthead()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -2589,7 +2589,7 @@ int SFesFwDefCmdPkg::ByteSize() const { } } - // repeated .kbd_idlfile.SFesFwDefCmd stDefCmd = 2; + // repeated .iot_idl.SFesFwDefCmd stDefCmd = 2; total_size += 1 * this->stdefcmd_size(); for (int i = 0; i < this->stdefcmd_size(); i++) { total_size += @@ -2625,7 +2625,7 @@ void SFesFwDefCmdPkg::MergeFrom(const SFesFwDefCmdPkg& from) { stdefcmd_.MergeFrom(from.stdefcmd_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_sthead()) { - mutable_sthead()->::kbd_idlfile::SFesFwDefCmdPkgHead::MergeFrom(from.sthead()); + mutable_sthead()->::iot_idl::SFesFwDefCmdPkgHead::MergeFrom(from.sthead()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -2684,7 +2684,7 @@ const int SFesFwAiValue::kUlTimeFieldNumber; SFesFwAiValue::SFesFwAiValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwAiValue) } void SFesFwAiValue::InitAsDefaultInstance() { @@ -2694,7 +2694,7 @@ SFesFwAiValue::SFesFwAiValue(const SFesFwAiValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwAiValue) } void SFesFwAiValue::SharedCtor() { @@ -2707,7 +2707,7 @@ void SFesFwAiValue::SharedCtor() { } SFesFwAiValue::~SFesFwAiValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwAiValue) SharedDtor(); } @@ -2761,7 +2761,7 @@ bool SFesFwAiValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwAiValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2840,17 +2840,17 @@ bool SFesFwAiValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwAiValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwAiValue) return false; #undef DO_ } void SFesFwAiValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwAiValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -2875,12 +2875,12 @@ void SFesFwAiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwAiValue) } ::google::protobuf::uint8* SFesFwAiValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwAiValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -2905,7 +2905,7 @@ void SFesFwAiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwAiValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwAiValue) return target; } @@ -3033,7 +3033,7 @@ const int SFesFwDiValue::kUlTimeFieldNumber; SFesFwDiValue::SFesFwDiValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwDiValue) } void SFesFwDiValue::InitAsDefaultInstance() { @@ -3043,7 +3043,7 @@ SFesFwDiValue::SFesFwDiValue(const SFesFwDiValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwDiValue) } void SFesFwDiValue::SharedCtor() { @@ -3056,7 +3056,7 @@ void SFesFwDiValue::SharedCtor() { } SFesFwDiValue::~SFesFwDiValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwDiValue) SharedDtor(); } @@ -3110,7 +3110,7 @@ bool SFesFwDiValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwDiValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3189,17 +3189,17 @@ bool SFesFwDiValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwDiValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwDiValue) return false; #undef DO_ } void SFesFwDiValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwDiValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -3224,12 +3224,12 @@ void SFesFwDiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwDiValue) } ::google::protobuf::uint8* SFesFwDiValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwDiValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -3254,7 +3254,7 @@ void SFesFwDiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwDiValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwDiValue) return target; } @@ -3384,7 +3384,7 @@ const int SFesFwAccValue::kUlTimeFieldNumber; SFesFwAccValue::SFesFwAccValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwAccValue) } void SFesFwAccValue::InitAsDefaultInstance() { @@ -3394,7 +3394,7 @@ SFesFwAccValue::SFesFwAccValue(const SFesFwAccValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwAccValue) } void SFesFwAccValue::SharedCtor() { @@ -3407,7 +3407,7 @@ void SFesFwAccValue::SharedCtor() { } SFesFwAccValue::~SFesFwAccValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwAccValue) SharedDtor(); } @@ -3461,7 +3461,7 @@ bool SFesFwAccValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwAccValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3540,17 +3540,17 @@ bool SFesFwAccValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwAccValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwAccValue) return false; #undef DO_ } void SFesFwAccValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwAccValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -3575,12 +3575,12 @@ void SFesFwAccValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwAccValue) } ::google::protobuf::uint8* SFesFwAccValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwAccValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -3605,7 +3605,7 @@ void SFesFwAccValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwAccValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwAccValue) return target; } @@ -3735,7 +3735,7 @@ const int SFesFwMiValue::kUlTimeFieldNumber; SFesFwMiValue::SFesFwMiValue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(constructor:iot_idl.SFesFwMiValue) } void SFesFwMiValue::InitAsDefaultInstance() { @@ -3745,7 +3745,7 @@ SFesFwMiValue::SFesFwMiValue(const SFesFwMiValue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesFwMiValue) } void SFesFwMiValue::SharedCtor() { @@ -3758,7 +3758,7 @@ void SFesFwMiValue::SharedCtor() { } SFesFwMiValue::~SFesFwMiValue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(destructor:iot_idl.SFesFwMiValue) SharedDtor(); } @@ -3812,7 +3812,7 @@ bool SFesFwMiValue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(parse_start:iot_idl.SFesFwMiValue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3891,17 +3891,17 @@ bool SFesFwMiValue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(parse_success:iot_idl.SFesFwMiValue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesFwMiValue) return false; #undef DO_ } void SFesFwMiValue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesFwMiValue) // required int32 nPointNo = 1; if (has_npointno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); @@ -3926,12 +3926,12 @@ void SFesFwMiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesFwMiValue) } ::google::protobuf::uint8* SFesFwMiValue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesFwMiValue) // required int32 nPointNo = 1; if (has_npointno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); @@ -3956,7 +3956,7 @@ void SFesFwMiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesFwMiValue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesFwMiValue) return target; } @@ -4085,7 +4085,7 @@ const int SFesWfStatus::kNStatusFieldNumber; SFesWfStatus::SFesWfStatus() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(constructor:iot_idl.SFesWfStatus) } void SFesWfStatus::InitAsDefaultInstance() { @@ -4095,7 +4095,7 @@ SFesWfStatus::SFesWfStatus(const SFesWfStatus& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesWfStatus) } void SFesWfStatus::SharedCtor() { @@ -4107,7 +4107,7 @@ void SFesWfStatus::SharedCtor() { } SFesWfStatus::~SFesWfStatus() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(destructor:iot_idl.SFesWfStatus) SharedDtor(); } @@ -4161,7 +4161,7 @@ bool SFesWfStatus::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(parse_start:iot_idl.SFesWfStatus) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -4225,17 +4225,17 @@ bool SFesWfStatus::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(parse_success:iot_idl.SFesWfStatus) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesWfStatus) return false; #undef DO_ } void SFesWfStatus::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(serialize_start:iot_idl.SFesWfStatus) // required int32 nSrcRtuNo = 1; if (has_nsrcrtuno()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->nsrcrtuno(), output); @@ -4255,12 +4255,12 @@ void SFesWfStatus::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesWfStatus) } ::google::protobuf::uint8* SFesWfStatus::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesWfStatus) // required int32 nSrcRtuNo = 1; if (has_nsrcrtuno()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->nsrcrtuno(), target); @@ -4280,7 +4280,7 @@ void SFesWfStatus::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesWfStatus) return target; } @@ -4396,7 +4396,7 @@ const int SFesWfDoStatusPkg::kStDoStatusFieldNumber; SFesWfDoStatusPkg::SFesWfDoStatusPkg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(constructor:iot_idl.SFesWfDoStatusPkg) } void SFesWfDoStatusPkg::InitAsDefaultInstance() { @@ -4406,7 +4406,7 @@ SFesWfDoStatusPkg::SFesWfDoStatusPkg(const SFesWfDoStatusPkg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesWfDoStatusPkg) } void SFesWfDoStatusPkg::SharedCtor() { @@ -4415,7 +4415,7 @@ void SFesWfDoStatusPkg::SharedCtor() { } SFesWfDoStatusPkg::~SFesWfDoStatusPkg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(destructor:iot_idl.SFesWfDoStatusPkg) SharedDtor(); } @@ -4455,13 +4455,13 @@ bool SFesWfDoStatusPkg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(parse_start:iot_idl.SFesWfDoStatusPkg) 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.SFesWfStatus stDoStatus = 1; + // repeated .iot_idl.SFesWfStatus stDoStatus = 1; case 1: { if (tag == 10) { parse_stDoStatus: @@ -4489,18 +4489,18 @@ bool SFesWfDoStatusPkg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(parse_success:iot_idl.SFesWfDoStatusPkg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(parse_failure:iot_idl.SFesWfDoStatusPkg) return false; #undef DO_ } void SFesWfDoStatusPkg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SFesWfDoStatusPkg) - // repeated .kbd_idlfile.SFesWfStatus stDoStatus = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.SFesWfDoStatusPkg) + // repeated .iot_idl.SFesWfStatus stDoStatus = 1; for (int i = 0; i < this->stdostatus_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->stdostatus(i), output); @@ -4510,13 +4510,13 @@ void SFesWfDoStatusPkg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(serialize_end:iot_idl.SFesWfDoStatusPkg) } ::google::protobuf::uint8* SFesWfDoStatusPkg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SFesWfDoStatusPkg) - // repeated .kbd_idlfile.SFesWfStatus stDoStatus = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesWfDoStatusPkg) + // repeated .iot_idl.SFesWfStatus stDoStatus = 1; for (int i = 0; i < this->stdostatus_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4527,14 +4527,14 @@ void SFesWfDoStatusPkg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesWfDoStatusPkg) return target; } int SFesWfDoStatusPkg::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.SFesWfStatus stDoStatus = 1; + // repeated .iot_idl.SFesWfStatus stDoStatus = 1; total_size += 1 * this->stdostatus_size(); for (int i = 0; i < this->stdostatus_size(); i++) { total_size += @@ -4609,6 +4609,6 @@ void SFesWfDoStatusPkg::Swap(SFesWfDoStatusPkg* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/FesFwMessage.pb.h b/product/src/idl_files/FesFwMessage.pb.h index 929fe28f..4336d990 100644 --- a/product/src/idl_files/FesFwMessage.pb.h +++ b/product/src/idl_files/FesFwMessage.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_FesFwMessage_2eproto(); @@ -240,7 +240,7 @@ class IDL_FILES_EXPORT SFesFwCtrlCmd : public ::google::protobuf::Message { inline float fparam() const; inline void set_fparam(float value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesFwCtrlCmd) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwCtrlCmd) private: inline void set_has_nfwsubsystem(); inline void clear_has_nfwsubsystem(); @@ -369,19 +369,19 @@ class IDL_FILES_EXPORT SFesFwCtrlPkg : public ::google::protobuf::Message { inline ::google::protobuf::int32 nrespara2() const; inline void set_nrespara2(::google::protobuf::int32 value); - // repeated .kbd_idlfile.SFesFwCtrlCmd stCtrlCmd = 4; + // repeated .iot_idl.SFesFwCtrlCmd stCtrlCmd = 4; inline int stctrlcmd_size() const; inline void clear_stctrlcmd(); static const int kStCtrlCmdFieldNumber = 4; - inline const ::kbd_idlfile::SFesFwCtrlCmd& stctrlcmd(int index) const; - inline ::kbd_idlfile::SFesFwCtrlCmd* mutable_stctrlcmd(int index); - inline ::kbd_idlfile::SFesFwCtrlCmd* add_stctrlcmd(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwCtrlCmd >& + inline const ::iot_idl::SFesFwCtrlCmd& stctrlcmd(int index) const; + inline ::iot_idl::SFesFwCtrlCmd* mutable_stctrlcmd(int index); + inline ::iot_idl::SFesFwCtrlCmd* add_stctrlcmd(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwCtrlCmd >& stctrlcmd() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwCtrlCmd >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwCtrlCmd >* mutable_stctrlcmd(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesFwCtrlPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwCtrlPkg) private: inline void set_has_ndatanum(); inline void clear_has_ndatanum(); @@ -396,7 +396,7 @@ class IDL_FILES_EXPORT SFesFwCtrlPkg : public ::google::protobuf::Message { mutable int _cached_size_; ::google::protobuf::int32 ndatanum_; ::google::protobuf::int32 nrespara1_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwCtrlCmd > stctrlcmd_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwCtrlCmd > stctrlcmd_; ::google::protobuf::int32 nrespara2_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesFwMessage_2eproto(); friend void protobuf_AssignDesc_FesFwMessage_2eproto(); @@ -530,7 +530,7 @@ class IDL_FILES_EXPORT SFesFwDefCmdPkgHead : 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.SFesFwDefCmdPkgHead) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwDefCmdPkgHead) private: inline void set_has_nmessageid(); inline void clear_has_nmessageid(); @@ -653,7 +653,7 @@ class IDL_FILES_EXPORT SFesFwDefCmd : public ::google::protobuf::Message { inline ::std::string* release_nstrvalue(); inline void set_allocated_nstrvalue(::std::string* nstrvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesFwDefCmd) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwDefCmd) private: inline void set_has_nstrname(); inline void clear_has_nstrname(); @@ -728,28 +728,28 @@ class IDL_FILES_EXPORT SFesFwDefCmdPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.SFesFwDefCmdPkgHead stHead = 1; + // required .iot_idl.SFesFwDefCmdPkgHead stHead = 1; inline bool has_sthead() const; inline void clear_sthead(); static const int kStHeadFieldNumber = 1; - inline const ::kbd_idlfile::SFesFwDefCmdPkgHead& sthead() const; - inline ::kbd_idlfile::SFesFwDefCmdPkgHead* mutable_sthead(); - inline ::kbd_idlfile::SFesFwDefCmdPkgHead* release_sthead(); - inline void set_allocated_sthead(::kbd_idlfile::SFesFwDefCmdPkgHead* sthead); + inline const ::iot_idl::SFesFwDefCmdPkgHead& sthead() const; + inline ::iot_idl::SFesFwDefCmdPkgHead* mutable_sthead(); + inline ::iot_idl::SFesFwDefCmdPkgHead* release_sthead(); + inline void set_allocated_sthead(::iot_idl::SFesFwDefCmdPkgHead* sthead); - // repeated .kbd_idlfile.SFesFwDefCmd stDefCmd = 2; + // repeated .iot_idl.SFesFwDefCmd stDefCmd = 2; inline int stdefcmd_size() const; inline void clear_stdefcmd(); static const int kStDefCmdFieldNumber = 2; - inline const ::kbd_idlfile::SFesFwDefCmd& stdefcmd(int index) const; - inline ::kbd_idlfile::SFesFwDefCmd* mutable_stdefcmd(int index); - inline ::kbd_idlfile::SFesFwDefCmd* add_stdefcmd(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwDefCmd >& + inline const ::iot_idl::SFesFwDefCmd& stdefcmd(int index) const; + inline ::iot_idl::SFesFwDefCmd* mutable_stdefcmd(int index); + inline ::iot_idl::SFesFwDefCmd* add_stdefcmd(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwDefCmd >& stdefcmd() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwDefCmd >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwDefCmd >* mutable_stdefcmd(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesFwDefCmdPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwDefCmdPkg) private: inline void set_has_sthead(); inline void clear_has_sthead(); @@ -758,8 +758,8 @@ class IDL_FILES_EXPORT SFesFwDefCmdPkg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::SFesFwDefCmdPkgHead* sthead_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwDefCmd > stdefcmd_; + ::iot_idl::SFesFwDefCmdPkgHead* sthead_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwDefCmd > stdefcmd_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesFwMessage_2eproto(); friend void protobuf_AssignDesc_FesFwMessage_2eproto(); friend void protobuf_ShutdownFile_FesFwMessage_2eproto(); @@ -850,7 +850,7 @@ class IDL_FILES_EXPORT SFesFwAiValue : 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.SFesFwAiValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwAiValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -959,7 +959,7 @@ class IDL_FILES_EXPORT SFesFwDiValue : 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.SFesFwDiValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwDiValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -1068,7 +1068,7 @@ class IDL_FILES_EXPORT SFesFwAccValue : 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.SFesFwAccValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwAccValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -1177,7 +1177,7 @@ class IDL_FILES_EXPORT SFesFwMiValue : 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.SFesFwMiValue) + // @@protoc_insertion_point(class_scope:iot_idl.SFesFwMiValue) private: inline void set_has_npointno(); inline void clear_has_npointno(); @@ -1279,7 +1279,7 @@ class IDL_FILES_EXPORT SFesWfStatus : public ::google::protobuf::Message { inline ::google::protobuf::uint32 nstatus() const; inline void set_nstatus(::google::protobuf::uint32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesWfStatus) + // @@protoc_insertion_point(class_scope:iot_idl.SFesWfStatus) private: inline void set_has_nsrcrtuno(); inline void clear_has_nsrcrtuno(); @@ -1357,26 +1357,26 @@ class IDL_FILES_EXPORT SFesWfDoStatusPkg : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.SFesWfStatus stDoStatus = 1; + // repeated .iot_idl.SFesWfStatus stDoStatus = 1; inline int stdostatus_size() const; inline void clear_stdostatus(); static const int kStDoStatusFieldNumber = 1; - inline const ::kbd_idlfile::SFesWfStatus& stdostatus(int index) const; - inline ::kbd_idlfile::SFesWfStatus* mutable_stdostatus(int index); - inline ::kbd_idlfile::SFesWfStatus* add_stdostatus(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesWfStatus >& + inline const ::iot_idl::SFesWfStatus& stdostatus(int index) const; + inline ::iot_idl::SFesWfStatus* mutable_stdostatus(int index); + inline ::iot_idl::SFesWfStatus* add_stdostatus(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesWfStatus >& stdostatus() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesWfStatus >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesWfStatus >* mutable_stdostatus(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SFesWfDoStatusPkg) + // @@protoc_insertion_point(class_scope:iot_idl.SFesWfDoStatusPkg) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesWfStatus > stdostatus_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesWfStatus > stdostatus_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesFwMessage_2eproto(); friend void protobuf_AssignDesc_FesFwMessage_2eproto(); friend void protobuf_ShutdownFile_FesFwMessage_2eproto(); @@ -1406,13 +1406,13 @@ inline void SFesFwCtrlCmd::clear_nfwsubsystem() { clear_has_nfwsubsystem(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nfwsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nFwSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nFwSubSystem) return nfwsubsystem_; } inline void SFesFwCtrlCmd::set_nfwsubsystem(::google::protobuf::int32 value) { set_has_nfwsubsystem(); nfwsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nFwSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nFwSubSystem) } // required int32 nFwRtuNo = 2; @@ -1430,13 +1430,13 @@ inline void SFesFwCtrlCmd::clear_nfwrtuno() { clear_has_nfwrtuno(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nfwrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nFwRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nFwRtuNo) return nfwrtuno_; } inline void SFesFwCtrlCmd::set_nfwrtuno(::google::protobuf::int32 value) { set_has_nfwrtuno(); nfwrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nFwRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nFwRtuNo) } // required int32 nFwPointNo = 3; @@ -1454,13 +1454,13 @@ inline void SFesFwCtrlCmd::clear_nfwpointno() { clear_has_nfwpointno(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nfwpointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nFwPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nFwPointNo) return nfwpointno_; } inline void SFesFwCtrlCmd::set_nfwpointno(::google::protobuf::int32 value) { set_has_nfwpointno(); nfwpointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nFwPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nFwPointNo) } // required int32 nSubSystem = 4; @@ -1478,13 +1478,13 @@ inline void SFesFwCtrlCmd::clear_nsubsystem() { clear_has_nsubsystem(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nSubSystem) return nsubsystem_; } inline void SFesFwCtrlCmd::set_nsubsystem(::google::protobuf::int32 value) { set_has_nsubsystem(); nsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nSubSystem) } // required int32 nRtuNo = 5; @@ -1502,13 +1502,13 @@ inline void SFesFwCtrlCmd::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nRtuNo) return nrtuno_; } inline void SFesFwCtrlCmd::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nRtuNo) } // required int32 nPointNo = 6; @@ -1526,13 +1526,13 @@ inline void SFesFwCtrlCmd::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nPointNo) return npointno_; } inline void SFesFwCtrlCmd::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nPointNo) } // required int32 nRetStatus = 7; @@ -1550,13 +1550,13 @@ inline void SFesFwCtrlCmd::clear_nretstatus() { clear_has_nretstatus(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nretstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nRetStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nRetStatus) return nretstatus_; } inline void SFesFwCtrlCmd::set_nretstatus(::google::protobuf::int32 value) { set_has_nretstatus(); nretstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nRetStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nRetStatus) } // required int32 nCtrlActType = 8; @@ -1574,13 +1574,13 @@ inline void SFesFwCtrlCmd::clear_nctrlacttype() { clear_has_nctrlacttype(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nctrlacttype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.nCtrlActType) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.nCtrlActType) return nctrlacttype_; } inline void SFesFwCtrlCmd::set_nctrlacttype(::google::protobuf::int32 value) { set_has_nctrlacttype(); nctrlacttype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.nCtrlActType) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.nCtrlActType) } // required int32 niValue = 9; @@ -1598,13 +1598,13 @@ inline void SFesFwCtrlCmd::clear_nivalue() { clear_has_nivalue(); } inline ::google::protobuf::int32 SFesFwCtrlCmd::nivalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.niValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.niValue) return nivalue_; } inline void SFesFwCtrlCmd::set_nivalue(::google::protobuf::int32 value) { set_has_nivalue(); nivalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.niValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.niValue) } // required float fValue = 10; @@ -1622,13 +1622,13 @@ inline void SFesFwCtrlCmd::clear_fvalue() { clear_has_fvalue(); } inline float SFesFwCtrlCmd::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.fValue) return fvalue_; } inline void SFesFwCtrlCmd::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.fValue) } // required uint64 ulParam1 = 11; @@ -1646,13 +1646,13 @@ inline void SFesFwCtrlCmd::clear_ulparam1() { clear_has_ulparam1(); } inline ::google::protobuf::uint64 SFesFwCtrlCmd::ulparam1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.ulParam1) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.ulParam1) return ulparam1_; } inline void SFesFwCtrlCmd::set_ulparam1(::google::protobuf::uint64 value) { set_has_ulparam1(); ulparam1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.ulParam1) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.ulParam1) } // required uint64 ulParam2 = 12; @@ -1670,13 +1670,13 @@ inline void SFesFwCtrlCmd::clear_ulparam2() { clear_has_ulparam2(); } inline ::google::protobuf::uint64 SFesFwCtrlCmd::ulparam2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.ulParam2) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.ulParam2) return ulparam2_; } inline void SFesFwCtrlCmd::set_ulparam2(::google::protobuf::uint64 value) { set_has_ulparam2(); ulparam2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.ulParam2) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.ulParam2) } // required float fParam = 13; @@ -1694,13 +1694,13 @@ inline void SFesFwCtrlCmd::clear_fparam() { clear_has_fparam(); } inline float SFesFwCtrlCmd::fparam() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlCmd.fParam) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlCmd.fParam) return fparam_; } inline void SFesFwCtrlCmd::set_fparam(float value) { set_has_fparam(); fparam_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlCmd.fParam) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlCmd.fParam) } // ------------------------------------------------------------------- @@ -1722,13 +1722,13 @@ inline void SFesFwCtrlPkg::clear_ndatanum() { clear_has_ndatanum(); } inline ::google::protobuf::int32 SFesFwCtrlPkg::ndatanum() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlPkg.nDataNum) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlPkg.nDataNum) return ndatanum_; } inline void SFesFwCtrlPkg::set_ndatanum(::google::protobuf::int32 value) { set_has_ndatanum(); ndatanum_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlPkg.nDataNum) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlPkg.nDataNum) } // optional int32 nResPara1 = 2; @@ -1746,13 +1746,13 @@ inline void SFesFwCtrlPkg::clear_nrespara1() { clear_has_nrespara1(); } inline ::google::protobuf::int32 SFesFwCtrlPkg::nrespara1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlPkg.nResPara1) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlPkg.nResPara1) return nrespara1_; } inline void SFesFwCtrlPkg::set_nrespara1(::google::protobuf::int32 value) { set_has_nrespara1(); nrespara1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlPkg.nResPara1) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlPkg.nResPara1) } // optional int32 nResPara2 = 3; @@ -1770,42 +1770,42 @@ inline void SFesFwCtrlPkg::clear_nrespara2() { clear_has_nrespara2(); } inline ::google::protobuf::int32 SFesFwCtrlPkg::nrespara2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlPkg.nResPara2) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlPkg.nResPara2) return nrespara2_; } inline void SFesFwCtrlPkg::set_nrespara2(::google::protobuf::int32 value) { set_has_nrespara2(); nrespara2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwCtrlPkg.nResPara2) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwCtrlPkg.nResPara2) } -// repeated .kbd_idlfile.SFesFwCtrlCmd stCtrlCmd = 4; +// repeated .iot_idl.SFesFwCtrlCmd stCtrlCmd = 4; inline int SFesFwCtrlPkg::stctrlcmd_size() const { return stctrlcmd_.size(); } inline void SFesFwCtrlPkg::clear_stctrlcmd() { stctrlcmd_.Clear(); } -inline const ::kbd_idlfile::SFesFwCtrlCmd& SFesFwCtrlPkg::stctrlcmd(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwCtrlPkg.stCtrlCmd) +inline const ::iot_idl::SFesFwCtrlCmd& SFesFwCtrlPkg::stctrlcmd(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesFwCtrlPkg.stCtrlCmd) return stctrlcmd_.Get(index); } -inline ::kbd_idlfile::SFesFwCtrlCmd* SFesFwCtrlPkg::mutable_stctrlcmd(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesFwCtrlPkg.stCtrlCmd) +inline ::iot_idl::SFesFwCtrlCmd* SFesFwCtrlPkg::mutable_stctrlcmd(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesFwCtrlPkg.stCtrlCmd) return stctrlcmd_.Mutable(index); } -inline ::kbd_idlfile::SFesFwCtrlCmd* SFesFwCtrlPkg::add_stctrlcmd() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesFwCtrlPkg.stCtrlCmd) +inline ::iot_idl::SFesFwCtrlCmd* SFesFwCtrlPkg::add_stctrlcmd() { + // @@protoc_insertion_point(field_add:iot_idl.SFesFwCtrlPkg.stCtrlCmd) return stctrlcmd_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwCtrlCmd >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwCtrlCmd >& SFesFwCtrlPkg::stctrlcmd() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesFwCtrlPkg.stCtrlCmd) + // @@protoc_insertion_point(field_list:iot_idl.SFesFwCtrlPkg.stCtrlCmd) return stctrlcmd_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwCtrlCmd >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwCtrlCmd >* SFesFwCtrlPkg::mutable_stctrlcmd() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesFwCtrlPkg.stCtrlCmd) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesFwCtrlPkg.stCtrlCmd) return &stctrlcmd_; } @@ -1828,13 +1828,13 @@ inline void SFesFwDefCmdPkgHead::clear_nmessageid() { clear_has_nmessageid(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nmessageid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nMessageID) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nMessageID) return nmessageid_; } inline void SFesFwDefCmdPkgHead::set_nmessageid(::google::protobuf::int32 value) { set_has_nmessageid(); nmessageid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nMessageID) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nMessageID) } // required int32 nDataNum = 2; @@ -1852,13 +1852,13 @@ inline void SFesFwDefCmdPkgHead::clear_ndatanum() { clear_has_ndatanum(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::ndatanum() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nDataNum) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nDataNum) return ndatanum_; } inline void SFesFwDefCmdPkgHead::set_ndatanum(::google::protobuf::int32 value) { set_has_ndatanum(); ndatanum_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nDataNum) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nDataNum) } // required int32 nFwSubSystem = 3; @@ -1876,13 +1876,13 @@ inline void SFesFwDefCmdPkgHead::clear_nfwsubsystem() { clear_has_nfwsubsystem(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nfwsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nFwSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nFwSubSystem) return nfwsubsystem_; } inline void SFesFwDefCmdPkgHead::set_nfwsubsystem(::google::protobuf::int32 value) { set_has_nfwsubsystem(); nfwsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nFwSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nFwSubSystem) } // required int32 nFwRtuNo = 4; @@ -1900,13 +1900,13 @@ inline void SFesFwDefCmdPkgHead::clear_nfwrtuno() { clear_has_nfwrtuno(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nfwrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nFwRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nFwRtuNo) return nfwrtuno_; } inline void SFesFwDefCmdPkgHead::set_nfwrtuno(::google::protobuf::int32 value) { set_has_nfwrtuno(); nfwrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nFwRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nFwRtuNo) } // required int32 nSubSystem = 5; @@ -1924,13 +1924,13 @@ inline void SFesFwDefCmdPkgHead::clear_nsubsystem() { clear_has_nsubsystem(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nsubsystem() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nSubSystem) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nSubSystem) return nsubsystem_; } inline void SFesFwDefCmdPkgHead::set_nsubsystem(::google::protobuf::int32 value) { set_has_nsubsystem(); nsubsystem_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nSubSystem) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nSubSystem) } // required int32 nRtuNo = 6; @@ -1948,13 +1948,13 @@ inline void SFesFwDefCmdPkgHead::clear_nrtuno() { clear_has_nrtuno(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nRtuNo) return nrtuno_; } inline void SFesFwDefCmdPkgHead::set_nrtuno(::google::protobuf::int32 value) { set_has_nrtuno(); nrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nRtuNo) } // required int32 nDevID = 7; @@ -1972,13 +1972,13 @@ inline void SFesFwDefCmdPkgHead::clear_ndevid() { clear_has_ndevid(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::ndevid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nDevID) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nDevID) return ndevid_; } inline void SFesFwDefCmdPkgHead::set_ndevid(::google::protobuf::int32 value) { set_has_ndevid(); ndevid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nDevID) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nDevID) } // required int32 nRetStatus = 8; @@ -1996,13 +1996,13 @@ inline void SFesFwDefCmdPkgHead::clear_nretstatus() { clear_has_nretstatus(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nretstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nRetStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nRetStatus) return nretstatus_; } inline void SFesFwDefCmdPkgHead::set_nretstatus(::google::protobuf::int32 value) { set_has_nretstatus(); nretstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nRetStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nRetStatus) } // optional int32 nResPara1 = 9; @@ -2020,13 +2020,13 @@ inline void SFesFwDefCmdPkgHead::clear_nrespara1() { clear_has_nrespara1(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nrespara1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nResPara1) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nResPara1) return nrespara1_; } inline void SFesFwDefCmdPkgHead::set_nrespara1(::google::protobuf::int32 value) { set_has_nrespara1(); nrespara1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nResPara1) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nResPara1) } // optional int32 nResPara2 = 10; @@ -2044,13 +2044,13 @@ inline void SFesFwDefCmdPkgHead::clear_nrespara2() { clear_has_nrespara2(); } inline ::google::protobuf::int32 SFesFwDefCmdPkgHead::nrespara2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkgHead.nResPara2) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkgHead.nResPara2) return nrespara2_; } inline void SFesFwDefCmdPkgHead::set_nrespara2(::google::protobuf::int32 value) { set_has_nrespara2(); nrespara2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmdPkgHead.nResPara2) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmdPkgHead.nResPara2) } // ------------------------------------------------------------------- @@ -2074,7 +2074,7 @@ inline void SFesFwDefCmd::clear_nstrname() { clear_has_nstrname(); } inline const ::std::string& SFesFwDefCmd::nstrname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmd.nstrName) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmd.nstrName) return *nstrname_; } inline void SFesFwDefCmd::set_nstrname(const ::std::string& value) { @@ -2083,7 +2083,7 @@ inline void SFesFwDefCmd::set_nstrname(const ::std::string& value) { nstrname_ = new ::std::string; } nstrname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmd.nstrName) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmd.nstrName) } inline void SFesFwDefCmd::set_nstrname(const char* value) { set_has_nstrname(); @@ -2091,7 +2091,7 @@ inline void SFesFwDefCmd::set_nstrname(const char* value) { nstrname_ = new ::std::string; } nstrname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesFwDefCmd.nstrName) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesFwDefCmd.nstrName) } inline void SFesFwDefCmd::set_nstrname(const char* value, size_t size) { set_has_nstrname(); @@ -2099,14 +2099,14 @@ inline void SFesFwDefCmd::set_nstrname(const char* value, size_t size) { nstrname_ = new ::std::string; } nstrname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesFwDefCmd.nstrName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesFwDefCmd.nstrName) } inline ::std::string* SFesFwDefCmd::mutable_nstrname() { set_has_nstrname(); if (nstrname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { nstrname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesFwDefCmd.nstrName) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesFwDefCmd.nstrName) return nstrname_; } inline ::std::string* SFesFwDefCmd::release_nstrname() { @@ -2130,7 +2130,7 @@ inline void SFesFwDefCmd::set_allocated_nstrname(::std::string* nstrname) { clear_has_nstrname(); nstrname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesFwDefCmd.nstrName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesFwDefCmd.nstrName) } // required string nStrValue = 2; @@ -2150,7 +2150,7 @@ inline void SFesFwDefCmd::clear_nstrvalue() { clear_has_nstrvalue(); } inline const ::std::string& SFesFwDefCmd::nstrvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmd.nStrValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmd.nStrValue) return *nstrvalue_; } inline void SFesFwDefCmd::set_nstrvalue(const ::std::string& value) { @@ -2159,7 +2159,7 @@ inline void SFesFwDefCmd::set_nstrvalue(const ::std::string& value) { nstrvalue_ = new ::std::string; } nstrvalue_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDefCmd.nStrValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDefCmd.nStrValue) } inline void SFesFwDefCmd::set_nstrvalue(const char* value) { set_has_nstrvalue(); @@ -2167,7 +2167,7 @@ inline void SFesFwDefCmd::set_nstrvalue(const char* value) { nstrvalue_ = new ::std::string; } nstrvalue_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SFesFwDefCmd.nStrValue) + // @@protoc_insertion_point(field_set_char:iot_idl.SFesFwDefCmd.nStrValue) } inline void SFesFwDefCmd::set_nstrvalue(const char* value, size_t size) { set_has_nstrvalue(); @@ -2175,14 +2175,14 @@ inline void SFesFwDefCmd::set_nstrvalue(const char* value, size_t size) { nstrvalue_ = new ::std::string; } nstrvalue_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SFesFwDefCmd.nStrValue) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SFesFwDefCmd.nStrValue) } inline ::std::string* SFesFwDefCmd::mutable_nstrvalue() { set_has_nstrvalue(); if (nstrvalue_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { nstrvalue_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesFwDefCmd.nStrValue) + // @@protoc_insertion_point(field_mutable:iot_idl.SFesFwDefCmd.nStrValue) return nstrvalue_; } inline ::std::string* SFesFwDefCmd::release_nstrvalue() { @@ -2206,14 +2206,14 @@ inline void SFesFwDefCmd::set_allocated_nstrvalue(::std::string* nstrvalue) { clear_has_nstrvalue(); nstrvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesFwDefCmd.nStrValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesFwDefCmd.nStrValue) } // ------------------------------------------------------------------- // SFesFwDefCmdPkg -// required .kbd_idlfile.SFesFwDefCmdPkgHead stHead = 1; +// required .iot_idl.SFesFwDefCmdPkgHead stHead = 1; inline bool SFesFwDefCmdPkg::has_sthead() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2224,26 +2224,26 @@ inline void SFesFwDefCmdPkg::clear_has_sthead() { _has_bits_[0] &= ~0x00000001u; } inline void SFesFwDefCmdPkg::clear_sthead() { - if (sthead_ != NULL) sthead_->::kbd_idlfile::SFesFwDefCmdPkgHead::Clear(); + if (sthead_ != NULL) sthead_->::iot_idl::SFesFwDefCmdPkgHead::Clear(); clear_has_sthead(); } -inline const ::kbd_idlfile::SFesFwDefCmdPkgHead& SFesFwDefCmdPkg::sthead() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkg.stHead) +inline const ::iot_idl::SFesFwDefCmdPkgHead& SFesFwDefCmdPkg::sthead() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkg.stHead) return sthead_ != NULL ? *sthead_ : *default_instance_->sthead_; } -inline ::kbd_idlfile::SFesFwDefCmdPkgHead* SFesFwDefCmdPkg::mutable_sthead() { +inline ::iot_idl::SFesFwDefCmdPkgHead* SFesFwDefCmdPkg::mutable_sthead() { set_has_sthead(); - if (sthead_ == NULL) sthead_ = new ::kbd_idlfile::SFesFwDefCmdPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesFwDefCmdPkg.stHead) + if (sthead_ == NULL) sthead_ = new ::iot_idl::SFesFwDefCmdPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.SFesFwDefCmdPkg.stHead) return sthead_; } -inline ::kbd_idlfile::SFesFwDefCmdPkgHead* SFesFwDefCmdPkg::release_sthead() { +inline ::iot_idl::SFesFwDefCmdPkgHead* SFesFwDefCmdPkg::release_sthead() { clear_has_sthead(); - ::kbd_idlfile::SFesFwDefCmdPkgHead* temp = sthead_; + ::iot_idl::SFesFwDefCmdPkgHead* temp = sthead_; sthead_ = NULL; return temp; } -inline void SFesFwDefCmdPkg::set_allocated_sthead(::kbd_idlfile::SFesFwDefCmdPkgHead* sthead) { +inline void SFesFwDefCmdPkg::set_allocated_sthead(::iot_idl::SFesFwDefCmdPkgHead* sthead) { delete sthead_; sthead_ = sthead; if (sthead) { @@ -2251,36 +2251,36 @@ inline void SFesFwDefCmdPkg::set_allocated_sthead(::kbd_idlfile::SFesFwDefCmdPkg } else { clear_has_sthead(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SFesFwDefCmdPkg.stHead) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesFwDefCmdPkg.stHead) } -// repeated .kbd_idlfile.SFesFwDefCmd stDefCmd = 2; +// repeated .iot_idl.SFesFwDefCmd stDefCmd = 2; inline int SFesFwDefCmdPkg::stdefcmd_size() const { return stdefcmd_.size(); } inline void SFesFwDefCmdPkg::clear_stdefcmd() { stdefcmd_.Clear(); } -inline const ::kbd_idlfile::SFesFwDefCmd& SFesFwDefCmdPkg::stdefcmd(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDefCmdPkg.stDefCmd) +inline const ::iot_idl::SFesFwDefCmd& SFesFwDefCmdPkg::stdefcmd(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDefCmdPkg.stDefCmd) return stdefcmd_.Get(index); } -inline ::kbd_idlfile::SFesFwDefCmd* SFesFwDefCmdPkg::mutable_stdefcmd(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesFwDefCmdPkg.stDefCmd) +inline ::iot_idl::SFesFwDefCmd* SFesFwDefCmdPkg::mutable_stdefcmd(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesFwDefCmdPkg.stDefCmd) return stdefcmd_.Mutable(index); } -inline ::kbd_idlfile::SFesFwDefCmd* SFesFwDefCmdPkg::add_stdefcmd() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesFwDefCmdPkg.stDefCmd) +inline ::iot_idl::SFesFwDefCmd* SFesFwDefCmdPkg::add_stdefcmd() { + // @@protoc_insertion_point(field_add:iot_idl.SFesFwDefCmdPkg.stDefCmd) return stdefcmd_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwDefCmd >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwDefCmd >& SFesFwDefCmdPkg::stdefcmd() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesFwDefCmdPkg.stDefCmd) + // @@protoc_insertion_point(field_list:iot_idl.SFesFwDefCmdPkg.stDefCmd) return stdefcmd_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesFwDefCmd >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesFwDefCmd >* SFesFwDefCmdPkg::mutable_stdefcmd() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesFwDefCmdPkg.stDefCmd) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesFwDefCmdPkg.stDefCmd) return &stdefcmd_; } @@ -2303,13 +2303,13 @@ inline void SFesFwAiValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesFwAiValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAiValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAiValue.nPointNo) return npointno_; } inline void SFesFwAiValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAiValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAiValue.nPointNo) } // required float fValue = 2; @@ -2327,13 +2327,13 @@ inline void SFesFwAiValue::clear_fvalue() { clear_has_fvalue(); } inline float SFesFwAiValue::fvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAiValue.fValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAiValue.fValue) return fvalue_; } inline void SFesFwAiValue::set_fvalue(float value) { set_has_fvalue(); fvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAiValue.fValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAiValue.fValue) } // required uint32 uStatus = 3; @@ -2351,13 +2351,13 @@ inline void SFesFwAiValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesFwAiValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAiValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAiValue.uStatus) return ustatus_; } inline void SFesFwAiValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAiValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAiValue.uStatus) } // required uint64 ulTime = 4; @@ -2375,13 +2375,13 @@ inline void SFesFwAiValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesFwAiValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAiValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAiValue.ulTime) return ultime_; } inline void SFesFwAiValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAiValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAiValue.ulTime) } // ------------------------------------------------------------------- @@ -2403,13 +2403,13 @@ inline void SFesFwDiValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesFwDiValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDiValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDiValue.nPointNo) return npointno_; } inline void SFesFwDiValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDiValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDiValue.nPointNo) } // required int32 nValue = 2; @@ -2427,13 +2427,13 @@ inline void SFesFwDiValue::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesFwDiValue::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDiValue.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDiValue.nValue) return nvalue_; } inline void SFesFwDiValue::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDiValue.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDiValue.nValue) } // required uint32 uStatus = 3; @@ -2451,13 +2451,13 @@ inline void SFesFwDiValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesFwDiValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDiValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDiValue.uStatus) return ustatus_; } inline void SFesFwDiValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDiValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDiValue.uStatus) } // required uint64 ulTime = 4; @@ -2475,13 +2475,13 @@ inline void SFesFwDiValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesFwDiValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwDiValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwDiValue.ulTime) return ultime_; } inline void SFesFwDiValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwDiValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwDiValue.ulTime) } // ------------------------------------------------------------------- @@ -2503,13 +2503,13 @@ inline void SFesFwAccValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesFwAccValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAccValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAccValue.nPointNo) return npointno_; } inline void SFesFwAccValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAccValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAccValue.nPointNo) } // required int64 nValue = 2; @@ -2527,13 +2527,13 @@ inline void SFesFwAccValue::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int64 SFesFwAccValue::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAccValue.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAccValue.nValue) return nvalue_; } inline void SFesFwAccValue::set_nvalue(::google::protobuf::int64 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAccValue.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAccValue.nValue) } // required uint32 uStatus = 3; @@ -2551,13 +2551,13 @@ inline void SFesFwAccValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesFwAccValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAccValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAccValue.uStatus) return ustatus_; } inline void SFesFwAccValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAccValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAccValue.uStatus) } // required uint64 ulTime = 4; @@ -2575,13 +2575,13 @@ inline void SFesFwAccValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesFwAccValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwAccValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwAccValue.ulTime) return ultime_; } inline void SFesFwAccValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwAccValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwAccValue.ulTime) } // ------------------------------------------------------------------- @@ -2603,13 +2603,13 @@ inline void SFesFwMiValue::clear_npointno() { clear_has_npointno(); } inline ::google::protobuf::int32 SFesFwMiValue::npointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwMiValue.nPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwMiValue.nPointNo) return npointno_; } inline void SFesFwMiValue::set_npointno(::google::protobuf::int32 value) { set_has_npointno(); npointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwMiValue.nPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwMiValue.nPointNo) } // required int32 nValue = 2; @@ -2627,13 +2627,13 @@ inline void SFesFwMiValue::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 SFesFwMiValue::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwMiValue.nValue) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwMiValue.nValue) return nvalue_; } inline void SFesFwMiValue::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwMiValue.nValue) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwMiValue.nValue) } // required uint32 uStatus = 3; @@ -2651,13 +2651,13 @@ inline void SFesFwMiValue::clear_ustatus() { clear_has_ustatus(); } inline ::google::protobuf::uint32 SFesFwMiValue::ustatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwMiValue.uStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwMiValue.uStatus) return ustatus_; } inline void SFesFwMiValue::set_ustatus(::google::protobuf::uint32 value) { set_has_ustatus(); ustatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwMiValue.uStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwMiValue.uStatus) } // required uint64 ulTime = 4; @@ -2675,13 +2675,13 @@ inline void SFesFwMiValue::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SFesFwMiValue::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesFwMiValue.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SFesFwMiValue.ulTime) return ultime_; } inline void SFesFwMiValue::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesFwMiValue.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SFesFwMiValue.ulTime) } // ------------------------------------------------------------------- @@ -2703,13 +2703,13 @@ inline void SFesWfStatus::clear_nsrcrtuno() { clear_has_nsrcrtuno(); } inline ::google::protobuf::int32 SFesWfStatus::nsrcrtuno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWfStatus.nSrcRtuNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesWfStatus.nSrcRtuNo) return nsrcrtuno_; } inline void SFesWfStatus::set_nsrcrtuno(::google::protobuf::int32 value) { set_has_nsrcrtuno(); nsrcrtuno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWfStatus.nSrcRtuNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesWfStatus.nSrcRtuNo) } // required int32 nSrcPointNo = 2; @@ -2727,13 +2727,13 @@ inline void SFesWfStatus::clear_nsrcpointno() { clear_has_nsrcpointno(); } inline ::google::protobuf::int32 SFesWfStatus::nsrcpointno() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWfStatus.nSrcPointNo) + // @@protoc_insertion_point(field_get:iot_idl.SFesWfStatus.nSrcPointNo) return nsrcpointno_; } inline void SFesWfStatus::set_nsrcpointno(::google::protobuf::int32 value) { set_has_nsrcpointno(); nsrcpointno_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWfStatus.nSrcPointNo) + // @@protoc_insertion_point(field_set:iot_idl.SFesWfStatus.nSrcPointNo) } // required uint32 nStatus = 3; @@ -2751,67 +2751,67 @@ inline void SFesWfStatus::clear_nstatus() { clear_has_nstatus(); } inline ::google::protobuf::uint32 SFesWfStatus::nstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWfStatus.nStatus) + // @@protoc_insertion_point(field_get:iot_idl.SFesWfStatus.nStatus) return nstatus_; } inline void SFesWfStatus::set_nstatus(::google::protobuf::uint32 value) { set_has_nstatus(); nstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SFesWfStatus.nStatus) + // @@protoc_insertion_point(field_set:iot_idl.SFesWfStatus.nStatus) } // ------------------------------------------------------------------- // SFesWfDoStatusPkg -// repeated .kbd_idlfile.SFesWfStatus stDoStatus = 1; +// repeated .iot_idl.SFesWfStatus stDoStatus = 1; inline int SFesWfDoStatusPkg::stdostatus_size() const { return stdostatus_.size(); } inline void SFesWfDoStatusPkg::clear_stdostatus() { stdostatus_.Clear(); } -inline const ::kbd_idlfile::SFesWfStatus& SFesWfDoStatusPkg::stdostatus(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SFesWfDoStatusPkg.stDoStatus) +inline const ::iot_idl::SFesWfStatus& SFesWfDoStatusPkg::stdostatus(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesWfDoStatusPkg.stDoStatus) return stdostatus_.Get(index); } -inline ::kbd_idlfile::SFesWfStatus* SFesWfDoStatusPkg::mutable_stdostatus(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SFesWfDoStatusPkg.stDoStatus) +inline ::iot_idl::SFesWfStatus* SFesWfDoStatusPkg::mutable_stdostatus(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesWfDoStatusPkg.stDoStatus) return stdostatus_.Mutable(index); } -inline ::kbd_idlfile::SFesWfStatus* SFesWfDoStatusPkg::add_stdostatus() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SFesWfDoStatusPkg.stDoStatus) +inline ::iot_idl::SFesWfStatus* SFesWfDoStatusPkg::add_stdostatus() { + // @@protoc_insertion_point(field_add:iot_idl.SFesWfDoStatusPkg.stDoStatus) return stdostatus_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesWfStatus >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesWfStatus >& SFesWfDoStatusPkg::stdostatus() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SFesWfDoStatusPkg.stDoStatus) + // @@protoc_insertion_point(field_list:iot_idl.SFesWfDoStatusPkg.stDoStatus) return stdostatus_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SFesWfStatus >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesWfStatus >* SFesWfDoStatusPkg::mutable_stdostatus() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SFesWfDoStatusPkg.stDoStatus) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesWfDoStatusPkg.stDoStatus) return &stdostatus_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enFesFwCtrlMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enFesFwCtrlMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enFesFwCtrlMsgType>() { - return ::kbd_idlfile::enFesFwCtrlMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enFesFwCtrlMsgType>() { + return ::iot_idl::enFesFwCtrlMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enFesFwDataMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enFesFwDataMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enFesFwDataMsgType>() { - return ::kbd_idlfile::enFesFwDataMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enFesFwDataMsgType>() { + return ::iot_idl::enFesFwDataMsgType_descriptor(); } } // namespace google diff --git a/product/src/idl_files/FesFwMessage.proto b/product/src/idl_files/FesFwMessage.proto index cc9e9e99..a074990b 100644 --- a/product/src/idl_files/FesFwMessage.proto +++ b/product/src/idl_files/FesFwMessage.proto @@ -4,7 +4,7 @@ // @author thxiao //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; //======================================================================================== // 控制消息类型枚举 diff --git a/product/src/idl_files/FileSyncBySvn.pb.cc b/product/src/idl_files/FileSyncBySvn.pb.cc index 6ba50c74..0d01d795 100644 --- a/product/src/idl_files/FileSyncBySvn.pb.cc +++ b/product/src/idl_files/FileSyncBySvn.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -132,14 +132,14 @@ void protobuf_AddDesc_FileSyncBySvn_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\023FileSyncBySvn.proto\022\013kbd_idlfile\"\201\001\n\016f" + "\n\023FileSyncBySvn.proto\022\013iot_idl\"\201\001\n\016f" "ileSyncNotice\022\030\n\020relativeFileName\030\001 \003(\t\022" "\020\n\010hostName\030\002 \002(\t\022\020\n\010domainId\030\003 \002(\005\022\022\n\nl" "ocationId\030\004 \002(\005\022\r\n\005appId\030\005 \002(\005\022\016\n\006others" "\030\006 \003(\t\"L\n\017messageFileInfo\022\020\n\010fileName\030\001 " - "\002(\t\022\'\n\004type\030\002 \002(\0162\031.kbd_idlfile.enUpdate" + "\002(\t\022\'\n\004type\030\002 \002(\0162\031.iot_idl.enUpdate" "Type\"E\n\023updateSuccessNotice\022.\n\010fileInfo\030" - "\001 \003(\0132\034.kbd_idlfile.messageFileInfo*C\n\021e" + "\001 \003(\0132\034.iot_idl.messageFileInfo*C\n\021e" "nFileSyncMsgType\022\026\n\022SVN_COMMIT_SUCCESS\020\001" "\022\026\n\022SVN_UPDATE_SUCCESS\020\002*k\n\014enUpdateType" "\022\016\n\nUPDATE_ADD\020\001\022\021\n\rUPDATE_DELETE\020\002\022\021\n\rU" @@ -208,7 +208,7 @@ const int fileSyncNotice::kOthersFieldNumber; fileSyncNotice::fileSyncNotice() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(constructor:iot_idl.fileSyncNotice) } void fileSyncNotice::InitAsDefaultInstance() { @@ -218,7 +218,7 @@ fileSyncNotice::fileSyncNotice(const fileSyncNotice& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(copy_constructor:iot_idl.fileSyncNotice) } void fileSyncNotice::SharedCtor() { @@ -232,7 +232,7 @@ void fileSyncNotice::SharedCtor() { } fileSyncNotice::~fileSyncNotice() { - // @@protoc_insertion_point(destructor:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(destructor:iot_idl.fileSyncNotice) SharedDtor(); } @@ -299,7 +299,7 @@ bool fileSyncNotice::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(parse_start:iot_idl.fileSyncNotice) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -419,17 +419,17 @@ bool fileSyncNotice::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(parse_success:iot_idl.fileSyncNotice) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(parse_failure:iot_idl.fileSyncNotice) return false; #undef DO_ } void fileSyncNotice::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(serialize_start:iot_idl.fileSyncNotice) // repeated string relativeFileName = 1; for (int i = 0; i < this->relativefilename_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -479,12 +479,12 @@ void fileSyncNotice::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(serialize_end:iot_idl.fileSyncNotice) } ::google::protobuf::uint8* fileSyncNotice::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.fileSyncNotice) // repeated string relativeFileName = 1; for (int i = 0; i < this->relativefilename_size(); i++) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -535,7 +535,7 @@ void fileSyncNotice::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.fileSyncNotice) return target; } @@ -681,7 +681,7 @@ const int messageFileInfo::kTypeFieldNumber; messageFileInfo::messageFileInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(constructor:iot_idl.messageFileInfo) } void messageFileInfo::InitAsDefaultInstance() { @@ -691,7 +691,7 @@ messageFileInfo::messageFileInfo(const messageFileInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.messageFileInfo) } void messageFileInfo::SharedCtor() { @@ -703,7 +703,7 @@ void messageFileInfo::SharedCtor() { } messageFileInfo::~messageFileInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(destructor:iot_idl.messageFileInfo) SharedDtor(); } @@ -753,7 +753,7 @@ bool messageFileInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(parse_start:iot_idl.messageFileInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -775,7 +775,7 @@ bool messageFileInfo::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.enUpdateType type = 2; + // required .iot_idl.enUpdateType type = 2; case 2: { if (tag == 16) { parse_type: @@ -783,8 +783,8 @@ bool messageFileInfo::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enUpdateType_IsValid(value)) { - set_type(static_cast< ::kbd_idlfile::enUpdateType >(value)); + if (::iot_idl::enUpdateType_IsValid(value)) { + set_type(static_cast< ::iot_idl::enUpdateType >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -809,17 +809,17 @@ bool messageFileInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(parse_success:iot_idl.messageFileInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.messageFileInfo) return false; #undef DO_ } void messageFileInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.messageFileInfo) // required string fileName = 1; if (has_filename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -830,7 +830,7 @@ void messageFileInfo::SerializeWithCachedSizes( 1, this->filename(), output); } - // required .kbd_idlfile.enUpdateType type = 2; + // required .iot_idl.enUpdateType type = 2; if (has_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->type(), output); @@ -840,12 +840,12 @@ void messageFileInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.messageFileInfo) } ::google::protobuf::uint8* messageFileInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.messageFileInfo) // required string fileName = 1; if (has_filename()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -857,7 +857,7 @@ void messageFileInfo::SerializeWithCachedSizes( 1, this->filename(), target); } - // required .kbd_idlfile.enUpdateType type = 2; + // required .iot_idl.enUpdateType type = 2; if (has_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->type(), target); @@ -867,7 +867,7 @@ void messageFileInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.messageFileInfo) return target; } @@ -882,7 +882,7 @@ int messageFileInfo::ByteSize() const { this->filename()); } - // required .kbd_idlfile.enUpdateType type = 2; + // required .iot_idl.enUpdateType type = 2; if (has_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->type()); @@ -971,7 +971,7 @@ const int updateSuccessNotice::kFileInfoFieldNumber; updateSuccessNotice::updateSuccessNotice() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(constructor:iot_idl.updateSuccessNotice) } void updateSuccessNotice::InitAsDefaultInstance() { @@ -981,7 +981,7 @@ updateSuccessNotice::updateSuccessNotice(const updateSuccessNotice& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(copy_constructor:iot_idl.updateSuccessNotice) } void updateSuccessNotice::SharedCtor() { @@ -990,7 +990,7 @@ void updateSuccessNotice::SharedCtor() { } updateSuccessNotice::~updateSuccessNotice() { - // @@protoc_insertion_point(destructor:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(destructor:iot_idl.updateSuccessNotice) SharedDtor(); } @@ -1030,13 +1030,13 @@ bool updateSuccessNotice::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(parse_start:iot_idl.updateSuccessNotice) 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.messageFileInfo fileInfo = 1; + // repeated .iot_idl.messageFileInfo fileInfo = 1; case 1: { if (tag == 10) { parse_fileInfo: @@ -1064,18 +1064,18 @@ bool updateSuccessNotice::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(parse_success:iot_idl.updateSuccessNotice) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(parse_failure:iot_idl.updateSuccessNotice) return false; #undef DO_ } void updateSuccessNotice::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.updateSuccessNotice) - // repeated .kbd_idlfile.messageFileInfo fileInfo = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.updateSuccessNotice) + // repeated .iot_idl.messageFileInfo fileInfo = 1; for (int i = 0; i < this->fileinfo_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->fileinfo(i), output); @@ -1085,13 +1085,13 @@ void updateSuccessNotice::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(serialize_end:iot_idl.updateSuccessNotice) } ::google::protobuf::uint8* updateSuccessNotice::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.updateSuccessNotice) - // repeated .kbd_idlfile.messageFileInfo fileInfo = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.updateSuccessNotice) + // repeated .iot_idl.messageFileInfo fileInfo = 1; for (int i = 0; i < this->fileinfo_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1102,14 +1102,14 @@ void updateSuccessNotice::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.updateSuccessNotice) return target; } int updateSuccessNotice::ByteSize() const { int total_size = 0; - // repeated .kbd_idlfile.messageFileInfo fileInfo = 1; + // repeated .iot_idl.messageFileInfo fileInfo = 1; total_size += 1 * this->fileinfo_size(); for (int i = 0; i < this->fileinfo_size(); i++) { total_size += @@ -1184,6 +1184,6 @@ void updateSuccessNotice::Swap(updateSuccessNotice* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/FileSyncBySvn.pb.h b/product/src/idl_files/FileSyncBySvn.pb.h index 7961a406..592fc903 100644 --- a/product/src/idl_files/FileSyncBySvn.pb.h +++ b/product/src/idl_files/FileSyncBySvn.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_FileSyncBySvn_2eproto(); @@ -199,7 +199,7 @@ class IDL_FILES_EXPORT fileSyncNotice : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& others() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_others(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.fileSyncNotice) + // @@protoc_insertion_point(class_scope:iot_idl.fileSyncNotice) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -294,14 +294,14 @@ class IDL_FILES_EXPORT messageFileInfo : public ::google::protobuf::Message { inline ::std::string* release_filename(); inline void set_allocated_filename(::std::string* filename); - // required .kbd_idlfile.enUpdateType type = 2; + // required .iot_idl.enUpdateType type = 2; inline bool has_type() const; inline void clear_type(); static const int kTypeFieldNumber = 2; - inline ::kbd_idlfile::enUpdateType type() const; - inline void set_type(::kbd_idlfile::enUpdateType value); + inline ::iot_idl::enUpdateType type() const; + inline void set_type(::iot_idl::enUpdateType value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.messageFileInfo) + // @@protoc_insertion_point(class_scope:iot_idl.messageFileInfo) private: inline void set_has_filename(); inline void clear_has_filename(); @@ -376,26 +376,26 @@ class IDL_FILES_EXPORT updateSuccessNotice : public ::google::protobuf::Message // accessors ------------------------------------------------------- - // repeated .kbd_idlfile.messageFileInfo fileInfo = 1; + // repeated .iot_idl.messageFileInfo fileInfo = 1; inline int fileinfo_size() const; inline void clear_fileinfo(); static const int kFileInfoFieldNumber = 1; - inline const ::kbd_idlfile::messageFileInfo& fileinfo(int index) const; - inline ::kbd_idlfile::messageFileInfo* mutable_fileinfo(int index); - inline ::kbd_idlfile::messageFileInfo* add_fileinfo(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::messageFileInfo >& + inline const ::iot_idl::messageFileInfo& fileinfo(int index) const; + inline ::iot_idl::messageFileInfo* mutable_fileinfo(int index); + inline ::iot_idl::messageFileInfo* add_fileinfo(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::messageFileInfo >& fileinfo() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::messageFileInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::messageFileInfo >* mutable_fileinfo(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.updateSuccessNotice) + // @@protoc_insertion_point(class_scope:iot_idl.updateSuccessNotice) private: ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::messageFileInfo > fileinfo_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::messageFileInfo > fileinfo_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FileSyncBySvn_2eproto(); friend void protobuf_AssignDesc_FileSyncBySvn_2eproto(); friend void protobuf_ShutdownFile_FileSyncBySvn_2eproto(); @@ -418,49 +418,49 @@ inline void fileSyncNotice::clear_relativefilename() { relativefilename_.Clear(); } inline const ::std::string& fileSyncNotice::relativefilename(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_get:iot_idl.fileSyncNotice.relativeFileName) return relativefilename_.Get(index); } inline ::std::string* fileSyncNotice::mutable_relativefilename(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_mutable:iot_idl.fileSyncNotice.relativeFileName) return relativefilename_.Mutable(index); } inline void fileSyncNotice::set_relativefilename(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_set:iot_idl.fileSyncNotice.relativeFileName) relativefilename_.Mutable(index)->assign(value); } inline void fileSyncNotice::set_relativefilename(int index, const char* value) { relativefilename_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_set_char:iot_idl.fileSyncNotice.relativeFileName) } inline void fileSyncNotice::set_relativefilename(int index, const char* value, size_t size) { relativefilename_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.fileSyncNotice.relativeFileName) } inline ::std::string* fileSyncNotice::add_relativefilename() { return relativefilename_.Add(); } inline void fileSyncNotice::add_relativefilename(const ::std::string& value) { relativefilename_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_add:iot_idl.fileSyncNotice.relativeFileName) } inline void fileSyncNotice::add_relativefilename(const char* value) { relativefilename_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_add_char:iot_idl.fileSyncNotice.relativeFileName) } inline void fileSyncNotice::add_relativefilename(const char* value, size_t size) { relativefilename_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_add_pointer:iot_idl.fileSyncNotice.relativeFileName) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& fileSyncNotice::relativefilename() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_list:iot_idl.fileSyncNotice.relativeFileName) return relativefilename_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* fileSyncNotice::mutable_relativefilename() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.fileSyncNotice.relativeFileName) + // @@protoc_insertion_point(field_mutable_list:iot_idl.fileSyncNotice.relativeFileName) return &relativefilename_; } @@ -481,7 +481,7 @@ inline void fileSyncNotice::clear_hostname() { clear_has_hostname(); } inline const ::std::string& fileSyncNotice::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.fileSyncNotice.hostName) + // @@protoc_insertion_point(field_get:iot_idl.fileSyncNotice.hostName) return *hostname_; } inline void fileSyncNotice::set_hostname(const ::std::string& value) { @@ -490,7 +490,7 @@ inline void fileSyncNotice::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.fileSyncNotice.hostName) + // @@protoc_insertion_point(field_set:iot_idl.fileSyncNotice.hostName) } inline void fileSyncNotice::set_hostname(const char* value) { set_has_hostname(); @@ -498,7 +498,7 @@ inline void fileSyncNotice::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.fileSyncNotice.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.fileSyncNotice.hostName) } inline void fileSyncNotice::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -506,14 +506,14 @@ inline void fileSyncNotice::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.fileSyncNotice.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.fileSyncNotice.hostName) } inline ::std::string* fileSyncNotice::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.fileSyncNotice.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.fileSyncNotice.hostName) return hostname_; } inline ::std::string* fileSyncNotice::release_hostname() { @@ -537,7 +537,7 @@ inline void fileSyncNotice::set_allocated_hostname(::std::string* hostname) { clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.fileSyncNotice.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.fileSyncNotice.hostName) } // required int32 domainId = 3; @@ -555,13 +555,13 @@ inline void fileSyncNotice::clear_domainid() { clear_has_domainid(); } inline ::google::protobuf::int32 fileSyncNotice::domainid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.fileSyncNotice.domainId) + // @@protoc_insertion_point(field_get:iot_idl.fileSyncNotice.domainId) return domainid_; } inline void fileSyncNotice::set_domainid(::google::protobuf::int32 value) { set_has_domainid(); domainid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.fileSyncNotice.domainId) + // @@protoc_insertion_point(field_set:iot_idl.fileSyncNotice.domainId) } // required int32 locationId = 4; @@ -579,13 +579,13 @@ inline void fileSyncNotice::clear_locationid() { clear_has_locationid(); } inline ::google::protobuf::int32 fileSyncNotice::locationid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.fileSyncNotice.locationId) + // @@protoc_insertion_point(field_get:iot_idl.fileSyncNotice.locationId) return locationid_; } inline void fileSyncNotice::set_locationid(::google::protobuf::int32 value) { set_has_locationid(); locationid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.fileSyncNotice.locationId) + // @@protoc_insertion_point(field_set:iot_idl.fileSyncNotice.locationId) } // required int32 appId = 5; @@ -603,13 +603,13 @@ inline void fileSyncNotice::clear_appid() { clear_has_appid(); } inline ::google::protobuf::int32 fileSyncNotice::appid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.fileSyncNotice.appId) + // @@protoc_insertion_point(field_get:iot_idl.fileSyncNotice.appId) return appid_; } inline void fileSyncNotice::set_appid(::google::protobuf::int32 value) { set_has_appid(); appid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.fileSyncNotice.appId) + // @@protoc_insertion_point(field_set:iot_idl.fileSyncNotice.appId) } // repeated string others = 6; @@ -620,49 +620,49 @@ inline void fileSyncNotice::clear_others() { others_.Clear(); } inline const ::std::string& fileSyncNotice::others(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_get:iot_idl.fileSyncNotice.others) return others_.Get(index); } inline ::std::string* fileSyncNotice::mutable_others(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_mutable:iot_idl.fileSyncNotice.others) return others_.Mutable(index); } inline void fileSyncNotice::set_others(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_set:iot_idl.fileSyncNotice.others) others_.Mutable(index)->assign(value); } inline void fileSyncNotice::set_others(int index, const char* value) { others_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_set_char:iot_idl.fileSyncNotice.others) } inline void fileSyncNotice::set_others(int index, const char* value, size_t size) { others_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_set_pointer:iot_idl.fileSyncNotice.others) } inline ::std::string* fileSyncNotice::add_others() { return others_.Add(); } inline void fileSyncNotice::add_others(const ::std::string& value) { others_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_add:iot_idl.fileSyncNotice.others) } inline void fileSyncNotice::add_others(const char* value) { others_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_add_char:iot_idl.fileSyncNotice.others) } inline void fileSyncNotice::add_others(const char* value, size_t size) { others_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_add_pointer:iot_idl.fileSyncNotice.others) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& fileSyncNotice::others() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_list:iot_idl.fileSyncNotice.others) return others_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* fileSyncNotice::mutable_others() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.fileSyncNotice.others) + // @@protoc_insertion_point(field_mutable_list:iot_idl.fileSyncNotice.others) return &others_; } @@ -687,7 +687,7 @@ inline void messageFileInfo::clear_filename() { clear_has_filename(); } inline const ::std::string& messageFileInfo::filename() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.messageFileInfo.fileName) + // @@protoc_insertion_point(field_get:iot_idl.messageFileInfo.fileName) return *filename_; } inline void messageFileInfo::set_filename(const ::std::string& value) { @@ -696,7 +696,7 @@ inline void messageFileInfo::set_filename(const ::std::string& value) { filename_ = new ::std::string; } filename_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.messageFileInfo.fileName) + // @@protoc_insertion_point(field_set:iot_idl.messageFileInfo.fileName) } inline void messageFileInfo::set_filename(const char* value) { set_has_filename(); @@ -704,7 +704,7 @@ inline void messageFileInfo::set_filename(const char* value) { filename_ = new ::std::string; } filename_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.messageFileInfo.fileName) + // @@protoc_insertion_point(field_set_char:iot_idl.messageFileInfo.fileName) } inline void messageFileInfo::set_filename(const char* value, size_t size) { set_has_filename(); @@ -712,14 +712,14 @@ inline void messageFileInfo::set_filename(const char* value, size_t size) { filename_ = new ::std::string; } filename_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.messageFileInfo.fileName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.messageFileInfo.fileName) } inline ::std::string* messageFileInfo::mutable_filename() { set_has_filename(); if (filename_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { filename_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.messageFileInfo.fileName) + // @@protoc_insertion_point(field_mutable:iot_idl.messageFileInfo.fileName) return filename_; } inline ::std::string* messageFileInfo::release_filename() { @@ -743,10 +743,10 @@ inline void messageFileInfo::set_allocated_filename(::std::string* filename) { clear_has_filename(); filename_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.messageFileInfo.fileName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.messageFileInfo.fileName) } -// required .kbd_idlfile.enUpdateType type = 2; +// required .iot_idl.enUpdateType type = 2; inline bool messageFileInfo::has_type() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -760,69 +760,69 @@ inline void messageFileInfo::clear_type() { type_ = 1; clear_has_type(); } -inline ::kbd_idlfile::enUpdateType messageFileInfo::type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.messageFileInfo.type) - return static_cast< ::kbd_idlfile::enUpdateType >(type_); +inline ::iot_idl::enUpdateType messageFileInfo::type() const { + // @@protoc_insertion_point(field_get:iot_idl.messageFileInfo.type) + return static_cast< ::iot_idl::enUpdateType >(type_); } -inline void messageFileInfo::set_type(::kbd_idlfile::enUpdateType value) { - assert(::kbd_idlfile::enUpdateType_IsValid(value)); +inline void messageFileInfo::set_type(::iot_idl::enUpdateType value) { + assert(::iot_idl::enUpdateType_IsValid(value)); set_has_type(); type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.messageFileInfo.type) + // @@protoc_insertion_point(field_set:iot_idl.messageFileInfo.type) } // ------------------------------------------------------------------- // updateSuccessNotice -// repeated .kbd_idlfile.messageFileInfo fileInfo = 1; +// repeated .iot_idl.messageFileInfo fileInfo = 1; inline int updateSuccessNotice::fileinfo_size() const { return fileinfo_.size(); } inline void updateSuccessNotice::clear_fileinfo() { fileinfo_.Clear(); } -inline const ::kbd_idlfile::messageFileInfo& updateSuccessNotice::fileinfo(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.updateSuccessNotice.fileInfo) +inline const ::iot_idl::messageFileInfo& updateSuccessNotice::fileinfo(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.updateSuccessNotice.fileInfo) return fileinfo_.Get(index); } -inline ::kbd_idlfile::messageFileInfo* updateSuccessNotice::mutable_fileinfo(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.updateSuccessNotice.fileInfo) +inline ::iot_idl::messageFileInfo* updateSuccessNotice::mutable_fileinfo(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.updateSuccessNotice.fileInfo) return fileinfo_.Mutable(index); } -inline ::kbd_idlfile::messageFileInfo* updateSuccessNotice::add_fileinfo() { - // @@protoc_insertion_point(field_add:kbd_idlfile.updateSuccessNotice.fileInfo) +inline ::iot_idl::messageFileInfo* updateSuccessNotice::add_fileinfo() { + // @@protoc_insertion_point(field_add:iot_idl.updateSuccessNotice.fileInfo) return fileinfo_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::messageFileInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::messageFileInfo >& updateSuccessNotice::fileinfo() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.updateSuccessNotice.fileInfo) + // @@protoc_insertion_point(field_list:iot_idl.updateSuccessNotice.fileInfo) return fileinfo_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::messageFileInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::messageFileInfo >* updateSuccessNotice::mutable_fileinfo() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.updateSuccessNotice.fileInfo) + // @@protoc_insertion_point(field_mutable_list:iot_idl.updateSuccessNotice.fileInfo) return &fileinfo_; } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enFileSyncMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enFileSyncMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enFileSyncMsgType>() { - return ::kbd_idlfile::enFileSyncMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enFileSyncMsgType>() { + return ::iot_idl::enFileSyncMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enUpdateType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enUpdateType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enUpdateType>() { - return ::kbd_idlfile::enUpdateType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enUpdateType>() { + return ::iot_idl::enUpdateType_descriptor(); } } // namespace google diff --git a/product/src/idl_files/FileSyncBySvn.proto b/product/src/idl_files/FileSyncBySvn.proto index ec3f715c..93c91b79 100644 --- a/product/src/idl_files/FileSyncBySvn.proto +++ b/product/src/idl_files/FileSyncBySvn.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; enum enFileSyncMsgType diff --git a/product/src/idl_files/FileSynch.pb.cc b/product/src/idl_files/FileSynch.pb.cc index f4e4beaa..436379b2 100644 --- a/product/src/idl_files/FileSynch.pb.cc +++ b/product/src/idl_files/FileSynch.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -319,12 +319,12 @@ void protobuf_AddDesc_FileSynch_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\017FileSynch.proto\022\013kbd_idlfile\"E\n\tDataBl" + "\n\017FileSynch.proto\022\013iot_idl\"E\n\tDataBl" "ock\022\r\n\005index\030\001 \002(\004\022\016\n\006offset\030\002 \002(\004\022\013\n\003le" "n\030\003 \002(\004\022\014\n\004buff\030\004 \002(\014\"\247\001\n\010DataPack\022\020\n\010pa" "thFile\030\001 \002(\t\022\022\n\nblockCount\030\002 \002(\004\022\r\n\005isDi" "r\030\003 \002(\005\022\020\n\010fileSize\030\004 \002(\004\022\021\n\tcheckCode\030\005" - " \002(\t\022)\n\tdataBlock\030\006 \001(\0132\026.kbd_idlfile.Da" + " \002(\t\022)\n\tdataBlock\030\006 \001(\0132\026.iot_idl.Da" "taBlock\022\026\n\016renamePathFile\030\007 \001(\t\"\221\001\n\010File" "Node\022\020\n\010pathFile\030\001 \002(\t\022\r\n\005isDir\030\002 \002(\005\022\024\n" "\014isConfigPath\030\003 \002(\005\022\020\n\010fileSize\030\004 \001(\004\022\022\n" @@ -332,24 +332,24 @@ void protobuf_AddDesc_FileSynch_2eproto() { "bd_idlfile.FileNode\"4\n\016FileNodeReqMsg\022\020\n" "\010hostName\030\001 \002(\t\022\020\n\010pathFile\030\002 \003(\t\"X\n\017Fil" "eNodeRespMsg\022\020\n\010hostName\030\001 \002(\t\022\016\n\006isRoot" - "\030\002 \002(\005\022#\n\004node\030\003 \003(\0132\025.kbd_idlfile.FileN" + "\030\002 \002(\005\022#\n\004node\030\003 \003(\0132\025.iot_idl.FileN" "ode\"G\n\020FileChangeReqMsg\022\020\n\010hostName\030\001 \002(" "\t\022\017\n\007optType\030\002 \002(\005\022\020\n\010pathFile\030\003 \002(\t\"p\n\020" "FileChangeExeMsg\022\020\n\010hostName\030\001 \002(\t\022\017\n\007op" "tType\030\002 \002(\005\022\020\n\010pathFile\030\003 \002(\t\022\'\n\010dataPac" - "k\030\004 \002(\0132\025.kbd_idlfile.DataPack\"\210\001\n\020Broad" + "k\030\004 \002(\0132\025.iot_idl.DataPack\"\210\001\n\020Broad" "castTaskMsg\022\020\n\010hostName\030\001 \002(\t\022\024\n\014recvHos" "tName\030\002 \002(\t\022\020\n\010taskTime\030\003 \002(\004\022\020\n\010pathFil" - "e\030\004 \003(\t\022(\n\007operate\030\005 \002(\0162\027.kbd_idlfile.e" + "e\030\004 \003(\t\022(\n\007operate\030\005 \002(\0162\027.iot_idl.e" "nTaskType\"\322\001\n\017ExeBroadcastMsg\022\020\n\010hostNam" - "e\030\001 \002(\t\022+\n\004task\030\002 \002(\0132\035.kbd_idlfile.Broa" + "e\030\001 \002(\t\022+\n\004task\030\002 \002(\0132\035.iot_idl.Broa" "dcastTaskMsg\022\020\n\010taskTime\030\003 \002(\004\022\r\n\005count\030" "\004 \002(\005\022\021\n\tsendCount\030\005 \002(\005\022#\n\004node\030\006 \001(\0132\025" - ".kbd_idlfile.FileNode\022\'\n\010dataPack\030\007 \001(\0132" - "\025.kbd_idlfile.DataPack\"\334\001\n\022BroadcastResu" + ".iot_idl.FileNode\022\'\n\010dataPack\030\007 \001(\0132" + "\025.iot_idl.DataPack\"\334\001\n\022BroadcastResu" "ltMsg\022\020\n\010hostName\030\001 \002(\t\022+\n\004task\030\002 \002(\0132\035." - "kbd_idlfile.BroadcastTaskMsg\022\021\n\tisSucces" - "s\030\003 \002(\010\022-\n\006status\030\004 \002(\0162\035.kbd_idlfile.en" + "iot_idl.BroadcastTaskMsg\022\021\n\tisSucces" + "s\030\003 \002(\010\022-\n\006status\030\004 \002(\0162\035.iot_idl.en" "TaskStatusType\022\021\n\tresultStr\030\005 \002(\t\022\r\n\005cou" "nt\030\006 \002(\005\022\021\n\tsendCount\030\007 \002(\005\022\020\n\010pathFile\030" "\010 \002(\t*U\n\nenTaskType\022\023\n\017enTaskType_STOP\020\000" @@ -431,7 +431,7 @@ const int DataBlock::kBuffFieldNumber; DataBlock::DataBlock() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(constructor:iot_idl.DataBlock) } void DataBlock::InitAsDefaultInstance() { @@ -441,7 +441,7 @@ DataBlock::DataBlock(const DataBlock& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(copy_constructor:iot_idl.DataBlock) } void DataBlock::SharedCtor() { @@ -455,7 +455,7 @@ void DataBlock::SharedCtor() { } DataBlock::~DataBlock() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(destructor:iot_idl.DataBlock) SharedDtor(); } @@ -519,7 +519,7 @@ bool DataBlock::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(parse_start:iot_idl.DataBlock) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -596,17 +596,17 @@ bool DataBlock::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(parse_success:iot_idl.DataBlock) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(parse_failure:iot_idl.DataBlock) return false; #undef DO_ } void DataBlock::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(serialize_start:iot_idl.DataBlock) // required uint64 index = 1; if (has_index()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->index(), output); @@ -632,12 +632,12 @@ void DataBlock::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(serialize_end:iot_idl.DataBlock) } ::google::protobuf::uint8* DataBlock::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DataBlock) // required uint64 index = 1; if (has_index()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->index(), target); @@ -664,7 +664,7 @@ void DataBlock::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DataBlock) return target; } @@ -797,18 +797,18 @@ const int DataPack::kRenamePathFileFieldNumber; DataPack::DataPack() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DataPack) + // @@protoc_insertion_point(constructor:iot_idl.DataPack) } void DataPack::InitAsDefaultInstance() { - datablock_ = const_cast< ::kbd_idlfile::DataBlock*>(&::kbd_idlfile::DataBlock::default_instance()); + datablock_ = const_cast< ::iot_idl::DataBlock*>(&::iot_idl::DataBlock::default_instance()); } DataPack::DataPack(const DataPack& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DataPack) + // @@protoc_insertion_point(copy_constructor:iot_idl.DataPack) } void DataPack::SharedCtor() { @@ -825,7 +825,7 @@ void DataPack::SharedCtor() { } DataPack::~DataPack() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DataPack) + // @@protoc_insertion_point(destructor:iot_idl.DataPack) SharedDtor(); } @@ -890,7 +890,7 @@ void DataPack::Clear() { } } if (has_datablock()) { - if (datablock_ != NULL) datablock_->::kbd_idlfile::DataBlock::Clear(); + if (datablock_ != NULL) datablock_->::iot_idl::DataBlock::Clear(); } if (has_renamepathfile()) { if (renamepathfile_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { @@ -910,7 +910,7 @@ bool DataPack::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DataPack) + // @@protoc_insertion_point(parse_start:iot_idl.DataPack) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -994,7 +994,7 @@ bool DataPack::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.DataBlock dataBlock = 6; + // optional .iot_idl.DataBlock dataBlock = 6; case 6: { if (tag == 50) { parse_dataBlock: @@ -1038,17 +1038,17 @@ bool DataPack::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DataPack) + // @@protoc_insertion_point(parse_success:iot_idl.DataPack) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DataPack) + // @@protoc_insertion_point(parse_failure:iot_idl.DataPack) return false; #undef DO_ } void DataPack::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DataPack) + // @@protoc_insertion_point(serialize_start:iot_idl.DataPack) // required string pathFile = 1; if (has_pathfile()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1084,7 +1084,7 @@ void DataPack::SerializeWithCachedSizes( 5, this->checkcode(), output); } - // optional .kbd_idlfile.DataBlock dataBlock = 6; + // optional .iot_idl.DataBlock dataBlock = 6; if (has_datablock()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->datablock(), output); @@ -1104,12 +1104,12 @@ void DataPack::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DataPack) + // @@protoc_insertion_point(serialize_end:iot_idl.DataPack) } ::google::protobuf::uint8* DataPack::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DataPack) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DataPack) // required string pathFile = 1; if (has_pathfile()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1147,7 +1147,7 @@ void DataPack::SerializeWithCachedSizes( 5, this->checkcode(), target); } - // optional .kbd_idlfile.DataBlock dataBlock = 6; + // optional .iot_idl.DataBlock dataBlock = 6; if (has_datablock()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1169,7 +1169,7 @@ void DataPack::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DataPack) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DataPack) return target; } @@ -1212,7 +1212,7 @@ int DataPack::ByteSize() const { this->checkcode()); } - // optional .kbd_idlfile.DataBlock dataBlock = 6; + // optional .iot_idl.DataBlock dataBlock = 6; if (has_datablock()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -1269,7 +1269,7 @@ void DataPack::MergeFrom(const DataPack& from) { set_checkcode(from.checkcode()); } if (from.has_datablock()) { - mutable_datablock()->::kbd_idlfile::DataBlock::MergeFrom(from.datablock()); + mutable_datablock()->::iot_idl::DataBlock::MergeFrom(from.datablock()); } if (from.has_renamepathfile()) { set_renamepathfile(from.renamepathfile()); @@ -1337,7 +1337,7 @@ const int FileNode::kChildNodeFieldNumber; FileNode::FileNode() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.FileNode) + // @@protoc_insertion_point(constructor:iot_idl.FileNode) } void FileNode::InitAsDefaultInstance() { @@ -1347,7 +1347,7 @@ FileNode::FileNode(const FileNode& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.FileNode) + // @@protoc_insertion_point(copy_constructor:iot_idl.FileNode) } void FileNode::SharedCtor() { @@ -1362,7 +1362,7 @@ void FileNode::SharedCtor() { } FileNode::~FileNode() { - // @@protoc_insertion_point(destructor:kbd_idlfile.FileNode) + // @@protoc_insertion_point(destructor:iot_idl.FileNode) SharedDtor(); } @@ -1427,7 +1427,7 @@ bool FileNode::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.FileNode) + // @@protoc_insertion_point(parse_start:iot_idl.FileNode) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1509,7 +1509,7 @@ bool FileNode::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.FileNode childNode = 6; + // repeated .iot_idl.FileNode childNode = 6; case 6: { if (tag == 50) { parse_childNode: @@ -1537,17 +1537,17 @@ bool FileNode::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.FileNode) + // @@protoc_insertion_point(parse_success:iot_idl.FileNode) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.FileNode) + // @@protoc_insertion_point(parse_failure:iot_idl.FileNode) return false; #undef DO_ } void FileNode::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.FileNode) + // @@protoc_insertion_point(serialize_start:iot_idl.FileNode) // required string pathFile = 1; if (has_pathfile()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1578,7 +1578,7 @@ void FileNode::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt64(5, this->modifytime(), output); } - // repeated .kbd_idlfile.FileNode childNode = 6; + // repeated .iot_idl.FileNode childNode = 6; for (int i = 0; i < this->childnode_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->childnode(i), output); @@ -1588,12 +1588,12 @@ void FileNode::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.FileNode) + // @@protoc_insertion_point(serialize_end:iot_idl.FileNode) } ::google::protobuf::uint8* FileNode::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.FileNode) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.FileNode) // required string pathFile = 1; if (has_pathfile()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1625,7 +1625,7 @@ void FileNode::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(5, this->modifytime(), target); } - // repeated .kbd_idlfile.FileNode childNode = 6; + // repeated .iot_idl.FileNode childNode = 6; for (int i = 0; i < this->childnode_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1636,7 +1636,7 @@ void FileNode::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.FileNode) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.FileNode) return target; } @@ -1680,7 +1680,7 @@ int FileNode::ByteSize() const { } } - // repeated .kbd_idlfile.FileNode childNode = 6; + // repeated .iot_idl.FileNode childNode = 6; total_size += 1 * this->childnode_size(); for (int i = 0; i < this->childnode_size(); i++) { total_size += @@ -1786,7 +1786,7 @@ const int FileNodeReqMsg::kPathFileFieldNumber; FileNodeReqMsg::FileNodeReqMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(constructor:iot_idl.FileNodeReqMsg) } void FileNodeReqMsg::InitAsDefaultInstance() { @@ -1796,7 +1796,7 @@ FileNodeReqMsg::FileNodeReqMsg(const FileNodeReqMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.FileNodeReqMsg) } void FileNodeReqMsg::SharedCtor() { @@ -1807,7 +1807,7 @@ void FileNodeReqMsg::SharedCtor() { } FileNodeReqMsg::~FileNodeReqMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(destructor:iot_idl.FileNodeReqMsg) SharedDtor(); } @@ -1855,7 +1855,7 @@ bool FileNodeReqMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(parse_start:iot_idl.FileNodeReqMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1910,17 +1910,17 @@ bool FileNodeReqMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(parse_success:iot_idl.FileNodeReqMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.FileNodeReqMsg) return false; #undef DO_ } void FileNodeReqMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.FileNodeReqMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1945,12 +1945,12 @@ void FileNodeReqMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.FileNodeReqMsg) } ::google::protobuf::uint8* FileNodeReqMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.FileNodeReqMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1976,7 +1976,7 @@ void FileNodeReqMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.FileNodeReqMsg) return target; } @@ -2081,7 +2081,7 @@ const int FileNodeRespMsg::kNodeFieldNumber; FileNodeRespMsg::FileNodeRespMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(constructor:iot_idl.FileNodeRespMsg) } void FileNodeRespMsg::InitAsDefaultInstance() { @@ -2091,7 +2091,7 @@ FileNodeRespMsg::FileNodeRespMsg(const FileNodeRespMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.FileNodeRespMsg) } void FileNodeRespMsg::SharedCtor() { @@ -2103,7 +2103,7 @@ void FileNodeRespMsg::SharedCtor() { } FileNodeRespMsg::~FileNodeRespMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(destructor:iot_idl.FileNodeRespMsg) SharedDtor(); } @@ -2154,7 +2154,7 @@ bool FileNodeRespMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(parse_start:iot_idl.FileNodeRespMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2191,7 +2191,7 @@ bool FileNodeRespMsg::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.FileNode node = 3; + // repeated .iot_idl.FileNode node = 3; case 3: { if (tag == 26) { parse_node: @@ -2219,17 +2219,17 @@ bool FileNodeRespMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(parse_success:iot_idl.FileNodeRespMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.FileNodeRespMsg) return false; #undef DO_ } void FileNodeRespMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.FileNodeRespMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2245,7 +2245,7 @@ void FileNodeRespMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->isroot(), output); } - // repeated .kbd_idlfile.FileNode node = 3; + // repeated .iot_idl.FileNode node = 3; for (int i = 0; i < this->node_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->node(i), output); @@ -2255,12 +2255,12 @@ void FileNodeRespMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.FileNodeRespMsg) } ::google::protobuf::uint8* FileNodeRespMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.FileNodeRespMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2277,7 +2277,7 @@ void FileNodeRespMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->isroot(), target); } - // repeated .kbd_idlfile.FileNode node = 3; + // repeated .iot_idl.FileNode node = 3; for (int i = 0; i < this->node_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2288,7 +2288,7 @@ void FileNodeRespMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.FileNodeRespMsg) return target; } @@ -2311,7 +2311,7 @@ int FileNodeRespMsg::ByteSize() const { } } - // repeated .kbd_idlfile.FileNode node = 3; + // repeated .iot_idl.FileNode node = 3; total_size += 1 * this->node_size(); for (int i = 0; i < this->node_size(); i++) { total_size += @@ -2406,7 +2406,7 @@ const int FileChangeReqMsg::kPathFileFieldNumber; FileChangeReqMsg::FileChangeReqMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(constructor:iot_idl.FileChangeReqMsg) } void FileChangeReqMsg::InitAsDefaultInstance() { @@ -2416,7 +2416,7 @@ FileChangeReqMsg::FileChangeReqMsg(const FileChangeReqMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.FileChangeReqMsg) } void FileChangeReqMsg::SharedCtor() { @@ -2429,7 +2429,7 @@ void FileChangeReqMsg::SharedCtor() { } FileChangeReqMsg::~FileChangeReqMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(destructor:iot_idl.FileChangeReqMsg) SharedDtor(); } @@ -2487,7 +2487,7 @@ bool FileChangeReqMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(parse_start:iot_idl.FileChangeReqMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2555,17 +2555,17 @@ bool FileChangeReqMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(parse_success:iot_idl.FileChangeReqMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.FileChangeReqMsg) return false; #undef DO_ } void FileChangeReqMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.FileChangeReqMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2595,12 +2595,12 @@ void FileChangeReqMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.FileChangeReqMsg) } ::google::protobuf::uint8* FileChangeReqMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.FileChangeReqMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2632,7 +2632,7 @@ void FileChangeReqMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.FileChangeReqMsg) return target; } @@ -2751,18 +2751,18 @@ const int FileChangeExeMsg::kDataPackFieldNumber; FileChangeExeMsg::FileChangeExeMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(constructor:iot_idl.FileChangeExeMsg) } void FileChangeExeMsg::InitAsDefaultInstance() { - datapack_ = const_cast< ::kbd_idlfile::DataPack*>(&::kbd_idlfile::DataPack::default_instance()); + datapack_ = const_cast< ::iot_idl::DataPack*>(&::iot_idl::DataPack::default_instance()); } FileChangeExeMsg::FileChangeExeMsg(const FileChangeExeMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.FileChangeExeMsg) } void FileChangeExeMsg::SharedCtor() { @@ -2776,7 +2776,7 @@ void FileChangeExeMsg::SharedCtor() { } FileChangeExeMsg::~FileChangeExeMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(destructor:iot_idl.FileChangeExeMsg) SharedDtor(); } @@ -2827,7 +2827,7 @@ void FileChangeExeMsg::Clear() { } } if (has_datapack()) { - if (datapack_ != NULL) datapack_->::kbd_idlfile::DataPack::Clear(); + if (datapack_ != NULL) datapack_->::iot_idl::DataPack::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -2838,7 +2838,7 @@ bool FileChangeExeMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(parse_start:iot_idl.FileChangeExeMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2892,7 +2892,7 @@ bool FileChangeExeMsg::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.DataPack dataPack = 4; + // required .iot_idl.DataPack dataPack = 4; case 4: { if (tag == 34) { parse_dataPack: @@ -2919,17 +2919,17 @@ bool FileChangeExeMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(parse_success:iot_idl.FileChangeExeMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.FileChangeExeMsg) return false; #undef DO_ } void FileChangeExeMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.FileChangeExeMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2955,7 +2955,7 @@ void FileChangeExeMsg::SerializeWithCachedSizes( 3, this->pathfile(), output); } - // required .kbd_idlfile.DataPack dataPack = 4; + // required .iot_idl.DataPack dataPack = 4; if (has_datapack()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->datapack(), output); @@ -2965,12 +2965,12 @@ void FileChangeExeMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.FileChangeExeMsg) } ::google::protobuf::uint8* FileChangeExeMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.FileChangeExeMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2998,7 +2998,7 @@ void FileChangeExeMsg::SerializeWithCachedSizes( 3, this->pathfile(), target); } - // required .kbd_idlfile.DataPack dataPack = 4; + // required .iot_idl.DataPack dataPack = 4; if (has_datapack()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3009,7 +3009,7 @@ void FileChangeExeMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.FileChangeExeMsg) return target; } @@ -3038,7 +3038,7 @@ int FileChangeExeMsg::ByteSize() const { this->pathfile()); } - // required .kbd_idlfile.DataPack dataPack = 4; + // required .iot_idl.DataPack dataPack = 4; if (has_datapack()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3082,7 +3082,7 @@ void FileChangeExeMsg::MergeFrom(const FileChangeExeMsg& from) { set_pathfile(from.pathfile()); } if (from.has_datapack()) { - mutable_datapack()->::kbd_idlfile::DataPack::MergeFrom(from.datapack()); + mutable_datapack()->::iot_idl::DataPack::MergeFrom(from.datapack()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -3143,7 +3143,7 @@ const int BroadcastTaskMsg::kOperateFieldNumber; BroadcastTaskMsg::BroadcastTaskMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(constructor:iot_idl.BroadcastTaskMsg) } void BroadcastTaskMsg::InitAsDefaultInstance() { @@ -3153,7 +3153,7 @@ BroadcastTaskMsg::BroadcastTaskMsg(const BroadcastTaskMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.BroadcastTaskMsg) } void BroadcastTaskMsg::SharedCtor() { @@ -3167,7 +3167,7 @@ void BroadcastTaskMsg::SharedCtor() { } BroadcastTaskMsg::~BroadcastTaskMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(destructor:iot_idl.BroadcastTaskMsg) SharedDtor(); } @@ -3227,7 +3227,7 @@ bool BroadcastTaskMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(parse_start:iot_idl.BroadcastTaskMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3300,7 +3300,7 @@ bool BroadcastTaskMsg::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.enTaskType operate = 5; + // required .iot_idl.enTaskType operate = 5; case 5: { if (tag == 40) { parse_operate: @@ -3308,8 +3308,8 @@ bool BroadcastTaskMsg::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enTaskType_IsValid(value)) { - set_operate(static_cast< ::kbd_idlfile::enTaskType >(value)); + if (::iot_idl::enTaskType_IsValid(value)) { + set_operate(static_cast< ::iot_idl::enTaskType >(value)); } else { mutable_unknown_fields()->AddVarint(5, value); } @@ -3334,17 +3334,17 @@ bool BroadcastTaskMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(parse_success:iot_idl.BroadcastTaskMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.BroadcastTaskMsg) return false; #undef DO_ } void BroadcastTaskMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.BroadcastTaskMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3380,7 +3380,7 @@ void BroadcastTaskMsg::SerializeWithCachedSizes( 4, this->pathfile(i), output); } - // required .kbd_idlfile.enTaskType operate = 5; + // required .iot_idl.enTaskType operate = 5; if (has_operate()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 5, this->operate(), output); @@ -3390,12 +3390,12 @@ void BroadcastTaskMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.BroadcastTaskMsg) } ::google::protobuf::uint8* BroadcastTaskMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.BroadcastTaskMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3433,7 +3433,7 @@ void BroadcastTaskMsg::SerializeWithCachedSizes( WriteStringToArray(4, this->pathfile(i), target); } - // required .kbd_idlfile.enTaskType operate = 5; + // required .iot_idl.enTaskType operate = 5; if (has_operate()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 5, this->operate(), target); @@ -3443,7 +3443,7 @@ void BroadcastTaskMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.BroadcastTaskMsg) return target; } @@ -3472,7 +3472,7 @@ int BroadcastTaskMsg::ByteSize() const { this->tasktime()); } - // required .kbd_idlfile.enTaskType operate = 5; + // required .iot_idl.enTaskType operate = 5; if (has_operate()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->operate()); @@ -3584,20 +3584,20 @@ const int ExeBroadcastMsg::kDataPackFieldNumber; ExeBroadcastMsg::ExeBroadcastMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(constructor:iot_idl.ExeBroadcastMsg) } void ExeBroadcastMsg::InitAsDefaultInstance() { - task_ = const_cast< ::kbd_idlfile::BroadcastTaskMsg*>(&::kbd_idlfile::BroadcastTaskMsg::default_instance()); - node_ = const_cast< ::kbd_idlfile::FileNode*>(&::kbd_idlfile::FileNode::default_instance()); - datapack_ = const_cast< ::kbd_idlfile::DataPack*>(&::kbd_idlfile::DataPack::default_instance()); + task_ = const_cast< ::iot_idl::BroadcastTaskMsg*>(&::iot_idl::BroadcastTaskMsg::default_instance()); + node_ = const_cast< ::iot_idl::FileNode*>(&::iot_idl::FileNode::default_instance()); + datapack_ = const_cast< ::iot_idl::DataPack*>(&::iot_idl::DataPack::default_instance()); } ExeBroadcastMsg::ExeBroadcastMsg(const ExeBroadcastMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.ExeBroadcastMsg) } void ExeBroadcastMsg::SharedCtor() { @@ -3614,7 +3614,7 @@ void ExeBroadcastMsg::SharedCtor() { } ExeBroadcastMsg::~ExeBroadcastMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(destructor:iot_idl.ExeBroadcastMsg) SharedDtor(); } @@ -3669,13 +3669,13 @@ void ExeBroadcastMsg::Clear() { } } if (has_task()) { - if (task_ != NULL) task_->::kbd_idlfile::BroadcastTaskMsg::Clear(); + if (task_ != NULL) task_->::iot_idl::BroadcastTaskMsg::Clear(); } if (has_node()) { - if (node_ != NULL) node_->::kbd_idlfile::FileNode::Clear(); + if (node_ != NULL) node_->::iot_idl::FileNode::Clear(); } if (has_datapack()) { - if (datapack_ != NULL) datapack_->::kbd_idlfile::DataPack::Clear(); + if (datapack_ != NULL) datapack_->::iot_idl::DataPack::Clear(); } } @@ -3690,7 +3690,7 @@ bool ExeBroadcastMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(parse_start:iot_idl.ExeBroadcastMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3712,7 +3712,7 @@ bool ExeBroadcastMsg::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; case 2: { if (tag == 18) { parse_task: @@ -3770,7 +3770,7 @@ bool ExeBroadcastMsg::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.FileNode node = 6; + // optional .iot_idl.FileNode node = 6; case 6: { if (tag == 50) { parse_node: @@ -3783,7 +3783,7 @@ bool ExeBroadcastMsg::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.DataPack dataPack = 7; + // optional .iot_idl.DataPack dataPack = 7; case 7: { if (tag == 58) { parse_dataPack: @@ -3810,17 +3810,17 @@ bool ExeBroadcastMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(parse_success:iot_idl.ExeBroadcastMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.ExeBroadcastMsg) return false; #undef DO_ } void ExeBroadcastMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.ExeBroadcastMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3831,7 +3831,7 @@ void ExeBroadcastMsg::SerializeWithCachedSizes( 1, this->hostname(), output); } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; if (has_task()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->task(), output); @@ -3852,13 +3852,13 @@ void ExeBroadcastMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->sendcount(), output); } - // optional .kbd_idlfile.FileNode node = 6; + // optional .iot_idl.FileNode node = 6; if (has_node()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->node(), output); } - // optional .kbd_idlfile.DataPack dataPack = 7; + // optional .iot_idl.DataPack dataPack = 7; if (has_datapack()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 7, this->datapack(), output); @@ -3868,12 +3868,12 @@ void ExeBroadcastMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.ExeBroadcastMsg) } ::google::protobuf::uint8* ExeBroadcastMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.ExeBroadcastMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3885,7 +3885,7 @@ void ExeBroadcastMsg::SerializeWithCachedSizes( 1, this->hostname(), target); } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; if (has_task()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3907,14 +3907,14 @@ void ExeBroadcastMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->sendcount(), target); } - // optional .kbd_idlfile.FileNode node = 6; + // optional .iot_idl.FileNode node = 6; if (has_node()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 6, this->node(), target); } - // optional .kbd_idlfile.DataPack dataPack = 7; + // optional .iot_idl.DataPack dataPack = 7; if (has_datapack()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3925,7 +3925,7 @@ void ExeBroadcastMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.ExeBroadcastMsg) return target; } @@ -3940,7 +3940,7 @@ int ExeBroadcastMsg::ByteSize() const { this->hostname()); } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; if (has_task()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3968,14 +3968,14 @@ int ExeBroadcastMsg::ByteSize() const { this->sendcount()); } - // optional .kbd_idlfile.FileNode node = 6; + // optional .iot_idl.FileNode node = 6; if (has_node()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->node()); } - // optional .kbd_idlfile.DataPack dataPack = 7; + // optional .iot_idl.DataPack dataPack = 7; if (has_datapack()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4013,7 +4013,7 @@ void ExeBroadcastMsg::MergeFrom(const ExeBroadcastMsg& from) { set_hostname(from.hostname()); } if (from.has_task()) { - mutable_task()->::kbd_idlfile::BroadcastTaskMsg::MergeFrom(from.task()); + mutable_task()->::iot_idl::BroadcastTaskMsg::MergeFrom(from.task()); } if (from.has_tasktime()) { set_tasktime(from.tasktime()); @@ -4025,10 +4025,10 @@ void ExeBroadcastMsg::MergeFrom(const ExeBroadcastMsg& from) { set_sendcount(from.sendcount()); } if (from.has_node()) { - mutable_node()->::kbd_idlfile::FileNode::MergeFrom(from.node()); + mutable_node()->::iot_idl::FileNode::MergeFrom(from.node()); } if (from.has_datapack()) { - mutable_datapack()->::kbd_idlfile::DataPack::MergeFrom(from.datapack()); + mutable_datapack()->::iot_idl::DataPack::MergeFrom(from.datapack()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -4101,18 +4101,18 @@ const int BroadcastResultMsg::kPathFileFieldNumber; BroadcastResultMsg::BroadcastResultMsg() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(constructor:iot_idl.BroadcastResultMsg) } void BroadcastResultMsg::InitAsDefaultInstance() { - task_ = const_cast< ::kbd_idlfile::BroadcastTaskMsg*>(&::kbd_idlfile::BroadcastTaskMsg::default_instance()); + task_ = const_cast< ::iot_idl::BroadcastTaskMsg*>(&::iot_idl::BroadcastTaskMsg::default_instance()); } BroadcastResultMsg::BroadcastResultMsg(const BroadcastResultMsg& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(copy_constructor:iot_idl.BroadcastResultMsg) } void BroadcastResultMsg::SharedCtor() { @@ -4130,7 +4130,7 @@ void BroadcastResultMsg::SharedCtor() { } BroadcastResultMsg::~BroadcastResultMsg() { - // @@protoc_insertion_point(destructor:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(destructor:iot_idl.BroadcastResultMsg) SharedDtor(); } @@ -4189,7 +4189,7 @@ void BroadcastResultMsg::Clear() { } } if (has_task()) { - if (task_ != NULL) task_->::kbd_idlfile::BroadcastTaskMsg::Clear(); + if (task_ != NULL) task_->::iot_idl::BroadcastTaskMsg::Clear(); } issuccess_ = false; status_ = 1; @@ -4216,7 +4216,7 @@ bool BroadcastResultMsg::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(parse_start:iot_idl.BroadcastResultMsg) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -4238,7 +4238,7 @@ bool BroadcastResultMsg::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; case 2: { if (tag == 18) { parse_task: @@ -4266,7 +4266,7 @@ bool BroadcastResultMsg::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.enTaskStatusType status = 4; + // required .iot_idl.enTaskStatusType status = 4; case 4: { if (tag == 32) { parse_status: @@ -4274,8 +4274,8 @@ bool BroadcastResultMsg::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::enTaskStatusType_IsValid(value)) { - set_status(static_cast< ::kbd_idlfile::enTaskStatusType >(value)); + if (::iot_idl::enTaskStatusType_IsValid(value)) { + set_status(static_cast< ::iot_idl::enTaskStatusType >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -4364,17 +4364,17 @@ bool BroadcastResultMsg::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(parse_success:iot_idl.BroadcastResultMsg) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(parse_failure:iot_idl.BroadcastResultMsg) return false; #undef DO_ } void BroadcastResultMsg::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(serialize_start:iot_idl.BroadcastResultMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4385,7 +4385,7 @@ void BroadcastResultMsg::SerializeWithCachedSizes( 1, this->hostname(), output); } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; if (has_task()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->task(), output); @@ -4396,7 +4396,7 @@ void BroadcastResultMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->issuccess(), output); } - // required .kbd_idlfile.enTaskStatusType status = 4; + // required .iot_idl.enTaskStatusType status = 4; if (has_status()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->status(), output); @@ -4436,12 +4436,12 @@ void BroadcastResultMsg::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(serialize_end:iot_idl.BroadcastResultMsg) } ::google::protobuf::uint8* BroadcastResultMsg::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.BroadcastResultMsg) // required string hostName = 1; if (has_hostname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4453,7 +4453,7 @@ void BroadcastResultMsg::SerializeWithCachedSizes( 1, this->hostname(), target); } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; if (has_task()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4465,7 +4465,7 @@ void BroadcastResultMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->issuccess(), target); } - // required .kbd_idlfile.enTaskStatusType status = 4; + // required .iot_idl.enTaskStatusType status = 4; if (has_status()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->status(), target); @@ -4507,7 +4507,7 @@ void BroadcastResultMsg::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.BroadcastResultMsg) return target; } @@ -4522,7 +4522,7 @@ int BroadcastResultMsg::ByteSize() const { this->hostname()); } - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; if (has_task()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4534,7 +4534,7 @@ int BroadcastResultMsg::ByteSize() const { total_size += 1 + 1; } - // required .kbd_idlfile.enTaskStatusType status = 4; + // required .iot_idl.enTaskStatusType status = 4; if (has_status()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->status()); @@ -4599,7 +4599,7 @@ void BroadcastResultMsg::MergeFrom(const BroadcastResultMsg& from) { set_hostname(from.hostname()); } if (from.has_task()) { - mutable_task()->::kbd_idlfile::BroadcastTaskMsg::MergeFrom(from.task()); + mutable_task()->::iot_idl::BroadcastTaskMsg::MergeFrom(from.task()); } if (from.has_issuccess()) { set_issuccess(from.issuccess()); @@ -4671,6 +4671,6 @@ void BroadcastResultMsg::Swap(BroadcastResultMsg* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/FileSynch.pb.h b/product/src/idl_files/FileSynch.pb.h index 8abcfb56..b42c92d7 100644 --- a/product/src/idl_files/FileSynch.pb.h +++ b/product/src/idl_files/FileSynch.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_FileSynch_2eproto(); @@ -173,7 +173,7 @@ class IDL_FILES_EXPORT DataBlock : public ::google::protobuf::Message { inline ::std::string* release_buff(); inline void set_allocated_buff(::std::string* buff); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DataBlock) + // @@protoc_insertion_point(class_scope:iot_idl.DataBlock) private: inline void set_has_index(); inline void clear_has_index(); @@ -299,14 +299,14 @@ class IDL_FILES_EXPORT DataPack : public ::google::protobuf::Message { inline ::std::string* release_checkcode(); inline void set_allocated_checkcode(::std::string* checkcode); - // optional .kbd_idlfile.DataBlock dataBlock = 6; + // optional .iot_idl.DataBlock dataBlock = 6; inline bool has_datablock() const; inline void clear_datablock(); static const int kDataBlockFieldNumber = 6; - inline const ::kbd_idlfile::DataBlock& datablock() const; - inline ::kbd_idlfile::DataBlock* mutable_datablock(); - inline ::kbd_idlfile::DataBlock* release_datablock(); - inline void set_allocated_datablock(::kbd_idlfile::DataBlock* datablock); + inline const ::iot_idl::DataBlock& datablock() const; + inline ::iot_idl::DataBlock* mutable_datablock(); + inline ::iot_idl::DataBlock* release_datablock(); + inline void set_allocated_datablock(::iot_idl::DataBlock* datablock); // optional string renamePathFile = 7; inline bool has_renamepathfile() const; @@ -320,7 +320,7 @@ class IDL_FILES_EXPORT DataPack : public ::google::protobuf::Message { inline ::std::string* release_renamepathfile(); inline void set_allocated_renamepathfile(::std::string* renamepathfile); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DataPack) + // @@protoc_insertion_point(class_scope:iot_idl.DataPack) private: inline void set_has_pathfile(); inline void clear_has_pathfile(); @@ -345,7 +345,7 @@ class IDL_FILES_EXPORT DataPack : public ::google::protobuf::Message { ::google::protobuf::uint64 blockcount_; ::google::protobuf::uint64 filesize_; ::std::string* checkcode_; - ::kbd_idlfile::DataBlock* datablock_; + ::iot_idl::DataBlock* datablock_; ::std::string* renamepathfile_; ::google::protobuf::int32 isdir_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FileSynch_2eproto(); @@ -450,19 +450,19 @@ class IDL_FILES_EXPORT FileNode : public ::google::protobuf::Message { inline ::google::protobuf::uint64 modifytime() const; inline void set_modifytime(::google::protobuf::uint64 value); - // repeated .kbd_idlfile.FileNode childNode = 6; + // repeated .iot_idl.FileNode childNode = 6; inline int childnode_size() const; inline void clear_childnode(); static const int kChildNodeFieldNumber = 6; - inline const ::kbd_idlfile::FileNode& childnode(int index) const; - inline ::kbd_idlfile::FileNode* mutable_childnode(int index); - inline ::kbd_idlfile::FileNode* add_childnode(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >& + inline const ::iot_idl::FileNode& childnode(int index) const; + inline ::iot_idl::FileNode* mutable_childnode(int index); + inline ::iot_idl::FileNode* add_childnode(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >& childnode() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >* mutable_childnode(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.FileNode) + // @@protoc_insertion_point(class_scope:iot_idl.FileNode) private: inline void set_has_pathfile(); inline void clear_has_pathfile(); @@ -484,7 +484,7 @@ class IDL_FILES_EXPORT FileNode : public ::google::protobuf::Message { ::google::protobuf::int32 isconfigpath_; ::google::protobuf::uint64 filesize_; ::google::protobuf::uint64 modifytime_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode > childnode_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode > childnode_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FileSynch_2eproto(); friend void protobuf_AssignDesc_FileSynch_2eproto(); friend void protobuf_ShutdownFile_FileSynch_2eproto(); @@ -575,7 +575,7 @@ class IDL_FILES_EXPORT FileNodeReqMsg : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& pathfile() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_pathfile(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.FileNodeReqMsg) + // @@protoc_insertion_point(class_scope:iot_idl.FileNodeReqMsg) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -667,19 +667,19 @@ class IDL_FILES_EXPORT FileNodeRespMsg : public ::google::protobuf::Message { inline ::google::protobuf::int32 isroot() const; inline void set_isroot(::google::protobuf::int32 value); - // repeated .kbd_idlfile.FileNode node = 3; + // repeated .iot_idl.FileNode node = 3; inline int node_size() const; inline void clear_node(); static const int kNodeFieldNumber = 3; - inline const ::kbd_idlfile::FileNode& node(int index) const; - inline ::kbd_idlfile::FileNode* mutable_node(int index); - inline ::kbd_idlfile::FileNode* add_node(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >& + inline const ::iot_idl::FileNode& node(int index) const; + inline ::iot_idl::FileNode* mutable_node(int index); + inline ::iot_idl::FileNode* add_node(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >& node() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >* mutable_node(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.FileNodeRespMsg) + // @@protoc_insertion_point(class_scope:iot_idl.FileNodeRespMsg) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -691,7 +691,7 @@ class IDL_FILES_EXPORT FileNodeRespMsg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* hostname_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode > node_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode > node_; ::google::protobuf::int32 isroot_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FileSynch_2eproto(); friend void protobuf_AssignDesc_FileSynch_2eproto(); @@ -786,7 +786,7 @@ class IDL_FILES_EXPORT FileChangeReqMsg : public ::google::protobuf::Message { inline ::std::string* release_pathfile(); inline void set_allocated_pathfile(::std::string* pathfile); - // @@protoc_insertion_point(class_scope:kbd_idlfile.FileChangeReqMsg) + // @@protoc_insertion_point(class_scope:iot_idl.FileChangeReqMsg) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -895,16 +895,16 @@ class IDL_FILES_EXPORT FileChangeExeMsg : public ::google::protobuf::Message { inline ::std::string* release_pathfile(); inline void set_allocated_pathfile(::std::string* pathfile); - // required .kbd_idlfile.DataPack dataPack = 4; + // required .iot_idl.DataPack dataPack = 4; inline bool has_datapack() const; inline void clear_datapack(); static const int kDataPackFieldNumber = 4; - inline const ::kbd_idlfile::DataPack& datapack() const; - inline ::kbd_idlfile::DataPack* mutable_datapack(); - inline ::kbd_idlfile::DataPack* release_datapack(); - inline void set_allocated_datapack(::kbd_idlfile::DataPack* datapack); + inline const ::iot_idl::DataPack& datapack() const; + inline ::iot_idl::DataPack* mutable_datapack(); + inline ::iot_idl::DataPack* release_datapack(); + inline void set_allocated_datapack(::iot_idl::DataPack* datapack); - // @@protoc_insertion_point(class_scope:kbd_idlfile.FileChangeExeMsg) + // @@protoc_insertion_point(class_scope:iot_idl.FileChangeExeMsg) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -921,7 +921,7 @@ class IDL_FILES_EXPORT FileChangeExeMsg : public ::google::protobuf::Message { mutable int _cached_size_; ::std::string* hostname_; ::std::string* pathfile_; - ::kbd_idlfile::DataPack* datapack_; + ::iot_idl::DataPack* datapack_; ::google::protobuf::int32 opttype_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FileSynch_2eproto(); friend void protobuf_AssignDesc_FileSynch_2eproto(); @@ -1032,14 +1032,14 @@ class IDL_FILES_EXPORT BroadcastTaskMsg : public ::google::protobuf::Message { inline const ::google::protobuf::RepeatedPtrField< ::std::string>& pathfile() const; inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_pathfile(); - // required .kbd_idlfile.enTaskType operate = 5; + // required .iot_idl.enTaskType operate = 5; inline bool has_operate() const; inline void clear_operate(); static const int kOperateFieldNumber = 5; - inline ::kbd_idlfile::enTaskType operate() const; - inline void set_operate(::kbd_idlfile::enTaskType value); + inline ::iot_idl::enTaskType operate() const; + inline void set_operate(::iot_idl::enTaskType value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.BroadcastTaskMsg) + // @@protoc_insertion_point(class_scope:iot_idl.BroadcastTaskMsg) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -1133,14 +1133,14 @@ class IDL_FILES_EXPORT ExeBroadcastMsg : public ::google::protobuf::Message { inline ::std::string* release_hostname(); inline void set_allocated_hostname(::std::string* hostname); - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; inline bool has_task() const; inline void clear_task(); static const int kTaskFieldNumber = 2; - inline const ::kbd_idlfile::BroadcastTaskMsg& task() const; - inline ::kbd_idlfile::BroadcastTaskMsg* mutable_task(); - inline ::kbd_idlfile::BroadcastTaskMsg* release_task(); - inline void set_allocated_task(::kbd_idlfile::BroadcastTaskMsg* task); + inline const ::iot_idl::BroadcastTaskMsg& task() const; + inline ::iot_idl::BroadcastTaskMsg* mutable_task(); + inline ::iot_idl::BroadcastTaskMsg* release_task(); + inline void set_allocated_task(::iot_idl::BroadcastTaskMsg* task); // required uint64 taskTime = 3; inline bool has_tasktime() const; @@ -1163,25 +1163,25 @@ class IDL_FILES_EXPORT ExeBroadcastMsg : public ::google::protobuf::Message { inline ::google::protobuf::int32 sendcount() const; inline void set_sendcount(::google::protobuf::int32 value); - // optional .kbd_idlfile.FileNode node = 6; + // optional .iot_idl.FileNode node = 6; inline bool has_node() const; inline void clear_node(); static const int kNodeFieldNumber = 6; - inline const ::kbd_idlfile::FileNode& node() const; - inline ::kbd_idlfile::FileNode* mutable_node(); - inline ::kbd_idlfile::FileNode* release_node(); - inline void set_allocated_node(::kbd_idlfile::FileNode* node); + inline const ::iot_idl::FileNode& node() const; + inline ::iot_idl::FileNode* mutable_node(); + inline ::iot_idl::FileNode* release_node(); + inline void set_allocated_node(::iot_idl::FileNode* node); - // optional .kbd_idlfile.DataPack dataPack = 7; + // optional .iot_idl.DataPack dataPack = 7; inline bool has_datapack() const; inline void clear_datapack(); static const int kDataPackFieldNumber = 7; - inline const ::kbd_idlfile::DataPack& datapack() const; - inline ::kbd_idlfile::DataPack* mutable_datapack(); - inline ::kbd_idlfile::DataPack* release_datapack(); - inline void set_allocated_datapack(::kbd_idlfile::DataPack* datapack); + inline const ::iot_idl::DataPack& datapack() const; + inline ::iot_idl::DataPack* mutable_datapack(); + inline ::iot_idl::DataPack* release_datapack(); + inline void set_allocated_datapack(::iot_idl::DataPack* datapack); - // @@protoc_insertion_point(class_scope:kbd_idlfile.ExeBroadcastMsg) + // @@protoc_insertion_point(class_scope:iot_idl.ExeBroadcastMsg) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -1203,12 +1203,12 @@ class IDL_FILES_EXPORT ExeBroadcastMsg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* hostname_; - ::kbd_idlfile::BroadcastTaskMsg* task_; + ::iot_idl::BroadcastTaskMsg* task_; ::google::protobuf::uint64 tasktime_; ::google::protobuf::int32 count_; ::google::protobuf::int32 sendcount_; - ::kbd_idlfile::FileNode* node_; - ::kbd_idlfile::DataPack* datapack_; + ::iot_idl::FileNode* node_; + ::iot_idl::DataPack* datapack_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FileSynch_2eproto(); friend void protobuf_AssignDesc_FileSynch_2eproto(); friend void protobuf_ShutdownFile_FileSynch_2eproto(); @@ -1283,14 +1283,14 @@ class IDL_FILES_EXPORT BroadcastResultMsg : public ::google::protobuf::Message { inline ::std::string* release_hostname(); inline void set_allocated_hostname(::std::string* hostname); - // required .kbd_idlfile.BroadcastTaskMsg task = 2; + // required .iot_idl.BroadcastTaskMsg task = 2; inline bool has_task() const; inline void clear_task(); static const int kTaskFieldNumber = 2; - inline const ::kbd_idlfile::BroadcastTaskMsg& task() const; - inline ::kbd_idlfile::BroadcastTaskMsg* mutable_task(); - inline ::kbd_idlfile::BroadcastTaskMsg* release_task(); - inline void set_allocated_task(::kbd_idlfile::BroadcastTaskMsg* task); + inline const ::iot_idl::BroadcastTaskMsg& task() const; + inline ::iot_idl::BroadcastTaskMsg* mutable_task(); + inline ::iot_idl::BroadcastTaskMsg* release_task(); + inline void set_allocated_task(::iot_idl::BroadcastTaskMsg* task); // required bool isSuccess = 3; inline bool has_issuccess() const; @@ -1299,12 +1299,12 @@ class IDL_FILES_EXPORT BroadcastResultMsg : public ::google::protobuf::Message { inline bool issuccess() const; inline void set_issuccess(bool value); - // required .kbd_idlfile.enTaskStatusType status = 4; + // required .iot_idl.enTaskStatusType status = 4; inline bool has_status() const; inline void clear_status(); static const int kStatusFieldNumber = 4; - inline ::kbd_idlfile::enTaskStatusType status() const; - inline void set_status(::kbd_idlfile::enTaskStatusType value); + inline ::iot_idl::enTaskStatusType status() const; + inline void set_status(::iot_idl::enTaskStatusType value); // required string resultStr = 5; inline bool has_resultstr() const; @@ -1344,7 +1344,7 @@ class IDL_FILES_EXPORT BroadcastResultMsg : public ::google::protobuf::Message { inline ::std::string* release_pathfile(); inline void set_allocated_pathfile(::std::string* pathfile); - // @@protoc_insertion_point(class_scope:kbd_idlfile.BroadcastResultMsg) + // @@protoc_insertion_point(class_scope:iot_idl.BroadcastResultMsg) private: inline void set_has_hostname(); inline void clear_has_hostname(); @@ -1368,7 +1368,7 @@ class IDL_FILES_EXPORT BroadcastResultMsg : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* hostname_; - ::kbd_idlfile::BroadcastTaskMsg* task_; + ::iot_idl::BroadcastTaskMsg* task_; bool issuccess_; int status_; ::std::string* resultstr_; @@ -1404,13 +1404,13 @@ inline void DataBlock::clear_index() { clear_has_index(); } inline ::google::protobuf::uint64 DataBlock::index() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataBlock.index) + // @@protoc_insertion_point(field_get:iot_idl.DataBlock.index) return index_; } inline void DataBlock::set_index(::google::protobuf::uint64 value) { set_has_index(); index_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DataBlock.index) + // @@protoc_insertion_point(field_set:iot_idl.DataBlock.index) } // required uint64 offset = 2; @@ -1428,13 +1428,13 @@ inline void DataBlock::clear_offset() { clear_has_offset(); } inline ::google::protobuf::uint64 DataBlock::offset() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataBlock.offset) + // @@protoc_insertion_point(field_get:iot_idl.DataBlock.offset) return offset_; } inline void DataBlock::set_offset(::google::protobuf::uint64 value) { set_has_offset(); offset_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DataBlock.offset) + // @@protoc_insertion_point(field_set:iot_idl.DataBlock.offset) } // required uint64 len = 3; @@ -1452,13 +1452,13 @@ inline void DataBlock::clear_len() { clear_has_len(); } inline ::google::protobuf::uint64 DataBlock::len() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataBlock.len) + // @@protoc_insertion_point(field_get:iot_idl.DataBlock.len) return len_; } inline void DataBlock::set_len(::google::protobuf::uint64 value) { set_has_len(); len_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DataBlock.len) + // @@protoc_insertion_point(field_set:iot_idl.DataBlock.len) } // required bytes buff = 4; @@ -1478,7 +1478,7 @@ inline void DataBlock::clear_buff() { clear_has_buff(); } inline const ::std::string& DataBlock::buff() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataBlock.buff) + // @@protoc_insertion_point(field_get:iot_idl.DataBlock.buff) return *buff_; } inline void DataBlock::set_buff(const ::std::string& value) { @@ -1487,7 +1487,7 @@ inline void DataBlock::set_buff(const ::std::string& value) { buff_ = new ::std::string; } buff_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DataBlock.buff) + // @@protoc_insertion_point(field_set:iot_idl.DataBlock.buff) } inline void DataBlock::set_buff(const char* value) { set_has_buff(); @@ -1495,7 +1495,7 @@ inline void DataBlock::set_buff(const char* value) { buff_ = new ::std::string; } buff_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DataBlock.buff) + // @@protoc_insertion_point(field_set_char:iot_idl.DataBlock.buff) } inline void DataBlock::set_buff(const void* value, size_t size) { set_has_buff(); @@ -1503,14 +1503,14 @@ inline void DataBlock::set_buff(const void* value, size_t size) { buff_ = new ::std::string; } buff_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DataBlock.buff) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DataBlock.buff) } inline ::std::string* DataBlock::mutable_buff() { set_has_buff(); if (buff_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { buff_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DataBlock.buff) + // @@protoc_insertion_point(field_mutable:iot_idl.DataBlock.buff) return buff_; } inline ::std::string* DataBlock::release_buff() { @@ -1534,7 +1534,7 @@ inline void DataBlock::set_allocated_buff(::std::string* buff) { clear_has_buff(); buff_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DataBlock.buff) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DataBlock.buff) } // ------------------------------------------------------------------- @@ -1558,7 +1558,7 @@ inline void DataPack::clear_pathfile() { clear_has_pathfile(); } inline const ::std::string& DataPack::pathfile() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataPack.pathFile) + // @@protoc_insertion_point(field_get:iot_idl.DataPack.pathFile) return *pathfile_; } inline void DataPack::set_pathfile(const ::std::string& value) { @@ -1567,7 +1567,7 @@ inline void DataPack::set_pathfile(const ::std::string& value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DataPack.pathFile) + // @@protoc_insertion_point(field_set:iot_idl.DataPack.pathFile) } inline void DataPack::set_pathfile(const char* value) { set_has_pathfile(); @@ -1575,7 +1575,7 @@ inline void DataPack::set_pathfile(const char* value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DataPack.pathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.DataPack.pathFile) } inline void DataPack::set_pathfile(const char* value, size_t size) { set_has_pathfile(); @@ -1583,14 +1583,14 @@ inline void DataPack::set_pathfile(const char* value, size_t size) { pathfile_ = new ::std::string; } pathfile_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DataPack.pathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DataPack.pathFile) } inline ::std::string* DataPack::mutable_pathfile() { set_has_pathfile(); if (pathfile_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { pathfile_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DataPack.pathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.DataPack.pathFile) return pathfile_; } inline ::std::string* DataPack::release_pathfile() { @@ -1614,7 +1614,7 @@ inline void DataPack::set_allocated_pathfile(::std::string* pathfile) { clear_has_pathfile(); pathfile_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DataPack.pathFile) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DataPack.pathFile) } // required uint64 blockCount = 2; @@ -1632,13 +1632,13 @@ inline void DataPack::clear_blockcount() { clear_has_blockcount(); } inline ::google::protobuf::uint64 DataPack::blockcount() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataPack.blockCount) + // @@protoc_insertion_point(field_get:iot_idl.DataPack.blockCount) return blockcount_; } inline void DataPack::set_blockcount(::google::protobuf::uint64 value) { set_has_blockcount(); blockcount_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DataPack.blockCount) + // @@protoc_insertion_point(field_set:iot_idl.DataPack.blockCount) } // required int32 isDir = 3; @@ -1656,13 +1656,13 @@ inline void DataPack::clear_isdir() { clear_has_isdir(); } inline ::google::protobuf::int32 DataPack::isdir() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataPack.isDir) + // @@protoc_insertion_point(field_get:iot_idl.DataPack.isDir) return isdir_; } inline void DataPack::set_isdir(::google::protobuf::int32 value) { set_has_isdir(); isdir_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DataPack.isDir) + // @@protoc_insertion_point(field_set:iot_idl.DataPack.isDir) } // required uint64 fileSize = 4; @@ -1680,13 +1680,13 @@ inline void DataPack::clear_filesize() { clear_has_filesize(); } inline ::google::protobuf::uint64 DataPack::filesize() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataPack.fileSize) + // @@protoc_insertion_point(field_get:iot_idl.DataPack.fileSize) return filesize_; } inline void DataPack::set_filesize(::google::protobuf::uint64 value) { set_has_filesize(); filesize_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DataPack.fileSize) + // @@protoc_insertion_point(field_set:iot_idl.DataPack.fileSize) } // required string checkCode = 5; @@ -1706,7 +1706,7 @@ inline void DataPack::clear_checkcode() { clear_has_checkcode(); } inline const ::std::string& DataPack::checkcode() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataPack.checkCode) + // @@protoc_insertion_point(field_get:iot_idl.DataPack.checkCode) return *checkcode_; } inline void DataPack::set_checkcode(const ::std::string& value) { @@ -1715,7 +1715,7 @@ inline void DataPack::set_checkcode(const ::std::string& value) { checkcode_ = new ::std::string; } checkcode_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DataPack.checkCode) + // @@protoc_insertion_point(field_set:iot_idl.DataPack.checkCode) } inline void DataPack::set_checkcode(const char* value) { set_has_checkcode(); @@ -1723,7 +1723,7 @@ inline void DataPack::set_checkcode(const char* value) { checkcode_ = new ::std::string; } checkcode_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DataPack.checkCode) + // @@protoc_insertion_point(field_set_char:iot_idl.DataPack.checkCode) } inline void DataPack::set_checkcode(const char* value, size_t size) { set_has_checkcode(); @@ -1731,14 +1731,14 @@ inline void DataPack::set_checkcode(const char* value, size_t size) { checkcode_ = new ::std::string; } checkcode_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DataPack.checkCode) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DataPack.checkCode) } inline ::std::string* DataPack::mutable_checkcode() { set_has_checkcode(); if (checkcode_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { checkcode_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DataPack.checkCode) + // @@protoc_insertion_point(field_mutable:iot_idl.DataPack.checkCode) return checkcode_; } inline ::std::string* DataPack::release_checkcode() { @@ -1762,10 +1762,10 @@ inline void DataPack::set_allocated_checkcode(::std::string* checkcode) { clear_has_checkcode(); checkcode_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DataPack.checkCode) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DataPack.checkCode) } -// optional .kbd_idlfile.DataBlock dataBlock = 6; +// optional .iot_idl.DataBlock dataBlock = 6; inline bool DataPack::has_datablock() const { return (_has_bits_[0] & 0x00000020u) != 0; } @@ -1776,26 +1776,26 @@ inline void DataPack::clear_has_datablock() { _has_bits_[0] &= ~0x00000020u; } inline void DataPack::clear_datablock() { - if (datablock_ != NULL) datablock_->::kbd_idlfile::DataBlock::Clear(); + if (datablock_ != NULL) datablock_->::iot_idl::DataBlock::Clear(); clear_has_datablock(); } -inline const ::kbd_idlfile::DataBlock& DataPack::datablock() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataPack.dataBlock) +inline const ::iot_idl::DataBlock& DataPack::datablock() const { + // @@protoc_insertion_point(field_get:iot_idl.DataPack.dataBlock) return datablock_ != NULL ? *datablock_ : *default_instance_->datablock_; } -inline ::kbd_idlfile::DataBlock* DataPack::mutable_datablock() { +inline ::iot_idl::DataBlock* DataPack::mutable_datablock() { set_has_datablock(); - if (datablock_ == NULL) datablock_ = new ::kbd_idlfile::DataBlock; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DataPack.dataBlock) + if (datablock_ == NULL) datablock_ = new ::iot_idl::DataBlock; + // @@protoc_insertion_point(field_mutable:iot_idl.DataPack.dataBlock) return datablock_; } -inline ::kbd_idlfile::DataBlock* DataPack::release_datablock() { +inline ::iot_idl::DataBlock* DataPack::release_datablock() { clear_has_datablock(); - ::kbd_idlfile::DataBlock* temp = datablock_; + ::iot_idl::DataBlock* temp = datablock_; datablock_ = NULL; return temp; } -inline void DataPack::set_allocated_datablock(::kbd_idlfile::DataBlock* datablock) { +inline void DataPack::set_allocated_datablock(::iot_idl::DataBlock* datablock) { delete datablock_; datablock_ = datablock; if (datablock) { @@ -1803,7 +1803,7 @@ inline void DataPack::set_allocated_datablock(::kbd_idlfile::DataBlock* databloc } else { clear_has_datablock(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DataPack.dataBlock) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DataPack.dataBlock) } // optional string renamePathFile = 7; @@ -1823,7 +1823,7 @@ inline void DataPack::clear_renamepathfile() { clear_has_renamepathfile(); } inline const ::std::string& DataPack::renamepathfile() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DataPack.renamePathFile) + // @@protoc_insertion_point(field_get:iot_idl.DataPack.renamePathFile) return *renamepathfile_; } inline void DataPack::set_renamepathfile(const ::std::string& value) { @@ -1832,7 +1832,7 @@ inline void DataPack::set_renamepathfile(const ::std::string& value) { renamepathfile_ = new ::std::string; } renamepathfile_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DataPack.renamePathFile) + // @@protoc_insertion_point(field_set:iot_idl.DataPack.renamePathFile) } inline void DataPack::set_renamepathfile(const char* value) { set_has_renamepathfile(); @@ -1840,7 +1840,7 @@ inline void DataPack::set_renamepathfile(const char* value) { renamepathfile_ = new ::std::string; } renamepathfile_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DataPack.renamePathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.DataPack.renamePathFile) } inline void DataPack::set_renamepathfile(const char* value, size_t size) { set_has_renamepathfile(); @@ -1848,14 +1848,14 @@ inline void DataPack::set_renamepathfile(const char* value, size_t size) { renamepathfile_ = new ::std::string; } renamepathfile_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DataPack.renamePathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DataPack.renamePathFile) } inline ::std::string* DataPack::mutable_renamepathfile() { set_has_renamepathfile(); if (renamepathfile_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { renamepathfile_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DataPack.renamePathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.DataPack.renamePathFile) return renamepathfile_; } inline ::std::string* DataPack::release_renamepathfile() { @@ -1879,7 +1879,7 @@ inline void DataPack::set_allocated_renamepathfile(::std::string* renamepathfile clear_has_renamepathfile(); renamepathfile_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DataPack.renamePathFile) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DataPack.renamePathFile) } // ------------------------------------------------------------------- @@ -1903,7 +1903,7 @@ inline void FileNode::clear_pathfile() { clear_has_pathfile(); } inline const ::std::string& FileNode::pathfile() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNode.pathFile) + // @@protoc_insertion_point(field_get:iot_idl.FileNode.pathFile) return *pathfile_; } inline void FileNode::set_pathfile(const ::std::string& value) { @@ -1912,7 +1912,7 @@ inline void FileNode::set_pathfile(const ::std::string& value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNode.pathFile) + // @@protoc_insertion_point(field_set:iot_idl.FileNode.pathFile) } inline void FileNode::set_pathfile(const char* value) { set_has_pathfile(); @@ -1920,7 +1920,7 @@ inline void FileNode::set_pathfile(const char* value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileNode.pathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.FileNode.pathFile) } inline void FileNode::set_pathfile(const char* value, size_t size) { set_has_pathfile(); @@ -1928,14 +1928,14 @@ inline void FileNode::set_pathfile(const char* value, size_t size) { pathfile_ = new ::std::string; } pathfile_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileNode.pathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileNode.pathFile) } inline ::std::string* FileNode::mutable_pathfile() { set_has_pathfile(); if (pathfile_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { pathfile_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileNode.pathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.FileNode.pathFile) return pathfile_; } inline ::std::string* FileNode::release_pathfile() { @@ -1959,7 +1959,7 @@ inline void FileNode::set_allocated_pathfile(::std::string* pathfile) { clear_has_pathfile(); pathfile_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileNode.pathFile) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileNode.pathFile) } // required int32 isDir = 2; @@ -1977,13 +1977,13 @@ inline void FileNode::clear_isdir() { clear_has_isdir(); } inline ::google::protobuf::int32 FileNode::isdir() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNode.isDir) + // @@protoc_insertion_point(field_get:iot_idl.FileNode.isDir) return isdir_; } inline void FileNode::set_isdir(::google::protobuf::int32 value) { set_has_isdir(); isdir_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNode.isDir) + // @@protoc_insertion_point(field_set:iot_idl.FileNode.isDir) } // required int32 isConfigPath = 3; @@ -2001,13 +2001,13 @@ inline void FileNode::clear_isconfigpath() { clear_has_isconfigpath(); } inline ::google::protobuf::int32 FileNode::isconfigpath() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNode.isConfigPath) + // @@protoc_insertion_point(field_get:iot_idl.FileNode.isConfigPath) return isconfigpath_; } inline void FileNode::set_isconfigpath(::google::protobuf::int32 value) { set_has_isconfigpath(); isconfigpath_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNode.isConfigPath) + // @@protoc_insertion_point(field_set:iot_idl.FileNode.isConfigPath) } // optional uint64 fileSize = 4; @@ -2025,13 +2025,13 @@ inline void FileNode::clear_filesize() { clear_has_filesize(); } inline ::google::protobuf::uint64 FileNode::filesize() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNode.fileSize) + // @@protoc_insertion_point(field_get:iot_idl.FileNode.fileSize) return filesize_; } inline void FileNode::set_filesize(::google::protobuf::uint64 value) { set_has_filesize(); filesize_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNode.fileSize) + // @@protoc_insertion_point(field_set:iot_idl.FileNode.fileSize) } // optional uint64 modifyTime = 5; @@ -2049,42 +2049,42 @@ inline void FileNode::clear_modifytime() { clear_has_modifytime(); } inline ::google::protobuf::uint64 FileNode::modifytime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNode.modifyTime) + // @@protoc_insertion_point(field_get:iot_idl.FileNode.modifyTime) return modifytime_; } inline void FileNode::set_modifytime(::google::protobuf::uint64 value) { set_has_modifytime(); modifytime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNode.modifyTime) + // @@protoc_insertion_point(field_set:iot_idl.FileNode.modifyTime) } -// repeated .kbd_idlfile.FileNode childNode = 6; +// repeated .iot_idl.FileNode childNode = 6; inline int FileNode::childnode_size() const { return childnode_.size(); } inline void FileNode::clear_childnode() { childnode_.Clear(); } -inline const ::kbd_idlfile::FileNode& FileNode::childnode(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNode.childNode) +inline const ::iot_idl::FileNode& FileNode::childnode(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.FileNode.childNode) return childnode_.Get(index); } -inline ::kbd_idlfile::FileNode* FileNode::mutable_childnode(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileNode.childNode) +inline ::iot_idl::FileNode* FileNode::mutable_childnode(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.FileNode.childNode) return childnode_.Mutable(index); } -inline ::kbd_idlfile::FileNode* FileNode::add_childnode() { - // @@protoc_insertion_point(field_add:kbd_idlfile.FileNode.childNode) +inline ::iot_idl::FileNode* FileNode::add_childnode() { + // @@protoc_insertion_point(field_add:iot_idl.FileNode.childNode) return childnode_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >& FileNode::childnode() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.FileNode.childNode) + // @@protoc_insertion_point(field_list:iot_idl.FileNode.childNode) return childnode_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >* FileNode::mutable_childnode() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.FileNode.childNode) + // @@protoc_insertion_point(field_mutable_list:iot_idl.FileNode.childNode) return &childnode_; } @@ -2109,7 +2109,7 @@ inline void FileNodeReqMsg::clear_hostname() { clear_has_hostname(); } inline const ::std::string& FileNodeReqMsg::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNodeReqMsg.hostName) + // @@protoc_insertion_point(field_get:iot_idl.FileNodeReqMsg.hostName) return *hostname_; } inline void FileNodeReqMsg::set_hostname(const ::std::string& value) { @@ -2118,7 +2118,7 @@ inline void FileNodeReqMsg::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNodeReqMsg.hostName) + // @@protoc_insertion_point(field_set:iot_idl.FileNodeReqMsg.hostName) } inline void FileNodeReqMsg::set_hostname(const char* value) { set_has_hostname(); @@ -2126,7 +2126,7 @@ inline void FileNodeReqMsg::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileNodeReqMsg.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.FileNodeReqMsg.hostName) } inline void FileNodeReqMsg::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -2134,14 +2134,14 @@ inline void FileNodeReqMsg::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileNodeReqMsg.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileNodeReqMsg.hostName) } inline ::std::string* FileNodeReqMsg::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileNodeReqMsg.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.FileNodeReqMsg.hostName) return hostname_; } inline ::std::string* FileNodeReqMsg::release_hostname() { @@ -2165,7 +2165,7 @@ inline void FileNodeReqMsg::set_allocated_hostname(::std::string* hostname) { clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileNodeReqMsg.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileNodeReqMsg.hostName) } // repeated string pathFile = 2; @@ -2176,49 +2176,49 @@ inline void FileNodeReqMsg::clear_pathfile() { pathfile_.Clear(); } inline const ::std::string& FileNodeReqMsg::pathfile(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_get:iot_idl.FileNodeReqMsg.pathFile) return pathfile_.Get(index); } inline ::std::string* FileNodeReqMsg::mutable_pathfile(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.FileNodeReqMsg.pathFile) return pathfile_.Mutable(index); } inline void FileNodeReqMsg::set_pathfile(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_set:iot_idl.FileNodeReqMsg.pathFile) pathfile_.Mutable(index)->assign(value); } inline void FileNodeReqMsg::set_pathfile(int index, const char* value) { pathfile_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.FileNodeReqMsg.pathFile) } inline void FileNodeReqMsg::set_pathfile(int index, const char* value, size_t size) { pathfile_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileNodeReqMsg.pathFile) } inline ::std::string* FileNodeReqMsg::add_pathfile() { return pathfile_.Add(); } inline void FileNodeReqMsg::add_pathfile(const ::std::string& value) { pathfile_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_add:iot_idl.FileNodeReqMsg.pathFile) } inline void FileNodeReqMsg::add_pathfile(const char* value) { pathfile_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_add_char:iot_idl.FileNodeReqMsg.pathFile) } inline void FileNodeReqMsg::add_pathfile(const char* value, size_t size) { pathfile_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_add_pointer:iot_idl.FileNodeReqMsg.pathFile) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& FileNodeReqMsg::pathfile() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_list:iot_idl.FileNodeReqMsg.pathFile) return pathfile_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* FileNodeReqMsg::mutable_pathfile() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.FileNodeReqMsg.pathFile) + // @@protoc_insertion_point(field_mutable_list:iot_idl.FileNodeReqMsg.pathFile) return &pathfile_; } @@ -2243,7 +2243,7 @@ inline void FileNodeRespMsg::clear_hostname() { clear_has_hostname(); } inline const ::std::string& FileNodeRespMsg::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNodeRespMsg.hostName) + // @@protoc_insertion_point(field_get:iot_idl.FileNodeRespMsg.hostName) return *hostname_; } inline void FileNodeRespMsg::set_hostname(const ::std::string& value) { @@ -2252,7 +2252,7 @@ inline void FileNodeRespMsg::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNodeRespMsg.hostName) + // @@protoc_insertion_point(field_set:iot_idl.FileNodeRespMsg.hostName) } inline void FileNodeRespMsg::set_hostname(const char* value) { set_has_hostname(); @@ -2260,7 +2260,7 @@ inline void FileNodeRespMsg::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileNodeRespMsg.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.FileNodeRespMsg.hostName) } inline void FileNodeRespMsg::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -2268,14 +2268,14 @@ inline void FileNodeRespMsg::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileNodeRespMsg.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileNodeRespMsg.hostName) } inline ::std::string* FileNodeRespMsg::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileNodeRespMsg.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.FileNodeRespMsg.hostName) return hostname_; } inline ::std::string* FileNodeRespMsg::release_hostname() { @@ -2299,7 +2299,7 @@ inline void FileNodeRespMsg::set_allocated_hostname(::std::string* hostname) { clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileNodeRespMsg.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileNodeRespMsg.hostName) } // required int32 isRoot = 2; @@ -2317,42 +2317,42 @@ inline void FileNodeRespMsg::clear_isroot() { clear_has_isroot(); } inline ::google::protobuf::int32 FileNodeRespMsg::isroot() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNodeRespMsg.isRoot) + // @@protoc_insertion_point(field_get:iot_idl.FileNodeRespMsg.isRoot) return isroot_; } inline void FileNodeRespMsg::set_isroot(::google::protobuf::int32 value) { set_has_isroot(); isroot_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.FileNodeRespMsg.isRoot) + // @@protoc_insertion_point(field_set:iot_idl.FileNodeRespMsg.isRoot) } -// repeated .kbd_idlfile.FileNode node = 3; +// repeated .iot_idl.FileNode node = 3; inline int FileNodeRespMsg::node_size() const { return node_.size(); } inline void FileNodeRespMsg::clear_node() { node_.Clear(); } -inline const ::kbd_idlfile::FileNode& FileNodeRespMsg::node(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileNodeRespMsg.node) +inline const ::iot_idl::FileNode& FileNodeRespMsg::node(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.FileNodeRespMsg.node) return node_.Get(index); } -inline ::kbd_idlfile::FileNode* FileNodeRespMsg::mutable_node(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileNodeRespMsg.node) +inline ::iot_idl::FileNode* FileNodeRespMsg::mutable_node(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.FileNodeRespMsg.node) return node_.Mutable(index); } -inline ::kbd_idlfile::FileNode* FileNodeRespMsg::add_node() { - // @@protoc_insertion_point(field_add:kbd_idlfile.FileNodeRespMsg.node) +inline ::iot_idl::FileNode* FileNodeRespMsg::add_node() { + // @@protoc_insertion_point(field_add:iot_idl.FileNodeRespMsg.node) return node_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >& FileNodeRespMsg::node() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.FileNodeRespMsg.node) + // @@protoc_insertion_point(field_list:iot_idl.FileNodeRespMsg.node) return node_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::FileNode >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::FileNode >* FileNodeRespMsg::mutable_node() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.FileNodeRespMsg.node) + // @@protoc_insertion_point(field_mutable_list:iot_idl.FileNodeRespMsg.node) return &node_; } @@ -2377,7 +2377,7 @@ inline void FileChangeReqMsg::clear_hostname() { clear_has_hostname(); } inline const ::std::string& FileChangeReqMsg::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileChangeReqMsg.hostName) + // @@protoc_insertion_point(field_get:iot_idl.FileChangeReqMsg.hostName) return *hostname_; } inline void FileChangeReqMsg::set_hostname(const ::std::string& value) { @@ -2386,7 +2386,7 @@ inline void FileChangeReqMsg::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.FileChangeReqMsg.hostName) + // @@protoc_insertion_point(field_set:iot_idl.FileChangeReqMsg.hostName) } inline void FileChangeReqMsg::set_hostname(const char* value) { set_has_hostname(); @@ -2394,7 +2394,7 @@ inline void FileChangeReqMsg::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileChangeReqMsg.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.FileChangeReqMsg.hostName) } inline void FileChangeReqMsg::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -2402,14 +2402,14 @@ inline void FileChangeReqMsg::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileChangeReqMsg.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileChangeReqMsg.hostName) } inline ::std::string* FileChangeReqMsg::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileChangeReqMsg.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.FileChangeReqMsg.hostName) return hostname_; } inline ::std::string* FileChangeReqMsg::release_hostname() { @@ -2433,7 +2433,7 @@ inline void FileChangeReqMsg::set_allocated_hostname(::std::string* hostname) { clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileChangeReqMsg.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileChangeReqMsg.hostName) } // required int32 optType = 2; @@ -2451,13 +2451,13 @@ inline void FileChangeReqMsg::clear_opttype() { clear_has_opttype(); } inline ::google::protobuf::int32 FileChangeReqMsg::opttype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileChangeReqMsg.optType) + // @@protoc_insertion_point(field_get:iot_idl.FileChangeReqMsg.optType) return opttype_; } inline void FileChangeReqMsg::set_opttype(::google::protobuf::int32 value) { set_has_opttype(); opttype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.FileChangeReqMsg.optType) + // @@protoc_insertion_point(field_set:iot_idl.FileChangeReqMsg.optType) } // required string pathFile = 3; @@ -2477,7 +2477,7 @@ inline void FileChangeReqMsg::clear_pathfile() { clear_has_pathfile(); } inline const ::std::string& FileChangeReqMsg::pathfile() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileChangeReqMsg.pathFile) + // @@protoc_insertion_point(field_get:iot_idl.FileChangeReqMsg.pathFile) return *pathfile_; } inline void FileChangeReqMsg::set_pathfile(const ::std::string& value) { @@ -2486,7 +2486,7 @@ inline void FileChangeReqMsg::set_pathfile(const ::std::string& value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.FileChangeReqMsg.pathFile) + // @@protoc_insertion_point(field_set:iot_idl.FileChangeReqMsg.pathFile) } inline void FileChangeReqMsg::set_pathfile(const char* value) { set_has_pathfile(); @@ -2494,7 +2494,7 @@ inline void FileChangeReqMsg::set_pathfile(const char* value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileChangeReqMsg.pathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.FileChangeReqMsg.pathFile) } inline void FileChangeReqMsg::set_pathfile(const char* value, size_t size) { set_has_pathfile(); @@ -2502,14 +2502,14 @@ inline void FileChangeReqMsg::set_pathfile(const char* value, size_t size) { pathfile_ = new ::std::string; } pathfile_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileChangeReqMsg.pathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileChangeReqMsg.pathFile) } inline ::std::string* FileChangeReqMsg::mutable_pathfile() { set_has_pathfile(); if (pathfile_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { pathfile_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileChangeReqMsg.pathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.FileChangeReqMsg.pathFile) return pathfile_; } inline ::std::string* FileChangeReqMsg::release_pathfile() { @@ -2533,7 +2533,7 @@ inline void FileChangeReqMsg::set_allocated_pathfile(::std::string* pathfile) { clear_has_pathfile(); pathfile_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileChangeReqMsg.pathFile) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileChangeReqMsg.pathFile) } // ------------------------------------------------------------------- @@ -2557,7 +2557,7 @@ inline void FileChangeExeMsg::clear_hostname() { clear_has_hostname(); } inline const ::std::string& FileChangeExeMsg::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileChangeExeMsg.hostName) + // @@protoc_insertion_point(field_get:iot_idl.FileChangeExeMsg.hostName) return *hostname_; } inline void FileChangeExeMsg::set_hostname(const ::std::string& value) { @@ -2566,7 +2566,7 @@ inline void FileChangeExeMsg::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.FileChangeExeMsg.hostName) + // @@protoc_insertion_point(field_set:iot_idl.FileChangeExeMsg.hostName) } inline void FileChangeExeMsg::set_hostname(const char* value) { set_has_hostname(); @@ -2574,7 +2574,7 @@ inline void FileChangeExeMsg::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileChangeExeMsg.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.FileChangeExeMsg.hostName) } inline void FileChangeExeMsg::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -2582,14 +2582,14 @@ inline void FileChangeExeMsg::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileChangeExeMsg.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileChangeExeMsg.hostName) } inline ::std::string* FileChangeExeMsg::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileChangeExeMsg.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.FileChangeExeMsg.hostName) return hostname_; } inline ::std::string* FileChangeExeMsg::release_hostname() { @@ -2613,7 +2613,7 @@ inline void FileChangeExeMsg::set_allocated_hostname(::std::string* hostname) { clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileChangeExeMsg.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileChangeExeMsg.hostName) } // required int32 optType = 2; @@ -2631,13 +2631,13 @@ inline void FileChangeExeMsg::clear_opttype() { clear_has_opttype(); } inline ::google::protobuf::int32 FileChangeExeMsg::opttype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileChangeExeMsg.optType) + // @@protoc_insertion_point(field_get:iot_idl.FileChangeExeMsg.optType) return opttype_; } inline void FileChangeExeMsg::set_opttype(::google::protobuf::int32 value) { set_has_opttype(); opttype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.FileChangeExeMsg.optType) + // @@protoc_insertion_point(field_set:iot_idl.FileChangeExeMsg.optType) } // required string pathFile = 3; @@ -2657,7 +2657,7 @@ inline void FileChangeExeMsg::clear_pathfile() { clear_has_pathfile(); } inline const ::std::string& FileChangeExeMsg::pathfile() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileChangeExeMsg.pathFile) + // @@protoc_insertion_point(field_get:iot_idl.FileChangeExeMsg.pathFile) return *pathfile_; } inline void FileChangeExeMsg::set_pathfile(const ::std::string& value) { @@ -2666,7 +2666,7 @@ inline void FileChangeExeMsg::set_pathfile(const ::std::string& value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.FileChangeExeMsg.pathFile) + // @@protoc_insertion_point(field_set:iot_idl.FileChangeExeMsg.pathFile) } inline void FileChangeExeMsg::set_pathfile(const char* value) { set_has_pathfile(); @@ -2674,7 +2674,7 @@ inline void FileChangeExeMsg::set_pathfile(const char* value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.FileChangeExeMsg.pathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.FileChangeExeMsg.pathFile) } inline void FileChangeExeMsg::set_pathfile(const char* value, size_t size) { set_has_pathfile(); @@ -2682,14 +2682,14 @@ inline void FileChangeExeMsg::set_pathfile(const char* value, size_t size) { pathfile_ = new ::std::string; } pathfile_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.FileChangeExeMsg.pathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.FileChangeExeMsg.pathFile) } inline ::std::string* FileChangeExeMsg::mutable_pathfile() { set_has_pathfile(); if (pathfile_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { pathfile_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileChangeExeMsg.pathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.FileChangeExeMsg.pathFile) return pathfile_; } inline ::std::string* FileChangeExeMsg::release_pathfile() { @@ -2713,10 +2713,10 @@ inline void FileChangeExeMsg::set_allocated_pathfile(::std::string* pathfile) { clear_has_pathfile(); pathfile_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileChangeExeMsg.pathFile) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileChangeExeMsg.pathFile) } -// required .kbd_idlfile.DataPack dataPack = 4; +// required .iot_idl.DataPack dataPack = 4; inline bool FileChangeExeMsg::has_datapack() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -2727,26 +2727,26 @@ inline void FileChangeExeMsg::clear_has_datapack() { _has_bits_[0] &= ~0x00000008u; } inline void FileChangeExeMsg::clear_datapack() { - if (datapack_ != NULL) datapack_->::kbd_idlfile::DataPack::Clear(); + if (datapack_ != NULL) datapack_->::iot_idl::DataPack::Clear(); clear_has_datapack(); } -inline const ::kbd_idlfile::DataPack& FileChangeExeMsg::datapack() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.FileChangeExeMsg.dataPack) +inline const ::iot_idl::DataPack& FileChangeExeMsg::datapack() const { + // @@protoc_insertion_point(field_get:iot_idl.FileChangeExeMsg.dataPack) return datapack_ != NULL ? *datapack_ : *default_instance_->datapack_; } -inline ::kbd_idlfile::DataPack* FileChangeExeMsg::mutable_datapack() { +inline ::iot_idl::DataPack* FileChangeExeMsg::mutable_datapack() { set_has_datapack(); - if (datapack_ == NULL) datapack_ = new ::kbd_idlfile::DataPack; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.FileChangeExeMsg.dataPack) + if (datapack_ == NULL) datapack_ = new ::iot_idl::DataPack; + // @@protoc_insertion_point(field_mutable:iot_idl.FileChangeExeMsg.dataPack) return datapack_; } -inline ::kbd_idlfile::DataPack* FileChangeExeMsg::release_datapack() { +inline ::iot_idl::DataPack* FileChangeExeMsg::release_datapack() { clear_has_datapack(); - ::kbd_idlfile::DataPack* temp = datapack_; + ::iot_idl::DataPack* temp = datapack_; datapack_ = NULL; return temp; } -inline void FileChangeExeMsg::set_allocated_datapack(::kbd_idlfile::DataPack* datapack) { +inline void FileChangeExeMsg::set_allocated_datapack(::iot_idl::DataPack* datapack) { delete datapack_; datapack_ = datapack; if (datapack) { @@ -2754,7 +2754,7 @@ inline void FileChangeExeMsg::set_allocated_datapack(::kbd_idlfile::DataPack* da } else { clear_has_datapack(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.FileChangeExeMsg.dataPack) + // @@protoc_insertion_point(field_set_allocated:iot_idl.FileChangeExeMsg.dataPack) } // ------------------------------------------------------------------- @@ -2778,7 +2778,7 @@ inline void BroadcastTaskMsg::clear_hostname() { clear_has_hostname(); } inline const ::std::string& BroadcastTaskMsg::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastTaskMsg.hostName) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastTaskMsg.hostName) return *hostname_; } inline void BroadcastTaskMsg::set_hostname(const ::std::string& value) { @@ -2787,7 +2787,7 @@ inline void BroadcastTaskMsg::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastTaskMsg.hostName) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastTaskMsg.hostName) } inline void BroadcastTaskMsg::set_hostname(const char* value) { set_has_hostname(); @@ -2795,7 +2795,7 @@ inline void BroadcastTaskMsg::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.BroadcastTaskMsg.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.BroadcastTaskMsg.hostName) } inline void BroadcastTaskMsg::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -2803,14 +2803,14 @@ inline void BroadcastTaskMsg::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.BroadcastTaskMsg.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.BroadcastTaskMsg.hostName) } inline ::std::string* BroadcastTaskMsg::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.BroadcastTaskMsg.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.BroadcastTaskMsg.hostName) return hostname_; } inline ::std::string* BroadcastTaskMsg::release_hostname() { @@ -2834,7 +2834,7 @@ inline void BroadcastTaskMsg::set_allocated_hostname(::std::string* hostname) { clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.BroadcastTaskMsg.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.BroadcastTaskMsg.hostName) } // required string recvHostName = 2; @@ -2854,7 +2854,7 @@ inline void BroadcastTaskMsg::clear_recvhostname() { clear_has_recvhostname(); } inline const ::std::string& BroadcastTaskMsg::recvhostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastTaskMsg.recvHostName) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastTaskMsg.recvHostName) return *recvhostname_; } inline void BroadcastTaskMsg::set_recvhostname(const ::std::string& value) { @@ -2863,7 +2863,7 @@ inline void BroadcastTaskMsg::set_recvhostname(const ::std::string& value) { recvhostname_ = new ::std::string; } recvhostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastTaskMsg.recvHostName) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastTaskMsg.recvHostName) } inline void BroadcastTaskMsg::set_recvhostname(const char* value) { set_has_recvhostname(); @@ -2871,7 +2871,7 @@ inline void BroadcastTaskMsg::set_recvhostname(const char* value) { recvhostname_ = new ::std::string; } recvhostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.BroadcastTaskMsg.recvHostName) + // @@protoc_insertion_point(field_set_char:iot_idl.BroadcastTaskMsg.recvHostName) } inline void BroadcastTaskMsg::set_recvhostname(const char* value, size_t size) { set_has_recvhostname(); @@ -2879,14 +2879,14 @@ inline void BroadcastTaskMsg::set_recvhostname(const char* value, size_t size) { recvhostname_ = new ::std::string; } recvhostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.BroadcastTaskMsg.recvHostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.BroadcastTaskMsg.recvHostName) } inline ::std::string* BroadcastTaskMsg::mutable_recvhostname() { set_has_recvhostname(); if (recvhostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { recvhostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.BroadcastTaskMsg.recvHostName) + // @@protoc_insertion_point(field_mutable:iot_idl.BroadcastTaskMsg.recvHostName) return recvhostname_; } inline ::std::string* BroadcastTaskMsg::release_recvhostname() { @@ -2910,7 +2910,7 @@ inline void BroadcastTaskMsg::set_allocated_recvhostname(::std::string* recvhost clear_has_recvhostname(); recvhostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.BroadcastTaskMsg.recvHostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.BroadcastTaskMsg.recvHostName) } // required uint64 taskTime = 3; @@ -2928,13 +2928,13 @@ inline void BroadcastTaskMsg::clear_tasktime() { clear_has_tasktime(); } inline ::google::protobuf::uint64 BroadcastTaskMsg::tasktime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastTaskMsg.taskTime) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastTaskMsg.taskTime) return tasktime_; } inline void BroadcastTaskMsg::set_tasktime(::google::protobuf::uint64 value) { set_has_tasktime(); tasktime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastTaskMsg.taskTime) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastTaskMsg.taskTime) } // repeated string pathFile = 4; @@ -2945,53 +2945,53 @@ inline void BroadcastTaskMsg::clear_pathfile() { pathfile_.Clear(); } inline const ::std::string& BroadcastTaskMsg::pathfile(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastTaskMsg.pathFile) return pathfile_.Get(index); } inline ::std::string* BroadcastTaskMsg::mutable_pathfile(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.BroadcastTaskMsg.pathFile) return pathfile_.Mutable(index); } inline void BroadcastTaskMsg::set_pathfile(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastTaskMsg.pathFile) pathfile_.Mutable(index)->assign(value); } inline void BroadcastTaskMsg::set_pathfile(int index, const char* value) { pathfile_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.BroadcastTaskMsg.pathFile) } inline void BroadcastTaskMsg::set_pathfile(int index, const char* value, size_t size) { pathfile_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.BroadcastTaskMsg.pathFile) } inline ::std::string* BroadcastTaskMsg::add_pathfile() { return pathfile_.Add(); } inline void BroadcastTaskMsg::add_pathfile(const ::std::string& value) { pathfile_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_add:iot_idl.BroadcastTaskMsg.pathFile) } inline void BroadcastTaskMsg::add_pathfile(const char* value) { pathfile_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_add_char:iot_idl.BroadcastTaskMsg.pathFile) } inline void BroadcastTaskMsg::add_pathfile(const char* value, size_t size) { pathfile_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_add_pointer:iot_idl.BroadcastTaskMsg.pathFile) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& BroadcastTaskMsg::pathfile() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_list:iot_idl.BroadcastTaskMsg.pathFile) return pathfile_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* BroadcastTaskMsg::mutable_pathfile() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.BroadcastTaskMsg.pathFile) + // @@protoc_insertion_point(field_mutable_list:iot_idl.BroadcastTaskMsg.pathFile) return &pathfile_; } -// required .kbd_idlfile.enTaskType operate = 5; +// required .iot_idl.enTaskType operate = 5; inline bool BroadcastTaskMsg::has_operate() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -3005,15 +3005,15 @@ inline void BroadcastTaskMsg::clear_operate() { operate_ = 0; clear_has_operate(); } -inline ::kbd_idlfile::enTaskType BroadcastTaskMsg::operate() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastTaskMsg.operate) - return static_cast< ::kbd_idlfile::enTaskType >(operate_); +inline ::iot_idl::enTaskType BroadcastTaskMsg::operate() const { + // @@protoc_insertion_point(field_get:iot_idl.BroadcastTaskMsg.operate) + return static_cast< ::iot_idl::enTaskType >(operate_); } -inline void BroadcastTaskMsg::set_operate(::kbd_idlfile::enTaskType value) { - assert(::kbd_idlfile::enTaskType_IsValid(value)); +inline void BroadcastTaskMsg::set_operate(::iot_idl::enTaskType value) { + assert(::iot_idl::enTaskType_IsValid(value)); set_has_operate(); operate_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastTaskMsg.operate) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastTaskMsg.operate) } // ------------------------------------------------------------------- @@ -3037,7 +3037,7 @@ inline void ExeBroadcastMsg::clear_hostname() { clear_has_hostname(); } inline const ::std::string& ExeBroadcastMsg::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ExeBroadcastMsg.hostName) + // @@protoc_insertion_point(field_get:iot_idl.ExeBroadcastMsg.hostName) return *hostname_; } inline void ExeBroadcastMsg::set_hostname(const ::std::string& value) { @@ -3046,7 +3046,7 @@ inline void ExeBroadcastMsg::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.ExeBroadcastMsg.hostName) + // @@protoc_insertion_point(field_set:iot_idl.ExeBroadcastMsg.hostName) } inline void ExeBroadcastMsg::set_hostname(const char* value) { set_has_hostname(); @@ -3054,7 +3054,7 @@ inline void ExeBroadcastMsg::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.ExeBroadcastMsg.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.ExeBroadcastMsg.hostName) } inline void ExeBroadcastMsg::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -3062,14 +3062,14 @@ inline void ExeBroadcastMsg::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.ExeBroadcastMsg.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.ExeBroadcastMsg.hostName) } inline ::std::string* ExeBroadcastMsg::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ExeBroadcastMsg.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.ExeBroadcastMsg.hostName) return hostname_; } inline ::std::string* ExeBroadcastMsg::release_hostname() { @@ -3093,10 +3093,10 @@ inline void ExeBroadcastMsg::set_allocated_hostname(::std::string* hostname) { clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.ExeBroadcastMsg.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.ExeBroadcastMsg.hostName) } -// required .kbd_idlfile.BroadcastTaskMsg task = 2; +// required .iot_idl.BroadcastTaskMsg task = 2; inline bool ExeBroadcastMsg::has_task() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3107,26 +3107,26 @@ inline void ExeBroadcastMsg::clear_has_task() { _has_bits_[0] &= ~0x00000002u; } inline void ExeBroadcastMsg::clear_task() { - if (task_ != NULL) task_->::kbd_idlfile::BroadcastTaskMsg::Clear(); + if (task_ != NULL) task_->::iot_idl::BroadcastTaskMsg::Clear(); clear_has_task(); } -inline const ::kbd_idlfile::BroadcastTaskMsg& ExeBroadcastMsg::task() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ExeBroadcastMsg.task) +inline const ::iot_idl::BroadcastTaskMsg& ExeBroadcastMsg::task() const { + // @@protoc_insertion_point(field_get:iot_idl.ExeBroadcastMsg.task) return task_ != NULL ? *task_ : *default_instance_->task_; } -inline ::kbd_idlfile::BroadcastTaskMsg* ExeBroadcastMsg::mutable_task() { +inline ::iot_idl::BroadcastTaskMsg* ExeBroadcastMsg::mutable_task() { set_has_task(); - if (task_ == NULL) task_ = new ::kbd_idlfile::BroadcastTaskMsg; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ExeBroadcastMsg.task) + if (task_ == NULL) task_ = new ::iot_idl::BroadcastTaskMsg; + // @@protoc_insertion_point(field_mutable:iot_idl.ExeBroadcastMsg.task) return task_; } -inline ::kbd_idlfile::BroadcastTaskMsg* ExeBroadcastMsg::release_task() { +inline ::iot_idl::BroadcastTaskMsg* ExeBroadcastMsg::release_task() { clear_has_task(); - ::kbd_idlfile::BroadcastTaskMsg* temp = task_; + ::iot_idl::BroadcastTaskMsg* temp = task_; task_ = NULL; return temp; } -inline void ExeBroadcastMsg::set_allocated_task(::kbd_idlfile::BroadcastTaskMsg* task) { +inline void ExeBroadcastMsg::set_allocated_task(::iot_idl::BroadcastTaskMsg* task) { delete task_; task_ = task; if (task) { @@ -3134,7 +3134,7 @@ inline void ExeBroadcastMsg::set_allocated_task(::kbd_idlfile::BroadcastTaskMsg* } else { clear_has_task(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.ExeBroadcastMsg.task) + // @@protoc_insertion_point(field_set_allocated:iot_idl.ExeBroadcastMsg.task) } // required uint64 taskTime = 3; @@ -3152,13 +3152,13 @@ inline void ExeBroadcastMsg::clear_tasktime() { clear_has_tasktime(); } inline ::google::protobuf::uint64 ExeBroadcastMsg::tasktime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ExeBroadcastMsg.taskTime) + // @@protoc_insertion_point(field_get:iot_idl.ExeBroadcastMsg.taskTime) return tasktime_; } inline void ExeBroadcastMsg::set_tasktime(::google::protobuf::uint64 value) { set_has_tasktime(); tasktime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ExeBroadcastMsg.taskTime) + // @@protoc_insertion_point(field_set:iot_idl.ExeBroadcastMsg.taskTime) } // required int32 count = 4; @@ -3176,13 +3176,13 @@ inline void ExeBroadcastMsg::clear_count() { clear_has_count(); } inline ::google::protobuf::int32 ExeBroadcastMsg::count() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ExeBroadcastMsg.count) + // @@protoc_insertion_point(field_get:iot_idl.ExeBroadcastMsg.count) return count_; } inline void ExeBroadcastMsg::set_count(::google::protobuf::int32 value) { set_has_count(); count_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ExeBroadcastMsg.count) + // @@protoc_insertion_point(field_set:iot_idl.ExeBroadcastMsg.count) } // required int32 sendCount = 5; @@ -3200,16 +3200,16 @@ inline void ExeBroadcastMsg::clear_sendcount() { clear_has_sendcount(); } inline ::google::protobuf::int32 ExeBroadcastMsg::sendcount() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ExeBroadcastMsg.sendCount) + // @@protoc_insertion_point(field_get:iot_idl.ExeBroadcastMsg.sendCount) return sendcount_; } inline void ExeBroadcastMsg::set_sendcount(::google::protobuf::int32 value) { set_has_sendcount(); sendcount_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ExeBroadcastMsg.sendCount) + // @@protoc_insertion_point(field_set:iot_idl.ExeBroadcastMsg.sendCount) } -// optional .kbd_idlfile.FileNode node = 6; +// optional .iot_idl.FileNode node = 6; inline bool ExeBroadcastMsg::has_node() const { return (_has_bits_[0] & 0x00000020u) != 0; } @@ -3220,26 +3220,26 @@ inline void ExeBroadcastMsg::clear_has_node() { _has_bits_[0] &= ~0x00000020u; } inline void ExeBroadcastMsg::clear_node() { - if (node_ != NULL) node_->::kbd_idlfile::FileNode::Clear(); + if (node_ != NULL) node_->::iot_idl::FileNode::Clear(); clear_has_node(); } -inline const ::kbd_idlfile::FileNode& ExeBroadcastMsg::node() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ExeBroadcastMsg.node) +inline const ::iot_idl::FileNode& ExeBroadcastMsg::node() const { + // @@protoc_insertion_point(field_get:iot_idl.ExeBroadcastMsg.node) return node_ != NULL ? *node_ : *default_instance_->node_; } -inline ::kbd_idlfile::FileNode* ExeBroadcastMsg::mutable_node() { +inline ::iot_idl::FileNode* ExeBroadcastMsg::mutable_node() { set_has_node(); - if (node_ == NULL) node_ = new ::kbd_idlfile::FileNode; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ExeBroadcastMsg.node) + if (node_ == NULL) node_ = new ::iot_idl::FileNode; + // @@protoc_insertion_point(field_mutable:iot_idl.ExeBroadcastMsg.node) return node_; } -inline ::kbd_idlfile::FileNode* ExeBroadcastMsg::release_node() { +inline ::iot_idl::FileNode* ExeBroadcastMsg::release_node() { clear_has_node(); - ::kbd_idlfile::FileNode* temp = node_; + ::iot_idl::FileNode* temp = node_; node_ = NULL; return temp; } -inline void ExeBroadcastMsg::set_allocated_node(::kbd_idlfile::FileNode* node) { +inline void ExeBroadcastMsg::set_allocated_node(::iot_idl::FileNode* node) { delete node_; node_ = node; if (node) { @@ -3247,10 +3247,10 @@ inline void ExeBroadcastMsg::set_allocated_node(::kbd_idlfile::FileNode* node) { } else { clear_has_node(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.ExeBroadcastMsg.node) + // @@protoc_insertion_point(field_set_allocated:iot_idl.ExeBroadcastMsg.node) } -// optional .kbd_idlfile.DataPack dataPack = 7; +// optional .iot_idl.DataPack dataPack = 7; inline bool ExeBroadcastMsg::has_datapack() const { return (_has_bits_[0] & 0x00000040u) != 0; } @@ -3261,26 +3261,26 @@ inline void ExeBroadcastMsg::clear_has_datapack() { _has_bits_[0] &= ~0x00000040u; } inline void ExeBroadcastMsg::clear_datapack() { - if (datapack_ != NULL) datapack_->::kbd_idlfile::DataPack::Clear(); + if (datapack_ != NULL) datapack_->::iot_idl::DataPack::Clear(); clear_has_datapack(); } -inline const ::kbd_idlfile::DataPack& ExeBroadcastMsg::datapack() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ExeBroadcastMsg.dataPack) +inline const ::iot_idl::DataPack& ExeBroadcastMsg::datapack() const { + // @@protoc_insertion_point(field_get:iot_idl.ExeBroadcastMsg.dataPack) return datapack_ != NULL ? *datapack_ : *default_instance_->datapack_; } -inline ::kbd_idlfile::DataPack* ExeBroadcastMsg::mutable_datapack() { +inline ::iot_idl::DataPack* ExeBroadcastMsg::mutable_datapack() { set_has_datapack(); - if (datapack_ == NULL) datapack_ = new ::kbd_idlfile::DataPack; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ExeBroadcastMsg.dataPack) + if (datapack_ == NULL) datapack_ = new ::iot_idl::DataPack; + // @@protoc_insertion_point(field_mutable:iot_idl.ExeBroadcastMsg.dataPack) return datapack_; } -inline ::kbd_idlfile::DataPack* ExeBroadcastMsg::release_datapack() { +inline ::iot_idl::DataPack* ExeBroadcastMsg::release_datapack() { clear_has_datapack(); - ::kbd_idlfile::DataPack* temp = datapack_; + ::iot_idl::DataPack* temp = datapack_; datapack_ = NULL; return temp; } -inline void ExeBroadcastMsg::set_allocated_datapack(::kbd_idlfile::DataPack* datapack) { +inline void ExeBroadcastMsg::set_allocated_datapack(::iot_idl::DataPack* datapack) { delete datapack_; datapack_ = datapack; if (datapack) { @@ -3288,7 +3288,7 @@ inline void ExeBroadcastMsg::set_allocated_datapack(::kbd_idlfile::DataPack* dat } else { clear_has_datapack(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.ExeBroadcastMsg.dataPack) + // @@protoc_insertion_point(field_set_allocated:iot_idl.ExeBroadcastMsg.dataPack) } // ------------------------------------------------------------------- @@ -3312,7 +3312,7 @@ inline void BroadcastResultMsg::clear_hostname() { clear_has_hostname(); } inline const ::std::string& BroadcastResultMsg::hostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.hostName) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.hostName) return *hostname_; } inline void BroadcastResultMsg::set_hostname(const ::std::string& value) { @@ -3321,7 +3321,7 @@ inline void BroadcastResultMsg::set_hostname(const ::std::string& value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastResultMsg.hostName) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastResultMsg.hostName) } inline void BroadcastResultMsg::set_hostname(const char* value) { set_has_hostname(); @@ -3329,7 +3329,7 @@ inline void BroadcastResultMsg::set_hostname(const char* value) { hostname_ = new ::std::string; } hostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.BroadcastResultMsg.hostName) + // @@protoc_insertion_point(field_set_char:iot_idl.BroadcastResultMsg.hostName) } inline void BroadcastResultMsg::set_hostname(const char* value, size_t size) { set_has_hostname(); @@ -3337,14 +3337,14 @@ inline void BroadcastResultMsg::set_hostname(const char* value, size_t size) { hostname_ = new ::std::string; } hostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.BroadcastResultMsg.hostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.BroadcastResultMsg.hostName) } inline ::std::string* BroadcastResultMsg::mutable_hostname() { set_has_hostname(); if (hostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.BroadcastResultMsg.hostName) + // @@protoc_insertion_point(field_mutable:iot_idl.BroadcastResultMsg.hostName) return hostname_; } inline ::std::string* BroadcastResultMsg::release_hostname() { @@ -3368,10 +3368,10 @@ inline void BroadcastResultMsg::set_allocated_hostname(::std::string* hostname) clear_has_hostname(); hostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.BroadcastResultMsg.hostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.BroadcastResultMsg.hostName) } -// required .kbd_idlfile.BroadcastTaskMsg task = 2; +// required .iot_idl.BroadcastTaskMsg task = 2; inline bool BroadcastResultMsg::has_task() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3382,26 +3382,26 @@ inline void BroadcastResultMsg::clear_has_task() { _has_bits_[0] &= ~0x00000002u; } inline void BroadcastResultMsg::clear_task() { - if (task_ != NULL) task_->::kbd_idlfile::BroadcastTaskMsg::Clear(); + if (task_ != NULL) task_->::iot_idl::BroadcastTaskMsg::Clear(); clear_has_task(); } -inline const ::kbd_idlfile::BroadcastTaskMsg& BroadcastResultMsg::task() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.task) +inline const ::iot_idl::BroadcastTaskMsg& BroadcastResultMsg::task() const { + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.task) return task_ != NULL ? *task_ : *default_instance_->task_; } -inline ::kbd_idlfile::BroadcastTaskMsg* BroadcastResultMsg::mutable_task() { +inline ::iot_idl::BroadcastTaskMsg* BroadcastResultMsg::mutable_task() { set_has_task(); - if (task_ == NULL) task_ = new ::kbd_idlfile::BroadcastTaskMsg; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.BroadcastResultMsg.task) + if (task_ == NULL) task_ = new ::iot_idl::BroadcastTaskMsg; + // @@protoc_insertion_point(field_mutable:iot_idl.BroadcastResultMsg.task) return task_; } -inline ::kbd_idlfile::BroadcastTaskMsg* BroadcastResultMsg::release_task() { +inline ::iot_idl::BroadcastTaskMsg* BroadcastResultMsg::release_task() { clear_has_task(); - ::kbd_idlfile::BroadcastTaskMsg* temp = task_; + ::iot_idl::BroadcastTaskMsg* temp = task_; task_ = NULL; return temp; } -inline void BroadcastResultMsg::set_allocated_task(::kbd_idlfile::BroadcastTaskMsg* task) { +inline void BroadcastResultMsg::set_allocated_task(::iot_idl::BroadcastTaskMsg* task) { delete task_; task_ = task; if (task) { @@ -3409,7 +3409,7 @@ inline void BroadcastResultMsg::set_allocated_task(::kbd_idlfile::BroadcastTaskM } else { clear_has_task(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.BroadcastResultMsg.task) + // @@protoc_insertion_point(field_set_allocated:iot_idl.BroadcastResultMsg.task) } // required bool isSuccess = 3; @@ -3427,16 +3427,16 @@ inline void BroadcastResultMsg::clear_issuccess() { clear_has_issuccess(); } inline bool BroadcastResultMsg::issuccess() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.isSuccess) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.isSuccess) return issuccess_; } inline void BroadcastResultMsg::set_issuccess(bool value) { set_has_issuccess(); issuccess_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastResultMsg.isSuccess) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastResultMsg.isSuccess) } -// required .kbd_idlfile.enTaskStatusType status = 4; +// required .iot_idl.enTaskStatusType status = 4; inline bool BroadcastResultMsg::has_status() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -3450,15 +3450,15 @@ inline void BroadcastResultMsg::clear_status() { status_ = 1; clear_has_status(); } -inline ::kbd_idlfile::enTaskStatusType BroadcastResultMsg::status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.status) - return static_cast< ::kbd_idlfile::enTaskStatusType >(status_); +inline ::iot_idl::enTaskStatusType BroadcastResultMsg::status() const { + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.status) + return static_cast< ::iot_idl::enTaskStatusType >(status_); } -inline void BroadcastResultMsg::set_status(::kbd_idlfile::enTaskStatusType value) { - assert(::kbd_idlfile::enTaskStatusType_IsValid(value)); +inline void BroadcastResultMsg::set_status(::iot_idl::enTaskStatusType value) { + assert(::iot_idl::enTaskStatusType_IsValid(value)); set_has_status(); status_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastResultMsg.status) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastResultMsg.status) } // required string resultStr = 5; @@ -3478,7 +3478,7 @@ inline void BroadcastResultMsg::clear_resultstr() { clear_has_resultstr(); } inline const ::std::string& BroadcastResultMsg::resultstr() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.resultStr) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.resultStr) return *resultstr_; } inline void BroadcastResultMsg::set_resultstr(const ::std::string& value) { @@ -3487,7 +3487,7 @@ inline void BroadcastResultMsg::set_resultstr(const ::std::string& value) { resultstr_ = new ::std::string; } resultstr_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastResultMsg.resultStr) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastResultMsg.resultStr) } inline void BroadcastResultMsg::set_resultstr(const char* value) { set_has_resultstr(); @@ -3495,7 +3495,7 @@ inline void BroadcastResultMsg::set_resultstr(const char* value) { resultstr_ = new ::std::string; } resultstr_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.BroadcastResultMsg.resultStr) + // @@protoc_insertion_point(field_set_char:iot_idl.BroadcastResultMsg.resultStr) } inline void BroadcastResultMsg::set_resultstr(const char* value, size_t size) { set_has_resultstr(); @@ -3503,14 +3503,14 @@ inline void BroadcastResultMsg::set_resultstr(const char* value, size_t size) { resultstr_ = new ::std::string; } resultstr_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.BroadcastResultMsg.resultStr) + // @@protoc_insertion_point(field_set_pointer:iot_idl.BroadcastResultMsg.resultStr) } inline ::std::string* BroadcastResultMsg::mutable_resultstr() { set_has_resultstr(); if (resultstr_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { resultstr_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.BroadcastResultMsg.resultStr) + // @@protoc_insertion_point(field_mutable:iot_idl.BroadcastResultMsg.resultStr) return resultstr_; } inline ::std::string* BroadcastResultMsg::release_resultstr() { @@ -3534,7 +3534,7 @@ inline void BroadcastResultMsg::set_allocated_resultstr(::std::string* resultstr clear_has_resultstr(); resultstr_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.BroadcastResultMsg.resultStr) + // @@protoc_insertion_point(field_set_allocated:iot_idl.BroadcastResultMsg.resultStr) } // required int32 count = 6; @@ -3552,13 +3552,13 @@ inline void BroadcastResultMsg::clear_count() { clear_has_count(); } inline ::google::protobuf::int32 BroadcastResultMsg::count() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.count) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.count) return count_; } inline void BroadcastResultMsg::set_count(::google::protobuf::int32 value) { set_has_count(); count_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastResultMsg.count) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastResultMsg.count) } // required int32 sendCount = 7; @@ -3576,13 +3576,13 @@ inline void BroadcastResultMsg::clear_sendcount() { clear_has_sendcount(); } inline ::google::protobuf::int32 BroadcastResultMsg::sendcount() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.sendCount) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.sendCount) return sendcount_; } inline void BroadcastResultMsg::set_sendcount(::google::protobuf::int32 value) { set_has_sendcount(); sendcount_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastResultMsg.sendCount) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastResultMsg.sendCount) } // required string pathFile = 8; @@ -3602,7 +3602,7 @@ inline void BroadcastResultMsg::clear_pathfile() { clear_has_pathfile(); } inline const ::std::string& BroadcastResultMsg::pathfile() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.BroadcastResultMsg.pathFile) + // @@protoc_insertion_point(field_get:iot_idl.BroadcastResultMsg.pathFile) return *pathfile_; } inline void BroadcastResultMsg::set_pathfile(const ::std::string& value) { @@ -3611,7 +3611,7 @@ inline void BroadcastResultMsg::set_pathfile(const ::std::string& value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.BroadcastResultMsg.pathFile) + // @@protoc_insertion_point(field_set:iot_idl.BroadcastResultMsg.pathFile) } inline void BroadcastResultMsg::set_pathfile(const char* value) { set_has_pathfile(); @@ -3619,7 +3619,7 @@ inline void BroadcastResultMsg::set_pathfile(const char* value) { pathfile_ = new ::std::string; } pathfile_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.BroadcastResultMsg.pathFile) + // @@protoc_insertion_point(field_set_char:iot_idl.BroadcastResultMsg.pathFile) } inline void BroadcastResultMsg::set_pathfile(const char* value, size_t size) { set_has_pathfile(); @@ -3627,14 +3627,14 @@ inline void BroadcastResultMsg::set_pathfile(const char* value, size_t size) { pathfile_ = new ::std::string; } pathfile_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.BroadcastResultMsg.pathFile) + // @@protoc_insertion_point(field_set_pointer:iot_idl.BroadcastResultMsg.pathFile) } inline ::std::string* BroadcastResultMsg::mutable_pathfile() { set_has_pathfile(); if (pathfile_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { pathfile_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.BroadcastResultMsg.pathFile) + // @@protoc_insertion_point(field_mutable:iot_idl.BroadcastResultMsg.pathFile) return pathfile_; } inline ::std::string* BroadcastResultMsg::release_pathfile() { @@ -3658,27 +3658,27 @@ inline void BroadcastResultMsg::set_allocated_pathfile(::std::string* pathfile) clear_has_pathfile(); pathfile_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.BroadcastResultMsg.pathFile) + // @@protoc_insertion_point(field_set_allocated:iot_idl.BroadcastResultMsg.pathFile) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enTaskType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enTaskType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enTaskType>() { - return ::kbd_idlfile::enTaskType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enTaskType>() { + return ::iot_idl::enTaskType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::enTaskStatusType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enTaskStatusType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enTaskStatusType>() { - return ::kbd_idlfile::enTaskStatusType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enTaskStatusType>() { + return ::iot_idl::enTaskStatusType_descriptor(); } } // namespace google diff --git a/product/src/idl_files/FileSynch.proto b/product/src/idl_files/FileSynch.proto index 233667d3..f1eda267 100644 --- a/product/src/idl_files/FileSynch.proto +++ b/product/src/idl_files/FileSynch.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; /*********服务间的同步******************************************************************/ //文件块 diff --git a/product/src/idl_files/HisAmendMessage.pb.cc b/product/src/idl_files/HisAmendMessage.pb.cc index 7cccdce5..4009c6df 100644 --- a/product/src/idl_files/HisAmendMessage.pb.cc +++ b/product/src/idl_files/HisAmendMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -107,7 +107,7 @@ void protobuf_AddDesc_HisAmendMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\025HisAmendMessage.proto\022\013kbd_idlfile\"A\n\010" + "\n\025HisAmendMessage.proto\022\013iot_idl\"A\n\010" "ADD_TASK\022\017\n\007rtu_idx\030\001 \002(\005\022\022\n\nstart_time\030" "\002 \002(\003\022\020\n\010end_time\030\003 \002(\003\"\257\001\n\013TASK_FINISH\022" "\017\n\007rtu_idx\030\001 \002(\005\022\022\n\nstart_time\030\002 \002(\003\022\020\n\010" @@ -142,7 +142,7 @@ const int ADD_TASK::kEndTimeFieldNumber; ADD_TASK::ADD_TASK() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(constructor:iot_idl.ADD_TASK) } void ADD_TASK::InitAsDefaultInstance() { @@ -152,7 +152,7 @@ ADD_TASK::ADD_TASK(const ADD_TASK& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(copy_constructor:iot_idl.ADD_TASK) } void ADD_TASK::SharedCtor() { @@ -164,7 +164,7 @@ void ADD_TASK::SharedCtor() { } ADD_TASK::~ADD_TASK() { - // @@protoc_insertion_point(destructor:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(destructor:iot_idl.ADD_TASK) SharedDtor(); } @@ -218,7 +218,7 @@ bool ADD_TASK::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(parse_start:iot_idl.ADD_TASK) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -282,17 +282,17 @@ bool ADD_TASK::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(parse_success:iot_idl.ADD_TASK) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(parse_failure:iot_idl.ADD_TASK) return false; #undef DO_ } void ADD_TASK::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(serialize_start:iot_idl.ADD_TASK) // required int32 rtu_idx = 1; if (has_rtu_idx()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->rtu_idx(), output); @@ -312,12 +312,12 @@ void ADD_TASK::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(serialize_end:iot_idl.ADD_TASK) } ::google::protobuf::uint8* ADD_TASK::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.ADD_TASK) // required int32 rtu_idx = 1; if (has_rtu_idx()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->rtu_idx(), target); @@ -337,7 +337,7 @@ void ADD_TASK::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.ADD_TASK) return target; } @@ -477,7 +477,7 @@ const int TASK_FINISH::kTaskResultFieldNumber; TASK_FINISH::TASK_FINISH() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(constructor:iot_idl.TASK_FINISH) } void TASK_FINISH::InitAsDefaultInstance() { @@ -487,7 +487,7 @@ TASK_FINISH::TASK_FINISH(const TASK_FINISH& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(copy_constructor:iot_idl.TASK_FINISH) } void TASK_FINISH::SharedCtor() { @@ -500,7 +500,7 @@ void TASK_FINISH::SharedCtor() { } TASK_FINISH::~TASK_FINISH() { - // @@protoc_insertion_point(destructor:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(destructor:iot_idl.TASK_FINISH) SharedDtor(); } @@ -554,7 +554,7 @@ bool TASK_FINISH::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(parse_start:iot_idl.TASK_FINISH) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -604,7 +604,7 @@ bool TASK_FINISH::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.TASK_FINISH.enTaskResult task_result = 4; + // required .iot_idl.TASK_FINISH.enTaskResult task_result = 4; case 4: { if (tag == 32) { parse_task_result: @@ -612,8 +612,8 @@ bool TASK_FINISH::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::TASK_FINISH_enTaskResult_IsValid(value)) { - set_task_result(static_cast< ::kbd_idlfile::TASK_FINISH_enTaskResult >(value)); + if (::iot_idl::TASK_FINISH_enTaskResult_IsValid(value)) { + set_task_result(static_cast< ::iot_idl::TASK_FINISH_enTaskResult >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -638,17 +638,17 @@ bool TASK_FINISH::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(parse_success:iot_idl.TASK_FINISH) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(parse_failure:iot_idl.TASK_FINISH) return false; #undef DO_ } void TASK_FINISH::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(serialize_start:iot_idl.TASK_FINISH) // required int32 rtu_idx = 1; if (has_rtu_idx()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->rtu_idx(), output); @@ -664,7 +664,7 @@ void TASK_FINISH::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(3, this->end_time(), output); } - // required .kbd_idlfile.TASK_FINISH.enTaskResult task_result = 4; + // required .iot_idl.TASK_FINISH.enTaskResult task_result = 4; if (has_task_result()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->task_result(), output); @@ -674,12 +674,12 @@ void TASK_FINISH::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(serialize_end:iot_idl.TASK_FINISH) } ::google::protobuf::uint8* TASK_FINISH::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.TASK_FINISH) // required int32 rtu_idx = 1; if (has_rtu_idx()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->rtu_idx(), target); @@ -695,7 +695,7 @@ void TASK_FINISH::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(3, this->end_time(), target); } - // required .kbd_idlfile.TASK_FINISH.enTaskResult task_result = 4; + // required .iot_idl.TASK_FINISH.enTaskResult task_result = 4; if (has_task_result()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->task_result(), target); @@ -705,7 +705,7 @@ void TASK_FINISH::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.TASK_FINISH) return target; } @@ -734,7 +734,7 @@ int TASK_FINISH::ByteSize() const { this->end_time()); } - // required .kbd_idlfile.TASK_FINISH.enTaskResult task_result = 4; + // required .iot_idl.TASK_FINISH.enTaskResult task_result = 4; if (has_task_result()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->task_result()); @@ -824,6 +824,6 @@ void TASK_FINISH::Swap(TASK_FINISH* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/HisAmendMessage.pb.h b/product/src/idl_files/HisAmendMessage.pb.h index 8c3943e9..ddb484ed 100644 --- a/product/src/idl_files/HisAmendMessage.pb.h +++ b/product/src/idl_files/HisAmendMessage.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_HisAmendMessage_2eproto(); @@ -132,7 +132,7 @@ class IDL_FILES_EXPORT ADD_TASK : public ::google::protobuf::Message { inline ::google::protobuf::int64 end_time() const; inline void set_end_time(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.ADD_TASK) + // @@protoc_insertion_point(class_scope:iot_idl.ADD_TASK) private: inline void set_has_rtu_idx(); inline void clear_has_rtu_idx(); @@ -255,14 +255,14 @@ class IDL_FILES_EXPORT TASK_FINISH : public ::google::protobuf::Message { inline ::google::protobuf::int64 end_time() const; inline void set_end_time(::google::protobuf::int64 value); - // required .kbd_idlfile.TASK_FINISH.enTaskResult task_result = 4; + // required .iot_idl.TASK_FINISH.enTaskResult task_result = 4; inline bool has_task_result() const; inline void clear_task_result(); static const int kTaskResultFieldNumber = 4; - inline ::kbd_idlfile::TASK_FINISH_enTaskResult task_result() const; - inline void set_task_result(::kbd_idlfile::TASK_FINISH_enTaskResult value); + inline ::iot_idl::TASK_FINISH_enTaskResult task_result() const; + inline void set_task_result(::iot_idl::TASK_FINISH_enTaskResult value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.TASK_FINISH) + // @@protoc_insertion_point(class_scope:iot_idl.TASK_FINISH) private: inline void set_has_rtu_idx(); inline void clear_has_rtu_idx(); @@ -310,13 +310,13 @@ inline void ADD_TASK::clear_rtu_idx() { clear_has_rtu_idx(); } inline ::google::protobuf::int32 ADD_TASK::rtu_idx() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ADD_TASK.rtu_idx) + // @@protoc_insertion_point(field_get:iot_idl.ADD_TASK.rtu_idx) return rtu_idx_; } inline void ADD_TASK::set_rtu_idx(::google::protobuf::int32 value) { set_has_rtu_idx(); rtu_idx_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ADD_TASK.rtu_idx) + // @@protoc_insertion_point(field_set:iot_idl.ADD_TASK.rtu_idx) } // required int64 start_time = 2; @@ -334,13 +334,13 @@ inline void ADD_TASK::clear_start_time() { clear_has_start_time(); } inline ::google::protobuf::int64 ADD_TASK::start_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ADD_TASK.start_time) + // @@protoc_insertion_point(field_get:iot_idl.ADD_TASK.start_time) return start_time_; } inline void ADD_TASK::set_start_time(::google::protobuf::int64 value) { set_has_start_time(); start_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ADD_TASK.start_time) + // @@protoc_insertion_point(field_set:iot_idl.ADD_TASK.start_time) } // required int64 end_time = 3; @@ -358,13 +358,13 @@ inline void ADD_TASK::clear_end_time() { clear_has_end_time(); } inline ::google::protobuf::int64 ADD_TASK::end_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ADD_TASK.end_time) + // @@protoc_insertion_point(field_get:iot_idl.ADD_TASK.end_time) return end_time_; } inline void ADD_TASK::set_end_time(::google::protobuf::int64 value) { set_has_end_time(); end_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ADD_TASK.end_time) + // @@protoc_insertion_point(field_set:iot_idl.ADD_TASK.end_time) } // ------------------------------------------------------------------- @@ -386,13 +386,13 @@ inline void TASK_FINISH::clear_rtu_idx() { clear_has_rtu_idx(); } inline ::google::protobuf::int32 TASK_FINISH::rtu_idx() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.TASK_FINISH.rtu_idx) + // @@protoc_insertion_point(field_get:iot_idl.TASK_FINISH.rtu_idx) return rtu_idx_; } inline void TASK_FINISH::set_rtu_idx(::google::protobuf::int32 value) { set_has_rtu_idx(); rtu_idx_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.TASK_FINISH.rtu_idx) + // @@protoc_insertion_point(field_set:iot_idl.TASK_FINISH.rtu_idx) } // required int64 start_time = 2; @@ -410,13 +410,13 @@ inline void TASK_FINISH::clear_start_time() { clear_has_start_time(); } inline ::google::protobuf::int64 TASK_FINISH::start_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.TASK_FINISH.start_time) + // @@protoc_insertion_point(field_get:iot_idl.TASK_FINISH.start_time) return start_time_; } inline void TASK_FINISH::set_start_time(::google::protobuf::int64 value) { set_has_start_time(); start_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.TASK_FINISH.start_time) + // @@protoc_insertion_point(field_set:iot_idl.TASK_FINISH.start_time) } // required int64 end_time = 3; @@ -434,16 +434,16 @@ inline void TASK_FINISH::clear_end_time() { clear_has_end_time(); } inline ::google::protobuf::int64 TASK_FINISH::end_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.TASK_FINISH.end_time) + // @@protoc_insertion_point(field_get:iot_idl.TASK_FINISH.end_time) return end_time_; } inline void TASK_FINISH::set_end_time(::google::protobuf::int64 value) { set_has_end_time(); end_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.TASK_FINISH.end_time) + // @@protoc_insertion_point(field_set:iot_idl.TASK_FINISH.end_time) } -// required .kbd_idlfile.TASK_FINISH.enTaskResult task_result = 4; +// required .iot_idl.TASK_FINISH.enTaskResult task_result = 4; inline bool TASK_FINISH::has_task_result() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -457,30 +457,30 @@ inline void TASK_FINISH::clear_task_result() { task_result_ = 0; clear_has_task_result(); } -inline ::kbd_idlfile::TASK_FINISH_enTaskResult TASK_FINISH::task_result() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.TASK_FINISH.task_result) - return static_cast< ::kbd_idlfile::TASK_FINISH_enTaskResult >(task_result_); +inline ::iot_idl::TASK_FINISH_enTaskResult TASK_FINISH::task_result() const { + // @@protoc_insertion_point(field_get:iot_idl.TASK_FINISH.task_result) + return static_cast< ::iot_idl::TASK_FINISH_enTaskResult >(task_result_); } -inline void TASK_FINISH::set_task_result(::kbd_idlfile::TASK_FINISH_enTaskResult value) { - assert(::kbd_idlfile::TASK_FINISH_enTaskResult_IsValid(value)); +inline void TASK_FINISH::set_task_result(::iot_idl::TASK_FINISH_enTaskResult value) { + assert(::iot_idl::TASK_FINISH_enTaskResult_IsValid(value)); set_has_task_result(); task_result_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.TASK_FINISH.task_result) + // @@protoc_insertion_point(field_set:iot_idl.TASK_FINISH.task_result) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::TASK_FINISH_enTaskResult> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::TASK_FINISH_enTaskResult> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::TASK_FINISH_enTaskResult>() { - return ::kbd_idlfile::TASK_FINISH_enTaskResult_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::TASK_FINISH_enTaskResult>() { + return ::iot_idl::TASK_FINISH_enTaskResult_descriptor(); } } // namespace google diff --git a/product/src/idl_files/HisAmendMessage.proto b/product/src/idl_files/HisAmendMessage.proto index 1a88c8d2..80495d25 100644 --- a/product/src/idl_files/HisAmendMessage.proto +++ b/product/src/idl_files/HisAmendMessage.proto @@ -5,7 +5,7 @@ //======================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; // 缩写说明： diff --git a/product/src/idl_files/LinkageMessage.pb.cc b/product/src/idl_files/LinkageMessage.pb.cc index a318d0a6..3da54108 100644 --- a/product/src/idl_files/LinkageMessage.pb.cc +++ b/product/src/idl_files/LinkageMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace linkage { namespace { @@ -470,82 +470,82 @@ void protobuf_AddDesc_LinkageMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024LinkageMessage.proto\022\023kbd_idlfile.link" + "\n\024LinkageMessage.proto\022\023iot_idl.link" "age\"\241\001\n\nLcsPkgHead\022\022\n\nsource_tag\030\001 \002(\t\0223" - "\n\010msg_type\030\002 \002(\0162!.kbd_idlfile.linkage.e" + "\n\010msg_type\030\002 \002(\0162!.iot_idl.linkage.e" "nLcsMsgType\022\025\n\rsource_domain\030\003 \002(\005\022\025\n\rta" "rget_domain\030\004 \002(\005\022\r\n\005para1\030\005 \002(\005\022\r\n\005para" "2\030\006 \002(\005\"_\n\016ErrorParameter\0223\n\tErrorCode\030\001" - " \002(\0162 .kbd_idlfile.linkage.enErrorCode\022\030" + " \002(\0162 .iot_idl.linkage.enErrorCode\022\030" "\n\020ErrorDescription\030\002 \002(\t\"e\n\026ExecuteStatu" "sParameter\022\022\n\nStatusCode\030\001 \002(\005\0227\n\nerro_p" - "aram\030\002 \001(\0132#.kbd_idlfile.linkage.ErrorPa" + "aram\030\002 \001(\0132#.iot_idl.linkage.ErrorPa" "rameter\"\315\001\n\031ActionNodeStatusParameter\022\023\n" "\013action_name\030\001 \002(\t\022\023\n\013action_desc\030\002 \002(\t\022" - ">\n\013check_state\030\003 \002(\0162).kbd_idlfile.linka" + ">\n\013check_state\030\003 \002(\0162).iot_idl.linka" "ge.ENLcsNodeCheckStatus\0224\n\nnode_state\030\004 " - "\002(\0162 .kbd_idlfile.linkage.ENLcsStatus\022\020\n" + "\002(\0162 .iot_idl.linkage.ENLcsStatus\022\020\n" "\010timeflag\030\005 \002(\003\"\206\002\n\026FucNodeStatusParamet" "er\022\020\n\010fuc_name\030\001 \002(\t\022\020\n\010fuc_desc\030\002 \002(\t\022>" - "\n\013check_state\030\003 \002(\0162).kbd_idlfile.linkag" + "\n\013check_state\030\003 \002(\0162).iot_idl.linkag" "e.ENLcsNodeCheckStatus\022\020\n\010timeflag\030\004 \002(\003" - "\0224\n\nnode_state\030\005 \002(\0162 .kbd_idlfile.linka" + "\0224\n\nnode_state\030\005 \002(\0162 .iot_idl.linka" "ge.ENLcsStatus\022@\n\010nodelist\030\006 \003(\0132..kbd_i" "dlfile.linkage.ActionNodeStatusParameter" "\"\206\002\n\027LinkNodeStatusParameter\022\021\n\tlink_nam" "e\030\001 \002(\t\022\021\n\tlink_desc\030\002 \002(\t\022>\n\013check_stat" - "e\030\003 \002(\0162).kbd_idlfile.linkage.ENLcsNodeC" + "e\030\003 \002(\0162).iot_idl.linkage.ENLcsNodeC" "heckStatus\022\020\n\010timeflag\030\004 \002(\003\0224\n\nnode_sta" - "te\030\005 \002(\0162 .kbd_idlfile.linkage.ENLcsStat" - "us\022=\n\010nodelist\030\006 \003(\0132+.kbd_idlfile.linka" + "te\030\005 \002(\0162 .iot_idl.linkage.ENLcsStat" + "us\022=\n\010nodelist\030\006 \003(\0132+.iot_idl.linka" "ge.FucNodeStatusParameter\"]\n\016ActorParame" "ter\022\017\n\007user_id\030\001 \002(\005\022\024\n\014user_groupId\030\002 \002" "(\005\022\021\n\thost_name\030\003 \002(\t\022\021\n\tuser_name\030\004 \002(\t" "\"\315\001\n\023StatusChangeMessage\0221\n\010pkg_head\030\001 \002" - "(\0132\037.kbd_idlfile.linkage.LcsPkgHead\022>\n\010n" - "odelist\030\002 \002(\0132,.kbd_idlfile.linkage.Link" + "(\0132\037.iot_idl.linkage.LcsPkgHead\022>\n\010n" + "odelist\030\002 \002(\0132,.iot_idl.linkage.Link" "NodeStatusParameter\022C\n\016execute_status\030\003 " - "\003(\0132+.kbd_idlfile.linkage.ExecuteStatusP" + "\003(\0132+.iot_idl.linkage.ExecuteStatusP" "arameter\"\242\001\n\027LinkStartRequestMessage\0221\n\010" - "pkg_head\030\001 \002(\0132\037.kbd_idlfile.linkage.Lcs" - "PkgHead\022>\n\010nodelist\030\002 \002(\0132,.kbd_idlfile." + "pkg_head\030\001 \002(\0132\037.iot_idl.linkage.Lcs" + "PkgHead\022>\n\010nodelist\030\002 \002(\0132,.iot_idl." "linkage.LinkNodeStatusParameter\022\024\n\014trigg" "er_time\030\003 \002(\003\"\376\001\n\020UiRequestMessage\0221\n\010pk" - "g_head\030\001 \002(\0132\037.kbd_idlfile.linkage.LcsPk" - "gHead\0222\n\005actor\030\002 \002(\0132#.kbd_idlfile.linka" + "g_head\030\001 \002(\0132\037.iot_idl.linkage.LcsPk" + "gHead\0222\n\005actor\030\002 \002(\0132#.iot_idl.linka" "ge.ActorParameter\022>\n\010nodelist\030\003 \002(\0132,.kb" "d_idlfile.linkage.LinkNodeStatusParamete" - "r\022C\n\016execute_status\030\004 \002(\0132+.kbd_idlfile." + "r\022C\n\016execute_status\030\004 \002(\0132+.iot_idl." "linkage.ExecuteStatusParameter\"\362\001\n\023UiReq" "uestMessageAck\0221\n\010pkg_head\030\001 \002(\0132\037.kbd_i" "dlfile.linkage.LcsPkgHead\0222\n\005actor\030\002 \002(\013" - "2#.kbd_idlfile.linkage.ActorParameter\022>\n" - "\010nodelist\030\003 \002(\0132,.kbd_idlfile.linkage.Li" + "2#.iot_idl.linkage.ActorParameter\022>\n" + "\010nodelist\030\003 \002(\0132,.iot_idl.linkage.Li" "nkNodeStatusParameter\0224\n\006optype\030\004 \002(\0162$." - "kbd_idlfile.linkage.ENUiOperateType\"\372\001\n\022" + "iot_idl.linkage.ENUiOperateType\"\372\001\n\022" "LinkOperateMessage\0221\n\010pkg_head\030\001 \002(\0132\037.k" "bd_idlfile.linkage.LcsPkgHead\022\?\n\tlink_no" - "de\030\002 \002(\0132,.kbd_idlfile.linkage.LinkNodeS" + "de\030\002 \002(\0132,.iot_idl.linkage.LinkNodeS" "tatusParameter\0222\n\005actor\030\003 \002(\0132#.kbd_idlf" "ile.linkage.ActorParameter\022<\n\014opreate_ty" - "pe\030\004 \002(\0162&.kbd_idlfile.linkage.ENLinkOpe" + "pe\030\004 \002(\0162&.iot_idl.linkage.ENLinkOpe" "rateType\"\302\002\n\025LinkOperateMessageAck\0221\n\010pk" - "g_head\030\001 \002(\0132\037.kbd_idlfile.linkage.LcsPk" - "gHead\022\?\n\tlink_node\030\002 \002(\0132,.kbd_idlfile.l" + "g_head\030\001 \002(\0132\037.iot_idl.linkage.LcsPk" + "gHead\022\?\n\tlink_node\030\002 \002(\0132,.iot_idl.l" "inkage.LinkNodeStatusParameter\022<\n\014opreat" - "e_type\030\003 \002(\0162&.kbd_idlfile.linkage.ENLin" + "e_type\030\003 \002(\0162&.iot_idl.linkage.ENLin" "kOperateType\0222\n\005actor\030\004 \002(\0132#.kbd_idlfil" "e.linkage.ActorParameter\022C\n\016execute_stat" - "us\030\005 \002(\0132+.kbd_idlfile.linkage.ExecuteSt" + "us\030\005 \002(\0132+.iot_idl.linkage.ExecuteSt" "atusParameter\"#\n\rPushParameter\022\022\n\ngraph_" "name\030\001 \002(\t\"\"\n\rHintParameter\022\021\n\thint_info" "\030\001 \002(\t\"\211\002\n\022ActionToHmiMessage\0221\n\010pkg_hea" - "d\030\001 \002(\0132\037.kbd_idlfile.linkage.LcsPkgHead" - "\022=\n\013action_type\030\002 \002(\0162(.kbd_idlfile.link" + "d\030\001 \002(\0132\037.iot_idl.linkage.LcsPkgHead" + "\022=\n\013action_type\030\002 \002(\0162(.iot_idl.link" "age.ENActionOperateType\022\021\n\thost_name\030\003 \002" - "(\t\0226\n\npush_param\030\004 \001(\0132\".kbd_idlfile.lin" + "(\t\0226\n\npush_param\030\004 \001(\0132\".iot_idl.lin" "kage.PushParameter\0226\n\nhint_param\030\005 \001(\0132\"" - ".kbd_idlfile.linkage.HintParameter*f\n\020en" + ".iot_idl.linkage.HintParameter*f\n\020en" "ChannelMsgType\022\034\n\030MT_LINKAGE_CTRL_HMI_DO" "WN\020\002\022\032\n\026MT_LINKAGE_CTRL_HMI_UP\020\003\022\030\n\024MT_L" "INKAGE_ACTION_UP\020\004*\324\001\n\014enLcsMsgType\022\025\n\021e" @@ -773,7 +773,7 @@ const int LcsPkgHead::kPara2FieldNumber; LcsPkgHead::LcsPkgHead() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(constructor:iot_idl.linkage.LcsPkgHead) } void LcsPkgHead::InitAsDefaultInstance() { @@ -783,7 +783,7 @@ LcsPkgHead::LcsPkgHead(const LcsPkgHead& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.LcsPkgHead) } void LcsPkgHead::SharedCtor() { @@ -799,7 +799,7 @@ void LcsPkgHead::SharedCtor() { } LcsPkgHead::~LcsPkgHead() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(destructor:iot_idl.linkage.LcsPkgHead) SharedDtor(); } @@ -864,7 +864,7 @@ bool LcsPkgHead::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.LcsPkgHead) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -886,7 +886,7 @@ bool LcsPkgHead::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.enLcsMsgType msg_type = 2; + // required .iot_idl.linkage.enLcsMsgType msg_type = 2; case 2: { if (tag == 16) { parse_msg_type: @@ -894,8 +894,8 @@ bool LcsPkgHead::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::enLcsMsgType_IsValid(value)) { - set_msg_type(static_cast< ::kbd_idlfile::linkage::enLcsMsgType >(value)); + if (::iot_idl::linkage::enLcsMsgType_IsValid(value)) { + set_msg_type(static_cast< ::iot_idl::linkage::enLcsMsgType >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -980,17 +980,17 @@ bool LcsPkgHead::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.LcsPkgHead) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.LcsPkgHead) return false; #undef DO_ } void LcsPkgHead::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.LcsPkgHead) // required string source_tag = 1; if (has_source_tag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1001,7 +1001,7 @@ void LcsPkgHead::SerializeWithCachedSizes( 1, this->source_tag(), output); } - // required .kbd_idlfile.linkage.enLcsMsgType msg_type = 2; + // required .iot_idl.linkage.enLcsMsgType msg_type = 2; if (has_msg_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->msg_type(), output); @@ -1031,12 +1031,12 @@ void LcsPkgHead::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.LcsPkgHead) } ::google::protobuf::uint8* LcsPkgHead::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.LcsPkgHead) // required string source_tag = 1; if (has_source_tag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1048,7 +1048,7 @@ void LcsPkgHead::SerializeWithCachedSizes( 1, this->source_tag(), target); } - // required .kbd_idlfile.linkage.enLcsMsgType msg_type = 2; + // required .iot_idl.linkage.enLcsMsgType msg_type = 2; if (has_msg_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->msg_type(), target); @@ -1078,7 +1078,7 @@ void LcsPkgHead::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.LcsPkgHead) return target; } @@ -1093,7 +1093,7 @@ int LcsPkgHead::ByteSize() const { this->source_tag()); } - // required .kbd_idlfile.linkage.enLcsMsgType msg_type = 2; + // required .iot_idl.linkage.enLcsMsgType msg_type = 2; if (has_msg_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->msg_type()); @@ -1227,7 +1227,7 @@ const int ErrorParameter::kErrorDescriptionFieldNumber; ErrorParameter::ErrorParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.ErrorParameter) } void ErrorParameter::InitAsDefaultInstance() { @@ -1237,7 +1237,7 @@ ErrorParameter::ErrorParameter(const ErrorParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.ErrorParameter) } void ErrorParameter::SharedCtor() { @@ -1249,7 +1249,7 @@ void ErrorParameter::SharedCtor() { } ErrorParameter::~ErrorParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.ErrorParameter) SharedDtor(); } @@ -1299,21 +1299,21 @@ bool ErrorParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.ErrorParameter) 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.linkage.enErrorCode ErrorCode = 1; + // required .iot_idl.linkage.enErrorCode ErrorCode = 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::linkage::enErrorCode_IsValid(value)) { - set_errorcode(static_cast< ::kbd_idlfile::linkage::enErrorCode >(value)); + if (::iot_idl::linkage::enErrorCode_IsValid(value)) { + set_errorcode(static_cast< ::iot_idl::linkage::enErrorCode >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -1355,18 +1355,18 @@ bool ErrorParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.ErrorParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.ErrorParameter) return false; #undef DO_ } void ErrorParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.ErrorParameter) - // required .kbd_idlfile.linkage.enErrorCode ErrorCode = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.ErrorParameter) + // required .iot_idl.linkage.enErrorCode ErrorCode = 1; if (has_errorcode()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->errorcode(), output); @@ -1386,13 +1386,13 @@ void ErrorParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.ErrorParameter) } ::google::protobuf::uint8* ErrorParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.ErrorParameter) - // required .kbd_idlfile.linkage.enErrorCode ErrorCode = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.ErrorParameter) + // required .iot_idl.linkage.enErrorCode ErrorCode = 1; if (has_errorcode()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->errorcode(), target); @@ -1413,7 +1413,7 @@ void ErrorParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.ErrorParameter) return target; } @@ -1421,7 +1421,7 @@ int ErrorParameter::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.enErrorCode ErrorCode = 1; + // required .iot_idl.linkage.enErrorCode ErrorCode = 1; if (has_errorcode()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->errorcode()); @@ -1518,18 +1518,18 @@ const int ExecuteStatusParameter::kErroParamFieldNumber; ExecuteStatusParameter::ExecuteStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.ExecuteStatusParameter) } void ExecuteStatusParameter::InitAsDefaultInstance() { - erro_param_ = const_cast< ::kbd_idlfile::linkage::ErrorParameter*>(&::kbd_idlfile::linkage::ErrorParameter::default_instance()); + erro_param_ = const_cast< ::iot_idl::linkage::ErrorParameter*>(&::iot_idl::linkage::ErrorParameter::default_instance()); } ExecuteStatusParameter::ExecuteStatusParameter(const ExecuteStatusParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.ExecuteStatusParameter) } void ExecuteStatusParameter::SharedCtor() { @@ -1540,7 +1540,7 @@ void ExecuteStatusParameter::SharedCtor() { } ExecuteStatusParameter::~ExecuteStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.ExecuteStatusParameter) SharedDtor(); } @@ -1575,7 +1575,7 @@ void ExecuteStatusParameter::Clear() { if (_has_bits_[0 / 32] & 3) { statuscode_ = 0; if (has_erro_param()) { - if (erro_param_ != NULL) erro_param_->::kbd_idlfile::linkage::ErrorParameter::Clear(); + if (erro_param_ != NULL) erro_param_->::iot_idl::linkage::ErrorParameter::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1586,7 +1586,7 @@ bool ExecuteStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.ExecuteStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1606,7 +1606,7 @@ bool ExecuteStatusParameter::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.linkage.ErrorParameter erro_param = 2; + // optional .iot_idl.linkage.ErrorParameter erro_param = 2; case 2: { if (tag == 18) { parse_erro_param: @@ -1633,23 +1633,23 @@ bool ExecuteStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.ExecuteStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.ExecuteStatusParameter) return false; #undef DO_ } void ExecuteStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.ExecuteStatusParameter) // required int32 StatusCode = 1; if (has_statuscode()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->statuscode(), output); } - // optional .kbd_idlfile.linkage.ErrorParameter erro_param = 2; + // optional .iot_idl.linkage.ErrorParameter erro_param = 2; if (has_erro_param()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->erro_param(), output); @@ -1659,18 +1659,18 @@ void ExecuteStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.ExecuteStatusParameter) } ::google::protobuf::uint8* ExecuteStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.ExecuteStatusParameter) // required int32 StatusCode = 1; if (has_statuscode()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->statuscode(), target); } - // optional .kbd_idlfile.linkage.ErrorParameter erro_param = 2; + // optional .iot_idl.linkage.ErrorParameter erro_param = 2; if (has_erro_param()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1681,7 +1681,7 @@ void ExecuteStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.ExecuteStatusParameter) return target; } @@ -1696,7 +1696,7 @@ int ExecuteStatusParameter::ByteSize() const { this->statuscode()); } - // optional .kbd_idlfile.linkage.ErrorParameter erro_param = 2; + // optional .iot_idl.linkage.ErrorParameter erro_param = 2; if (has_erro_param()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -1734,7 +1734,7 @@ void ExecuteStatusParameter::MergeFrom(const ExecuteStatusParameter& from) { set_statuscode(from.statuscode()); } if (from.has_erro_param()) { - mutable_erro_param()->::kbd_idlfile::linkage::ErrorParameter::MergeFrom(from.erro_param()); + mutable_erro_param()->::iot_idl::linkage::ErrorParameter::MergeFrom(from.erro_param()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1793,7 +1793,7 @@ const int ActionNodeStatusParameter::kTimeflagFieldNumber; ActionNodeStatusParameter::ActionNodeStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.ActionNodeStatusParameter) } void ActionNodeStatusParameter::InitAsDefaultInstance() { @@ -1803,7 +1803,7 @@ ActionNodeStatusParameter::ActionNodeStatusParameter(const ActionNodeStatusParam : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.ActionNodeStatusParameter) } void ActionNodeStatusParameter::SharedCtor() { @@ -1818,7 +1818,7 @@ void ActionNodeStatusParameter::SharedCtor() { } ActionNodeStatusParameter::~ActionNodeStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.ActionNodeStatusParameter) SharedDtor(); } @@ -1890,7 +1890,7 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.ActionNodeStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1929,7 +1929,7 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; case 3: { if (tag == 24) { parse_check_state: @@ -1937,8 +1937,8 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLcsNodeCheckStatus_IsValid(value)) { - set_check_state(static_cast< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus >(value)); + if (::iot_idl::linkage::ENLcsNodeCheckStatus_IsValid(value)) { + set_check_state(static_cast< ::iot_idl::linkage::ENLcsNodeCheckStatus >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -1949,7 +1949,7 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 4; + // required .iot_idl.linkage.ENLcsStatus node_state = 4; case 4: { if (tag == 32) { parse_node_state: @@ -1957,8 +1957,8 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLcsStatus_IsValid(value)) { - set_node_state(static_cast< ::kbd_idlfile::linkage::ENLcsStatus >(value)); + if (::iot_idl::linkage::ENLcsStatus_IsValid(value)) { + set_node_state(static_cast< ::iot_idl::linkage::ENLcsStatus >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -1998,17 +1998,17 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.ActionNodeStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.ActionNodeStatusParameter) return false; #undef DO_ } void ActionNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.ActionNodeStatusParameter) // required string action_name = 1; if (has_action_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2029,13 +2029,13 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( 2, this->action_desc(), output); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->check_state(), output); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 4; + // required .iot_idl.linkage.ENLcsStatus node_state = 4; if (has_node_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->node_state(), output); @@ -2050,12 +2050,12 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.ActionNodeStatusParameter) } ::google::protobuf::uint8* ActionNodeStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.ActionNodeStatusParameter) // required string action_name = 1; if (has_action_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2078,13 +2078,13 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( 2, this->action_desc(), target); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->check_state(), target); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 4; + // required .iot_idl.linkage.ENLcsStatus node_state = 4; if (has_node_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->node_state(), target); @@ -2099,7 +2099,7 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.ActionNodeStatusParameter) return target; } @@ -2121,13 +2121,13 @@ int ActionNodeStatusParameter::ByteSize() const { this->action_desc()); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->check_state()); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 4; + // required .iot_idl.linkage.ENLcsStatus node_state = 4; if (has_node_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->node_state()); @@ -2240,7 +2240,7 @@ const int FucNodeStatusParameter::kNodelistFieldNumber; FucNodeStatusParameter::FucNodeStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.FucNodeStatusParameter) } void FucNodeStatusParameter::InitAsDefaultInstance() { @@ -2250,7 +2250,7 @@ FucNodeStatusParameter::FucNodeStatusParameter(const FucNodeStatusParameter& fro : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.FucNodeStatusParameter) } void FucNodeStatusParameter::SharedCtor() { @@ -2265,7 +2265,7 @@ void FucNodeStatusParameter::SharedCtor() { } FucNodeStatusParameter::~FucNodeStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.FucNodeStatusParameter) SharedDtor(); } @@ -2338,7 +2338,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.FucNodeStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2377,7 +2377,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; case 3: { if (tag == 24) { parse_check_state: @@ -2385,8 +2385,8 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLcsNodeCheckStatus_IsValid(value)) { - set_check_state(static_cast< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus >(value)); + if (::iot_idl::linkage::ENLcsNodeCheckStatus_IsValid(value)) { + set_check_state(static_cast< ::iot_idl::linkage::ENLcsNodeCheckStatus >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -2412,7 +2412,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; case 5: { if (tag == 40) { parse_node_state: @@ -2420,8 +2420,8 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLcsStatus_IsValid(value)) { - set_node_state(static_cast< ::kbd_idlfile::linkage::ENLcsStatus >(value)); + if (::iot_idl::linkage::ENLcsStatus_IsValid(value)) { + set_node_state(static_cast< ::iot_idl::linkage::ENLcsStatus >(value)); } else { mutable_unknown_fields()->AddVarint(5, value); } @@ -2432,7 +2432,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.linkage.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.ActionNodeStatusParameter nodelist = 6; case 6: { if (tag == 50) { parse_nodelist: @@ -2460,17 +2460,17 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.FucNodeStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.FucNodeStatusParameter) return false; #undef DO_ } void FucNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.FucNodeStatusParameter) // required string fuc_name = 1; if (has_fuc_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2491,7 +2491,7 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( 2, this->fuc_desc(), output); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->check_state(), output); @@ -2502,13 +2502,13 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(4, this->timeflag(), output); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; if (has_node_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 5, this->node_state(), output); } - // repeated .kbd_idlfile.linkage.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.ActionNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->nodelist(i), output); @@ -2518,12 +2518,12 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.FucNodeStatusParameter) } ::google::protobuf::uint8* FucNodeStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.FucNodeStatusParameter) // required string fuc_name = 1; if (has_fuc_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2546,7 +2546,7 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( 2, this->fuc_desc(), target); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->check_state(), target); @@ -2557,13 +2557,13 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(4, this->timeflag(), target); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; if (has_node_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 5, this->node_state(), target); } - // repeated .kbd_idlfile.linkage.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.ActionNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2574,7 +2574,7 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.FucNodeStatusParameter) return target; } @@ -2596,7 +2596,7 @@ int FucNodeStatusParameter::ByteSize() const { this->fuc_desc()); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->check_state()); @@ -2609,14 +2609,14 @@ int FucNodeStatusParameter::ByteSize() const { this->timeflag()); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; if (has_node_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->node_state()); } } - // repeated .kbd_idlfile.linkage.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.ActionNodeStatusParameter nodelist = 6; total_size += 1 * this->nodelist_size(); for (int i = 0; i < this->nodelist_size(); i++) { total_size += @@ -2726,7 +2726,7 @@ const int LinkNodeStatusParameter::kNodelistFieldNumber; LinkNodeStatusParameter::LinkNodeStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.LinkNodeStatusParameter) } void LinkNodeStatusParameter::InitAsDefaultInstance() { @@ -2736,7 +2736,7 @@ LinkNodeStatusParameter::LinkNodeStatusParameter(const LinkNodeStatusParameter& : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.LinkNodeStatusParameter) } void LinkNodeStatusParameter::SharedCtor() { @@ -2751,7 +2751,7 @@ void LinkNodeStatusParameter::SharedCtor() { } LinkNodeStatusParameter::~LinkNodeStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.LinkNodeStatusParameter) SharedDtor(); } @@ -2824,7 +2824,7 @@ bool LinkNodeStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.LinkNodeStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2863,7 +2863,7 @@ bool LinkNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; case 3: { if (tag == 24) { parse_check_state: @@ -2871,8 +2871,8 @@ bool LinkNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLcsNodeCheckStatus_IsValid(value)) { - set_check_state(static_cast< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus >(value)); + if (::iot_idl::linkage::ENLcsNodeCheckStatus_IsValid(value)) { + set_check_state(static_cast< ::iot_idl::linkage::ENLcsNodeCheckStatus >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -2898,7 +2898,7 @@ bool LinkNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; case 5: { if (tag == 40) { parse_node_state: @@ -2906,8 +2906,8 @@ bool LinkNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLcsStatus_IsValid(value)) { - set_node_state(static_cast< ::kbd_idlfile::linkage::ENLcsStatus >(value)); + if (::iot_idl::linkage::ENLcsStatus_IsValid(value)) { + set_node_state(static_cast< ::iot_idl::linkage::ENLcsStatus >(value)); } else { mutable_unknown_fields()->AddVarint(5, value); } @@ -2918,7 +2918,7 @@ bool LinkNodeStatusParameter::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.linkage.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.FucNodeStatusParameter nodelist = 6; case 6: { if (tag == 50) { parse_nodelist: @@ -2946,17 +2946,17 @@ bool LinkNodeStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.LinkNodeStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.LinkNodeStatusParameter) return false; #undef DO_ } void LinkNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.LinkNodeStatusParameter) // required string link_name = 1; if (has_link_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2977,7 +2977,7 @@ void LinkNodeStatusParameter::SerializeWithCachedSizes( 2, this->link_desc(), output); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->check_state(), output); @@ -2988,13 +2988,13 @@ void LinkNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(4, this->timeflag(), output); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; if (has_node_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 5, this->node_state(), output); } - // repeated .kbd_idlfile.linkage.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.FucNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->nodelist(i), output); @@ -3004,12 +3004,12 @@ void LinkNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.LinkNodeStatusParameter) } ::google::protobuf::uint8* LinkNodeStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.LinkNodeStatusParameter) // required string link_name = 1; if (has_link_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3032,7 +3032,7 @@ void LinkNodeStatusParameter::SerializeWithCachedSizes( 2, this->link_desc(), target); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->check_state(), target); @@ -3043,13 +3043,13 @@ void LinkNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(4, this->timeflag(), target); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; if (has_node_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 5, this->node_state(), target); } - // repeated .kbd_idlfile.linkage.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.FucNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3060,7 +3060,7 @@ void LinkNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.LinkNodeStatusParameter) return target; } @@ -3082,7 +3082,7 @@ int LinkNodeStatusParameter::ByteSize() const { this->link_desc()); } - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; if (has_check_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->check_state()); @@ -3095,14 +3095,14 @@ int LinkNodeStatusParameter::ByteSize() const { this->timeflag()); } - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; if (has_node_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->node_state()); } } - // repeated .kbd_idlfile.linkage.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.FucNodeStatusParameter nodelist = 6; total_size += 1 * this->nodelist_size(); for (int i = 0; i < this->nodelist_size(); i++) { total_size += @@ -3210,7 +3210,7 @@ const int ActorParameter::kUserNameFieldNumber; ActorParameter::ActorParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.ActorParameter) } void ActorParameter::InitAsDefaultInstance() { @@ -3220,7 +3220,7 @@ ActorParameter::ActorParameter(const ActorParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.ActorParameter) } void ActorParameter::SharedCtor() { @@ -3234,7 +3234,7 @@ void ActorParameter::SharedCtor() { } ActorParameter::~ActorParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.ActorParameter) SharedDtor(); } @@ -3306,7 +3306,7 @@ bool ActorParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.ActorParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3389,17 +3389,17 @@ bool ActorParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.ActorParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.ActorParameter) return false; #undef DO_ } void ActorParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.ActorParameter) // required int32 user_id = 1; if (has_user_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->user_id(), output); @@ -3434,12 +3434,12 @@ void ActorParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.ActorParameter) } ::google::protobuf::uint8* ActorParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.ActorParameter) // required int32 user_id = 1; if (has_user_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->user_id(), target); @@ -3476,7 +3476,7 @@ void ActorParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.ActorParameter) return target; } @@ -3605,19 +3605,19 @@ const int StatusChangeMessage::kExecuteStatusFieldNumber; StatusChangeMessage::StatusChangeMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(constructor:iot_idl.linkage.StatusChangeMessage) } void StatusChangeMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::linkage::LcsPkgHead*>(&::kbd_idlfile::linkage::LcsPkgHead::default_instance()); - nodelist_ = const_cast< ::kbd_idlfile::linkage::LinkNodeStatusParameter*>(&::kbd_idlfile::linkage::LinkNodeStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::linkage::LcsPkgHead*>(&::iot_idl::linkage::LcsPkgHead::default_instance()); + nodelist_ = const_cast< ::iot_idl::linkage::LinkNodeStatusParameter*>(&::iot_idl::linkage::LinkNodeStatusParameter::default_instance()); } StatusChangeMessage::StatusChangeMessage(const StatusChangeMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.StatusChangeMessage) } void StatusChangeMessage::SharedCtor() { @@ -3628,7 +3628,7 @@ void StatusChangeMessage::SharedCtor() { } StatusChangeMessage::~StatusChangeMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(destructor:iot_idl.linkage.StatusChangeMessage) SharedDtor(); } @@ -3663,10 +3663,10 @@ StatusChangeMessage* StatusChangeMessage::New() const { void StatusChangeMessage::Clear() { if (_has_bits_[0 / 32] & 3) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); } if (has_nodelist()) { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); } } execute_status_.Clear(); @@ -3678,13 +3678,13 @@ bool StatusChangeMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.StatusChangeMessage) 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.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -3696,7 +3696,7 @@ bool StatusChangeMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; case 2: { if (tag == 18) { parse_nodelist: @@ -3709,7 +3709,7 @@ bool StatusChangeMessage::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.linkage.ExecuteStatusParameter execute_status = 3; case 3: { if (tag == 26) { parse_execute_status: @@ -3737,30 +3737,30 @@ bool StatusChangeMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.StatusChangeMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.StatusChangeMessage) return false; #undef DO_ } void StatusChangeMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.StatusChangeMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.StatusChangeMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; if (has_nodelist()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->nodelist(), output); } - // repeated .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.linkage.ExecuteStatusParameter execute_status = 3; for (int i = 0; i < this->execute_status_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->execute_status(i), output); @@ -3770,27 +3770,27 @@ void StatusChangeMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.StatusChangeMessage) } ::google::protobuf::uint8* StatusChangeMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.StatusChangeMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.StatusChangeMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; if (has_nodelist()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->nodelist(), target); } - // repeated .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.linkage.ExecuteStatusParameter execute_status = 3; for (int i = 0; i < this->execute_status_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3801,7 +3801,7 @@ void StatusChangeMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.StatusChangeMessage) return target; } @@ -3809,14 +3809,14 @@ int StatusChangeMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; if (has_nodelist()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3824,7 +3824,7 @@ int StatusChangeMessage::ByteSize() const { } } - // repeated .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.linkage.ExecuteStatusParameter execute_status = 3; total_size += 1 * this->execute_status_size(); for (int i = 0; i < this->execute_status_size(); i++) { total_size += @@ -3860,10 +3860,10 @@ void StatusChangeMessage::MergeFrom(const StatusChangeMessage& from) { execute_status_.MergeFrom(from.execute_status_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); } if (from.has_nodelist()) { - mutable_nodelist()->::kbd_idlfile::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); + mutable_nodelist()->::iot_idl::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -3925,19 +3925,19 @@ const int LinkStartRequestMessage::kTriggerTimeFieldNumber; LinkStartRequestMessage::LinkStartRequestMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(constructor:iot_idl.linkage.LinkStartRequestMessage) } void LinkStartRequestMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::linkage::LcsPkgHead*>(&::kbd_idlfile::linkage::LcsPkgHead::default_instance()); - nodelist_ = const_cast< ::kbd_idlfile::linkage::LinkNodeStatusParameter*>(&::kbd_idlfile::linkage::LinkNodeStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::linkage::LcsPkgHead*>(&::iot_idl::linkage::LcsPkgHead::default_instance()); + nodelist_ = const_cast< ::iot_idl::linkage::LinkNodeStatusParameter*>(&::iot_idl::linkage::LinkNodeStatusParameter::default_instance()); } LinkStartRequestMessage::LinkStartRequestMessage(const LinkStartRequestMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.LinkStartRequestMessage) } void LinkStartRequestMessage::SharedCtor() { @@ -3949,7 +3949,7 @@ void LinkStartRequestMessage::SharedCtor() { } LinkStartRequestMessage::~LinkStartRequestMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(destructor:iot_idl.linkage.LinkStartRequestMessage) SharedDtor(); } @@ -3984,10 +3984,10 @@ LinkStartRequestMessage* LinkStartRequestMessage::New() const { void LinkStartRequestMessage::Clear() { if (_has_bits_[0 / 32] & 7) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); } if (has_nodelist()) { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); } trigger_time_ = GOOGLE_LONGLONG(0); } @@ -3999,13 +3999,13 @@ bool LinkStartRequestMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.LinkStartRequestMessage) 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.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4017,7 +4017,7 @@ bool LinkStartRequestMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; case 2: { if (tag == 18) { parse_nodelist: @@ -4059,24 +4059,24 @@ bool LinkStartRequestMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.LinkStartRequestMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.LinkStartRequestMessage) return false; #undef DO_ } void LinkStartRequestMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.LinkStartRequestMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.LinkStartRequestMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; if (has_nodelist()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->nodelist(), output); @@ -4091,20 +4091,20 @@ void LinkStartRequestMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.LinkStartRequestMessage) } ::google::protobuf::uint8* LinkStartRequestMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.LinkStartRequestMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.LinkStartRequestMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; if (has_nodelist()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4120,7 +4120,7 @@ void LinkStartRequestMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.LinkStartRequestMessage) return target; } @@ -4128,14 +4128,14 @@ int LinkStartRequestMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; if (has_nodelist()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4177,10 +4177,10 @@ void LinkStartRequestMessage::MergeFrom(const LinkStartRequestMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); } if (from.has_nodelist()) { - mutable_nodelist()->::kbd_idlfile::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); + mutable_nodelist()->::iot_idl::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); } if (from.has_trigger_time()) { set_trigger_time(from.trigger_time()); @@ -4245,21 +4245,21 @@ const int UiRequestMessage::kExecuteStatusFieldNumber; UiRequestMessage::UiRequestMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(constructor:iot_idl.linkage.UiRequestMessage) } void UiRequestMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::linkage::LcsPkgHead*>(&::kbd_idlfile::linkage::LcsPkgHead::default_instance()); - actor_ = const_cast< ::kbd_idlfile::linkage::ActorParameter*>(&::kbd_idlfile::linkage::ActorParameter::default_instance()); - nodelist_ = const_cast< ::kbd_idlfile::linkage::LinkNodeStatusParameter*>(&::kbd_idlfile::linkage::LinkNodeStatusParameter::default_instance()); - execute_status_ = const_cast< ::kbd_idlfile::linkage::ExecuteStatusParameter*>(&::kbd_idlfile::linkage::ExecuteStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::linkage::LcsPkgHead*>(&::iot_idl::linkage::LcsPkgHead::default_instance()); + actor_ = const_cast< ::iot_idl::linkage::ActorParameter*>(&::iot_idl::linkage::ActorParameter::default_instance()); + nodelist_ = const_cast< ::iot_idl::linkage::LinkNodeStatusParameter*>(&::iot_idl::linkage::LinkNodeStatusParameter::default_instance()); + execute_status_ = const_cast< ::iot_idl::linkage::ExecuteStatusParameter*>(&::iot_idl::linkage::ExecuteStatusParameter::default_instance()); } UiRequestMessage::UiRequestMessage(const UiRequestMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.UiRequestMessage) } void UiRequestMessage::SharedCtor() { @@ -4272,7 +4272,7 @@ void UiRequestMessage::SharedCtor() { } UiRequestMessage::~UiRequestMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(destructor:iot_idl.linkage.UiRequestMessage) SharedDtor(); } @@ -4309,16 +4309,16 @@ UiRequestMessage* UiRequestMessage::New() const { void UiRequestMessage::Clear() { if (_has_bits_[0 / 32] & 15) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); } if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); } if (has_nodelist()) { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); } if (has_execute_status()) { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::linkage::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::linkage::ExecuteStatusParameter::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -4329,13 +4329,13 @@ bool UiRequestMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.UiRequestMessage) 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.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4347,7 +4347,7 @@ bool UiRequestMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; case 2: { if (tag == 18) { parse_actor: @@ -4360,7 +4360,7 @@ bool UiRequestMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; case 3: { if (tag == 26) { parse_nodelist: @@ -4373,7 +4373,7 @@ bool UiRequestMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 4; case 4: { if (tag == 34) { parse_execute_status: @@ -4400,36 +4400,36 @@ bool UiRequestMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.UiRequestMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.UiRequestMessage) return false; #undef DO_ } void UiRequestMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.UiRequestMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.UiRequestMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->actor(), output); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; if (has_nodelist()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->nodelist(), output); } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 4; if (has_execute_status()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->execute_status(), output); @@ -4439,34 +4439,34 @@ void UiRequestMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.UiRequestMessage) } ::google::protobuf::uint8* UiRequestMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.UiRequestMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.UiRequestMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->actor(), target); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; if (has_nodelist()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->nodelist(), target); } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 4; if (has_execute_status()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4477,7 +4477,7 @@ void UiRequestMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.UiRequestMessage) return target; } @@ -4485,28 +4485,28 @@ int UiRequestMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; if (has_nodelist()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->nodelist()); } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 4; if (has_execute_status()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4541,16 +4541,16 @@ void UiRequestMessage::MergeFrom(const UiRequestMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::linkage::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::linkage::ActorParameter::MergeFrom(from.actor()); } if (from.has_nodelist()) { - mutable_nodelist()->::kbd_idlfile::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); + mutable_nodelist()->::iot_idl::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); } if (from.has_execute_status()) { - mutable_execute_status()->::kbd_idlfile::linkage::ExecuteStatusParameter::MergeFrom(from.execute_status()); + mutable_execute_status()->::iot_idl::linkage::ExecuteStatusParameter::MergeFrom(from.execute_status()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -4619,20 +4619,20 @@ const int UiRequestMessageAck::kOptypeFieldNumber; UiRequestMessageAck::UiRequestMessageAck() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(constructor:iot_idl.linkage.UiRequestMessageAck) } void UiRequestMessageAck::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::linkage::LcsPkgHead*>(&::kbd_idlfile::linkage::LcsPkgHead::default_instance()); - actor_ = const_cast< ::kbd_idlfile::linkage::ActorParameter*>(&::kbd_idlfile::linkage::ActorParameter::default_instance()); - nodelist_ = const_cast< ::kbd_idlfile::linkage::LinkNodeStatusParameter*>(&::kbd_idlfile::linkage::LinkNodeStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::linkage::LcsPkgHead*>(&::iot_idl::linkage::LcsPkgHead::default_instance()); + actor_ = const_cast< ::iot_idl::linkage::ActorParameter*>(&::iot_idl::linkage::ActorParameter::default_instance()); + nodelist_ = const_cast< ::iot_idl::linkage::LinkNodeStatusParameter*>(&::iot_idl::linkage::LinkNodeStatusParameter::default_instance()); } UiRequestMessageAck::UiRequestMessageAck(const UiRequestMessageAck& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.UiRequestMessageAck) } void UiRequestMessageAck::SharedCtor() { @@ -4645,7 +4645,7 @@ void UiRequestMessageAck::SharedCtor() { } UiRequestMessageAck::~UiRequestMessageAck() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(destructor:iot_idl.linkage.UiRequestMessageAck) SharedDtor(); } @@ -4681,13 +4681,13 @@ UiRequestMessageAck* UiRequestMessageAck::New() const { void UiRequestMessageAck::Clear() { if (_has_bits_[0 / 32] & 15) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); } if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); } if (has_nodelist()) { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); } optype_ = 1; } @@ -4699,13 +4699,13 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.UiRequestMessageAck) 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.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4717,7 +4717,7 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; case 2: { if (tag == 18) { parse_actor: @@ -4730,7 +4730,7 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; case 3: { if (tag == 26) { parse_nodelist: @@ -4743,7 +4743,7 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENUiOperateType optype = 4; + // required .iot_idl.linkage.ENUiOperateType optype = 4; case 4: { if (tag == 32) { parse_optype: @@ -4751,8 +4751,8 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENUiOperateType_IsValid(value)) { - set_optype(static_cast< ::kbd_idlfile::linkage::ENUiOperateType >(value)); + if (::iot_idl::linkage::ENUiOperateType_IsValid(value)) { + set_optype(static_cast< ::iot_idl::linkage::ENUiOperateType >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -4777,36 +4777,36 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.UiRequestMessageAck) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.UiRequestMessageAck) return false; #undef DO_ } void UiRequestMessageAck::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.UiRequestMessageAck) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.UiRequestMessageAck) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->actor(), output); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; if (has_nodelist()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->nodelist(), output); } - // required .kbd_idlfile.linkage.ENUiOperateType optype = 4; + // required .iot_idl.linkage.ENUiOperateType optype = 4; if (has_optype()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->optype(), output); @@ -4816,34 +4816,34 @@ void UiRequestMessageAck::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.UiRequestMessageAck) } ::google::protobuf::uint8* UiRequestMessageAck::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.UiRequestMessageAck) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.UiRequestMessageAck) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->actor(), target); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; if (has_nodelist()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->nodelist(), target); } - // required .kbd_idlfile.linkage.ENUiOperateType optype = 4; + // required .iot_idl.linkage.ENUiOperateType optype = 4; if (has_optype()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->optype(), target); @@ -4853,7 +4853,7 @@ void UiRequestMessageAck::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.UiRequestMessageAck) return target; } @@ -4861,28 +4861,28 @@ int UiRequestMessageAck::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; if (has_nodelist()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->nodelist()); } - // required .kbd_idlfile.linkage.ENUiOperateType optype = 4; + // required .iot_idl.linkage.ENUiOperateType optype = 4; if (has_optype()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->optype()); @@ -4916,13 +4916,13 @@ void UiRequestMessageAck::MergeFrom(const UiRequestMessageAck& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::linkage::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::linkage::ActorParameter::MergeFrom(from.actor()); } if (from.has_nodelist()) { - mutable_nodelist()->::kbd_idlfile::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); + mutable_nodelist()->::iot_idl::linkage::LinkNodeStatusParameter::MergeFrom(from.nodelist()); } if (from.has_optype()) { set_optype(from.optype()); @@ -4991,20 +4991,20 @@ const int LinkOperateMessage::kOpreateTypeFieldNumber; LinkOperateMessage::LinkOperateMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(constructor:iot_idl.linkage.LinkOperateMessage) } void LinkOperateMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::linkage::LcsPkgHead*>(&::kbd_idlfile::linkage::LcsPkgHead::default_instance()); - link_node_ = const_cast< ::kbd_idlfile::linkage::LinkNodeStatusParameter*>(&::kbd_idlfile::linkage::LinkNodeStatusParameter::default_instance()); - actor_ = const_cast< ::kbd_idlfile::linkage::ActorParameter*>(&::kbd_idlfile::linkage::ActorParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::linkage::LcsPkgHead*>(&::iot_idl::linkage::LcsPkgHead::default_instance()); + link_node_ = const_cast< ::iot_idl::linkage::LinkNodeStatusParameter*>(&::iot_idl::linkage::LinkNodeStatusParameter::default_instance()); + actor_ = const_cast< ::iot_idl::linkage::ActorParameter*>(&::iot_idl::linkage::ActorParameter::default_instance()); } LinkOperateMessage::LinkOperateMessage(const LinkOperateMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.LinkOperateMessage) } void LinkOperateMessage::SharedCtor() { @@ -5017,7 +5017,7 @@ void LinkOperateMessage::SharedCtor() { } LinkOperateMessage::~LinkOperateMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(destructor:iot_idl.linkage.LinkOperateMessage) SharedDtor(); } @@ -5053,13 +5053,13 @@ LinkOperateMessage* LinkOperateMessage::New() const { void LinkOperateMessage::Clear() { if (_has_bits_[0 / 32] & 15) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); } if (has_link_node()) { - if (link_node_ != NULL) link_node_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (link_node_ != NULL) link_node_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); } if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); } opreate_type_ = 0; } @@ -5071,13 +5071,13 @@ bool LinkOperateMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.LinkOperateMessage) 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.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -5089,7 +5089,7 @@ bool LinkOperateMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; case 2: { if (tag == 18) { parse_link_node: @@ -5102,7 +5102,7 @@ bool LinkOperateMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ActorParameter actor = 3; + // required .iot_idl.linkage.ActorParameter actor = 3; case 3: { if (tag == 26) { parse_actor: @@ -5115,7 +5115,7 @@ bool LinkOperateMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 4; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 4; case 4: { if (tag == 32) { parse_opreate_type: @@ -5123,8 +5123,8 @@ bool LinkOperateMessage::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLinkOperateType_IsValid(value)) { - set_opreate_type(static_cast< ::kbd_idlfile::linkage::ENLinkOperateType >(value)); + if (::iot_idl::linkage::ENLinkOperateType_IsValid(value)) { + set_opreate_type(static_cast< ::iot_idl::linkage::ENLinkOperateType >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -5149,36 +5149,36 @@ bool LinkOperateMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.LinkOperateMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.LinkOperateMessage) return false; #undef DO_ } void LinkOperateMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.LinkOperateMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.LinkOperateMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; if (has_link_node()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->link_node(), output); } - // required .kbd_idlfile.linkage.ActorParameter actor = 3; + // required .iot_idl.linkage.ActorParameter actor = 3; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->actor(), output); } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 4; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 4; if (has_opreate_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->opreate_type(), output); @@ -5188,34 +5188,34 @@ void LinkOperateMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.LinkOperateMessage) } ::google::protobuf::uint8* LinkOperateMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.LinkOperateMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.LinkOperateMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; if (has_link_node()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->link_node(), target); } - // required .kbd_idlfile.linkage.ActorParameter actor = 3; + // required .iot_idl.linkage.ActorParameter actor = 3; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->actor(), target); } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 4; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 4; if (has_opreate_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->opreate_type(), target); @@ -5225,7 +5225,7 @@ void LinkOperateMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.LinkOperateMessage) return target; } @@ -5233,28 +5233,28 @@ int LinkOperateMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; if (has_link_node()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->link_node()); } - // required .kbd_idlfile.linkage.ActorParameter actor = 3; + // required .iot_idl.linkage.ActorParameter actor = 3; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 4; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 4; if (has_opreate_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->opreate_type()); @@ -5288,13 +5288,13 @@ void LinkOperateMessage::MergeFrom(const LinkOperateMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); } if (from.has_link_node()) { - mutable_link_node()->::kbd_idlfile::linkage::LinkNodeStatusParameter::MergeFrom(from.link_node()); + mutable_link_node()->::iot_idl::linkage::LinkNodeStatusParameter::MergeFrom(from.link_node()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::linkage::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::linkage::ActorParameter::MergeFrom(from.actor()); } if (from.has_opreate_type()) { set_opreate_type(from.opreate_type()); @@ -5364,21 +5364,21 @@ const int LinkOperateMessageAck::kExecuteStatusFieldNumber; LinkOperateMessageAck::LinkOperateMessageAck() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(constructor:iot_idl.linkage.LinkOperateMessageAck) } void LinkOperateMessageAck::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::linkage::LcsPkgHead*>(&::kbd_idlfile::linkage::LcsPkgHead::default_instance()); - link_node_ = const_cast< ::kbd_idlfile::linkage::LinkNodeStatusParameter*>(&::kbd_idlfile::linkage::LinkNodeStatusParameter::default_instance()); - actor_ = const_cast< ::kbd_idlfile::linkage::ActorParameter*>(&::kbd_idlfile::linkage::ActorParameter::default_instance()); - execute_status_ = const_cast< ::kbd_idlfile::linkage::ExecuteStatusParameter*>(&::kbd_idlfile::linkage::ExecuteStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::linkage::LcsPkgHead*>(&::iot_idl::linkage::LcsPkgHead::default_instance()); + link_node_ = const_cast< ::iot_idl::linkage::LinkNodeStatusParameter*>(&::iot_idl::linkage::LinkNodeStatusParameter::default_instance()); + actor_ = const_cast< ::iot_idl::linkage::ActorParameter*>(&::iot_idl::linkage::ActorParameter::default_instance()); + execute_status_ = const_cast< ::iot_idl::linkage::ExecuteStatusParameter*>(&::iot_idl::linkage::ExecuteStatusParameter::default_instance()); } LinkOperateMessageAck::LinkOperateMessageAck(const LinkOperateMessageAck& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.LinkOperateMessageAck) } void LinkOperateMessageAck::SharedCtor() { @@ -5392,7 +5392,7 @@ void LinkOperateMessageAck::SharedCtor() { } LinkOperateMessageAck::~LinkOperateMessageAck() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(destructor:iot_idl.linkage.LinkOperateMessageAck) SharedDtor(); } @@ -5429,17 +5429,17 @@ LinkOperateMessageAck* LinkOperateMessageAck::New() const { void LinkOperateMessageAck::Clear() { if (_has_bits_[0 / 32] & 31) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); } if (has_link_node()) { - if (link_node_ != NULL) link_node_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (link_node_ != NULL) link_node_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); } opreate_type_ = 0; if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); } if (has_execute_status()) { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::linkage::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::linkage::ExecuteStatusParameter::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -5450,13 +5450,13 @@ bool LinkOperateMessageAck::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.LinkOperateMessageAck) 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.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -5468,7 +5468,7 @@ bool LinkOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; case 2: { if (tag == 18) { parse_link_node: @@ -5481,7 +5481,7 @@ bool LinkOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 3; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 3; case 3: { if (tag == 24) { parse_opreate_type: @@ -5489,8 +5489,8 @@ bool LinkOperateMessageAck::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENLinkOperateType_IsValid(value)) { - set_opreate_type(static_cast< ::kbd_idlfile::linkage::ENLinkOperateType >(value)); + if (::iot_idl::linkage::ENLinkOperateType_IsValid(value)) { + set_opreate_type(static_cast< ::iot_idl::linkage::ENLinkOperateType >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -5501,7 +5501,7 @@ bool LinkOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ActorParameter actor = 4; + // required .iot_idl.linkage.ActorParameter actor = 4; case 4: { if (tag == 34) { parse_actor: @@ -5514,7 +5514,7 @@ bool LinkOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 5; case 5: { if (tag == 42) { parse_execute_status: @@ -5541,42 +5541,42 @@ bool LinkOperateMessageAck::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.LinkOperateMessageAck) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.LinkOperateMessageAck) return false; #undef DO_ } void LinkOperateMessageAck::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.LinkOperateMessageAck) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.LinkOperateMessageAck) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; if (has_link_node()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->link_node(), output); } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 3; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 3; if (has_opreate_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->opreate_type(), output); } - // required .kbd_idlfile.linkage.ActorParameter actor = 4; + // required .iot_idl.linkage.ActorParameter actor = 4; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->actor(), output); } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 5; if (has_execute_status()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->execute_status(), output); @@ -5586,40 +5586,40 @@ void LinkOperateMessageAck::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.LinkOperateMessageAck) } ::google::protobuf::uint8* LinkOperateMessageAck::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.LinkOperateMessageAck) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.LinkOperateMessageAck) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; if (has_link_node()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->link_node(), target); } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 3; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 3; if (has_opreate_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->opreate_type(), target); } - // required .kbd_idlfile.linkage.ActorParameter actor = 4; + // required .iot_idl.linkage.ActorParameter actor = 4; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->actor(), target); } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 5; if (has_execute_status()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -5630,7 +5630,7 @@ void LinkOperateMessageAck::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.LinkOperateMessageAck) return target; } @@ -5638,34 +5638,34 @@ int LinkOperateMessageAck::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; if (has_link_node()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->link_node()); } - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 3; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 3; if (has_opreate_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->opreate_type()); } - // required .kbd_idlfile.linkage.ActorParameter actor = 4; + // required .iot_idl.linkage.ActorParameter actor = 4; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 5; if (has_execute_status()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -5700,19 +5700,19 @@ void LinkOperateMessageAck::MergeFrom(const LinkOperateMessageAck& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); } if (from.has_link_node()) { - mutable_link_node()->::kbd_idlfile::linkage::LinkNodeStatusParameter::MergeFrom(from.link_node()); + mutable_link_node()->::iot_idl::linkage::LinkNodeStatusParameter::MergeFrom(from.link_node()); } if (from.has_opreate_type()) { set_opreate_type(from.opreate_type()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::linkage::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::linkage::ActorParameter::MergeFrom(from.actor()); } if (from.has_execute_status()) { - mutable_execute_status()->::kbd_idlfile::linkage::ExecuteStatusParameter::MergeFrom(from.execute_status()); + mutable_execute_status()->::iot_idl::linkage::ExecuteStatusParameter::MergeFrom(from.execute_status()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -5779,7 +5779,7 @@ const int PushParameter::kGraphNameFieldNumber; PushParameter::PushParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.PushParameter) } void PushParameter::InitAsDefaultInstance() { @@ -5789,7 +5789,7 @@ PushParameter::PushParameter(const PushParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.PushParameter) } void PushParameter::SharedCtor() { @@ -5800,7 +5800,7 @@ void PushParameter::SharedCtor() { } PushParameter::~PushParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.PushParameter) SharedDtor(); } @@ -5847,7 +5847,7 @@ bool PushParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.PushParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -5883,17 +5883,17 @@ bool PushParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.PushParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.PushParameter) return false; #undef DO_ } void PushParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.PushParameter) // required string graph_name = 1; if (has_graph_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5908,12 +5908,12 @@ void PushParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.PushParameter) } ::google::protobuf::uint8* PushParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.PushParameter) // required string graph_name = 1; if (has_graph_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5929,7 +5929,7 @@ void PushParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.PushParameter) return target; } @@ -6023,7 +6023,7 @@ const int HintParameter::kHintInfoFieldNumber; HintParameter::HintParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(constructor:iot_idl.linkage.HintParameter) } void HintParameter::InitAsDefaultInstance() { @@ -6033,7 +6033,7 @@ HintParameter::HintParameter(const HintParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.HintParameter) } void HintParameter::SharedCtor() { @@ -6044,7 +6044,7 @@ void HintParameter::SharedCtor() { } HintParameter::~HintParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(destructor:iot_idl.linkage.HintParameter) SharedDtor(); } @@ -6091,7 +6091,7 @@ bool HintParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.HintParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -6127,17 +6127,17 @@ bool HintParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.HintParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.HintParameter) return false; #undef DO_ } void HintParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.HintParameter) // required string hint_info = 1; if (has_hint_info()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -6152,12 +6152,12 @@ void HintParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.HintParameter) } ::google::protobuf::uint8* HintParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.HintParameter) // required string hint_info = 1; if (has_hint_info()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -6173,7 +6173,7 @@ void HintParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.HintParameter) return target; } @@ -6271,20 +6271,20 @@ const int ActionToHmiMessage::kHintParamFieldNumber; ActionToHmiMessage::ActionToHmiMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(constructor:iot_idl.linkage.ActionToHmiMessage) } void ActionToHmiMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::linkage::LcsPkgHead*>(&::kbd_idlfile::linkage::LcsPkgHead::default_instance()); - push_param_ = const_cast< ::kbd_idlfile::linkage::PushParameter*>(&::kbd_idlfile::linkage::PushParameter::default_instance()); - hint_param_ = const_cast< ::kbd_idlfile::linkage::HintParameter*>(&::kbd_idlfile::linkage::HintParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::linkage::LcsPkgHead*>(&::iot_idl::linkage::LcsPkgHead::default_instance()); + push_param_ = const_cast< ::iot_idl::linkage::PushParameter*>(&::iot_idl::linkage::PushParameter::default_instance()); + hint_param_ = const_cast< ::iot_idl::linkage::HintParameter*>(&::iot_idl::linkage::HintParameter::default_instance()); } ActionToHmiMessage::ActionToHmiMessage(const ActionToHmiMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.linkage.ActionToHmiMessage) } void ActionToHmiMessage::SharedCtor() { @@ -6299,7 +6299,7 @@ void ActionToHmiMessage::SharedCtor() { } ActionToHmiMessage::~ActionToHmiMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(destructor:iot_idl.linkage.ActionToHmiMessage) SharedDtor(); } @@ -6338,7 +6338,7 @@ ActionToHmiMessage* ActionToHmiMessage::New() const { void ActionToHmiMessage::Clear() { if (_has_bits_[0 / 32] & 31) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); } action_type_ = 0; if (has_host_name()) { @@ -6347,10 +6347,10 @@ void ActionToHmiMessage::Clear() { } } if (has_push_param()) { - if (push_param_ != NULL) push_param_->::kbd_idlfile::linkage::PushParameter::Clear(); + if (push_param_ != NULL) push_param_->::iot_idl::linkage::PushParameter::Clear(); } if (has_hint_param()) { - if (hint_param_ != NULL) hint_param_->::kbd_idlfile::linkage::HintParameter::Clear(); + if (hint_param_ != NULL) hint_param_->::iot_idl::linkage::HintParameter::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -6361,13 +6361,13 @@ bool ActionToHmiMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(parse_start:iot_idl.linkage.ActionToHmiMessage) 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.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -6379,7 +6379,7 @@ bool ActionToHmiMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.linkage.ENActionOperateType action_type = 2; + // required .iot_idl.linkage.ENActionOperateType action_type = 2; case 2: { if (tag == 16) { parse_action_type: @@ -6387,8 +6387,8 @@ bool ActionToHmiMessage::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::linkage::ENActionOperateType_IsValid(value)) { - set_action_type(static_cast< ::kbd_idlfile::linkage::ENActionOperateType >(value)); + if (::iot_idl::linkage::ENActionOperateType_IsValid(value)) { + set_action_type(static_cast< ::iot_idl::linkage::ENActionOperateType >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -6416,7 +6416,7 @@ bool ActionToHmiMessage::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.linkage.PushParameter push_param = 4; + // optional .iot_idl.linkage.PushParameter push_param = 4; case 4: { if (tag == 34) { parse_push_param: @@ -6429,7 +6429,7 @@ bool ActionToHmiMessage::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.linkage.HintParameter hint_param = 5; + // optional .iot_idl.linkage.HintParameter hint_param = 5; case 5: { if (tag == 42) { parse_hint_param: @@ -6456,24 +6456,24 @@ bool ActionToHmiMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(parse_success:iot_idl.linkage.ActionToHmiMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.linkage.ActionToHmiMessage) return false; #undef DO_ } void ActionToHmiMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.linkage.ActionToHmiMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.linkage.ActionToHmiMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.linkage.ENActionOperateType action_type = 2; + // required .iot_idl.linkage.ENActionOperateType action_type = 2; if (has_action_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->action_type(), output); @@ -6489,13 +6489,13 @@ void ActionToHmiMessage::SerializeWithCachedSizes( 3, this->host_name(), output); } - // optional .kbd_idlfile.linkage.PushParameter push_param = 4; + // optional .iot_idl.linkage.PushParameter push_param = 4; if (has_push_param()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->push_param(), output); } - // optional .kbd_idlfile.linkage.HintParameter hint_param = 5; + // optional .iot_idl.linkage.HintParameter hint_param = 5; if (has_hint_param()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->hint_param(), output); @@ -6505,20 +6505,20 @@ void ActionToHmiMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.linkage.ActionToHmiMessage) } ::google::protobuf::uint8* ActionToHmiMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.linkage.ActionToHmiMessage) - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.linkage.ActionToHmiMessage) + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.linkage.ENActionOperateType action_type = 2; + // required .iot_idl.linkage.ENActionOperateType action_type = 2; if (has_action_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->action_type(), target); @@ -6535,14 +6535,14 @@ void ActionToHmiMessage::SerializeWithCachedSizes( 3, this->host_name(), target); } - // optional .kbd_idlfile.linkage.PushParameter push_param = 4; + // optional .iot_idl.linkage.PushParameter push_param = 4; if (has_push_param()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->push_param(), target); } - // optional .kbd_idlfile.linkage.HintParameter hint_param = 5; + // optional .iot_idl.linkage.HintParameter hint_param = 5; if (has_hint_param()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -6553,7 +6553,7 @@ void ActionToHmiMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.linkage.ActionToHmiMessage) return target; } @@ -6561,14 +6561,14 @@ int ActionToHmiMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.linkage.ENActionOperateType action_type = 2; + // required .iot_idl.linkage.ENActionOperateType action_type = 2; if (has_action_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->action_type()); @@ -6581,14 +6581,14 @@ int ActionToHmiMessage::ByteSize() const { this->host_name()); } - // optional .kbd_idlfile.linkage.PushParameter push_param = 4; + // optional .iot_idl.linkage.PushParameter push_param = 4; if (has_push_param()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->push_param()); } - // optional .kbd_idlfile.linkage.HintParameter hint_param = 5; + // optional .iot_idl.linkage.HintParameter hint_param = 5; if (has_hint_param()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -6623,7 +6623,7 @@ void ActionToHmiMessage::MergeFrom(const ActionToHmiMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::linkage::LcsPkgHead::MergeFrom(from.pkg_head()); } if (from.has_action_type()) { set_action_type(from.action_type()); @@ -6632,10 +6632,10 @@ void ActionToHmiMessage::MergeFrom(const ActionToHmiMessage& from) { set_host_name(from.host_name()); } if (from.has_push_param()) { - mutable_push_param()->::kbd_idlfile::linkage::PushParameter::MergeFrom(from.push_param()); + mutable_push_param()->::iot_idl::linkage::PushParameter::MergeFrom(from.push_param()); } if (from.has_hint_param()) { - mutable_hint_param()->::kbd_idlfile::linkage::HintParameter::MergeFrom(from.hint_param()); + mutable_hint_param()->::iot_idl::linkage::HintParameter::MergeFrom(from.hint_param()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -6693,6 +6693,6 @@ void ActionToHmiMessage::Swap(ActionToHmiMessage* other) { // @@protoc_insertion_point(namespace_scope) } // namespace linkage -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/LinkageMessage.pb.h b/product/src/idl_files/LinkageMessage.pb.h index a1343afd..a355a362 100644 --- a/product/src/idl_files/LinkageMessage.pb.h +++ b/product/src/idl_files/LinkageMessage.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace linkage { // Internal implementation detail -- do not call these. @@ -296,12 +296,12 @@ class IDL_FILES_EXPORT LcsPkgHead : public ::google::protobuf::Message { inline ::std::string* release_source_tag(); inline void set_allocated_source_tag(::std::string* source_tag); - // required .kbd_idlfile.linkage.enLcsMsgType msg_type = 2; + // required .iot_idl.linkage.enLcsMsgType msg_type = 2; inline bool has_msg_type() const; inline void clear_msg_type(); static const int kMsgTypeFieldNumber = 2; - inline ::kbd_idlfile::linkage::enLcsMsgType msg_type() const; - inline void set_msg_type(::kbd_idlfile::linkage::enLcsMsgType value); + inline ::iot_idl::linkage::enLcsMsgType msg_type() const; + inline void set_msg_type(::iot_idl::linkage::enLcsMsgType value); // required int32 source_domain = 3; inline bool has_source_domain() const; @@ -331,7 +331,7 @@ class IDL_FILES_EXPORT LcsPkgHead : public ::google::protobuf::Message { inline ::google::protobuf::int32 para2() const; inline void set_para2(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.LcsPkgHead) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.LcsPkgHead) private: inline void set_has_source_tag(); inline void clear_has_source_tag(); @@ -418,12 +418,12 @@ class IDL_FILES_EXPORT ErrorParameter : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.enErrorCode ErrorCode = 1; + // required .iot_idl.linkage.enErrorCode ErrorCode = 1; inline bool has_errorcode() const; inline void clear_errorcode(); static const int kErrorCodeFieldNumber = 1; - inline ::kbd_idlfile::linkage::enErrorCode errorcode() const; - inline void set_errorcode(::kbd_idlfile::linkage::enErrorCode value); + inline ::iot_idl::linkage::enErrorCode errorcode() const; + inline void set_errorcode(::iot_idl::linkage::enErrorCode value); // required string ErrorDescription = 2; inline bool has_errordescription() const; @@ -437,7 +437,7 @@ class IDL_FILES_EXPORT ErrorParameter : public ::google::protobuf::Message { inline ::std::string* release_errordescription(); inline void set_allocated_errordescription(::std::string* errordescription); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.ErrorParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.ErrorParameter) private: inline void set_has_errorcode(); inline void clear_has_errorcode(); @@ -519,16 +519,16 @@ class IDL_FILES_EXPORT ExecuteStatusParameter : public ::google::protobuf::Messa inline ::google::protobuf::int32 statuscode() const; inline void set_statuscode(::google::protobuf::int32 value); - // optional .kbd_idlfile.linkage.ErrorParameter erro_param = 2; + // optional .iot_idl.linkage.ErrorParameter erro_param = 2; inline bool has_erro_param() const; inline void clear_erro_param(); static const int kErroParamFieldNumber = 2; - inline const ::kbd_idlfile::linkage::ErrorParameter& erro_param() const; - inline ::kbd_idlfile::linkage::ErrorParameter* mutable_erro_param(); - inline ::kbd_idlfile::linkage::ErrorParameter* release_erro_param(); - inline void set_allocated_erro_param(::kbd_idlfile::linkage::ErrorParameter* erro_param); + inline const ::iot_idl::linkage::ErrorParameter& erro_param() const; + inline ::iot_idl::linkage::ErrorParameter* mutable_erro_param(); + inline ::iot_idl::linkage::ErrorParameter* release_erro_param(); + inline void set_allocated_erro_param(::iot_idl::linkage::ErrorParameter* erro_param); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.ExecuteStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.ExecuteStatusParameter) private: inline void set_has_statuscode(); inline void clear_has_statuscode(); @@ -539,7 +539,7 @@ class IDL_FILES_EXPORT ExecuteStatusParameter : public ::google::protobuf::Messa ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::ErrorParameter* erro_param_; + ::iot_idl::linkage::ErrorParameter* erro_param_; ::google::protobuf::int32 statuscode_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); @@ -627,19 +627,19 @@ class IDL_FILES_EXPORT ActionNodeStatusParameter : public ::google::protobuf::Me inline ::std::string* release_action_desc(); inline void set_allocated_action_desc(::std::string* action_desc); - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; inline bool has_check_state() const; inline void clear_check_state(); static const int kCheckStateFieldNumber = 3; - inline ::kbd_idlfile::linkage::ENLcsNodeCheckStatus check_state() const; - inline void set_check_state(::kbd_idlfile::linkage::ENLcsNodeCheckStatus value); + inline ::iot_idl::linkage::ENLcsNodeCheckStatus check_state() const; + inline void set_check_state(::iot_idl::linkage::ENLcsNodeCheckStatus value); - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 4; + // required .iot_idl.linkage.ENLcsStatus node_state = 4; inline bool has_node_state() const; inline void clear_node_state(); static const int kNodeStateFieldNumber = 4; - inline ::kbd_idlfile::linkage::ENLcsStatus node_state() const; - inline void set_node_state(::kbd_idlfile::linkage::ENLcsStatus value); + inline ::iot_idl::linkage::ENLcsStatus node_state() const; + inline void set_node_state(::iot_idl::linkage::ENLcsStatus value); // required int64 timeflag = 5; inline bool has_timeflag() const; @@ -648,7 +648,7 @@ class IDL_FILES_EXPORT ActionNodeStatusParameter : public ::google::protobuf::Me inline ::google::protobuf::int64 timeflag() const; inline void set_timeflag(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.ActionNodeStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.ActionNodeStatusParameter) private: inline void set_has_action_name(); inline void clear_has_action_name(); @@ -756,12 +756,12 @@ class IDL_FILES_EXPORT FucNodeStatusParameter : public ::google::protobuf::Messa inline ::std::string* release_fuc_desc(); inline void set_allocated_fuc_desc(::std::string* fuc_desc); - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; inline bool has_check_state() const; inline void clear_check_state(); static const int kCheckStateFieldNumber = 3; - inline ::kbd_idlfile::linkage::ENLcsNodeCheckStatus check_state() const; - inline void set_check_state(::kbd_idlfile::linkage::ENLcsNodeCheckStatus value); + inline ::iot_idl::linkage::ENLcsNodeCheckStatus check_state() const; + inline void set_check_state(::iot_idl::linkage::ENLcsNodeCheckStatus value); // required int64 timeflag = 4; inline bool has_timeflag() const; @@ -770,26 +770,26 @@ class IDL_FILES_EXPORT FucNodeStatusParameter : public ::google::protobuf::Messa inline ::google::protobuf::int64 timeflag() const; inline void set_timeflag(::google::protobuf::int64 value); - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; inline bool has_node_state() const; inline void clear_node_state(); static const int kNodeStateFieldNumber = 5; - inline ::kbd_idlfile::linkage::ENLcsStatus node_state() const; - inline void set_node_state(::kbd_idlfile::linkage::ENLcsStatus value); + inline ::iot_idl::linkage::ENLcsStatus node_state() const; + inline void set_node_state(::iot_idl::linkage::ENLcsStatus value); - // repeated .kbd_idlfile.linkage.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.ActionNodeStatusParameter nodelist = 6; inline int nodelist_size() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 6; - inline const ::kbd_idlfile::linkage::ActionNodeStatusParameter& nodelist(int index) const; - inline ::kbd_idlfile::linkage::ActionNodeStatusParameter* mutable_nodelist(int index); - inline ::kbd_idlfile::linkage::ActionNodeStatusParameter* add_nodelist(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ActionNodeStatusParameter >& + inline const ::iot_idl::linkage::ActionNodeStatusParameter& nodelist(int index) const; + inline ::iot_idl::linkage::ActionNodeStatusParameter* mutable_nodelist(int index); + inline ::iot_idl::linkage::ActionNodeStatusParameter* add_nodelist(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ActionNodeStatusParameter >& nodelist() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ActionNodeStatusParameter >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ActionNodeStatusParameter >* mutable_nodelist(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.FucNodeStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.FucNodeStatusParameter) private: inline void set_has_fuc_name(); inline void clear_has_fuc_name(); @@ -811,7 +811,7 @@ class IDL_FILES_EXPORT FucNodeStatusParameter : public ::google::protobuf::Messa ::google::protobuf::int64 timeflag_; int check_state_; int node_state_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ActionNodeStatusParameter > nodelist_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ActionNodeStatusParameter > nodelist_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); friend void protobuf_ShutdownFile_LinkageMessage_2eproto(); @@ -898,12 +898,12 @@ class IDL_FILES_EXPORT LinkNodeStatusParameter : public ::google::protobuf::Mess inline ::std::string* release_link_desc(); inline void set_allocated_link_desc(::std::string* link_desc); - // required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; + // required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; inline bool has_check_state() const; inline void clear_check_state(); static const int kCheckStateFieldNumber = 3; - inline ::kbd_idlfile::linkage::ENLcsNodeCheckStatus check_state() const; - inline void set_check_state(::kbd_idlfile::linkage::ENLcsNodeCheckStatus value); + inline ::iot_idl::linkage::ENLcsNodeCheckStatus check_state() const; + inline void set_check_state(::iot_idl::linkage::ENLcsNodeCheckStatus value); // required int64 timeflag = 4; inline bool has_timeflag() const; @@ -912,26 +912,26 @@ class IDL_FILES_EXPORT LinkNodeStatusParameter : public ::google::protobuf::Mess inline ::google::protobuf::int64 timeflag() const; inline void set_timeflag(::google::protobuf::int64 value); - // required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; + // required .iot_idl.linkage.ENLcsStatus node_state = 5; inline bool has_node_state() const; inline void clear_node_state(); static const int kNodeStateFieldNumber = 5; - inline ::kbd_idlfile::linkage::ENLcsStatus node_state() const; - inline void set_node_state(::kbd_idlfile::linkage::ENLcsStatus value); + inline ::iot_idl::linkage::ENLcsStatus node_state() const; + inline void set_node_state(::iot_idl::linkage::ENLcsStatus value); - // repeated .kbd_idlfile.linkage.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.linkage.FucNodeStatusParameter nodelist = 6; inline int nodelist_size() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 6; - inline const ::kbd_idlfile::linkage::FucNodeStatusParameter& nodelist(int index) const; - inline ::kbd_idlfile::linkage::FucNodeStatusParameter* mutable_nodelist(int index); - inline ::kbd_idlfile::linkage::FucNodeStatusParameter* add_nodelist(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::FucNodeStatusParameter >& + inline const ::iot_idl::linkage::FucNodeStatusParameter& nodelist(int index) const; + inline ::iot_idl::linkage::FucNodeStatusParameter* mutable_nodelist(int index); + inline ::iot_idl::linkage::FucNodeStatusParameter* add_nodelist(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::FucNodeStatusParameter >& nodelist() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::FucNodeStatusParameter >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::FucNodeStatusParameter >* mutable_nodelist(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.LinkNodeStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.LinkNodeStatusParameter) private: inline void set_has_link_name(); inline void clear_has_link_name(); @@ -953,7 +953,7 @@ class IDL_FILES_EXPORT LinkNodeStatusParameter : public ::google::protobuf::Mess ::google::protobuf::int64 timeflag_; int check_state_; int node_state_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::FucNodeStatusParameter > nodelist_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::FucNodeStatusParameter > nodelist_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); friend void protobuf_ShutdownFile_LinkageMessage_2eproto(); @@ -1054,7 +1054,7 @@ class IDL_FILES_EXPORT ActorParameter : public ::google::protobuf::Message { inline ::std::string* release_user_name(); inline void set_allocated_user_name(::std::string* user_name); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.ActorParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.ActorParameter) private: inline void set_has_user_id(); inline void clear_has_user_id(); @@ -1135,37 +1135,37 @@ class IDL_FILES_EXPORT StatusChangeMessage : public ::google::protobuf::Message // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::linkage::LcsPkgHead& pkg_head() const; - inline ::kbd_idlfile::linkage::LcsPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::linkage::LcsPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head); + inline const ::iot_idl::linkage::LcsPkgHead& pkg_head() const; + inline ::iot_idl::linkage::LcsPkgHead* mutable_pkg_head(); + inline ::iot_idl::linkage::LcsPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head); - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; inline bool has_nodelist() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 2; - inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& nodelist() const; - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* mutable_nodelist(); - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* release_nodelist(); - inline void set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist); + inline const ::iot_idl::linkage::LinkNodeStatusParameter& nodelist() const; + inline ::iot_idl::linkage::LinkNodeStatusParameter* mutable_nodelist(); + inline ::iot_idl::linkage::LinkNodeStatusParameter* release_nodelist(); + inline void set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist); - // repeated .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.linkage.ExecuteStatusParameter execute_status = 3; inline int execute_status_size() const; inline void clear_execute_status(); static const int kExecuteStatusFieldNumber = 3; - inline const ::kbd_idlfile::linkage::ExecuteStatusParameter& execute_status(int index) const; - inline ::kbd_idlfile::linkage::ExecuteStatusParameter* mutable_execute_status(int index); - inline ::kbd_idlfile::linkage::ExecuteStatusParameter* add_execute_status(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ExecuteStatusParameter >& + inline const ::iot_idl::linkage::ExecuteStatusParameter& execute_status(int index) const; + inline ::iot_idl::linkage::ExecuteStatusParameter* mutable_execute_status(int index); + inline ::iot_idl::linkage::ExecuteStatusParameter* add_execute_status(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ExecuteStatusParameter >& execute_status() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ExecuteStatusParameter >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ExecuteStatusParameter >* mutable_execute_status(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.StatusChangeMessage) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.StatusChangeMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1176,9 +1176,9 @@ class IDL_FILES_EXPORT StatusChangeMessage : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::LcsPkgHead* pkg_head_; - ::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ExecuteStatusParameter > execute_status_; + ::iot_idl::linkage::LcsPkgHead* pkg_head_; + ::iot_idl::linkage::LinkNodeStatusParameter* nodelist_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ExecuteStatusParameter > execute_status_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); friend void protobuf_ShutdownFile_LinkageMessage_2eproto(); @@ -1241,23 +1241,23 @@ class IDL_FILES_EXPORT LinkStartRequestMessage : public ::google::protobuf::Mess // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::linkage::LcsPkgHead& pkg_head() const; - inline ::kbd_idlfile::linkage::LcsPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::linkage::LcsPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head); + inline const ::iot_idl::linkage::LcsPkgHead& pkg_head() const; + inline ::iot_idl::linkage::LcsPkgHead* mutable_pkg_head(); + inline ::iot_idl::linkage::LcsPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head); - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; inline bool has_nodelist() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 2; - inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& nodelist() const; - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* mutable_nodelist(); - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* release_nodelist(); - inline void set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist); + inline const ::iot_idl::linkage::LinkNodeStatusParameter& nodelist() const; + inline ::iot_idl::linkage::LinkNodeStatusParameter* mutable_nodelist(); + inline ::iot_idl::linkage::LinkNodeStatusParameter* release_nodelist(); + inline void set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist); // required int64 trigger_time = 3; inline bool has_trigger_time() const; @@ -1266,7 +1266,7 @@ class IDL_FILES_EXPORT LinkStartRequestMessage : public ::google::protobuf::Mess inline ::google::protobuf::int64 trigger_time() const; inline void set_trigger_time(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.LinkStartRequestMessage) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.LinkStartRequestMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1279,8 +1279,8 @@ class IDL_FILES_EXPORT LinkStartRequestMessage : public ::google::protobuf::Mess ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::LcsPkgHead* pkg_head_; - ::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist_; + ::iot_idl::linkage::LcsPkgHead* pkg_head_; + ::iot_idl::linkage::LinkNodeStatusParameter* nodelist_; ::google::protobuf::int64 trigger_time_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); @@ -1344,43 +1344,43 @@ class IDL_FILES_EXPORT UiRequestMessage : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::linkage::LcsPkgHead& pkg_head() const; - inline ::kbd_idlfile::linkage::LcsPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::linkage::LcsPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head); + inline const ::iot_idl::linkage::LcsPkgHead& pkg_head() const; + inline ::iot_idl::linkage::LcsPkgHead* mutable_pkg_head(); + inline ::iot_idl::linkage::LcsPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head); - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 2; - inline const ::kbd_idlfile::linkage::ActorParameter& actor() const; - inline ::kbd_idlfile::linkage::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::linkage::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor); + inline const ::iot_idl::linkage::ActorParameter& actor() const; + inline ::iot_idl::linkage::ActorParameter* mutable_actor(); + inline ::iot_idl::linkage::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::linkage::ActorParameter* actor); - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; inline bool has_nodelist() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 3; - inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& nodelist() const; - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* mutable_nodelist(); - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* release_nodelist(); - inline void set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist); + inline const ::iot_idl::linkage::LinkNodeStatusParameter& nodelist() const; + inline ::iot_idl::linkage::LinkNodeStatusParameter* mutable_nodelist(); + inline ::iot_idl::linkage::LinkNodeStatusParameter* release_nodelist(); + inline void set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist); - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 4; inline bool has_execute_status() const; inline void clear_execute_status(); static const int kExecuteStatusFieldNumber = 4; - inline const ::kbd_idlfile::linkage::ExecuteStatusParameter& execute_status() const; - inline ::kbd_idlfile::linkage::ExecuteStatusParameter* mutable_execute_status(); - inline ::kbd_idlfile::linkage::ExecuteStatusParameter* release_execute_status(); - inline void set_allocated_execute_status(::kbd_idlfile::linkage::ExecuteStatusParameter* execute_status); + inline const ::iot_idl::linkage::ExecuteStatusParameter& execute_status() const; + inline ::iot_idl::linkage::ExecuteStatusParameter* mutable_execute_status(); + inline ::iot_idl::linkage::ExecuteStatusParameter* release_execute_status(); + inline void set_allocated_execute_status(::iot_idl::linkage::ExecuteStatusParameter* execute_status); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.UiRequestMessage) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.UiRequestMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1395,10 +1395,10 @@ class IDL_FILES_EXPORT UiRequestMessage : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::LcsPkgHead* pkg_head_; - ::kbd_idlfile::linkage::ActorParameter* actor_; - ::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist_; - ::kbd_idlfile::linkage::ExecuteStatusParameter* execute_status_; + ::iot_idl::linkage::LcsPkgHead* pkg_head_; + ::iot_idl::linkage::ActorParameter* actor_; + ::iot_idl::linkage::LinkNodeStatusParameter* nodelist_; + ::iot_idl::linkage::ExecuteStatusParameter* execute_status_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); friend void protobuf_ShutdownFile_LinkageMessage_2eproto(); @@ -1461,41 +1461,41 @@ class IDL_FILES_EXPORT UiRequestMessageAck : public ::google::protobuf::Message // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::linkage::LcsPkgHead& pkg_head() const; - inline ::kbd_idlfile::linkage::LcsPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::linkage::LcsPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head); + inline const ::iot_idl::linkage::LcsPkgHead& pkg_head() const; + inline ::iot_idl::linkage::LcsPkgHead* mutable_pkg_head(); + inline ::iot_idl::linkage::LcsPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head); - // required .kbd_idlfile.linkage.ActorParameter actor = 2; + // required .iot_idl.linkage.ActorParameter actor = 2; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 2; - inline const ::kbd_idlfile::linkage::ActorParameter& actor() const; - inline ::kbd_idlfile::linkage::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::linkage::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor); + inline const ::iot_idl::linkage::ActorParameter& actor() const; + inline ::iot_idl::linkage::ActorParameter* mutable_actor(); + inline ::iot_idl::linkage::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::linkage::ActorParameter* actor); - // required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; + // required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; inline bool has_nodelist() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 3; - inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& nodelist() const; - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* mutable_nodelist(); - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* release_nodelist(); - inline void set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist); + inline const ::iot_idl::linkage::LinkNodeStatusParameter& nodelist() const; + inline ::iot_idl::linkage::LinkNodeStatusParameter* mutable_nodelist(); + inline ::iot_idl::linkage::LinkNodeStatusParameter* release_nodelist(); + inline void set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist); - // required .kbd_idlfile.linkage.ENUiOperateType optype = 4; + // required .iot_idl.linkage.ENUiOperateType optype = 4; inline bool has_optype() const; inline void clear_optype(); static const int kOptypeFieldNumber = 4; - inline ::kbd_idlfile::linkage::ENUiOperateType optype() const; - inline void set_optype(::kbd_idlfile::linkage::ENUiOperateType value); + inline ::iot_idl::linkage::ENUiOperateType optype() const; + inline void set_optype(::iot_idl::linkage::ENUiOperateType value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.UiRequestMessageAck) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.UiRequestMessageAck) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1510,9 +1510,9 @@ class IDL_FILES_EXPORT UiRequestMessageAck : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::LcsPkgHead* pkg_head_; - ::kbd_idlfile::linkage::ActorParameter* actor_; - ::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist_; + ::iot_idl::linkage::LcsPkgHead* pkg_head_; + ::iot_idl::linkage::ActorParameter* actor_; + ::iot_idl::linkage::LinkNodeStatusParameter* nodelist_; int optype_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); @@ -1576,41 +1576,41 @@ class IDL_FILES_EXPORT LinkOperateMessage : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::linkage::LcsPkgHead& pkg_head() const; - inline ::kbd_idlfile::linkage::LcsPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::linkage::LcsPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head); + inline const ::iot_idl::linkage::LcsPkgHead& pkg_head() const; + inline ::iot_idl::linkage::LcsPkgHead* mutable_pkg_head(); + inline ::iot_idl::linkage::LcsPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head); - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; inline bool has_link_node() const; inline void clear_link_node(); static const int kLinkNodeFieldNumber = 2; - inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& link_node() const; - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* mutable_link_node(); - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* release_link_node(); - inline void set_allocated_link_node(::kbd_idlfile::linkage::LinkNodeStatusParameter* link_node); + inline const ::iot_idl::linkage::LinkNodeStatusParameter& link_node() const; + inline ::iot_idl::linkage::LinkNodeStatusParameter* mutable_link_node(); + inline ::iot_idl::linkage::LinkNodeStatusParameter* release_link_node(); + inline void set_allocated_link_node(::iot_idl::linkage::LinkNodeStatusParameter* link_node); - // required .kbd_idlfile.linkage.ActorParameter actor = 3; + // required .iot_idl.linkage.ActorParameter actor = 3; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 3; - inline const ::kbd_idlfile::linkage::ActorParameter& actor() const; - inline ::kbd_idlfile::linkage::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::linkage::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor); + inline const ::iot_idl::linkage::ActorParameter& actor() const; + inline ::iot_idl::linkage::ActorParameter* mutable_actor(); + inline ::iot_idl::linkage::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::linkage::ActorParameter* actor); - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 4; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 4; inline bool has_opreate_type() const; inline void clear_opreate_type(); static const int kOpreateTypeFieldNumber = 4; - inline ::kbd_idlfile::linkage::ENLinkOperateType opreate_type() const; - inline void set_opreate_type(::kbd_idlfile::linkage::ENLinkOperateType value); + inline ::iot_idl::linkage::ENLinkOperateType opreate_type() const; + inline void set_opreate_type(::iot_idl::linkage::ENLinkOperateType value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.LinkOperateMessage) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.LinkOperateMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1625,9 +1625,9 @@ class IDL_FILES_EXPORT LinkOperateMessage : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::LcsPkgHead* pkg_head_; - ::kbd_idlfile::linkage::LinkNodeStatusParameter* link_node_; - ::kbd_idlfile::linkage::ActorParameter* actor_; + ::iot_idl::linkage::LcsPkgHead* pkg_head_; + ::iot_idl::linkage::LinkNodeStatusParameter* link_node_; + ::iot_idl::linkage::ActorParameter* actor_; int opreate_type_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); @@ -1691,50 +1691,50 @@ class IDL_FILES_EXPORT LinkOperateMessageAck : public ::google::protobuf::Messag // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::linkage::LcsPkgHead& pkg_head() const; - inline ::kbd_idlfile::linkage::LcsPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::linkage::LcsPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head); + inline const ::iot_idl::linkage::LcsPkgHead& pkg_head() const; + inline ::iot_idl::linkage::LcsPkgHead* mutable_pkg_head(); + inline ::iot_idl::linkage::LcsPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head); - // required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; + // required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; inline bool has_link_node() const; inline void clear_link_node(); static const int kLinkNodeFieldNumber = 2; - inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& link_node() const; - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* mutable_link_node(); - inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* release_link_node(); - inline void set_allocated_link_node(::kbd_idlfile::linkage::LinkNodeStatusParameter* link_node); + inline const ::iot_idl::linkage::LinkNodeStatusParameter& link_node() const; + inline ::iot_idl::linkage::LinkNodeStatusParameter* mutable_link_node(); + inline ::iot_idl::linkage::LinkNodeStatusParameter* release_link_node(); + inline void set_allocated_link_node(::iot_idl::linkage::LinkNodeStatusParameter* link_node); - // required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 3; + // required .iot_idl.linkage.ENLinkOperateType opreate_type = 3; inline bool has_opreate_type() const; inline void clear_opreate_type(); static const int kOpreateTypeFieldNumber = 3; - inline ::kbd_idlfile::linkage::ENLinkOperateType opreate_type() const; - inline void set_opreate_type(::kbd_idlfile::linkage::ENLinkOperateType value); + inline ::iot_idl::linkage::ENLinkOperateType opreate_type() const; + inline void set_opreate_type(::iot_idl::linkage::ENLinkOperateType value); - // required .kbd_idlfile.linkage.ActorParameter actor = 4; + // required .iot_idl.linkage.ActorParameter actor = 4; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 4; - inline const ::kbd_idlfile::linkage::ActorParameter& actor() const; - inline ::kbd_idlfile::linkage::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::linkage::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor); + inline const ::iot_idl::linkage::ActorParameter& actor() const; + inline ::iot_idl::linkage::ActorParameter* mutable_actor(); + inline ::iot_idl::linkage::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::linkage::ActorParameter* actor); - // required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.linkage.ExecuteStatusParameter execute_status = 5; inline bool has_execute_status() const; inline void clear_execute_status(); static const int kExecuteStatusFieldNumber = 5; - inline const ::kbd_idlfile::linkage::ExecuteStatusParameter& execute_status() const; - inline ::kbd_idlfile::linkage::ExecuteStatusParameter* mutable_execute_status(); - inline ::kbd_idlfile::linkage::ExecuteStatusParameter* release_execute_status(); - inline void set_allocated_execute_status(::kbd_idlfile::linkage::ExecuteStatusParameter* execute_status); + inline const ::iot_idl::linkage::ExecuteStatusParameter& execute_status() const; + inline ::iot_idl::linkage::ExecuteStatusParameter* mutable_execute_status(); + inline ::iot_idl::linkage::ExecuteStatusParameter* release_execute_status(); + inline void set_allocated_execute_status(::iot_idl::linkage::ExecuteStatusParameter* execute_status); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.LinkOperateMessageAck) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.LinkOperateMessageAck) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1751,10 +1751,10 @@ class IDL_FILES_EXPORT LinkOperateMessageAck : public ::google::protobuf::Messag ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::LcsPkgHead* pkg_head_; - ::kbd_idlfile::linkage::LinkNodeStatusParameter* link_node_; - ::kbd_idlfile::linkage::ActorParameter* actor_; - ::kbd_idlfile::linkage::ExecuteStatusParameter* execute_status_; + ::iot_idl::linkage::LcsPkgHead* pkg_head_; + ::iot_idl::linkage::LinkNodeStatusParameter* link_node_; + ::iot_idl::linkage::ActorParameter* actor_; + ::iot_idl::linkage::ExecuteStatusParameter* execute_status_; int opreate_type_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); @@ -1830,7 +1830,7 @@ class IDL_FILES_EXPORT PushParameter : public ::google::protobuf::Message { inline ::std::string* release_graph_name(); inline void set_allocated_graph_name(::std::string* graph_name); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.PushParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.PushParameter) private: inline void set_has_graph_name(); inline void clear_has_graph_name(); @@ -1914,7 +1914,7 @@ class IDL_FILES_EXPORT HintParameter : public ::google::protobuf::Message { inline ::std::string* release_hint_info(); inline void set_allocated_hint_info(::std::string* hint_info); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.HintParameter) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.HintParameter) private: inline void set_has_hint_info(); inline void clear_has_hint_info(); @@ -1986,21 +1986,21 @@ class IDL_FILES_EXPORT ActionToHmiMessage : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; + // required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::linkage::LcsPkgHead& pkg_head() const; - inline ::kbd_idlfile::linkage::LcsPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::linkage::LcsPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head); + inline const ::iot_idl::linkage::LcsPkgHead& pkg_head() const; + inline ::iot_idl::linkage::LcsPkgHead* mutable_pkg_head(); + inline ::iot_idl::linkage::LcsPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head); - // required .kbd_idlfile.linkage.ENActionOperateType action_type = 2; + // required .iot_idl.linkage.ENActionOperateType action_type = 2; inline bool has_action_type() const; inline void clear_action_type(); static const int kActionTypeFieldNumber = 2; - inline ::kbd_idlfile::linkage::ENActionOperateType action_type() const; - inline void set_action_type(::kbd_idlfile::linkage::ENActionOperateType value); + inline ::iot_idl::linkage::ENActionOperateType action_type() const; + inline void set_action_type(::iot_idl::linkage::ENActionOperateType value); // required string host_name = 3; inline bool has_host_name() const; @@ -2014,25 +2014,25 @@ class IDL_FILES_EXPORT ActionToHmiMessage : public ::google::protobuf::Message { inline ::std::string* release_host_name(); inline void set_allocated_host_name(::std::string* host_name); - // optional .kbd_idlfile.linkage.PushParameter push_param = 4; + // optional .iot_idl.linkage.PushParameter push_param = 4; inline bool has_push_param() const; inline void clear_push_param(); static const int kPushParamFieldNumber = 4; - inline const ::kbd_idlfile::linkage::PushParameter& push_param() const; - inline ::kbd_idlfile::linkage::PushParameter* mutable_push_param(); - inline ::kbd_idlfile::linkage::PushParameter* release_push_param(); - inline void set_allocated_push_param(::kbd_idlfile::linkage::PushParameter* push_param); + inline const ::iot_idl::linkage::PushParameter& push_param() const; + inline ::iot_idl::linkage::PushParameter* mutable_push_param(); + inline ::iot_idl::linkage::PushParameter* release_push_param(); + inline void set_allocated_push_param(::iot_idl::linkage::PushParameter* push_param); - // optional .kbd_idlfile.linkage.HintParameter hint_param = 5; + // optional .iot_idl.linkage.HintParameter hint_param = 5; inline bool has_hint_param() const; inline void clear_hint_param(); static const int kHintParamFieldNumber = 5; - inline const ::kbd_idlfile::linkage::HintParameter& hint_param() const; - inline ::kbd_idlfile::linkage::HintParameter* mutable_hint_param(); - inline ::kbd_idlfile::linkage::HintParameter* release_hint_param(); - inline void set_allocated_hint_param(::kbd_idlfile::linkage::HintParameter* hint_param); + inline const ::iot_idl::linkage::HintParameter& hint_param() const; + inline ::iot_idl::linkage::HintParameter* mutable_hint_param(); + inline ::iot_idl::linkage::HintParameter* release_hint_param(); + inline void set_allocated_hint_param(::iot_idl::linkage::HintParameter* hint_param); - // @@protoc_insertion_point(class_scope:kbd_idlfile.linkage.ActionToHmiMessage) + // @@protoc_insertion_point(class_scope:iot_idl.linkage.ActionToHmiMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -2049,10 +2049,10 @@ class IDL_FILES_EXPORT ActionToHmiMessage : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::linkage::LcsPkgHead* pkg_head_; + ::iot_idl::linkage::LcsPkgHead* pkg_head_; ::std::string* host_name_; - ::kbd_idlfile::linkage::PushParameter* push_param_; - ::kbd_idlfile::linkage::HintParameter* hint_param_; + ::iot_idl::linkage::PushParameter* push_param_; + ::iot_idl::linkage::HintParameter* hint_param_; int action_type_; friend void IDL_FILES_EXPORT protobuf_AddDesc_LinkageMessage_2eproto(); friend void protobuf_AssignDesc_LinkageMessage_2eproto(); @@ -2085,7 +2085,7 @@ inline void LcsPkgHead::clear_source_tag() { clear_has_source_tag(); } inline const ::std::string& LcsPkgHead::source_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LcsPkgHead.source_tag) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LcsPkgHead.source_tag) return *source_tag_; } inline void LcsPkgHead::set_source_tag(const ::std::string& value) { @@ -2094,7 +2094,7 @@ inline void LcsPkgHead::set_source_tag(const ::std::string& value) { source_tag_ = new ::std::string; } source_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LcsPkgHead.source_tag) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LcsPkgHead.source_tag) } inline void LcsPkgHead::set_source_tag(const char* value) { set_has_source_tag(); @@ -2102,7 +2102,7 @@ inline void LcsPkgHead::set_source_tag(const char* value) { source_tag_ = new ::std::string; } source_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.LcsPkgHead.source_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.LcsPkgHead.source_tag) } inline void LcsPkgHead::set_source_tag(const char* value, size_t size) { set_has_source_tag(); @@ -2110,14 +2110,14 @@ inline void LcsPkgHead::set_source_tag(const char* value, size_t size) { source_tag_ = new ::std::string; } source_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.LcsPkgHead.source_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.LcsPkgHead.source_tag) } inline ::std::string* LcsPkgHead::mutable_source_tag() { set_has_source_tag(); if (source_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { source_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LcsPkgHead.source_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LcsPkgHead.source_tag) return source_tag_; } inline ::std::string* LcsPkgHead::release_source_tag() { @@ -2141,10 +2141,10 @@ inline void LcsPkgHead::set_allocated_source_tag(::std::string* source_tag) { clear_has_source_tag(); source_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LcsPkgHead.source_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LcsPkgHead.source_tag) } -// required .kbd_idlfile.linkage.enLcsMsgType msg_type = 2; +// required .iot_idl.linkage.enLcsMsgType msg_type = 2; inline bool LcsPkgHead::has_msg_type() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -2158,15 +2158,15 @@ inline void LcsPkgHead::clear_msg_type() { msg_type_ = 1; clear_has_msg_type(); } -inline ::kbd_idlfile::linkage::enLcsMsgType LcsPkgHead::msg_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LcsPkgHead.msg_type) - return static_cast< ::kbd_idlfile::linkage::enLcsMsgType >(msg_type_); +inline ::iot_idl::linkage::enLcsMsgType LcsPkgHead::msg_type() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LcsPkgHead.msg_type) + return static_cast< ::iot_idl::linkage::enLcsMsgType >(msg_type_); } -inline void LcsPkgHead::set_msg_type(::kbd_idlfile::linkage::enLcsMsgType value) { - assert(::kbd_idlfile::linkage::enLcsMsgType_IsValid(value)); +inline void LcsPkgHead::set_msg_type(::iot_idl::linkage::enLcsMsgType value) { + assert(::iot_idl::linkage::enLcsMsgType_IsValid(value)); set_has_msg_type(); msg_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LcsPkgHead.msg_type) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LcsPkgHead.msg_type) } // required int32 source_domain = 3; @@ -2184,13 +2184,13 @@ inline void LcsPkgHead::clear_source_domain() { clear_has_source_domain(); } inline ::google::protobuf::int32 LcsPkgHead::source_domain() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LcsPkgHead.source_domain) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LcsPkgHead.source_domain) return source_domain_; } inline void LcsPkgHead::set_source_domain(::google::protobuf::int32 value) { set_has_source_domain(); source_domain_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LcsPkgHead.source_domain) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LcsPkgHead.source_domain) } // required int32 target_domain = 4; @@ -2208,13 +2208,13 @@ inline void LcsPkgHead::clear_target_domain() { clear_has_target_domain(); } inline ::google::protobuf::int32 LcsPkgHead::target_domain() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LcsPkgHead.target_domain) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LcsPkgHead.target_domain) return target_domain_; } inline void LcsPkgHead::set_target_domain(::google::protobuf::int32 value) { set_has_target_domain(); target_domain_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LcsPkgHead.target_domain) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LcsPkgHead.target_domain) } // required int32 para1 = 5; @@ -2232,13 +2232,13 @@ inline void LcsPkgHead::clear_para1() { clear_has_para1(); } inline ::google::protobuf::int32 LcsPkgHead::para1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LcsPkgHead.para1) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LcsPkgHead.para1) return para1_; } inline void LcsPkgHead::set_para1(::google::protobuf::int32 value) { set_has_para1(); para1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LcsPkgHead.para1) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LcsPkgHead.para1) } // required int32 para2 = 6; @@ -2256,20 +2256,20 @@ inline void LcsPkgHead::clear_para2() { clear_has_para2(); } inline ::google::protobuf::int32 LcsPkgHead::para2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LcsPkgHead.para2) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LcsPkgHead.para2) return para2_; } inline void LcsPkgHead::set_para2(::google::protobuf::int32 value) { set_has_para2(); para2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LcsPkgHead.para2) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LcsPkgHead.para2) } // ------------------------------------------------------------------- // ErrorParameter -// required .kbd_idlfile.linkage.enErrorCode ErrorCode = 1; +// required .iot_idl.linkage.enErrorCode ErrorCode = 1; inline bool ErrorParameter::has_errorcode() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2283,15 +2283,15 @@ inline void ErrorParameter::clear_errorcode() { errorcode_ = 0; clear_has_errorcode(); } -inline ::kbd_idlfile::linkage::enErrorCode ErrorParameter::errorcode() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ErrorParameter.ErrorCode) - return static_cast< ::kbd_idlfile::linkage::enErrorCode >(errorcode_); +inline ::iot_idl::linkage::enErrorCode ErrorParameter::errorcode() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ErrorParameter.ErrorCode) + return static_cast< ::iot_idl::linkage::enErrorCode >(errorcode_); } -inline void ErrorParameter::set_errorcode(::kbd_idlfile::linkage::enErrorCode value) { - assert(::kbd_idlfile::linkage::enErrorCode_IsValid(value)); +inline void ErrorParameter::set_errorcode(::iot_idl::linkage::enErrorCode value) { + assert(::iot_idl::linkage::enErrorCode_IsValid(value)); set_has_errorcode(); errorcode_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ErrorParameter.ErrorCode) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ErrorParameter.ErrorCode) } // required string ErrorDescription = 2; @@ -2311,7 +2311,7 @@ inline void ErrorParameter::clear_errordescription() { clear_has_errordescription(); } inline const ::std::string& ErrorParameter::errordescription() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ErrorParameter.ErrorDescription) return *errordescription_; } inline void ErrorParameter::set_errordescription(const ::std::string& value) { @@ -2320,7 +2320,7 @@ inline void ErrorParameter::set_errordescription(const ::std::string& value) { errordescription_ = new ::std::string; } errordescription_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ErrorParameter.ErrorDescription) } inline void ErrorParameter::set_errordescription(const char* value) { set_has_errordescription(); @@ -2328,7 +2328,7 @@ inline void ErrorParameter::set_errordescription(const char* value) { errordescription_ = new ::std::string; } errordescription_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.ErrorParameter.ErrorDescription) } inline void ErrorParameter::set_errordescription(const char* value, size_t size) { set_has_errordescription(); @@ -2336,14 +2336,14 @@ inline void ErrorParameter::set_errordescription(const char* value, size_t size) errordescription_ = new ::std::string; } errordescription_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.ErrorParameter.ErrorDescription) } inline ::std::string* ErrorParameter::mutable_errordescription() { set_has_errordescription(); if (errordescription_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { errordescription_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ErrorParameter.ErrorDescription) return errordescription_; } inline ::std::string* ErrorParameter::release_errordescription() { @@ -2367,7 +2367,7 @@ inline void ErrorParameter::set_allocated_errordescription(::std::string* errord clear_has_errordescription(); errordescription_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ErrorParameter.ErrorDescription) } // ------------------------------------------------------------------- @@ -2389,16 +2389,16 @@ inline void ExecuteStatusParameter::clear_statuscode() { clear_has_statuscode(); } inline ::google::protobuf::int32 ExecuteStatusParameter::statuscode() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ExecuteStatusParameter.StatusCode) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ExecuteStatusParameter.StatusCode) return statuscode_; } inline void ExecuteStatusParameter::set_statuscode(::google::protobuf::int32 value) { set_has_statuscode(); statuscode_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ExecuteStatusParameter.StatusCode) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ExecuteStatusParameter.StatusCode) } -// optional .kbd_idlfile.linkage.ErrorParameter erro_param = 2; +// optional .iot_idl.linkage.ErrorParameter erro_param = 2; inline bool ExecuteStatusParameter::has_erro_param() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -2409,26 +2409,26 @@ inline void ExecuteStatusParameter::clear_has_erro_param() { _has_bits_[0] &= ~0x00000002u; } inline void ExecuteStatusParameter::clear_erro_param() { - if (erro_param_ != NULL) erro_param_->::kbd_idlfile::linkage::ErrorParameter::Clear(); + if (erro_param_ != NULL) erro_param_->::iot_idl::linkage::ErrorParameter::Clear(); clear_has_erro_param(); } -inline const ::kbd_idlfile::linkage::ErrorParameter& ExecuteStatusParameter::erro_param() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ExecuteStatusParameter.erro_param) +inline const ::iot_idl::linkage::ErrorParameter& ExecuteStatusParameter::erro_param() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ExecuteStatusParameter.erro_param) return erro_param_ != NULL ? *erro_param_ : *default_instance_->erro_param_; } -inline ::kbd_idlfile::linkage::ErrorParameter* ExecuteStatusParameter::mutable_erro_param() { +inline ::iot_idl::linkage::ErrorParameter* ExecuteStatusParameter::mutable_erro_param() { set_has_erro_param(); - if (erro_param_ == NULL) erro_param_ = new ::kbd_idlfile::linkage::ErrorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ExecuteStatusParameter.erro_param) + if (erro_param_ == NULL) erro_param_ = new ::iot_idl::linkage::ErrorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ExecuteStatusParameter.erro_param) return erro_param_; } -inline ::kbd_idlfile::linkage::ErrorParameter* ExecuteStatusParameter::release_erro_param() { +inline ::iot_idl::linkage::ErrorParameter* ExecuteStatusParameter::release_erro_param() { clear_has_erro_param(); - ::kbd_idlfile::linkage::ErrorParameter* temp = erro_param_; + ::iot_idl::linkage::ErrorParameter* temp = erro_param_; erro_param_ = NULL; return temp; } -inline void ExecuteStatusParameter::set_allocated_erro_param(::kbd_idlfile::linkage::ErrorParameter* erro_param) { +inline void ExecuteStatusParameter::set_allocated_erro_param(::iot_idl::linkage::ErrorParameter* erro_param) { delete erro_param_; erro_param_ = erro_param; if (erro_param) { @@ -2436,7 +2436,7 @@ inline void ExecuteStatusParameter::set_allocated_erro_param(::kbd_idlfile::link } else { clear_has_erro_param(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ExecuteStatusParameter.erro_param) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ExecuteStatusParameter.erro_param) } // ------------------------------------------------------------------- @@ -2460,7 +2460,7 @@ inline void ActionNodeStatusParameter::clear_action_name() { clear_has_action_name(); } inline const ::std::string& ActionNodeStatusParameter::action_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionNodeStatusParameter.action_name) return *action_name_; } inline void ActionNodeStatusParameter::set_action_name(const ::std::string& value) { @@ -2469,7 +2469,7 @@ inline void ActionNodeStatusParameter::set_action_name(const ::std::string& valu action_name_ = new ::std::string; } action_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActionNodeStatusParameter.action_name) } inline void ActionNodeStatusParameter::set_action_name(const char* value) { set_has_action_name(); @@ -2477,7 +2477,7 @@ inline void ActionNodeStatusParameter::set_action_name(const char* value) { action_name_ = new ::std::string; } action_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.ActionNodeStatusParameter.action_name) } inline void ActionNodeStatusParameter::set_action_name(const char* value, size_t size) { set_has_action_name(); @@ -2485,14 +2485,14 @@ inline void ActionNodeStatusParameter::set_action_name(const char* value, size_t action_name_ = new ::std::string; } action_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.ActionNodeStatusParameter.action_name) } inline ::std::string* ActionNodeStatusParameter::mutable_action_name() { set_has_action_name(); if (action_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { action_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActionNodeStatusParameter.action_name) return action_name_; } inline ::std::string* ActionNodeStatusParameter::release_action_name() { @@ -2516,7 +2516,7 @@ inline void ActionNodeStatusParameter::set_allocated_action_name(::std::string* clear_has_action_name(); action_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActionNodeStatusParameter.action_name) } // required string action_desc = 2; @@ -2536,7 +2536,7 @@ inline void ActionNodeStatusParameter::clear_action_desc() { clear_has_action_desc(); } inline const ::std::string& ActionNodeStatusParameter::action_desc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionNodeStatusParameter.action_desc) return *action_desc_; } inline void ActionNodeStatusParameter::set_action_desc(const ::std::string& value) { @@ -2545,7 +2545,7 @@ inline void ActionNodeStatusParameter::set_action_desc(const ::std::string& valu action_desc_ = new ::std::string; } action_desc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActionNodeStatusParameter.action_desc) } inline void ActionNodeStatusParameter::set_action_desc(const char* value) { set_has_action_desc(); @@ -2553,7 +2553,7 @@ inline void ActionNodeStatusParameter::set_action_desc(const char* value) { action_desc_ = new ::std::string; } action_desc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.ActionNodeStatusParameter.action_desc) } inline void ActionNodeStatusParameter::set_action_desc(const char* value, size_t size) { set_has_action_desc(); @@ -2561,14 +2561,14 @@ inline void ActionNodeStatusParameter::set_action_desc(const char* value, size_t action_desc_ = new ::std::string; } action_desc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.ActionNodeStatusParameter.action_desc) } inline ::std::string* ActionNodeStatusParameter::mutable_action_desc() { set_has_action_desc(); if (action_desc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { action_desc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActionNodeStatusParameter.action_desc) return action_desc_; } inline ::std::string* ActionNodeStatusParameter::release_action_desc() { @@ -2592,10 +2592,10 @@ inline void ActionNodeStatusParameter::set_allocated_action_desc(::std::string* clear_has_action_desc(); action_desc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActionNodeStatusParameter.action_desc) } -// required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; +// required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; inline bool ActionNodeStatusParameter::has_check_state() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -2609,18 +2609,18 @@ inline void ActionNodeStatusParameter::clear_check_state() { check_state_ = 0; clear_has_check_state(); } -inline ::kbd_idlfile::linkage::ENLcsNodeCheckStatus ActionNodeStatusParameter::check_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionNodeStatusParameter.check_state) - return static_cast< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus >(check_state_); +inline ::iot_idl::linkage::ENLcsNodeCheckStatus ActionNodeStatusParameter::check_state() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionNodeStatusParameter.check_state) + return static_cast< ::iot_idl::linkage::ENLcsNodeCheckStatus >(check_state_); } -inline void ActionNodeStatusParameter::set_check_state(::kbd_idlfile::linkage::ENLcsNodeCheckStatus value) { - assert(::kbd_idlfile::linkage::ENLcsNodeCheckStatus_IsValid(value)); +inline void ActionNodeStatusParameter::set_check_state(::iot_idl::linkage::ENLcsNodeCheckStatus value) { + assert(::iot_idl::linkage::ENLcsNodeCheckStatus_IsValid(value)); set_has_check_state(); check_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActionNodeStatusParameter.check_state) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActionNodeStatusParameter.check_state) } -// required .kbd_idlfile.linkage.ENLcsStatus node_state = 4; +// required .iot_idl.linkage.ENLcsStatus node_state = 4; inline bool ActionNodeStatusParameter::has_node_state() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -2634,15 +2634,15 @@ inline void ActionNodeStatusParameter::clear_node_state() { node_state_ = 0; clear_has_node_state(); } -inline ::kbd_idlfile::linkage::ENLcsStatus ActionNodeStatusParameter::node_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionNodeStatusParameter.node_state) - return static_cast< ::kbd_idlfile::linkage::ENLcsStatus >(node_state_); +inline ::iot_idl::linkage::ENLcsStatus ActionNodeStatusParameter::node_state() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionNodeStatusParameter.node_state) + return static_cast< ::iot_idl::linkage::ENLcsStatus >(node_state_); } -inline void ActionNodeStatusParameter::set_node_state(::kbd_idlfile::linkage::ENLcsStatus value) { - assert(::kbd_idlfile::linkage::ENLcsStatus_IsValid(value)); +inline void ActionNodeStatusParameter::set_node_state(::iot_idl::linkage::ENLcsStatus value) { + assert(::iot_idl::linkage::ENLcsStatus_IsValid(value)); set_has_node_state(); node_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActionNodeStatusParameter.node_state) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActionNodeStatusParameter.node_state) } // required int64 timeflag = 5; @@ -2660,13 +2660,13 @@ inline void ActionNodeStatusParameter::clear_timeflag() { clear_has_timeflag(); } inline ::google::protobuf::int64 ActionNodeStatusParameter::timeflag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionNodeStatusParameter.timeflag) return timeflag_; } inline void ActionNodeStatusParameter::set_timeflag(::google::protobuf::int64 value) { set_has_timeflag(); timeflag_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActionNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActionNodeStatusParameter.timeflag) } // ------------------------------------------------------------------- @@ -2690,7 +2690,7 @@ inline void FucNodeStatusParameter::clear_fuc_name() { clear_has_fuc_name(); } inline const ::std::string& FucNodeStatusParameter::fuc_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_get:iot_idl.linkage.FucNodeStatusParameter.fuc_name) return *fuc_name_; } inline void FucNodeStatusParameter::set_fuc_name(const ::std::string& value) { @@ -2699,7 +2699,7 @@ inline void FucNodeStatusParameter::set_fuc_name(const ::std::string& value) { fuc_name_ = new ::std::string; } fuc_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set:iot_idl.linkage.FucNodeStatusParameter.fuc_name) } inline void FucNodeStatusParameter::set_fuc_name(const char* value) { set_has_fuc_name(); @@ -2707,7 +2707,7 @@ inline void FucNodeStatusParameter::set_fuc_name(const char* value) { fuc_name_ = new ::std::string; } fuc_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.FucNodeStatusParameter.fuc_name) } inline void FucNodeStatusParameter::set_fuc_name(const char* value, size_t size) { set_has_fuc_name(); @@ -2715,14 +2715,14 @@ inline void FucNodeStatusParameter::set_fuc_name(const char* value, size_t size) fuc_name_ = new ::std::string; } fuc_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.FucNodeStatusParameter.fuc_name) } inline ::std::string* FucNodeStatusParameter::mutable_fuc_name() { set_has_fuc_name(); if (fuc_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { fuc_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.FucNodeStatusParameter.fuc_name) return fuc_name_; } inline ::std::string* FucNodeStatusParameter::release_fuc_name() { @@ -2746,7 +2746,7 @@ inline void FucNodeStatusParameter::set_allocated_fuc_name(::std::string* fuc_na clear_has_fuc_name(); fuc_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.FucNodeStatusParameter.fuc_name) } // required string fuc_desc = 2; @@ -2766,7 +2766,7 @@ inline void FucNodeStatusParameter::clear_fuc_desc() { clear_has_fuc_desc(); } inline const ::std::string& FucNodeStatusParameter::fuc_desc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_get:iot_idl.linkage.FucNodeStatusParameter.fuc_desc) return *fuc_desc_; } inline void FucNodeStatusParameter::set_fuc_desc(const ::std::string& value) { @@ -2775,7 +2775,7 @@ inline void FucNodeStatusParameter::set_fuc_desc(const ::std::string& value) { fuc_desc_ = new ::std::string; } fuc_desc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set:iot_idl.linkage.FucNodeStatusParameter.fuc_desc) } inline void FucNodeStatusParameter::set_fuc_desc(const char* value) { set_has_fuc_desc(); @@ -2783,7 +2783,7 @@ inline void FucNodeStatusParameter::set_fuc_desc(const char* value) { fuc_desc_ = new ::std::string; } fuc_desc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.FucNodeStatusParameter.fuc_desc) } inline void FucNodeStatusParameter::set_fuc_desc(const char* value, size_t size) { set_has_fuc_desc(); @@ -2791,14 +2791,14 @@ inline void FucNodeStatusParameter::set_fuc_desc(const char* value, size_t size) fuc_desc_ = new ::std::string; } fuc_desc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.FucNodeStatusParameter.fuc_desc) } inline ::std::string* FucNodeStatusParameter::mutable_fuc_desc() { set_has_fuc_desc(); if (fuc_desc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { fuc_desc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.FucNodeStatusParameter.fuc_desc) return fuc_desc_; } inline ::std::string* FucNodeStatusParameter::release_fuc_desc() { @@ -2822,10 +2822,10 @@ inline void FucNodeStatusParameter::set_allocated_fuc_desc(::std::string* fuc_de clear_has_fuc_desc(); fuc_desc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.FucNodeStatusParameter.fuc_desc) } -// required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; +// required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; inline bool FucNodeStatusParameter::has_check_state() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -2839,15 +2839,15 @@ inline void FucNodeStatusParameter::clear_check_state() { check_state_ = 0; clear_has_check_state(); } -inline ::kbd_idlfile::linkage::ENLcsNodeCheckStatus FucNodeStatusParameter::check_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.FucNodeStatusParameter.check_state) - return static_cast< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus >(check_state_); +inline ::iot_idl::linkage::ENLcsNodeCheckStatus FucNodeStatusParameter::check_state() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.FucNodeStatusParameter.check_state) + return static_cast< ::iot_idl::linkage::ENLcsNodeCheckStatus >(check_state_); } -inline void FucNodeStatusParameter::set_check_state(::kbd_idlfile::linkage::ENLcsNodeCheckStatus value) { - assert(::kbd_idlfile::linkage::ENLcsNodeCheckStatus_IsValid(value)); +inline void FucNodeStatusParameter::set_check_state(::iot_idl::linkage::ENLcsNodeCheckStatus value) { + assert(::iot_idl::linkage::ENLcsNodeCheckStatus_IsValid(value)); set_has_check_state(); check_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.FucNodeStatusParameter.check_state) + // @@protoc_insertion_point(field_set:iot_idl.linkage.FucNodeStatusParameter.check_state) } // required int64 timeflag = 4; @@ -2865,16 +2865,16 @@ inline void FucNodeStatusParameter::clear_timeflag() { clear_has_timeflag(); } inline ::google::protobuf::int64 FucNodeStatusParameter::timeflag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.FucNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_get:iot_idl.linkage.FucNodeStatusParameter.timeflag) return timeflag_; } inline void FucNodeStatusParameter::set_timeflag(::google::protobuf::int64 value) { set_has_timeflag(); timeflag_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.FucNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_set:iot_idl.linkage.FucNodeStatusParameter.timeflag) } -// required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; +// required .iot_idl.linkage.ENLcsStatus node_state = 5; inline bool FucNodeStatusParameter::has_node_state() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -2888,44 +2888,44 @@ inline void FucNodeStatusParameter::clear_node_state() { node_state_ = 0; clear_has_node_state(); } -inline ::kbd_idlfile::linkage::ENLcsStatus FucNodeStatusParameter::node_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.FucNodeStatusParameter.node_state) - return static_cast< ::kbd_idlfile::linkage::ENLcsStatus >(node_state_); +inline ::iot_idl::linkage::ENLcsStatus FucNodeStatusParameter::node_state() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.FucNodeStatusParameter.node_state) + return static_cast< ::iot_idl::linkage::ENLcsStatus >(node_state_); } -inline void FucNodeStatusParameter::set_node_state(::kbd_idlfile::linkage::ENLcsStatus value) { - assert(::kbd_idlfile::linkage::ENLcsStatus_IsValid(value)); +inline void FucNodeStatusParameter::set_node_state(::iot_idl::linkage::ENLcsStatus value) { + assert(::iot_idl::linkage::ENLcsStatus_IsValid(value)); set_has_node_state(); node_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.FucNodeStatusParameter.node_state) + // @@protoc_insertion_point(field_set:iot_idl.linkage.FucNodeStatusParameter.node_state) } -// repeated .kbd_idlfile.linkage.ActionNodeStatusParameter nodelist = 6; +// repeated .iot_idl.linkage.ActionNodeStatusParameter nodelist = 6; inline int FucNodeStatusParameter::nodelist_size() const { return nodelist_.size(); } inline void FucNodeStatusParameter::clear_nodelist() { nodelist_.Clear(); } -inline const ::kbd_idlfile::linkage::ActionNodeStatusParameter& FucNodeStatusParameter::nodelist(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.FucNodeStatusParameter.nodelist) +inline const ::iot_idl::linkage::ActionNodeStatusParameter& FucNodeStatusParameter::nodelist(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.FucNodeStatusParameter.nodelist) return nodelist_.Get(index); } -inline ::kbd_idlfile::linkage::ActionNodeStatusParameter* FucNodeStatusParameter::mutable_nodelist(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.FucNodeStatusParameter.nodelist) +inline ::iot_idl::linkage::ActionNodeStatusParameter* FucNodeStatusParameter::mutable_nodelist(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.FucNodeStatusParameter.nodelist) return nodelist_.Mutable(index); } -inline ::kbd_idlfile::linkage::ActionNodeStatusParameter* FucNodeStatusParameter::add_nodelist() { - // @@protoc_insertion_point(field_add:kbd_idlfile.linkage.FucNodeStatusParameter.nodelist) +inline ::iot_idl::linkage::ActionNodeStatusParameter* FucNodeStatusParameter::add_nodelist() { + // @@protoc_insertion_point(field_add:iot_idl.linkage.FucNodeStatusParameter.nodelist) return nodelist_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ActionNodeStatusParameter >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ActionNodeStatusParameter >& FucNodeStatusParameter::nodelist() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.linkage.FucNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_list:iot_idl.linkage.FucNodeStatusParameter.nodelist) return nodelist_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ActionNodeStatusParameter >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ActionNodeStatusParameter >* FucNodeStatusParameter::mutable_nodelist() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.linkage.FucNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_mutable_list:iot_idl.linkage.FucNodeStatusParameter.nodelist) return &nodelist_; } @@ -2950,7 +2950,7 @@ inline void LinkNodeStatusParameter::clear_link_name() { clear_has_link_name(); } inline const ::std::string& LinkNodeStatusParameter::link_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkNodeStatusParameter.link_name) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkNodeStatusParameter.link_name) return *link_name_; } inline void LinkNodeStatusParameter::set_link_name(const ::std::string& value) { @@ -2959,7 +2959,7 @@ inline void LinkNodeStatusParameter::set_link_name(const ::std::string& value) { link_name_ = new ::std::string; } link_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkNodeStatusParameter.link_name) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkNodeStatusParameter.link_name) } inline void LinkNodeStatusParameter::set_link_name(const char* value) { set_has_link_name(); @@ -2967,7 +2967,7 @@ inline void LinkNodeStatusParameter::set_link_name(const char* value) { link_name_ = new ::std::string; } link_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.LinkNodeStatusParameter.link_name) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.LinkNodeStatusParameter.link_name) } inline void LinkNodeStatusParameter::set_link_name(const char* value, size_t size) { set_has_link_name(); @@ -2975,14 +2975,14 @@ inline void LinkNodeStatusParameter::set_link_name(const char* value, size_t siz link_name_ = new ::std::string; } link_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.LinkNodeStatusParameter.link_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.LinkNodeStatusParameter.link_name) } inline ::std::string* LinkNodeStatusParameter::mutable_link_name() { set_has_link_name(); if (link_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { link_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkNodeStatusParameter.link_name) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkNodeStatusParameter.link_name) return link_name_; } inline ::std::string* LinkNodeStatusParameter::release_link_name() { @@ -3006,7 +3006,7 @@ inline void LinkNodeStatusParameter::set_allocated_link_name(::std::string* link clear_has_link_name(); link_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkNodeStatusParameter.link_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkNodeStatusParameter.link_name) } // required string link_desc = 2; @@ -3026,7 +3026,7 @@ inline void LinkNodeStatusParameter::clear_link_desc() { clear_has_link_desc(); } inline const ::std::string& LinkNodeStatusParameter::link_desc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkNodeStatusParameter.link_desc) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkNodeStatusParameter.link_desc) return *link_desc_; } inline void LinkNodeStatusParameter::set_link_desc(const ::std::string& value) { @@ -3035,7 +3035,7 @@ inline void LinkNodeStatusParameter::set_link_desc(const ::std::string& value) { link_desc_ = new ::std::string; } link_desc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkNodeStatusParameter.link_desc) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkNodeStatusParameter.link_desc) } inline void LinkNodeStatusParameter::set_link_desc(const char* value) { set_has_link_desc(); @@ -3043,7 +3043,7 @@ inline void LinkNodeStatusParameter::set_link_desc(const char* value) { link_desc_ = new ::std::string; } link_desc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.LinkNodeStatusParameter.link_desc) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.LinkNodeStatusParameter.link_desc) } inline void LinkNodeStatusParameter::set_link_desc(const char* value, size_t size) { set_has_link_desc(); @@ -3051,14 +3051,14 @@ inline void LinkNodeStatusParameter::set_link_desc(const char* value, size_t siz link_desc_ = new ::std::string; } link_desc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.LinkNodeStatusParameter.link_desc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.LinkNodeStatusParameter.link_desc) } inline ::std::string* LinkNodeStatusParameter::mutable_link_desc() { set_has_link_desc(); if (link_desc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { link_desc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkNodeStatusParameter.link_desc) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkNodeStatusParameter.link_desc) return link_desc_; } inline ::std::string* LinkNodeStatusParameter::release_link_desc() { @@ -3082,10 +3082,10 @@ inline void LinkNodeStatusParameter::set_allocated_link_desc(::std::string* link clear_has_link_desc(); link_desc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkNodeStatusParameter.link_desc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkNodeStatusParameter.link_desc) } -// required .kbd_idlfile.linkage.ENLcsNodeCheckStatus check_state = 3; +// required .iot_idl.linkage.ENLcsNodeCheckStatus check_state = 3; inline bool LinkNodeStatusParameter::has_check_state() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3099,15 +3099,15 @@ inline void LinkNodeStatusParameter::clear_check_state() { check_state_ = 0; clear_has_check_state(); } -inline ::kbd_idlfile::linkage::ENLcsNodeCheckStatus LinkNodeStatusParameter::check_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkNodeStatusParameter.check_state) - return static_cast< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus >(check_state_); +inline ::iot_idl::linkage::ENLcsNodeCheckStatus LinkNodeStatusParameter::check_state() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkNodeStatusParameter.check_state) + return static_cast< ::iot_idl::linkage::ENLcsNodeCheckStatus >(check_state_); } -inline void LinkNodeStatusParameter::set_check_state(::kbd_idlfile::linkage::ENLcsNodeCheckStatus value) { - assert(::kbd_idlfile::linkage::ENLcsNodeCheckStatus_IsValid(value)); +inline void LinkNodeStatusParameter::set_check_state(::iot_idl::linkage::ENLcsNodeCheckStatus value) { + assert(::iot_idl::linkage::ENLcsNodeCheckStatus_IsValid(value)); set_has_check_state(); check_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkNodeStatusParameter.check_state) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkNodeStatusParameter.check_state) } // required int64 timeflag = 4; @@ -3125,16 +3125,16 @@ inline void LinkNodeStatusParameter::clear_timeflag() { clear_has_timeflag(); } inline ::google::protobuf::int64 LinkNodeStatusParameter::timeflag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkNodeStatusParameter.timeflag) return timeflag_; } inline void LinkNodeStatusParameter::set_timeflag(::google::protobuf::int64 value) { set_has_timeflag(); timeflag_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkNodeStatusParameter.timeflag) } -// required .kbd_idlfile.linkage.ENLcsStatus node_state = 5; +// required .iot_idl.linkage.ENLcsStatus node_state = 5; inline bool LinkNodeStatusParameter::has_node_state() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -3148,44 +3148,44 @@ inline void LinkNodeStatusParameter::clear_node_state() { node_state_ = 0; clear_has_node_state(); } -inline ::kbd_idlfile::linkage::ENLcsStatus LinkNodeStatusParameter::node_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkNodeStatusParameter.node_state) - return static_cast< ::kbd_idlfile::linkage::ENLcsStatus >(node_state_); +inline ::iot_idl::linkage::ENLcsStatus LinkNodeStatusParameter::node_state() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkNodeStatusParameter.node_state) + return static_cast< ::iot_idl::linkage::ENLcsStatus >(node_state_); } -inline void LinkNodeStatusParameter::set_node_state(::kbd_idlfile::linkage::ENLcsStatus value) { - assert(::kbd_idlfile::linkage::ENLcsStatus_IsValid(value)); +inline void LinkNodeStatusParameter::set_node_state(::iot_idl::linkage::ENLcsStatus value) { + assert(::iot_idl::linkage::ENLcsStatus_IsValid(value)); set_has_node_state(); node_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkNodeStatusParameter.node_state) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkNodeStatusParameter.node_state) } -// repeated .kbd_idlfile.linkage.FucNodeStatusParameter nodelist = 6; +// repeated .iot_idl.linkage.FucNodeStatusParameter nodelist = 6; inline int LinkNodeStatusParameter::nodelist_size() const { return nodelist_.size(); } inline void LinkNodeStatusParameter::clear_nodelist() { nodelist_.Clear(); } -inline const ::kbd_idlfile::linkage::FucNodeStatusParameter& LinkNodeStatusParameter::nodelist(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkNodeStatusParameter.nodelist) +inline const ::iot_idl::linkage::FucNodeStatusParameter& LinkNodeStatusParameter::nodelist(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkNodeStatusParameter.nodelist) return nodelist_.Get(index); } -inline ::kbd_idlfile::linkage::FucNodeStatusParameter* LinkNodeStatusParameter::mutable_nodelist(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkNodeStatusParameter.nodelist) +inline ::iot_idl::linkage::FucNodeStatusParameter* LinkNodeStatusParameter::mutable_nodelist(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkNodeStatusParameter.nodelist) return nodelist_.Mutable(index); } -inline ::kbd_idlfile::linkage::FucNodeStatusParameter* LinkNodeStatusParameter::add_nodelist() { - // @@protoc_insertion_point(field_add:kbd_idlfile.linkage.LinkNodeStatusParameter.nodelist) +inline ::iot_idl::linkage::FucNodeStatusParameter* LinkNodeStatusParameter::add_nodelist() { + // @@protoc_insertion_point(field_add:iot_idl.linkage.LinkNodeStatusParameter.nodelist) return nodelist_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::FucNodeStatusParameter >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::FucNodeStatusParameter >& LinkNodeStatusParameter::nodelist() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.linkage.LinkNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_list:iot_idl.linkage.LinkNodeStatusParameter.nodelist) return nodelist_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::FucNodeStatusParameter >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::FucNodeStatusParameter >* LinkNodeStatusParameter::mutable_nodelist() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.linkage.LinkNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_mutable_list:iot_idl.linkage.LinkNodeStatusParameter.nodelist) return &nodelist_; } @@ -3208,13 +3208,13 @@ inline void ActorParameter::clear_user_id() { clear_has_user_id(); } inline ::google::protobuf::int32 ActorParameter::user_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActorParameter.user_id) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActorParameter.user_id) return user_id_; } inline void ActorParameter::set_user_id(::google::protobuf::int32 value) { set_has_user_id(); user_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActorParameter.user_id) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActorParameter.user_id) } // required int32 user_groupId = 2; @@ -3232,13 +3232,13 @@ inline void ActorParameter::clear_user_groupid() { clear_has_user_groupid(); } inline ::google::protobuf::int32 ActorParameter::user_groupid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActorParameter.user_groupId) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActorParameter.user_groupId) return user_groupid_; } inline void ActorParameter::set_user_groupid(::google::protobuf::int32 value) { set_has_user_groupid(); user_groupid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActorParameter.user_groupId) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActorParameter.user_groupId) } // required string host_name = 3; @@ -3258,7 +3258,7 @@ inline void ActorParameter::clear_host_name() { clear_has_host_name(); } inline const ::std::string& ActorParameter::host_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActorParameter.host_name) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActorParameter.host_name) return *host_name_; } inline void ActorParameter::set_host_name(const ::std::string& value) { @@ -3267,7 +3267,7 @@ inline void ActorParameter::set_host_name(const ::std::string& value) { host_name_ = new ::std::string; } host_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActorParameter.host_name) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActorParameter.host_name) } inline void ActorParameter::set_host_name(const char* value) { set_has_host_name(); @@ -3275,7 +3275,7 @@ inline void ActorParameter::set_host_name(const char* value) { host_name_ = new ::std::string; } host_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.ActorParameter.host_name) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.ActorParameter.host_name) } inline void ActorParameter::set_host_name(const char* value, size_t size) { set_has_host_name(); @@ -3283,14 +3283,14 @@ inline void ActorParameter::set_host_name(const char* value, size_t size) { host_name_ = new ::std::string; } host_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.ActorParameter.host_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.ActorParameter.host_name) } inline ::std::string* ActorParameter::mutable_host_name() { set_has_host_name(); if (host_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { host_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActorParameter.host_name) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActorParameter.host_name) return host_name_; } inline ::std::string* ActorParameter::release_host_name() { @@ -3314,7 +3314,7 @@ inline void ActorParameter::set_allocated_host_name(::std::string* host_name) { clear_has_host_name(); host_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActorParameter.host_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActorParameter.host_name) } // required string user_name = 4; @@ -3334,7 +3334,7 @@ inline void ActorParameter::clear_user_name() { clear_has_user_name(); } inline const ::std::string& ActorParameter::user_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActorParameter.user_name) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActorParameter.user_name) return *user_name_; } inline void ActorParameter::set_user_name(const ::std::string& value) { @@ -3343,7 +3343,7 @@ inline void ActorParameter::set_user_name(const ::std::string& value) { user_name_ = new ::std::string; } user_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActorParameter.user_name) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActorParameter.user_name) } inline void ActorParameter::set_user_name(const char* value) { set_has_user_name(); @@ -3351,7 +3351,7 @@ inline void ActorParameter::set_user_name(const char* value) { user_name_ = new ::std::string; } user_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.ActorParameter.user_name) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.ActorParameter.user_name) } inline void ActorParameter::set_user_name(const char* value, size_t size) { set_has_user_name(); @@ -3359,14 +3359,14 @@ inline void ActorParameter::set_user_name(const char* value, size_t size) { user_name_ = new ::std::string; } user_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.ActorParameter.user_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.ActorParameter.user_name) } inline ::std::string* ActorParameter::mutable_user_name() { set_has_user_name(); if (user_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { user_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActorParameter.user_name) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActorParameter.user_name) return user_name_; } inline ::std::string* ActorParameter::release_user_name() { @@ -3390,14 +3390,14 @@ inline void ActorParameter::set_allocated_user_name(::std::string* user_name) { clear_has_user_name(); user_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActorParameter.user_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActorParameter.user_name) } // ------------------------------------------------------------------- // StatusChangeMessage -// required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; +// required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool StatusChangeMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3408,26 +3408,26 @@ inline void StatusChangeMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void StatusChangeMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::linkage::LcsPkgHead& StatusChangeMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.StatusChangeMessage.pkg_head) +inline const ::iot_idl::linkage::LcsPkgHead& StatusChangeMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.StatusChangeMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* StatusChangeMessage::mutable_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* StatusChangeMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::linkage::LcsPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.StatusChangeMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::linkage::LcsPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.StatusChangeMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* StatusChangeMessage::release_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* StatusChangeMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::linkage::LcsPkgHead* temp = pkg_head_; + ::iot_idl::linkage::LcsPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void StatusChangeMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head) { +inline void StatusChangeMessage::set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3435,10 +3435,10 @@ inline void StatusChangeMessage::set_allocated_pkg_head(::kbd_idlfile::linkage:: } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.StatusChangeMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.StatusChangeMessage.pkg_head) } -// required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; +// required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; inline bool StatusChangeMessage::has_nodelist() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3449,26 +3449,26 @@ inline void StatusChangeMessage::clear_has_nodelist() { _has_bits_[0] &= ~0x00000002u; } inline void StatusChangeMessage::clear_nodelist() { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); clear_has_nodelist(); } -inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& StatusChangeMessage::nodelist() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.StatusChangeMessage.nodelist) +inline const ::iot_idl::linkage::LinkNodeStatusParameter& StatusChangeMessage::nodelist() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.StatusChangeMessage.nodelist) return nodelist_ != NULL ? *nodelist_ : *default_instance_->nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* StatusChangeMessage::mutable_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* StatusChangeMessage::mutable_nodelist() { set_has_nodelist(); - if (nodelist_ == NULL) nodelist_ = new ::kbd_idlfile::linkage::LinkNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.StatusChangeMessage.nodelist) + if (nodelist_ == NULL) nodelist_ = new ::iot_idl::linkage::LinkNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.StatusChangeMessage.nodelist) return nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* StatusChangeMessage::release_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* StatusChangeMessage::release_nodelist() { clear_has_nodelist(); - ::kbd_idlfile::linkage::LinkNodeStatusParameter* temp = nodelist_; + ::iot_idl::linkage::LinkNodeStatusParameter* temp = nodelist_; nodelist_ = NULL; return temp; } -inline void StatusChangeMessage::set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist) { +inline void StatusChangeMessage::set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist) { delete nodelist_; nodelist_ = nodelist; if (nodelist) { @@ -3476,36 +3476,36 @@ inline void StatusChangeMessage::set_allocated_nodelist(::kbd_idlfile::linkage:: } else { clear_has_nodelist(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.StatusChangeMessage.nodelist) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.StatusChangeMessage.nodelist) } -// repeated .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 3; +// repeated .iot_idl.linkage.ExecuteStatusParameter execute_status = 3; inline int StatusChangeMessage::execute_status_size() const { return execute_status_.size(); } inline void StatusChangeMessage::clear_execute_status() { execute_status_.Clear(); } -inline const ::kbd_idlfile::linkage::ExecuteStatusParameter& StatusChangeMessage::execute_status(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.StatusChangeMessage.execute_status) +inline const ::iot_idl::linkage::ExecuteStatusParameter& StatusChangeMessage::execute_status(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.StatusChangeMessage.execute_status) return execute_status_.Get(index); } -inline ::kbd_idlfile::linkage::ExecuteStatusParameter* StatusChangeMessage::mutable_execute_status(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.StatusChangeMessage.execute_status) +inline ::iot_idl::linkage::ExecuteStatusParameter* StatusChangeMessage::mutable_execute_status(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.StatusChangeMessage.execute_status) return execute_status_.Mutable(index); } -inline ::kbd_idlfile::linkage::ExecuteStatusParameter* StatusChangeMessage::add_execute_status() { - // @@protoc_insertion_point(field_add:kbd_idlfile.linkage.StatusChangeMessage.execute_status) +inline ::iot_idl::linkage::ExecuteStatusParameter* StatusChangeMessage::add_execute_status() { + // @@protoc_insertion_point(field_add:iot_idl.linkage.StatusChangeMessage.execute_status) return execute_status_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ExecuteStatusParameter >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ExecuteStatusParameter >& StatusChangeMessage::execute_status() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.linkage.StatusChangeMessage.execute_status) + // @@protoc_insertion_point(field_list:iot_idl.linkage.StatusChangeMessage.execute_status) return execute_status_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::linkage::ExecuteStatusParameter >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::linkage::ExecuteStatusParameter >* StatusChangeMessage::mutable_execute_status() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.linkage.StatusChangeMessage.execute_status) + // @@protoc_insertion_point(field_mutable_list:iot_idl.linkage.StatusChangeMessage.execute_status) return &execute_status_; } @@ -3513,7 +3513,7 @@ StatusChangeMessage::mutable_execute_status() { // LinkStartRequestMessage -// required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; +// required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool LinkStartRequestMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3524,26 +3524,26 @@ inline void LinkStartRequestMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void LinkStartRequestMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::linkage::LcsPkgHead& LinkStartRequestMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkStartRequestMessage.pkg_head) +inline const ::iot_idl::linkage::LcsPkgHead& LinkStartRequestMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkStartRequestMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* LinkStartRequestMessage::mutable_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* LinkStartRequestMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::linkage::LcsPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkStartRequestMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::linkage::LcsPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkStartRequestMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* LinkStartRequestMessage::release_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* LinkStartRequestMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::linkage::LcsPkgHead* temp = pkg_head_; + ::iot_idl::linkage::LcsPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void LinkStartRequestMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head) { +inline void LinkStartRequestMessage::set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3551,10 +3551,10 @@ inline void LinkStartRequestMessage::set_allocated_pkg_head(::kbd_idlfile::linka } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkStartRequestMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkStartRequestMessage.pkg_head) } -// required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 2; +// required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 2; inline bool LinkStartRequestMessage::has_nodelist() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3565,26 +3565,26 @@ inline void LinkStartRequestMessage::clear_has_nodelist() { _has_bits_[0] &= ~0x00000002u; } inline void LinkStartRequestMessage::clear_nodelist() { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); clear_has_nodelist(); } -inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& LinkStartRequestMessage::nodelist() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkStartRequestMessage.nodelist) +inline const ::iot_idl::linkage::LinkNodeStatusParameter& LinkStartRequestMessage::nodelist() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkStartRequestMessage.nodelist) return nodelist_ != NULL ? *nodelist_ : *default_instance_->nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* LinkStartRequestMessage::mutable_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* LinkStartRequestMessage::mutable_nodelist() { set_has_nodelist(); - if (nodelist_ == NULL) nodelist_ = new ::kbd_idlfile::linkage::LinkNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkStartRequestMessage.nodelist) + if (nodelist_ == NULL) nodelist_ = new ::iot_idl::linkage::LinkNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkStartRequestMessage.nodelist) return nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* LinkStartRequestMessage::release_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* LinkStartRequestMessage::release_nodelist() { clear_has_nodelist(); - ::kbd_idlfile::linkage::LinkNodeStatusParameter* temp = nodelist_; + ::iot_idl::linkage::LinkNodeStatusParameter* temp = nodelist_; nodelist_ = NULL; return temp; } -inline void LinkStartRequestMessage::set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist) { +inline void LinkStartRequestMessage::set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist) { delete nodelist_; nodelist_ = nodelist; if (nodelist) { @@ -3592,7 +3592,7 @@ inline void LinkStartRequestMessage::set_allocated_nodelist(::kbd_idlfile::linka } else { clear_has_nodelist(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkStartRequestMessage.nodelist) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkStartRequestMessage.nodelist) } // required int64 trigger_time = 3; @@ -3610,20 +3610,20 @@ inline void LinkStartRequestMessage::clear_trigger_time() { clear_has_trigger_time(); } inline ::google::protobuf::int64 LinkStartRequestMessage::trigger_time() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkStartRequestMessage.trigger_time) + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkStartRequestMessage.trigger_time) return trigger_time_; } inline void LinkStartRequestMessage::set_trigger_time(::google::protobuf::int64 value) { set_has_trigger_time(); trigger_time_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkStartRequestMessage.trigger_time) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkStartRequestMessage.trigger_time) } // ------------------------------------------------------------------- // UiRequestMessage -// required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; +// required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool UiRequestMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3634,26 +3634,26 @@ inline void UiRequestMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void UiRequestMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::linkage::LcsPkgHead& UiRequestMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessage.pkg_head) +inline const ::iot_idl::linkage::LcsPkgHead& UiRequestMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* UiRequestMessage::mutable_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* UiRequestMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::linkage::LcsPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.UiRequestMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::linkage::LcsPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.UiRequestMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* UiRequestMessage::release_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* UiRequestMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::linkage::LcsPkgHead* temp = pkg_head_; + ::iot_idl::linkage::LcsPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head) { +inline void UiRequestMessage::set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3661,10 +3661,10 @@ inline void UiRequestMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::Lcs } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.UiRequestMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.UiRequestMessage.pkg_head) } -// required .kbd_idlfile.linkage.ActorParameter actor = 2; +// required .iot_idl.linkage.ActorParameter actor = 2; inline bool UiRequestMessage::has_actor() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3675,26 +3675,26 @@ inline void UiRequestMessage::clear_has_actor() { _has_bits_[0] &= ~0x00000002u; } inline void UiRequestMessage::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::linkage::ActorParameter& UiRequestMessage::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessage.actor) +inline const ::iot_idl::linkage::ActorParameter& UiRequestMessage::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessage.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* UiRequestMessage::mutable_actor() { +inline ::iot_idl::linkage::ActorParameter* UiRequestMessage::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::linkage::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.UiRequestMessage.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::linkage::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.UiRequestMessage.actor) return actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* UiRequestMessage::release_actor() { +inline ::iot_idl::linkage::ActorParameter* UiRequestMessage::release_actor() { clear_has_actor(); - ::kbd_idlfile::linkage::ActorParameter* temp = actor_; + ::iot_idl::linkage::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor) { +inline void UiRequestMessage::set_allocated_actor(::iot_idl::linkage::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -3702,10 +3702,10 @@ inline void UiRequestMessage::set_allocated_actor(::kbd_idlfile::linkage::ActorP } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.UiRequestMessage.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.UiRequestMessage.actor) } -// required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; +// required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; inline bool UiRequestMessage::has_nodelist() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3716,26 +3716,26 @@ inline void UiRequestMessage::clear_has_nodelist() { _has_bits_[0] &= ~0x00000004u; } inline void UiRequestMessage::clear_nodelist() { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); clear_has_nodelist(); } -inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& UiRequestMessage::nodelist() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessage.nodelist) +inline const ::iot_idl::linkage::LinkNodeStatusParameter& UiRequestMessage::nodelist() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessage.nodelist) return nodelist_ != NULL ? *nodelist_ : *default_instance_->nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* UiRequestMessage::mutable_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* UiRequestMessage::mutable_nodelist() { set_has_nodelist(); - if (nodelist_ == NULL) nodelist_ = new ::kbd_idlfile::linkage::LinkNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.UiRequestMessage.nodelist) + if (nodelist_ == NULL) nodelist_ = new ::iot_idl::linkage::LinkNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.UiRequestMessage.nodelist) return nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* UiRequestMessage::release_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* UiRequestMessage::release_nodelist() { clear_has_nodelist(); - ::kbd_idlfile::linkage::LinkNodeStatusParameter* temp = nodelist_; + ::iot_idl::linkage::LinkNodeStatusParameter* temp = nodelist_; nodelist_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist) { +inline void UiRequestMessage::set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist) { delete nodelist_; nodelist_ = nodelist; if (nodelist) { @@ -3743,10 +3743,10 @@ inline void UiRequestMessage::set_allocated_nodelist(::kbd_idlfile::linkage::Lin } else { clear_has_nodelist(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.UiRequestMessage.nodelist) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.UiRequestMessage.nodelist) } -// required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 4; +// required .iot_idl.linkage.ExecuteStatusParameter execute_status = 4; inline bool UiRequestMessage::has_execute_status() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -3757,26 +3757,26 @@ inline void UiRequestMessage::clear_has_execute_status() { _has_bits_[0] &= ~0x00000008u; } inline void UiRequestMessage::clear_execute_status() { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::linkage::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::linkage::ExecuteStatusParameter::Clear(); clear_has_execute_status(); } -inline const ::kbd_idlfile::linkage::ExecuteStatusParameter& UiRequestMessage::execute_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessage.execute_status) +inline const ::iot_idl::linkage::ExecuteStatusParameter& UiRequestMessage::execute_status() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessage.execute_status) return execute_status_ != NULL ? *execute_status_ : *default_instance_->execute_status_; } -inline ::kbd_idlfile::linkage::ExecuteStatusParameter* UiRequestMessage::mutable_execute_status() { +inline ::iot_idl::linkage::ExecuteStatusParameter* UiRequestMessage::mutable_execute_status() { set_has_execute_status(); - if (execute_status_ == NULL) execute_status_ = new ::kbd_idlfile::linkage::ExecuteStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.UiRequestMessage.execute_status) + if (execute_status_ == NULL) execute_status_ = new ::iot_idl::linkage::ExecuteStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.UiRequestMessage.execute_status) return execute_status_; } -inline ::kbd_idlfile::linkage::ExecuteStatusParameter* UiRequestMessage::release_execute_status() { +inline ::iot_idl::linkage::ExecuteStatusParameter* UiRequestMessage::release_execute_status() { clear_has_execute_status(); - ::kbd_idlfile::linkage::ExecuteStatusParameter* temp = execute_status_; + ::iot_idl::linkage::ExecuteStatusParameter* temp = execute_status_; execute_status_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_execute_status(::kbd_idlfile::linkage::ExecuteStatusParameter* execute_status) { +inline void UiRequestMessage::set_allocated_execute_status(::iot_idl::linkage::ExecuteStatusParameter* execute_status) { delete execute_status_; execute_status_ = execute_status; if (execute_status) { @@ -3784,14 +3784,14 @@ inline void UiRequestMessage::set_allocated_execute_status(::kbd_idlfile::linkag } else { clear_has_execute_status(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.UiRequestMessage.execute_status) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.UiRequestMessage.execute_status) } // ------------------------------------------------------------------- // UiRequestMessageAck -// required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; +// required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool UiRequestMessageAck::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3802,26 +3802,26 @@ inline void UiRequestMessageAck::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void UiRequestMessageAck::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::linkage::LcsPkgHead& UiRequestMessageAck::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessageAck.pkg_head) +inline const ::iot_idl::linkage::LcsPkgHead& UiRequestMessageAck::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessageAck.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* UiRequestMessageAck::mutable_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* UiRequestMessageAck::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::linkage::LcsPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.UiRequestMessageAck.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::linkage::LcsPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.UiRequestMessageAck.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* UiRequestMessageAck::release_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* UiRequestMessageAck::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::linkage::LcsPkgHead* temp = pkg_head_; + ::iot_idl::linkage::LcsPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void UiRequestMessageAck::set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head) { +inline void UiRequestMessageAck::set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3829,10 +3829,10 @@ inline void UiRequestMessageAck::set_allocated_pkg_head(::kbd_idlfile::linkage:: } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.UiRequestMessageAck.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.UiRequestMessageAck.pkg_head) } -// required .kbd_idlfile.linkage.ActorParameter actor = 2; +// required .iot_idl.linkage.ActorParameter actor = 2; inline bool UiRequestMessageAck::has_actor() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3843,26 +3843,26 @@ inline void UiRequestMessageAck::clear_has_actor() { _has_bits_[0] &= ~0x00000002u; } inline void UiRequestMessageAck::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::linkage::ActorParameter& UiRequestMessageAck::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessageAck.actor) +inline const ::iot_idl::linkage::ActorParameter& UiRequestMessageAck::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessageAck.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* UiRequestMessageAck::mutable_actor() { +inline ::iot_idl::linkage::ActorParameter* UiRequestMessageAck::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::linkage::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.UiRequestMessageAck.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::linkage::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.UiRequestMessageAck.actor) return actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* UiRequestMessageAck::release_actor() { +inline ::iot_idl::linkage::ActorParameter* UiRequestMessageAck::release_actor() { clear_has_actor(); - ::kbd_idlfile::linkage::ActorParameter* temp = actor_; + ::iot_idl::linkage::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void UiRequestMessageAck::set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor) { +inline void UiRequestMessageAck::set_allocated_actor(::iot_idl::linkage::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -3870,10 +3870,10 @@ inline void UiRequestMessageAck::set_allocated_actor(::kbd_idlfile::linkage::Act } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.UiRequestMessageAck.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.UiRequestMessageAck.actor) } -// required .kbd_idlfile.linkage.LinkNodeStatusParameter nodelist = 3; +// required .iot_idl.linkage.LinkNodeStatusParameter nodelist = 3; inline bool UiRequestMessageAck::has_nodelist() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3884,26 +3884,26 @@ inline void UiRequestMessageAck::clear_has_nodelist() { _has_bits_[0] &= ~0x00000004u; } inline void UiRequestMessageAck::clear_nodelist() { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); clear_has_nodelist(); } -inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& UiRequestMessageAck::nodelist() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessageAck.nodelist) +inline const ::iot_idl::linkage::LinkNodeStatusParameter& UiRequestMessageAck::nodelist() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessageAck.nodelist) return nodelist_ != NULL ? *nodelist_ : *default_instance_->nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* UiRequestMessageAck::mutable_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* UiRequestMessageAck::mutable_nodelist() { set_has_nodelist(); - if (nodelist_ == NULL) nodelist_ = new ::kbd_idlfile::linkage::LinkNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.UiRequestMessageAck.nodelist) + if (nodelist_ == NULL) nodelist_ = new ::iot_idl::linkage::LinkNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.UiRequestMessageAck.nodelist) return nodelist_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* UiRequestMessageAck::release_nodelist() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* UiRequestMessageAck::release_nodelist() { clear_has_nodelist(); - ::kbd_idlfile::linkage::LinkNodeStatusParameter* temp = nodelist_; + ::iot_idl::linkage::LinkNodeStatusParameter* temp = nodelist_; nodelist_ = NULL; return temp; } -inline void UiRequestMessageAck::set_allocated_nodelist(::kbd_idlfile::linkage::LinkNodeStatusParameter* nodelist) { +inline void UiRequestMessageAck::set_allocated_nodelist(::iot_idl::linkage::LinkNodeStatusParameter* nodelist) { delete nodelist_; nodelist_ = nodelist; if (nodelist) { @@ -3911,10 +3911,10 @@ inline void UiRequestMessageAck::set_allocated_nodelist(::kbd_idlfile::linkage:: } else { clear_has_nodelist(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.UiRequestMessageAck.nodelist) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.UiRequestMessageAck.nodelist) } -// required .kbd_idlfile.linkage.ENUiOperateType optype = 4; +// required .iot_idl.linkage.ENUiOperateType optype = 4; inline bool UiRequestMessageAck::has_optype() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -3928,22 +3928,22 @@ inline void UiRequestMessageAck::clear_optype() { optype_ = 1; clear_has_optype(); } -inline ::kbd_idlfile::linkage::ENUiOperateType UiRequestMessageAck::optype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.UiRequestMessageAck.optype) - return static_cast< ::kbd_idlfile::linkage::ENUiOperateType >(optype_); +inline ::iot_idl::linkage::ENUiOperateType UiRequestMessageAck::optype() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.UiRequestMessageAck.optype) + return static_cast< ::iot_idl::linkage::ENUiOperateType >(optype_); } -inline void UiRequestMessageAck::set_optype(::kbd_idlfile::linkage::ENUiOperateType value) { - assert(::kbd_idlfile::linkage::ENUiOperateType_IsValid(value)); +inline void UiRequestMessageAck::set_optype(::iot_idl::linkage::ENUiOperateType value) { + assert(::iot_idl::linkage::ENUiOperateType_IsValid(value)); set_has_optype(); optype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.UiRequestMessageAck.optype) + // @@protoc_insertion_point(field_set:iot_idl.linkage.UiRequestMessageAck.optype) } // ------------------------------------------------------------------- // LinkOperateMessage -// required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; +// required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool LinkOperateMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3954,26 +3954,26 @@ inline void LinkOperateMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void LinkOperateMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::linkage::LcsPkgHead& LinkOperateMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessage.pkg_head) +inline const ::iot_idl::linkage::LcsPkgHead& LinkOperateMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* LinkOperateMessage::mutable_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* LinkOperateMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::linkage::LcsPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkOperateMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::linkage::LcsPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkOperateMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* LinkOperateMessage::release_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* LinkOperateMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::linkage::LcsPkgHead* temp = pkg_head_; + ::iot_idl::linkage::LcsPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void LinkOperateMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head) { +inline void LinkOperateMessage::set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3981,10 +3981,10 @@ inline void LinkOperateMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::L } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkOperateMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkOperateMessage.pkg_head) } -// required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; +// required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; inline bool LinkOperateMessage::has_link_node() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3995,26 +3995,26 @@ inline void LinkOperateMessage::clear_has_link_node() { _has_bits_[0] &= ~0x00000002u; } inline void LinkOperateMessage::clear_link_node() { - if (link_node_ != NULL) link_node_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (link_node_ != NULL) link_node_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); clear_has_link_node(); } -inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& LinkOperateMessage::link_node() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessage.link_node) +inline const ::iot_idl::linkage::LinkNodeStatusParameter& LinkOperateMessage::link_node() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessage.link_node) return link_node_ != NULL ? *link_node_ : *default_instance_->link_node_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* LinkOperateMessage::mutable_link_node() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* LinkOperateMessage::mutable_link_node() { set_has_link_node(); - if (link_node_ == NULL) link_node_ = new ::kbd_idlfile::linkage::LinkNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkOperateMessage.link_node) + if (link_node_ == NULL) link_node_ = new ::iot_idl::linkage::LinkNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkOperateMessage.link_node) return link_node_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* LinkOperateMessage::release_link_node() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* LinkOperateMessage::release_link_node() { clear_has_link_node(); - ::kbd_idlfile::linkage::LinkNodeStatusParameter* temp = link_node_; + ::iot_idl::linkage::LinkNodeStatusParameter* temp = link_node_; link_node_ = NULL; return temp; } -inline void LinkOperateMessage::set_allocated_link_node(::kbd_idlfile::linkage::LinkNodeStatusParameter* link_node) { +inline void LinkOperateMessage::set_allocated_link_node(::iot_idl::linkage::LinkNodeStatusParameter* link_node) { delete link_node_; link_node_ = link_node; if (link_node) { @@ -4022,10 +4022,10 @@ inline void LinkOperateMessage::set_allocated_link_node(::kbd_idlfile::linkage:: } else { clear_has_link_node(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkOperateMessage.link_node) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkOperateMessage.link_node) } -// required .kbd_idlfile.linkage.ActorParameter actor = 3; +// required .iot_idl.linkage.ActorParameter actor = 3; inline bool LinkOperateMessage::has_actor() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -4036,26 +4036,26 @@ inline void LinkOperateMessage::clear_has_actor() { _has_bits_[0] &= ~0x00000004u; } inline void LinkOperateMessage::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::linkage::ActorParameter& LinkOperateMessage::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessage.actor) +inline const ::iot_idl::linkage::ActorParameter& LinkOperateMessage::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessage.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* LinkOperateMessage::mutable_actor() { +inline ::iot_idl::linkage::ActorParameter* LinkOperateMessage::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::linkage::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkOperateMessage.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::linkage::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkOperateMessage.actor) return actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* LinkOperateMessage::release_actor() { +inline ::iot_idl::linkage::ActorParameter* LinkOperateMessage::release_actor() { clear_has_actor(); - ::kbd_idlfile::linkage::ActorParameter* temp = actor_; + ::iot_idl::linkage::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void LinkOperateMessage::set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor) { +inline void LinkOperateMessage::set_allocated_actor(::iot_idl::linkage::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -4063,10 +4063,10 @@ inline void LinkOperateMessage::set_allocated_actor(::kbd_idlfile::linkage::Acto } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkOperateMessage.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkOperateMessage.actor) } -// required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 4; +// required .iot_idl.linkage.ENLinkOperateType opreate_type = 4; inline bool LinkOperateMessage::has_opreate_type() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -4080,22 +4080,22 @@ inline void LinkOperateMessage::clear_opreate_type() { opreate_type_ = 0; clear_has_opreate_type(); } -inline ::kbd_idlfile::linkage::ENLinkOperateType LinkOperateMessage::opreate_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessage.opreate_type) - return static_cast< ::kbd_idlfile::linkage::ENLinkOperateType >(opreate_type_); +inline ::iot_idl::linkage::ENLinkOperateType LinkOperateMessage::opreate_type() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessage.opreate_type) + return static_cast< ::iot_idl::linkage::ENLinkOperateType >(opreate_type_); } -inline void LinkOperateMessage::set_opreate_type(::kbd_idlfile::linkage::ENLinkOperateType value) { - assert(::kbd_idlfile::linkage::ENLinkOperateType_IsValid(value)); +inline void LinkOperateMessage::set_opreate_type(::iot_idl::linkage::ENLinkOperateType value) { + assert(::iot_idl::linkage::ENLinkOperateType_IsValid(value)); set_has_opreate_type(); opreate_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkOperateMessage.opreate_type) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkOperateMessage.opreate_type) } // ------------------------------------------------------------------- // LinkOperateMessageAck -// required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; +// required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool LinkOperateMessageAck::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -4106,26 +4106,26 @@ inline void LinkOperateMessageAck::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void LinkOperateMessageAck::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::linkage::LcsPkgHead& LinkOperateMessageAck::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessageAck.pkg_head) +inline const ::iot_idl::linkage::LcsPkgHead& LinkOperateMessageAck::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessageAck.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* LinkOperateMessageAck::mutable_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* LinkOperateMessageAck::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::linkage::LcsPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkOperateMessageAck.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::linkage::LcsPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkOperateMessageAck.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* LinkOperateMessageAck::release_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* LinkOperateMessageAck::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::linkage::LcsPkgHead* temp = pkg_head_; + ::iot_idl::linkage::LcsPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void LinkOperateMessageAck::set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head) { +inline void LinkOperateMessageAck::set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -4133,10 +4133,10 @@ inline void LinkOperateMessageAck::set_allocated_pkg_head(::kbd_idlfile::linkage } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkOperateMessageAck.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkOperateMessageAck.pkg_head) } -// required .kbd_idlfile.linkage.LinkNodeStatusParameter link_node = 2; +// required .iot_idl.linkage.LinkNodeStatusParameter link_node = 2; inline bool LinkOperateMessageAck::has_link_node() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -4147,26 +4147,26 @@ inline void LinkOperateMessageAck::clear_has_link_node() { _has_bits_[0] &= ~0x00000002u; } inline void LinkOperateMessageAck::clear_link_node() { - if (link_node_ != NULL) link_node_->::kbd_idlfile::linkage::LinkNodeStatusParameter::Clear(); + if (link_node_ != NULL) link_node_->::iot_idl::linkage::LinkNodeStatusParameter::Clear(); clear_has_link_node(); } -inline const ::kbd_idlfile::linkage::LinkNodeStatusParameter& LinkOperateMessageAck::link_node() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessageAck.link_node) +inline const ::iot_idl::linkage::LinkNodeStatusParameter& LinkOperateMessageAck::link_node() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessageAck.link_node) return link_node_ != NULL ? *link_node_ : *default_instance_->link_node_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* LinkOperateMessageAck::mutable_link_node() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* LinkOperateMessageAck::mutable_link_node() { set_has_link_node(); - if (link_node_ == NULL) link_node_ = new ::kbd_idlfile::linkage::LinkNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkOperateMessageAck.link_node) + if (link_node_ == NULL) link_node_ = new ::iot_idl::linkage::LinkNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkOperateMessageAck.link_node) return link_node_; } -inline ::kbd_idlfile::linkage::LinkNodeStatusParameter* LinkOperateMessageAck::release_link_node() { +inline ::iot_idl::linkage::LinkNodeStatusParameter* LinkOperateMessageAck::release_link_node() { clear_has_link_node(); - ::kbd_idlfile::linkage::LinkNodeStatusParameter* temp = link_node_; + ::iot_idl::linkage::LinkNodeStatusParameter* temp = link_node_; link_node_ = NULL; return temp; } -inline void LinkOperateMessageAck::set_allocated_link_node(::kbd_idlfile::linkage::LinkNodeStatusParameter* link_node) { +inline void LinkOperateMessageAck::set_allocated_link_node(::iot_idl::linkage::LinkNodeStatusParameter* link_node) { delete link_node_; link_node_ = link_node; if (link_node) { @@ -4174,10 +4174,10 @@ inline void LinkOperateMessageAck::set_allocated_link_node(::kbd_idlfile::linkag } else { clear_has_link_node(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkOperateMessageAck.link_node) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkOperateMessageAck.link_node) } -// required .kbd_idlfile.linkage.ENLinkOperateType opreate_type = 3; +// required .iot_idl.linkage.ENLinkOperateType opreate_type = 3; inline bool LinkOperateMessageAck::has_opreate_type() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -4191,18 +4191,18 @@ inline void LinkOperateMessageAck::clear_opreate_type() { opreate_type_ = 0; clear_has_opreate_type(); } -inline ::kbd_idlfile::linkage::ENLinkOperateType LinkOperateMessageAck::opreate_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessageAck.opreate_type) - return static_cast< ::kbd_idlfile::linkage::ENLinkOperateType >(opreate_type_); +inline ::iot_idl::linkage::ENLinkOperateType LinkOperateMessageAck::opreate_type() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessageAck.opreate_type) + return static_cast< ::iot_idl::linkage::ENLinkOperateType >(opreate_type_); } -inline void LinkOperateMessageAck::set_opreate_type(::kbd_idlfile::linkage::ENLinkOperateType value) { - assert(::kbd_idlfile::linkage::ENLinkOperateType_IsValid(value)); +inline void LinkOperateMessageAck::set_opreate_type(::iot_idl::linkage::ENLinkOperateType value) { + assert(::iot_idl::linkage::ENLinkOperateType_IsValid(value)); set_has_opreate_type(); opreate_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.LinkOperateMessageAck.opreate_type) + // @@protoc_insertion_point(field_set:iot_idl.linkage.LinkOperateMessageAck.opreate_type) } -// required .kbd_idlfile.linkage.ActorParameter actor = 4; +// required .iot_idl.linkage.ActorParameter actor = 4; inline bool LinkOperateMessageAck::has_actor() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -4213,26 +4213,26 @@ inline void LinkOperateMessageAck::clear_has_actor() { _has_bits_[0] &= ~0x00000008u; } inline void LinkOperateMessageAck::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::linkage::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::linkage::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::linkage::ActorParameter& LinkOperateMessageAck::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessageAck.actor) +inline const ::iot_idl::linkage::ActorParameter& LinkOperateMessageAck::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessageAck.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* LinkOperateMessageAck::mutable_actor() { +inline ::iot_idl::linkage::ActorParameter* LinkOperateMessageAck::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::linkage::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkOperateMessageAck.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::linkage::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkOperateMessageAck.actor) return actor_; } -inline ::kbd_idlfile::linkage::ActorParameter* LinkOperateMessageAck::release_actor() { +inline ::iot_idl::linkage::ActorParameter* LinkOperateMessageAck::release_actor() { clear_has_actor(); - ::kbd_idlfile::linkage::ActorParameter* temp = actor_; + ::iot_idl::linkage::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void LinkOperateMessageAck::set_allocated_actor(::kbd_idlfile::linkage::ActorParameter* actor) { +inline void LinkOperateMessageAck::set_allocated_actor(::iot_idl::linkage::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -4240,10 +4240,10 @@ inline void LinkOperateMessageAck::set_allocated_actor(::kbd_idlfile::linkage::A } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkOperateMessageAck.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkOperateMessageAck.actor) } -// required .kbd_idlfile.linkage.ExecuteStatusParameter execute_status = 5; +// required .iot_idl.linkage.ExecuteStatusParameter execute_status = 5; inline bool LinkOperateMessageAck::has_execute_status() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -4254,26 +4254,26 @@ inline void LinkOperateMessageAck::clear_has_execute_status() { _has_bits_[0] &= ~0x00000010u; } inline void LinkOperateMessageAck::clear_execute_status() { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::linkage::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::linkage::ExecuteStatusParameter::Clear(); clear_has_execute_status(); } -inline const ::kbd_idlfile::linkage::ExecuteStatusParameter& LinkOperateMessageAck::execute_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.LinkOperateMessageAck.execute_status) +inline const ::iot_idl::linkage::ExecuteStatusParameter& LinkOperateMessageAck::execute_status() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.LinkOperateMessageAck.execute_status) return execute_status_ != NULL ? *execute_status_ : *default_instance_->execute_status_; } -inline ::kbd_idlfile::linkage::ExecuteStatusParameter* LinkOperateMessageAck::mutable_execute_status() { +inline ::iot_idl::linkage::ExecuteStatusParameter* LinkOperateMessageAck::mutable_execute_status() { set_has_execute_status(); - if (execute_status_ == NULL) execute_status_ = new ::kbd_idlfile::linkage::ExecuteStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.LinkOperateMessageAck.execute_status) + if (execute_status_ == NULL) execute_status_ = new ::iot_idl::linkage::ExecuteStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.LinkOperateMessageAck.execute_status) return execute_status_; } -inline ::kbd_idlfile::linkage::ExecuteStatusParameter* LinkOperateMessageAck::release_execute_status() { +inline ::iot_idl::linkage::ExecuteStatusParameter* LinkOperateMessageAck::release_execute_status() { clear_has_execute_status(); - ::kbd_idlfile::linkage::ExecuteStatusParameter* temp = execute_status_; + ::iot_idl::linkage::ExecuteStatusParameter* temp = execute_status_; execute_status_ = NULL; return temp; } -inline void LinkOperateMessageAck::set_allocated_execute_status(::kbd_idlfile::linkage::ExecuteStatusParameter* execute_status) { +inline void LinkOperateMessageAck::set_allocated_execute_status(::iot_idl::linkage::ExecuteStatusParameter* execute_status) { delete execute_status_; execute_status_ = execute_status; if (execute_status) { @@ -4281,7 +4281,7 @@ inline void LinkOperateMessageAck::set_allocated_execute_status(::kbd_idlfile::l } else { clear_has_execute_status(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.LinkOperateMessageAck.execute_status) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.LinkOperateMessageAck.execute_status) } // ------------------------------------------------------------------- @@ -4305,7 +4305,7 @@ inline void PushParameter::clear_graph_name() { clear_has_graph_name(); } inline const ::std::string& PushParameter::graph_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.PushParameter.graph_name) + // @@protoc_insertion_point(field_get:iot_idl.linkage.PushParameter.graph_name) return *graph_name_; } inline void PushParameter::set_graph_name(const ::std::string& value) { @@ -4314,7 +4314,7 @@ inline void PushParameter::set_graph_name(const ::std::string& value) { graph_name_ = new ::std::string; } graph_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.PushParameter.graph_name) + // @@protoc_insertion_point(field_set:iot_idl.linkage.PushParameter.graph_name) } inline void PushParameter::set_graph_name(const char* value) { set_has_graph_name(); @@ -4322,7 +4322,7 @@ inline void PushParameter::set_graph_name(const char* value) { graph_name_ = new ::std::string; } graph_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.PushParameter.graph_name) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.PushParameter.graph_name) } inline void PushParameter::set_graph_name(const char* value, size_t size) { set_has_graph_name(); @@ -4330,14 +4330,14 @@ inline void PushParameter::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.linkage.PushParameter.graph_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.PushParameter.graph_name) } inline ::std::string* PushParameter::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.linkage.PushParameter.graph_name) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.PushParameter.graph_name) return graph_name_; } inline ::std::string* PushParameter::release_graph_name() { @@ -4361,7 +4361,7 @@ inline void PushParameter::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.linkage.PushParameter.graph_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.PushParameter.graph_name) } // ------------------------------------------------------------------- @@ -4385,7 +4385,7 @@ inline void HintParameter::clear_hint_info() { clear_has_hint_info(); } inline const ::std::string& HintParameter::hint_info() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.HintParameter.hint_info) + // @@protoc_insertion_point(field_get:iot_idl.linkage.HintParameter.hint_info) return *hint_info_; } inline void HintParameter::set_hint_info(const ::std::string& value) { @@ -4394,7 +4394,7 @@ inline void HintParameter::set_hint_info(const ::std::string& value) { hint_info_ = new ::std::string; } hint_info_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.HintParameter.hint_info) + // @@protoc_insertion_point(field_set:iot_idl.linkage.HintParameter.hint_info) } inline void HintParameter::set_hint_info(const char* value) { set_has_hint_info(); @@ -4402,7 +4402,7 @@ inline void HintParameter::set_hint_info(const char* value) { hint_info_ = new ::std::string; } hint_info_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.HintParameter.hint_info) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.HintParameter.hint_info) } inline void HintParameter::set_hint_info(const char* value, size_t size) { set_has_hint_info(); @@ -4410,14 +4410,14 @@ inline void HintParameter::set_hint_info(const char* value, size_t size) { hint_info_ = new ::std::string; } hint_info_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.HintParameter.hint_info) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.HintParameter.hint_info) } inline ::std::string* HintParameter::mutable_hint_info() { set_has_hint_info(); if (hint_info_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { hint_info_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.HintParameter.hint_info) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.HintParameter.hint_info) return hint_info_; } inline ::std::string* HintParameter::release_hint_info() { @@ -4441,14 +4441,14 @@ inline void HintParameter::set_allocated_hint_info(::std::string* hint_info) { clear_has_hint_info(); hint_info_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.HintParameter.hint_info) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.HintParameter.hint_info) } // ------------------------------------------------------------------- // ActionToHmiMessage -// required .kbd_idlfile.linkage.LcsPkgHead pkg_head = 1; +// required .iot_idl.linkage.LcsPkgHead pkg_head = 1; inline bool ActionToHmiMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -4459,26 +4459,26 @@ inline void ActionToHmiMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void ActionToHmiMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::linkage::LcsPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::linkage::LcsPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::linkage::LcsPkgHead& ActionToHmiMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionToHmiMessage.pkg_head) +inline const ::iot_idl::linkage::LcsPkgHead& ActionToHmiMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionToHmiMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* ActionToHmiMessage::mutable_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* ActionToHmiMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::linkage::LcsPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActionToHmiMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::linkage::LcsPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActionToHmiMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::linkage::LcsPkgHead* ActionToHmiMessage::release_pkg_head() { +inline ::iot_idl::linkage::LcsPkgHead* ActionToHmiMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::linkage::LcsPkgHead* temp = pkg_head_; + ::iot_idl::linkage::LcsPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void ActionToHmiMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::LcsPkgHead* pkg_head) { +inline void ActionToHmiMessage::set_allocated_pkg_head(::iot_idl::linkage::LcsPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -4486,10 +4486,10 @@ inline void ActionToHmiMessage::set_allocated_pkg_head(::kbd_idlfile::linkage::L } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActionToHmiMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActionToHmiMessage.pkg_head) } -// required .kbd_idlfile.linkage.ENActionOperateType action_type = 2; +// required .iot_idl.linkage.ENActionOperateType action_type = 2; inline bool ActionToHmiMessage::has_action_type() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -4503,15 +4503,15 @@ inline void ActionToHmiMessage::clear_action_type() { action_type_ = 0; clear_has_action_type(); } -inline ::kbd_idlfile::linkage::ENActionOperateType ActionToHmiMessage::action_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionToHmiMessage.action_type) - return static_cast< ::kbd_idlfile::linkage::ENActionOperateType >(action_type_); +inline ::iot_idl::linkage::ENActionOperateType ActionToHmiMessage::action_type() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionToHmiMessage.action_type) + return static_cast< ::iot_idl::linkage::ENActionOperateType >(action_type_); } -inline void ActionToHmiMessage::set_action_type(::kbd_idlfile::linkage::ENActionOperateType value) { - assert(::kbd_idlfile::linkage::ENActionOperateType_IsValid(value)); +inline void ActionToHmiMessage::set_action_type(::iot_idl::linkage::ENActionOperateType value) { + assert(::iot_idl::linkage::ENActionOperateType_IsValid(value)); set_has_action_type(); action_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActionToHmiMessage.action_type) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActionToHmiMessage.action_type) } // required string host_name = 3; @@ -4531,7 +4531,7 @@ inline void ActionToHmiMessage::clear_host_name() { clear_has_host_name(); } inline const ::std::string& ActionToHmiMessage::host_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionToHmiMessage.host_name) + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionToHmiMessage.host_name) return *host_name_; } inline void ActionToHmiMessage::set_host_name(const ::std::string& value) { @@ -4540,7 +4540,7 @@ inline void ActionToHmiMessage::set_host_name(const ::std::string& value) { host_name_ = new ::std::string; } host_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.linkage.ActionToHmiMessage.host_name) + // @@protoc_insertion_point(field_set:iot_idl.linkage.ActionToHmiMessage.host_name) } inline void ActionToHmiMessage::set_host_name(const char* value) { set_has_host_name(); @@ -4548,7 +4548,7 @@ inline void ActionToHmiMessage::set_host_name(const char* value) { host_name_ = new ::std::string; } host_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.linkage.ActionToHmiMessage.host_name) + // @@protoc_insertion_point(field_set_char:iot_idl.linkage.ActionToHmiMessage.host_name) } inline void ActionToHmiMessage::set_host_name(const char* value, size_t size) { set_has_host_name(); @@ -4556,14 +4556,14 @@ inline void ActionToHmiMessage::set_host_name(const char* value, size_t size) { host_name_ = new ::std::string; } host_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.linkage.ActionToHmiMessage.host_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.linkage.ActionToHmiMessage.host_name) } inline ::std::string* ActionToHmiMessage::mutable_host_name() { set_has_host_name(); if (host_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { host_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActionToHmiMessage.host_name) + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActionToHmiMessage.host_name) return host_name_; } inline ::std::string* ActionToHmiMessage::release_host_name() { @@ -4587,10 +4587,10 @@ inline void ActionToHmiMessage::set_allocated_host_name(::std::string* host_name clear_has_host_name(); host_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActionToHmiMessage.host_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActionToHmiMessage.host_name) } -// optional .kbd_idlfile.linkage.PushParameter push_param = 4; +// optional .iot_idl.linkage.PushParameter push_param = 4; inline bool ActionToHmiMessage::has_push_param() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -4601,26 +4601,26 @@ inline void ActionToHmiMessage::clear_has_push_param() { _has_bits_[0] &= ~0x00000008u; } inline void ActionToHmiMessage::clear_push_param() { - if (push_param_ != NULL) push_param_->::kbd_idlfile::linkage::PushParameter::Clear(); + if (push_param_ != NULL) push_param_->::iot_idl::linkage::PushParameter::Clear(); clear_has_push_param(); } -inline const ::kbd_idlfile::linkage::PushParameter& ActionToHmiMessage::push_param() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionToHmiMessage.push_param) +inline const ::iot_idl::linkage::PushParameter& ActionToHmiMessage::push_param() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionToHmiMessage.push_param) return push_param_ != NULL ? *push_param_ : *default_instance_->push_param_; } -inline ::kbd_idlfile::linkage::PushParameter* ActionToHmiMessage::mutable_push_param() { +inline ::iot_idl::linkage::PushParameter* ActionToHmiMessage::mutable_push_param() { set_has_push_param(); - if (push_param_ == NULL) push_param_ = new ::kbd_idlfile::linkage::PushParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActionToHmiMessage.push_param) + if (push_param_ == NULL) push_param_ = new ::iot_idl::linkage::PushParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActionToHmiMessage.push_param) return push_param_; } -inline ::kbd_idlfile::linkage::PushParameter* ActionToHmiMessage::release_push_param() { +inline ::iot_idl::linkage::PushParameter* ActionToHmiMessage::release_push_param() { clear_has_push_param(); - ::kbd_idlfile::linkage::PushParameter* temp = push_param_; + ::iot_idl::linkage::PushParameter* temp = push_param_; push_param_ = NULL; return temp; } -inline void ActionToHmiMessage::set_allocated_push_param(::kbd_idlfile::linkage::PushParameter* push_param) { +inline void ActionToHmiMessage::set_allocated_push_param(::iot_idl::linkage::PushParameter* push_param) { delete push_param_; push_param_ = push_param; if (push_param) { @@ -4628,10 +4628,10 @@ inline void ActionToHmiMessage::set_allocated_push_param(::kbd_idlfile::linkage: } else { clear_has_push_param(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActionToHmiMessage.push_param) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActionToHmiMessage.push_param) } -// optional .kbd_idlfile.linkage.HintParameter hint_param = 5; +// optional .iot_idl.linkage.HintParameter hint_param = 5; inline bool ActionToHmiMessage::has_hint_param() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -4642,26 +4642,26 @@ inline void ActionToHmiMessage::clear_has_hint_param() { _has_bits_[0] &= ~0x00000010u; } inline void ActionToHmiMessage::clear_hint_param() { - if (hint_param_ != NULL) hint_param_->::kbd_idlfile::linkage::HintParameter::Clear(); + if (hint_param_ != NULL) hint_param_->::iot_idl::linkage::HintParameter::Clear(); clear_has_hint_param(); } -inline const ::kbd_idlfile::linkage::HintParameter& ActionToHmiMessage::hint_param() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.linkage.ActionToHmiMessage.hint_param) +inline const ::iot_idl::linkage::HintParameter& ActionToHmiMessage::hint_param() const { + // @@protoc_insertion_point(field_get:iot_idl.linkage.ActionToHmiMessage.hint_param) return hint_param_ != NULL ? *hint_param_ : *default_instance_->hint_param_; } -inline ::kbd_idlfile::linkage::HintParameter* ActionToHmiMessage::mutable_hint_param() { +inline ::iot_idl::linkage::HintParameter* ActionToHmiMessage::mutable_hint_param() { set_has_hint_param(); - if (hint_param_ == NULL) hint_param_ = new ::kbd_idlfile::linkage::HintParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.linkage.ActionToHmiMessage.hint_param) + if (hint_param_ == NULL) hint_param_ = new ::iot_idl::linkage::HintParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.linkage.ActionToHmiMessage.hint_param) return hint_param_; } -inline ::kbd_idlfile::linkage::HintParameter* ActionToHmiMessage::release_hint_param() { +inline ::iot_idl::linkage::HintParameter* ActionToHmiMessage::release_hint_param() { clear_has_hint_param(); - ::kbd_idlfile::linkage::HintParameter* temp = hint_param_; + ::iot_idl::linkage::HintParameter* temp = hint_param_; hint_param_ = NULL; return temp; } -inline void ActionToHmiMessage::set_allocated_hint_param(::kbd_idlfile::linkage::HintParameter* hint_param) { +inline void ActionToHmiMessage::set_allocated_hint_param(::iot_idl::linkage::HintParameter* hint_param) { delete hint_param_; hint_param_ = hint_param; if (hint_param) { @@ -4669,58 +4669,58 @@ inline void ActionToHmiMessage::set_allocated_hint_param(::kbd_idlfile::linkage: } else { clear_has_hint_param(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.linkage.ActionToHmiMessage.hint_param) + // @@protoc_insertion_point(field_set_allocated:iot_idl.linkage.ActionToHmiMessage.hint_param) } // @@protoc_insertion_point(namespace_scope) } // namespace linkage -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::linkage::enChannelMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::enChannelMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::enChannelMsgType>() { - return ::kbd_idlfile::linkage::enChannelMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::enChannelMsgType>() { + return ::iot_idl::linkage::enChannelMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::linkage::enLcsMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::enLcsMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::enLcsMsgType>() { - return ::kbd_idlfile::linkage::enLcsMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::enLcsMsgType>() { + return ::iot_idl::linkage::enLcsMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::linkage::enErrorCode> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::enErrorCode> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::enErrorCode>() { - return ::kbd_idlfile::linkage::enErrorCode_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::enErrorCode>() { + return ::iot_idl::linkage::enErrorCode_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::linkage::ENLcsStatus> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::ENLcsStatus> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::ENLcsStatus>() { - return ::kbd_idlfile::linkage::ENLcsStatus_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::ENLcsStatus>() { + return ::iot_idl::linkage::ENLcsStatus_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::ENLcsNodeCheckStatus> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::ENLcsNodeCheckStatus>() { - return ::kbd_idlfile::linkage::ENLcsNodeCheckStatus_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::ENLcsNodeCheckStatus>() { + return ::iot_idl::linkage::ENLcsNodeCheckStatus_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::linkage::ENUiOperateType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::ENUiOperateType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::ENUiOperateType>() { - return ::kbd_idlfile::linkage::ENUiOperateType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::ENUiOperateType>() { + return ::iot_idl::linkage::ENUiOperateType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::linkage::ENLinkOperateType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::ENLinkOperateType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::ENLinkOperateType>() { - return ::kbd_idlfile::linkage::ENLinkOperateType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::ENLinkOperateType>() { + return ::iot_idl::linkage::ENLinkOperateType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::linkage::ENActionOperateType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::linkage::ENActionOperateType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::linkage::ENActionOperateType>() { - return ::kbd_idlfile::linkage::ENActionOperateType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::linkage::ENActionOperateType>() { + return ::iot_idl::linkage::ENActionOperateType_descriptor(); } } // namespace google diff --git a/product/src/idl_files/LinkageMessage.proto b/product/src/idl_files/LinkageMessage.proto index 81db473c..2da3273a 100644 --- a/product/src/idl_files/LinkageMessage.proto +++ b/product/src/idl_files/LinkageMessage.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -package kbd_idlfile.linkage; +package iot_idl.linkage; //简写说明 //Opt : 操作控制台 diff --git a/product/src/idl_files/OpcMessage.pb.cc b/product/src/idl_files/OpcMessage.pb.cc index 6d52e153..dfe19c27 100644 --- a/product/src/idl_files/OpcMessage.pb.cc +++ b/product/src/idl_files/OpcMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -218,7 +218,7 @@ void protobuf_AddDesc_OpcMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\020OpcMessage.proto\022\013kbd_idlfile\"m\n\013AiPoi" + "\n\020OpcMessage.proto\022\013iot_idl\"m\n\013AiPoi" "ntInfo\022\023\n\013strPointTag\030\001 \002(\t\022\024\n\014strPointD" "esc\030\002 \001(\t\022\022\n\nnPointType\030\003 \002(\005\022\016\n\006dValue\030" "\004 \002(\001\022\017\n\007nStatus\030\005 \002(\005\"m\n\013DiPointInfo\022\023\n" @@ -234,10 +234,10 @@ void protobuf_AddDesc_OpcMessage_2eproto() { "nDomainId\030\002 \002(\005\022\024\n\014nSubSystemId\030\003 \002(\005\022\r\n" "\005nTime\030\004 \001(\004\022\023\n\013strHostName\030\005 \002(\t\"\232\002\n\016Re" "plyPointInfo\022\023\n\013strGroupTag\030\001 \002(\t\022(\n\006aiI" - "nfo\030\002 \003(\0132\030.kbd_idlfile.AiPointInfo\022(\n\006p" - "iInfo\030\003 \003(\0132\030.kbd_idlfile.PiPointInfo\022(\n" - "\006miInfo\030\004 \003(\0132\030.kbd_idlfile.MiPointInfo\022" - "(\n\006diInfo\030\005 \003(\0132\030.kbd_idlfile.DiPointInf" + "nfo\030\002 \003(\0132\030.iot_idl.AiPointInfo\022(\n\006p" + "iInfo\030\003 \003(\0132\030.iot_idl.PiPointInfo\022(\n" + "\006miInfo\030\004 \003(\0132\030.iot_idl.MiPointInfo\022" + "(\n\006diInfo\030\005 \003(\0132\030.iot_idl.DiPointInf" "o\022\021\n\tnDomainId\030\006 \002(\005\022\024\n\014nSubSystemId\030\007 \002" "(\005\022\r\n\005nTime\030\010 \001(\004\022\023\n\013strHostName\030\t \002(\t*P" "\n\renTypeMessage\022\037\n\033MT_TOOLS_REQUEST_POIN" @@ -293,7 +293,7 @@ const int AiPointInfo::kNStatusFieldNumber; AiPointInfo::AiPointInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(constructor:iot_idl.AiPointInfo) } void AiPointInfo::InitAsDefaultInstance() { @@ -303,7 +303,7 @@ AiPointInfo::AiPointInfo(const AiPointInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.AiPointInfo) } void AiPointInfo::SharedCtor() { @@ -318,7 +318,7 @@ void AiPointInfo::SharedCtor() { } AiPointInfo::~AiPointInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(destructor:iot_idl.AiPointInfo) SharedDtor(); } @@ -390,7 +390,7 @@ bool AiPointInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(parse_start:iot_idl.AiPointInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -488,17 +488,17 @@ bool AiPointInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(parse_success:iot_idl.AiPointInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.AiPointInfo) return false; #undef DO_ } void AiPointInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.AiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -538,12 +538,12 @@ void AiPointInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.AiPointInfo) } ::google::protobuf::uint8* AiPointInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.AiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -585,7 +585,7 @@ void AiPointInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.AiPointInfo) return target; } @@ -725,7 +725,7 @@ const int DiPointInfo::kNStatusFieldNumber; DiPointInfo::DiPointInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(constructor:iot_idl.DiPointInfo) } void DiPointInfo::InitAsDefaultInstance() { @@ -735,7 +735,7 @@ DiPointInfo::DiPointInfo(const DiPointInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.DiPointInfo) } void DiPointInfo::SharedCtor() { @@ -750,7 +750,7 @@ void DiPointInfo::SharedCtor() { } DiPointInfo::~DiPointInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(destructor:iot_idl.DiPointInfo) SharedDtor(); } @@ -822,7 +822,7 @@ bool DiPointInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(parse_start:iot_idl.DiPointInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -920,17 +920,17 @@ bool DiPointInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(parse_success:iot_idl.DiPointInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.DiPointInfo) return false; #undef DO_ } void DiPointInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.DiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -970,12 +970,12 @@ void DiPointInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.DiPointInfo) } ::google::protobuf::uint8* DiPointInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.DiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1017,7 +1017,7 @@ void DiPointInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.DiPointInfo) return target; } @@ -1159,7 +1159,7 @@ const int PiPointInfo::kNStatusFieldNumber; PiPointInfo::PiPointInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(constructor:iot_idl.PiPointInfo) } void PiPointInfo::InitAsDefaultInstance() { @@ -1169,7 +1169,7 @@ PiPointInfo::PiPointInfo(const PiPointInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.PiPointInfo) } void PiPointInfo::SharedCtor() { @@ -1184,7 +1184,7 @@ void PiPointInfo::SharedCtor() { } PiPointInfo::~PiPointInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(destructor:iot_idl.PiPointInfo) SharedDtor(); } @@ -1256,7 +1256,7 @@ bool PiPointInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(parse_start:iot_idl.PiPointInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1354,17 +1354,17 @@ bool PiPointInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(parse_success:iot_idl.PiPointInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.PiPointInfo) return false; #undef DO_ } void PiPointInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.PiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1404,12 +1404,12 @@ void PiPointInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.PiPointInfo) } ::google::protobuf::uint8* PiPointInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.PiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1451,7 +1451,7 @@ void PiPointInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.PiPointInfo) return target; } @@ -1591,7 +1591,7 @@ const int MiPointInfo::kNStatusFieldNumber; MiPointInfo::MiPointInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(constructor:iot_idl.MiPointInfo) } void MiPointInfo::InitAsDefaultInstance() { @@ -1601,7 +1601,7 @@ MiPointInfo::MiPointInfo(const MiPointInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.MiPointInfo) } void MiPointInfo::SharedCtor() { @@ -1616,7 +1616,7 @@ void MiPointInfo::SharedCtor() { } MiPointInfo::~MiPointInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(destructor:iot_idl.MiPointInfo) SharedDtor(); } @@ -1688,7 +1688,7 @@ bool MiPointInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(parse_start:iot_idl.MiPointInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1786,17 +1786,17 @@ bool MiPointInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(parse_success:iot_idl.MiPointInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.MiPointInfo) return false; #undef DO_ } void MiPointInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.MiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1836,12 +1836,12 @@ void MiPointInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.MiPointInfo) } ::google::protobuf::uint8* MiPointInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MiPointInfo) // required string strPointTag = 1; if (has_strpointtag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1883,7 +1883,7 @@ void MiPointInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MiPointInfo) return target; } @@ -2025,7 +2025,7 @@ const int RequestPointInfo::kStrHostNameFieldNumber; RequestPointInfo::RequestPointInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(constructor:iot_idl.RequestPointInfo) } void RequestPointInfo::InitAsDefaultInstance() { @@ -2035,7 +2035,7 @@ RequestPointInfo::RequestPointInfo(const RequestPointInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.RequestPointInfo) } void RequestPointInfo::SharedCtor() { @@ -2050,7 +2050,7 @@ void RequestPointInfo::SharedCtor() { } RequestPointInfo::~RequestPointInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(destructor:iot_idl.RequestPointInfo) SharedDtor(); } @@ -2122,7 +2122,7 @@ bool RequestPointInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(parse_start:iot_idl.RequestPointInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2220,17 +2220,17 @@ bool RequestPointInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(parse_success:iot_idl.RequestPointInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.RequestPointInfo) return false; #undef DO_ } void RequestPointInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.RequestPointInfo) // required string strGroupTag = 1; if (has_strgrouptag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2270,12 +2270,12 @@ void RequestPointInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.RequestPointInfo) } ::google::protobuf::uint8* RequestPointInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.RequestPointInfo) // required string strGroupTag = 1; if (has_strgrouptag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2317,7 +2317,7 @@ void RequestPointInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.RequestPointInfo) return target; } @@ -2463,7 +2463,7 @@ const int ReplyPointInfo::kStrHostNameFieldNumber; ReplyPointInfo::ReplyPointInfo() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(constructor:iot_idl.ReplyPointInfo) } void ReplyPointInfo::InitAsDefaultInstance() { @@ -2473,7 +2473,7 @@ ReplyPointInfo::ReplyPointInfo(const ReplyPointInfo& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(copy_constructor:iot_idl.ReplyPointInfo) } void ReplyPointInfo::SharedCtor() { @@ -2488,7 +2488,7 @@ void ReplyPointInfo::SharedCtor() { } ReplyPointInfo::~ReplyPointInfo() { - // @@protoc_insertion_point(destructor:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(destructor:iot_idl.ReplyPointInfo) SharedDtor(); } @@ -2564,7 +2564,7 @@ bool ReplyPointInfo::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(parse_start:iot_idl.ReplyPointInfo) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2586,7 +2586,7 @@ bool ReplyPointInfo::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.AiPointInfo aiInfo = 2; + // repeated .iot_idl.AiPointInfo aiInfo = 2; case 2: { if (tag == 18) { parse_aiInfo: @@ -2600,7 +2600,7 @@ bool ReplyPointInfo::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.PiPointInfo piInfo = 3; + // repeated .iot_idl.PiPointInfo piInfo = 3; case 3: { if (tag == 26) { parse_piInfo: @@ -2614,7 +2614,7 @@ bool ReplyPointInfo::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.MiPointInfo miInfo = 4; + // repeated .iot_idl.MiPointInfo miInfo = 4; case 4: { if (tag == 34) { parse_miInfo: @@ -2628,7 +2628,7 @@ bool ReplyPointInfo::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.DiPointInfo diInfo = 5; + // repeated .iot_idl.DiPointInfo diInfo = 5; case 5: { if (tag == 42) { parse_diInfo: @@ -2718,17 +2718,17 @@ bool ReplyPointInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(parse_success:iot_idl.ReplyPointInfo) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(parse_failure:iot_idl.ReplyPointInfo) return false; #undef DO_ } void ReplyPointInfo::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(serialize_start:iot_idl.ReplyPointInfo) // required string strGroupTag = 1; if (has_strgrouptag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2739,25 +2739,25 @@ void ReplyPointInfo::SerializeWithCachedSizes( 1, this->strgrouptag(), output); } - // repeated .kbd_idlfile.AiPointInfo aiInfo = 2; + // repeated .iot_idl.AiPointInfo aiInfo = 2; for (int i = 0; i < this->aiinfo_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->aiinfo(i), output); } - // repeated .kbd_idlfile.PiPointInfo piInfo = 3; + // repeated .iot_idl.PiPointInfo piInfo = 3; for (int i = 0; i < this->piinfo_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->piinfo(i), output); } - // repeated .kbd_idlfile.MiPointInfo miInfo = 4; + // repeated .iot_idl.MiPointInfo miInfo = 4; for (int i = 0; i < this->miinfo_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->miinfo(i), output); } - // repeated .kbd_idlfile.DiPointInfo diInfo = 5; + // repeated .iot_idl.DiPointInfo diInfo = 5; for (int i = 0; i < this->diinfo_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->diinfo(i), output); @@ -2792,12 +2792,12 @@ void ReplyPointInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(serialize_end:iot_idl.ReplyPointInfo) } ::google::protobuf::uint8* ReplyPointInfo::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.ReplyPointInfo) // required string strGroupTag = 1; if (has_strgrouptag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2809,28 +2809,28 @@ void ReplyPointInfo::SerializeWithCachedSizes( 1, this->strgrouptag(), target); } - // repeated .kbd_idlfile.AiPointInfo aiInfo = 2; + // repeated .iot_idl.AiPointInfo aiInfo = 2; for (int i = 0; i < this->aiinfo_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->aiinfo(i), target); } - // repeated .kbd_idlfile.PiPointInfo piInfo = 3; + // repeated .iot_idl.PiPointInfo piInfo = 3; for (int i = 0; i < this->piinfo_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->piinfo(i), target); } - // repeated .kbd_idlfile.MiPointInfo miInfo = 4; + // repeated .iot_idl.MiPointInfo miInfo = 4; for (int i = 0; i < this->miinfo_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->miinfo(i), target); } - // repeated .kbd_idlfile.DiPointInfo diInfo = 5; + // repeated .iot_idl.DiPointInfo diInfo = 5; for (int i = 0; i < this->diinfo_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2867,7 +2867,7 @@ void ReplyPointInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.ReplyPointInfo) return target; } @@ -2913,7 +2913,7 @@ int ReplyPointInfo::ByteSize() const { } } - // repeated .kbd_idlfile.AiPointInfo aiInfo = 2; + // repeated .iot_idl.AiPointInfo aiInfo = 2; total_size += 1 * this->aiinfo_size(); for (int i = 0; i < this->aiinfo_size(); i++) { total_size += @@ -2921,7 +2921,7 @@ int ReplyPointInfo::ByteSize() const { this->aiinfo(i)); } - // repeated .kbd_idlfile.PiPointInfo piInfo = 3; + // repeated .iot_idl.PiPointInfo piInfo = 3; total_size += 1 * this->piinfo_size(); for (int i = 0; i < this->piinfo_size(); i++) { total_size += @@ -2929,7 +2929,7 @@ int ReplyPointInfo::ByteSize() const { this->piinfo(i)); } - // repeated .kbd_idlfile.MiPointInfo miInfo = 4; + // repeated .iot_idl.MiPointInfo miInfo = 4; total_size += 1 * this->miinfo_size(); for (int i = 0; i < this->miinfo_size(); i++) { total_size += @@ -2937,7 +2937,7 @@ int ReplyPointInfo::ByteSize() const { this->miinfo(i)); } - // repeated .kbd_idlfile.DiPointInfo diInfo = 5; + // repeated .iot_idl.DiPointInfo diInfo = 5; total_size += 1 * this->diinfo_size(); for (int i = 0; i < this->diinfo_size(); i++) { total_size += @@ -3046,6 +3046,6 @@ void ReplyPointInfo::Swap(ReplyPointInfo* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/OpcMessage.pb.h b/product/src/idl_files/OpcMessage.pb.h index 8a2775f9..3a7e187e 100644 --- a/product/src/idl_files/OpcMessage.pb.h +++ b/product/src/idl_files/OpcMessage.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_OpcMessage_2eproto(); @@ -160,7 +160,7 @@ class IDL_FILES_EXPORT AiPointInfo : public ::google::protobuf::Message { inline ::google::protobuf::int32 nstatus() const; inline void set_nstatus(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.AiPointInfo) + // @@protoc_insertion_point(class_scope:iot_idl.AiPointInfo) private: inline void set_has_strpointtag(); inline void clear_has_strpointtag(); @@ -289,7 +289,7 @@ class IDL_FILES_EXPORT DiPointInfo : public ::google::protobuf::Message { inline ::google::protobuf::int32 nstatus() const; inline void set_nstatus(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.DiPointInfo) + // @@protoc_insertion_point(class_scope:iot_idl.DiPointInfo) private: inline void set_has_strpointtag(); inline void clear_has_strpointtag(); @@ -418,7 +418,7 @@ class IDL_FILES_EXPORT PiPointInfo : public ::google::protobuf::Message { inline ::google::protobuf::int32 nstatus() const; inline void set_nstatus(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.PiPointInfo) + // @@protoc_insertion_point(class_scope:iot_idl.PiPointInfo) private: inline void set_has_strpointtag(); inline void clear_has_strpointtag(); @@ -547,7 +547,7 @@ class IDL_FILES_EXPORT MiPointInfo : public ::google::protobuf::Message { inline ::google::protobuf::int32 nstatus() const; inline void set_nstatus(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MiPointInfo) + // @@protoc_insertion_point(class_scope:iot_idl.MiPointInfo) private: inline void set_has_strpointtag(); inline void clear_has_strpointtag(); @@ -676,7 +676,7 @@ class IDL_FILES_EXPORT RequestPointInfo : public ::google::protobuf::Message { inline ::std::string* release_strhostname(); inline void set_allocated_strhostname(::std::string* strhostname); - // @@protoc_insertion_point(class_scope:kbd_idlfile.RequestPointInfo) + // @@protoc_insertion_point(class_scope:iot_idl.RequestPointInfo) private: inline void set_has_strgrouptag(); inline void clear_has_strgrouptag(); @@ -772,52 +772,52 @@ class IDL_FILES_EXPORT ReplyPointInfo : public ::google::protobuf::Message { inline ::std::string* release_strgrouptag(); inline void set_allocated_strgrouptag(::std::string* strgrouptag); - // repeated .kbd_idlfile.AiPointInfo aiInfo = 2; + // repeated .iot_idl.AiPointInfo aiInfo = 2; inline int aiinfo_size() const; inline void clear_aiinfo(); static const int kAiInfoFieldNumber = 2; - inline const ::kbd_idlfile::AiPointInfo& aiinfo(int index) const; - inline ::kbd_idlfile::AiPointInfo* mutable_aiinfo(int index); - inline ::kbd_idlfile::AiPointInfo* add_aiinfo(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::AiPointInfo >& + inline const ::iot_idl::AiPointInfo& aiinfo(int index) const; + inline ::iot_idl::AiPointInfo* mutable_aiinfo(int index); + inline ::iot_idl::AiPointInfo* add_aiinfo(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::AiPointInfo >& aiinfo() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::AiPointInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::AiPointInfo >* mutable_aiinfo(); - // repeated .kbd_idlfile.PiPointInfo piInfo = 3; + // repeated .iot_idl.PiPointInfo piInfo = 3; inline int piinfo_size() const; inline void clear_piinfo(); static const int kPiInfoFieldNumber = 3; - inline const ::kbd_idlfile::PiPointInfo& piinfo(int index) const; - inline ::kbd_idlfile::PiPointInfo* mutable_piinfo(int index); - inline ::kbd_idlfile::PiPointInfo* add_piinfo(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::PiPointInfo >& + inline const ::iot_idl::PiPointInfo& piinfo(int index) const; + inline ::iot_idl::PiPointInfo* mutable_piinfo(int index); + inline ::iot_idl::PiPointInfo* add_piinfo(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::PiPointInfo >& piinfo() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::PiPointInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::PiPointInfo >* mutable_piinfo(); - // repeated .kbd_idlfile.MiPointInfo miInfo = 4; + // repeated .iot_idl.MiPointInfo miInfo = 4; inline int miinfo_size() const; inline void clear_miinfo(); static const int kMiInfoFieldNumber = 4; - inline const ::kbd_idlfile::MiPointInfo& miinfo(int index) const; - inline ::kbd_idlfile::MiPointInfo* mutable_miinfo(int index); - inline ::kbd_idlfile::MiPointInfo* add_miinfo(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::MiPointInfo >& + inline const ::iot_idl::MiPointInfo& miinfo(int index) const; + inline ::iot_idl::MiPointInfo* mutable_miinfo(int index); + inline ::iot_idl::MiPointInfo* add_miinfo(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::MiPointInfo >& miinfo() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::MiPointInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::MiPointInfo >* mutable_miinfo(); - // repeated .kbd_idlfile.DiPointInfo diInfo = 5; + // repeated .iot_idl.DiPointInfo diInfo = 5; inline int diinfo_size() const; inline void clear_diinfo(); static const int kDiInfoFieldNumber = 5; - inline const ::kbd_idlfile::DiPointInfo& diinfo(int index) const; - inline ::kbd_idlfile::DiPointInfo* mutable_diinfo(int index); - inline ::kbd_idlfile::DiPointInfo* add_diinfo(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DiPointInfo >& + inline const ::iot_idl::DiPointInfo& diinfo(int index) const; + inline ::iot_idl::DiPointInfo* mutable_diinfo(int index); + inline ::iot_idl::DiPointInfo* add_diinfo(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DiPointInfo >& diinfo() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DiPointInfo >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DiPointInfo >* mutable_diinfo(); // required int32 nDomainId = 6; @@ -853,7 +853,7 @@ class IDL_FILES_EXPORT ReplyPointInfo : public ::google::protobuf::Message { inline ::std::string* release_strhostname(); inline void set_allocated_strhostname(::std::string* strhostname); - // @@protoc_insertion_point(class_scope:kbd_idlfile.ReplyPointInfo) + // @@protoc_insertion_point(class_scope:iot_idl.ReplyPointInfo) private: inline void set_has_strgrouptag(); inline void clear_has_strgrouptag(); @@ -871,10 +871,10 @@ class IDL_FILES_EXPORT ReplyPointInfo : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* strgrouptag_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::AiPointInfo > aiinfo_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::PiPointInfo > piinfo_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::MiPointInfo > miinfo_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DiPointInfo > diinfo_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::AiPointInfo > aiinfo_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::PiPointInfo > piinfo_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::MiPointInfo > miinfo_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::DiPointInfo > diinfo_; ::google::protobuf::int32 ndomainid_; ::google::protobuf::int32 nsubsystemid_; ::google::protobuf::uint64 ntime_; @@ -910,7 +910,7 @@ inline void AiPointInfo::clear_strpointtag() { clear_has_strpointtag(); } inline const ::std::string& AiPointInfo::strpointtag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.AiPointInfo.strPointTag) + // @@protoc_insertion_point(field_get:iot_idl.AiPointInfo.strPointTag) return *strpointtag_; } inline void AiPointInfo::set_strpointtag(const ::std::string& value) { @@ -919,7 +919,7 @@ inline void AiPointInfo::set_strpointtag(const ::std::string& value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.AiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set:iot_idl.AiPointInfo.strPointTag) } inline void AiPointInfo::set_strpointtag(const char* value) { set_has_strpointtag(); @@ -927,7 +927,7 @@ inline void AiPointInfo::set_strpointtag(const char* value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.AiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_char:iot_idl.AiPointInfo.strPointTag) } inline void AiPointInfo::set_strpointtag(const char* value, size_t size) { set_has_strpointtag(); @@ -935,14 +935,14 @@ inline void AiPointInfo::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.AiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.AiPointInfo.strPointTag) } inline ::std::string* AiPointInfo::mutable_strpointtag() { set_has_strpointtag(); if (strpointtag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointtag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.AiPointInfo.strPointTag) + // @@protoc_insertion_point(field_mutable:iot_idl.AiPointInfo.strPointTag) return strpointtag_; } inline ::std::string* AiPointInfo::release_strpointtag() { @@ -966,7 +966,7 @@ inline void AiPointInfo::set_allocated_strpointtag(::std::string* strpointtag) { clear_has_strpointtag(); strpointtag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.AiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.AiPointInfo.strPointTag) } // optional string strPointDesc = 2; @@ -986,7 +986,7 @@ inline void AiPointInfo::clear_strpointdesc() { clear_has_strpointdesc(); } inline const ::std::string& AiPointInfo::strpointdesc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.AiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_get:iot_idl.AiPointInfo.strPointDesc) return *strpointdesc_; } inline void AiPointInfo::set_strpointdesc(const ::std::string& value) { @@ -995,7 +995,7 @@ inline void AiPointInfo::set_strpointdesc(const ::std::string& value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.AiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set:iot_idl.AiPointInfo.strPointDesc) } inline void AiPointInfo::set_strpointdesc(const char* value) { set_has_strpointdesc(); @@ -1003,7 +1003,7 @@ inline void AiPointInfo::set_strpointdesc(const char* value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.AiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_char:iot_idl.AiPointInfo.strPointDesc) } inline void AiPointInfo::set_strpointdesc(const char* value, size_t size) { set_has_strpointdesc(); @@ -1011,14 +1011,14 @@ inline void AiPointInfo::set_strpointdesc(const char* value, size_t size) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.AiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.AiPointInfo.strPointDesc) } inline ::std::string* AiPointInfo::mutable_strpointdesc() { set_has_strpointdesc(); if (strpointdesc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointdesc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.AiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_mutable:iot_idl.AiPointInfo.strPointDesc) return strpointdesc_; } inline ::std::string* AiPointInfo::release_strpointdesc() { @@ -1042,7 +1042,7 @@ inline void AiPointInfo::set_allocated_strpointdesc(::std::string* strpointdesc) clear_has_strpointdesc(); strpointdesc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.AiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.AiPointInfo.strPointDesc) } // required int32 nPointType = 3; @@ -1060,13 +1060,13 @@ inline void AiPointInfo::clear_npointtype() { clear_has_npointtype(); } inline ::google::protobuf::int32 AiPointInfo::npointtype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.AiPointInfo.nPointType) + // @@protoc_insertion_point(field_get:iot_idl.AiPointInfo.nPointType) return npointtype_; } inline void AiPointInfo::set_npointtype(::google::protobuf::int32 value) { set_has_npointtype(); npointtype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.AiPointInfo.nPointType) + // @@protoc_insertion_point(field_set:iot_idl.AiPointInfo.nPointType) } // required double dValue = 4; @@ -1084,13 +1084,13 @@ inline void AiPointInfo::clear_dvalue() { clear_has_dvalue(); } inline double AiPointInfo::dvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.AiPointInfo.dValue) + // @@protoc_insertion_point(field_get:iot_idl.AiPointInfo.dValue) return dvalue_; } inline void AiPointInfo::set_dvalue(double value) { set_has_dvalue(); dvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.AiPointInfo.dValue) + // @@protoc_insertion_point(field_set:iot_idl.AiPointInfo.dValue) } // required int32 nStatus = 5; @@ -1108,13 +1108,13 @@ inline void AiPointInfo::clear_nstatus() { clear_has_nstatus(); } inline ::google::protobuf::int32 AiPointInfo::nstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.AiPointInfo.nStatus) + // @@protoc_insertion_point(field_get:iot_idl.AiPointInfo.nStatus) return nstatus_; } inline void AiPointInfo::set_nstatus(::google::protobuf::int32 value) { set_has_nstatus(); nstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.AiPointInfo.nStatus) + // @@protoc_insertion_point(field_set:iot_idl.AiPointInfo.nStatus) } // ------------------------------------------------------------------- @@ -1138,7 +1138,7 @@ inline void DiPointInfo::clear_strpointtag() { clear_has_strpointtag(); } inline const ::std::string& DiPointInfo::strpointtag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DiPointInfo.strPointTag) + // @@protoc_insertion_point(field_get:iot_idl.DiPointInfo.strPointTag) return *strpointtag_; } inline void DiPointInfo::set_strpointtag(const ::std::string& value) { @@ -1147,7 +1147,7 @@ inline void DiPointInfo::set_strpointtag(const ::std::string& value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set:iot_idl.DiPointInfo.strPointTag) } inline void DiPointInfo::set_strpointtag(const char* value) { set_has_strpointtag(); @@ -1155,7 +1155,7 @@ inline void DiPointInfo::set_strpointtag(const char* value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_char:iot_idl.DiPointInfo.strPointTag) } inline void DiPointInfo::set_strpointtag(const char* value, size_t size) { set_has_strpointtag(); @@ -1163,14 +1163,14 @@ inline void DiPointInfo::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.DiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DiPointInfo.strPointTag) } inline ::std::string* DiPointInfo::mutable_strpointtag() { set_has_strpointtag(); if (strpointtag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointtag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DiPointInfo.strPointTag) + // @@protoc_insertion_point(field_mutable:iot_idl.DiPointInfo.strPointTag) return strpointtag_; } inline ::std::string* DiPointInfo::release_strpointtag() { @@ -1194,7 +1194,7 @@ inline void DiPointInfo::set_allocated_strpointtag(::std::string* strpointtag) { clear_has_strpointtag(); strpointtag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DiPointInfo.strPointTag) } // optional string strPointDesc = 2; @@ -1214,7 +1214,7 @@ inline void DiPointInfo::clear_strpointdesc() { clear_has_strpointdesc(); } inline const ::std::string& DiPointInfo::strpointdesc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_get:iot_idl.DiPointInfo.strPointDesc) return *strpointdesc_; } inline void DiPointInfo::set_strpointdesc(const ::std::string& value) { @@ -1223,7 +1223,7 @@ inline void DiPointInfo::set_strpointdesc(const ::std::string& value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.DiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set:iot_idl.DiPointInfo.strPointDesc) } inline void DiPointInfo::set_strpointdesc(const char* value) { set_has_strpointdesc(); @@ -1231,7 +1231,7 @@ inline void DiPointInfo::set_strpointdesc(const char* value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.DiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_char:iot_idl.DiPointInfo.strPointDesc) } inline void DiPointInfo::set_strpointdesc(const char* value, size_t size) { set_has_strpointdesc(); @@ -1239,14 +1239,14 @@ inline void DiPointInfo::set_strpointdesc(const char* value, size_t size) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.DiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.DiPointInfo.strPointDesc) } inline ::std::string* DiPointInfo::mutable_strpointdesc() { set_has_strpointdesc(); if (strpointdesc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointdesc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.DiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_mutable:iot_idl.DiPointInfo.strPointDesc) return strpointdesc_; } inline ::std::string* DiPointInfo::release_strpointdesc() { @@ -1270,7 +1270,7 @@ inline void DiPointInfo::set_allocated_strpointdesc(::std::string* strpointdesc) clear_has_strpointdesc(); strpointdesc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.DiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.DiPointInfo.strPointDesc) } // required int32 nPointType = 3; @@ -1288,13 +1288,13 @@ inline void DiPointInfo::clear_npointtype() { clear_has_npointtype(); } inline ::google::protobuf::int32 DiPointInfo::npointtype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DiPointInfo.nPointType) + // @@protoc_insertion_point(field_get:iot_idl.DiPointInfo.nPointType) return npointtype_; } inline void DiPointInfo::set_npointtype(::google::protobuf::int32 value) { set_has_npointtype(); npointtype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DiPointInfo.nPointType) + // @@protoc_insertion_point(field_set:iot_idl.DiPointInfo.nPointType) } // required int32 nValue = 4; @@ -1312,13 +1312,13 @@ inline void DiPointInfo::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 DiPointInfo::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DiPointInfo.nValue) + // @@protoc_insertion_point(field_get:iot_idl.DiPointInfo.nValue) return nvalue_; } inline void DiPointInfo::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DiPointInfo.nValue) + // @@protoc_insertion_point(field_set:iot_idl.DiPointInfo.nValue) } // required int32 nStatus = 5; @@ -1336,13 +1336,13 @@ inline void DiPointInfo::clear_nstatus() { clear_has_nstatus(); } inline ::google::protobuf::int32 DiPointInfo::nstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.DiPointInfo.nStatus) + // @@protoc_insertion_point(field_get:iot_idl.DiPointInfo.nStatus) return nstatus_; } inline void DiPointInfo::set_nstatus(::google::protobuf::int32 value) { set_has_nstatus(); nstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.DiPointInfo.nStatus) + // @@protoc_insertion_point(field_set:iot_idl.DiPointInfo.nStatus) } // ------------------------------------------------------------------- @@ -1366,7 +1366,7 @@ inline void PiPointInfo::clear_strpointtag() { clear_has_strpointtag(); } inline const ::std::string& PiPointInfo::strpointtag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.PiPointInfo.strPointTag) + // @@protoc_insertion_point(field_get:iot_idl.PiPointInfo.strPointTag) return *strpointtag_; } inline void PiPointInfo::set_strpointtag(const ::std::string& value) { @@ -1375,7 +1375,7 @@ inline void PiPointInfo::set_strpointtag(const ::std::string& value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.PiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set:iot_idl.PiPointInfo.strPointTag) } inline void PiPointInfo::set_strpointtag(const char* value) { set_has_strpointtag(); @@ -1383,7 +1383,7 @@ inline void PiPointInfo::set_strpointtag(const char* value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.PiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_char:iot_idl.PiPointInfo.strPointTag) } inline void PiPointInfo::set_strpointtag(const char* value, size_t size) { set_has_strpointtag(); @@ -1391,14 +1391,14 @@ inline void PiPointInfo::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.PiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.PiPointInfo.strPointTag) } inline ::std::string* PiPointInfo::mutable_strpointtag() { set_has_strpointtag(); if (strpointtag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointtag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.PiPointInfo.strPointTag) + // @@protoc_insertion_point(field_mutable:iot_idl.PiPointInfo.strPointTag) return strpointtag_; } inline ::std::string* PiPointInfo::release_strpointtag() { @@ -1422,7 +1422,7 @@ inline void PiPointInfo::set_allocated_strpointtag(::std::string* strpointtag) { clear_has_strpointtag(); strpointtag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.PiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.PiPointInfo.strPointTag) } // optional string strPointDesc = 2; @@ -1442,7 +1442,7 @@ inline void PiPointInfo::clear_strpointdesc() { clear_has_strpointdesc(); } inline const ::std::string& PiPointInfo::strpointdesc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.PiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_get:iot_idl.PiPointInfo.strPointDesc) return *strpointdesc_; } inline void PiPointInfo::set_strpointdesc(const ::std::string& value) { @@ -1451,7 +1451,7 @@ inline void PiPointInfo::set_strpointdesc(const ::std::string& value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.PiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set:iot_idl.PiPointInfo.strPointDesc) } inline void PiPointInfo::set_strpointdesc(const char* value) { set_has_strpointdesc(); @@ -1459,7 +1459,7 @@ inline void PiPointInfo::set_strpointdesc(const char* value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.PiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_char:iot_idl.PiPointInfo.strPointDesc) } inline void PiPointInfo::set_strpointdesc(const char* value, size_t size) { set_has_strpointdesc(); @@ -1467,14 +1467,14 @@ inline void PiPointInfo::set_strpointdesc(const char* value, size_t size) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.PiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.PiPointInfo.strPointDesc) } inline ::std::string* PiPointInfo::mutable_strpointdesc() { set_has_strpointdesc(); if (strpointdesc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointdesc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.PiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_mutable:iot_idl.PiPointInfo.strPointDesc) return strpointdesc_; } inline ::std::string* PiPointInfo::release_strpointdesc() { @@ -1498,7 +1498,7 @@ inline void PiPointInfo::set_allocated_strpointdesc(::std::string* strpointdesc) clear_has_strpointdesc(); strpointdesc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.PiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.PiPointInfo.strPointDesc) } // required int32 nPointType = 3; @@ -1516,13 +1516,13 @@ inline void PiPointInfo::clear_npointtype() { clear_has_npointtype(); } inline ::google::protobuf::int32 PiPointInfo::npointtype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.PiPointInfo.nPointType) + // @@protoc_insertion_point(field_get:iot_idl.PiPointInfo.nPointType) return npointtype_; } inline void PiPointInfo::set_npointtype(::google::protobuf::int32 value) { set_has_npointtype(); npointtype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.PiPointInfo.nPointType) + // @@protoc_insertion_point(field_set:iot_idl.PiPointInfo.nPointType) } // required double dValue = 4; @@ -1540,13 +1540,13 @@ inline void PiPointInfo::clear_dvalue() { clear_has_dvalue(); } inline double PiPointInfo::dvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.PiPointInfo.dValue) + // @@protoc_insertion_point(field_get:iot_idl.PiPointInfo.dValue) return dvalue_; } inline void PiPointInfo::set_dvalue(double value) { set_has_dvalue(); dvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.PiPointInfo.dValue) + // @@protoc_insertion_point(field_set:iot_idl.PiPointInfo.dValue) } // required int32 nStatus = 5; @@ -1564,13 +1564,13 @@ inline void PiPointInfo::clear_nstatus() { clear_has_nstatus(); } inline ::google::protobuf::int32 PiPointInfo::nstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.PiPointInfo.nStatus) + // @@protoc_insertion_point(field_get:iot_idl.PiPointInfo.nStatus) return nstatus_; } inline void PiPointInfo::set_nstatus(::google::protobuf::int32 value) { set_has_nstatus(); nstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.PiPointInfo.nStatus) + // @@protoc_insertion_point(field_set:iot_idl.PiPointInfo.nStatus) } // ------------------------------------------------------------------- @@ -1594,7 +1594,7 @@ inline void MiPointInfo::clear_strpointtag() { clear_has_strpointtag(); } inline const ::std::string& MiPointInfo::strpointtag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MiPointInfo.strPointTag) + // @@protoc_insertion_point(field_get:iot_idl.MiPointInfo.strPointTag) return *strpointtag_; } inline void MiPointInfo::set_strpointtag(const ::std::string& value) { @@ -1603,7 +1603,7 @@ inline void MiPointInfo::set_strpointtag(const ::std::string& value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set:iot_idl.MiPointInfo.strPointTag) } inline void MiPointInfo::set_strpointtag(const char* value) { set_has_strpointtag(); @@ -1611,7 +1611,7 @@ inline void MiPointInfo::set_strpointtag(const char* value) { strpointtag_ = new ::std::string; } strpointtag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_char:iot_idl.MiPointInfo.strPointTag) } inline void MiPointInfo::set_strpointtag(const char* value, size_t size) { set_has_strpointtag(); @@ -1619,14 +1619,14 @@ inline void MiPointInfo::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.MiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MiPointInfo.strPointTag) } inline ::std::string* MiPointInfo::mutable_strpointtag() { set_has_strpointtag(); if (strpointtag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointtag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MiPointInfo.strPointTag) + // @@protoc_insertion_point(field_mutable:iot_idl.MiPointInfo.strPointTag) return strpointtag_; } inline ::std::string* MiPointInfo::release_strpointtag() { @@ -1650,7 +1650,7 @@ inline void MiPointInfo::set_allocated_strpointtag(::std::string* strpointtag) { clear_has_strpointtag(); strpointtag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MiPointInfo.strPointTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MiPointInfo.strPointTag) } // optional string strPointDesc = 2; @@ -1670,7 +1670,7 @@ inline void MiPointInfo::clear_strpointdesc() { clear_has_strpointdesc(); } inline const ::std::string& MiPointInfo::strpointdesc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_get:iot_idl.MiPointInfo.strPointDesc) return *strpointdesc_; } inline void MiPointInfo::set_strpointdesc(const ::std::string& value) { @@ -1679,7 +1679,7 @@ inline void MiPointInfo::set_strpointdesc(const ::std::string& value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set:iot_idl.MiPointInfo.strPointDesc) } inline void MiPointInfo::set_strpointdesc(const char* value) { set_has_strpointdesc(); @@ -1687,7 +1687,7 @@ inline void MiPointInfo::set_strpointdesc(const char* value) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_char:iot_idl.MiPointInfo.strPointDesc) } inline void MiPointInfo::set_strpointdesc(const char* value, size_t size) { set_has_strpointdesc(); @@ -1695,14 +1695,14 @@ inline void MiPointInfo::set_strpointdesc(const char* value, size_t size) { strpointdesc_ = new ::std::string; } strpointdesc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MiPointInfo.strPointDesc) } inline ::std::string* MiPointInfo::mutable_strpointdesc() { set_has_strpointdesc(); if (strpointdesc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strpointdesc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_mutable:iot_idl.MiPointInfo.strPointDesc) return strpointdesc_; } inline ::std::string* MiPointInfo::release_strpointdesc() { @@ -1726,7 +1726,7 @@ inline void MiPointInfo::set_allocated_strpointdesc(::std::string* strpointdesc) clear_has_strpointdesc(); strpointdesc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MiPointInfo.strPointDesc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MiPointInfo.strPointDesc) } // required int32 nPointType = 3; @@ -1744,13 +1744,13 @@ inline void MiPointInfo::clear_npointtype() { clear_has_npointtype(); } inline ::google::protobuf::int32 MiPointInfo::npointtype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MiPointInfo.nPointType) + // @@protoc_insertion_point(field_get:iot_idl.MiPointInfo.nPointType) return npointtype_; } inline void MiPointInfo::set_npointtype(::google::protobuf::int32 value) { set_has_npointtype(); npointtype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.MiPointInfo.nPointType) + // @@protoc_insertion_point(field_set:iot_idl.MiPointInfo.nPointType) } // required int32 nValue = 4; @@ -1768,13 +1768,13 @@ inline void MiPointInfo::clear_nvalue() { clear_has_nvalue(); } inline ::google::protobuf::int32 MiPointInfo::nvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MiPointInfo.nValue) + // @@protoc_insertion_point(field_get:iot_idl.MiPointInfo.nValue) return nvalue_; } inline void MiPointInfo::set_nvalue(::google::protobuf::int32 value) { set_has_nvalue(); nvalue_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.MiPointInfo.nValue) + // @@protoc_insertion_point(field_set:iot_idl.MiPointInfo.nValue) } // required int32 nStatus = 5; @@ -1792,13 +1792,13 @@ inline void MiPointInfo::clear_nstatus() { clear_has_nstatus(); } inline ::google::protobuf::int32 MiPointInfo::nstatus() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MiPointInfo.nStatus) + // @@protoc_insertion_point(field_get:iot_idl.MiPointInfo.nStatus) return nstatus_; } inline void MiPointInfo::set_nstatus(::google::protobuf::int32 value) { set_has_nstatus(); nstatus_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.MiPointInfo.nStatus) + // @@protoc_insertion_point(field_set:iot_idl.MiPointInfo.nStatus) } // ------------------------------------------------------------------- @@ -1822,7 +1822,7 @@ inline void RequestPointInfo::clear_strgrouptag() { clear_has_strgrouptag(); } inline const ::std::string& RequestPointInfo::strgrouptag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RequestPointInfo.strGroupTag) + // @@protoc_insertion_point(field_get:iot_idl.RequestPointInfo.strGroupTag) return *strgrouptag_; } inline void RequestPointInfo::set_strgrouptag(const ::std::string& value) { @@ -1831,7 +1831,7 @@ inline void RequestPointInfo::set_strgrouptag(const ::std::string& value) { strgrouptag_ = new ::std::string; } strgrouptag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RequestPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set:iot_idl.RequestPointInfo.strGroupTag) } inline void RequestPointInfo::set_strgrouptag(const char* value) { set_has_strgrouptag(); @@ -1839,7 +1839,7 @@ inline void RequestPointInfo::set_strgrouptag(const char* value) { strgrouptag_ = new ::std::string; } strgrouptag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RequestPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set_char:iot_idl.RequestPointInfo.strGroupTag) } inline void RequestPointInfo::set_strgrouptag(const char* value, size_t size) { set_has_strgrouptag(); @@ -1847,14 +1847,14 @@ inline void RequestPointInfo::set_strgrouptag(const char* value, size_t size) { strgrouptag_ = new ::std::string; } strgrouptag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RequestPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RequestPointInfo.strGroupTag) } inline ::std::string* RequestPointInfo::mutable_strgrouptag() { set_has_strgrouptag(); if (strgrouptag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strgrouptag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RequestPointInfo.strGroupTag) + // @@protoc_insertion_point(field_mutable:iot_idl.RequestPointInfo.strGroupTag) return strgrouptag_; } inline ::std::string* RequestPointInfo::release_strgrouptag() { @@ -1878,7 +1878,7 @@ inline void RequestPointInfo::set_allocated_strgrouptag(::std::string* strgroupt clear_has_strgrouptag(); strgrouptag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RequestPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RequestPointInfo.strGroupTag) } // required int32 nDomainId = 2; @@ -1896,13 +1896,13 @@ inline void RequestPointInfo::clear_ndomainid() { clear_has_ndomainid(); } inline ::google::protobuf::int32 RequestPointInfo::ndomainid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RequestPointInfo.nDomainId) + // @@protoc_insertion_point(field_get:iot_idl.RequestPointInfo.nDomainId) return ndomainid_; } inline void RequestPointInfo::set_ndomainid(::google::protobuf::int32 value) { set_has_ndomainid(); ndomainid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RequestPointInfo.nDomainId) + // @@protoc_insertion_point(field_set:iot_idl.RequestPointInfo.nDomainId) } // required int32 nSubSystemId = 3; @@ -1920,13 +1920,13 @@ inline void RequestPointInfo::clear_nsubsystemid() { clear_has_nsubsystemid(); } inline ::google::protobuf::int32 RequestPointInfo::nsubsystemid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RequestPointInfo.nSubSystemId) + // @@protoc_insertion_point(field_get:iot_idl.RequestPointInfo.nSubSystemId) return nsubsystemid_; } inline void RequestPointInfo::set_nsubsystemid(::google::protobuf::int32 value) { set_has_nsubsystemid(); nsubsystemid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RequestPointInfo.nSubSystemId) + // @@protoc_insertion_point(field_set:iot_idl.RequestPointInfo.nSubSystemId) } // optional uint64 nTime = 4; @@ -1944,13 +1944,13 @@ inline void RequestPointInfo::clear_ntime() { clear_has_ntime(); } inline ::google::protobuf::uint64 RequestPointInfo::ntime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RequestPointInfo.nTime) + // @@protoc_insertion_point(field_get:iot_idl.RequestPointInfo.nTime) return ntime_; } inline void RequestPointInfo::set_ntime(::google::protobuf::uint64 value) { set_has_ntime(); ntime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.RequestPointInfo.nTime) + // @@protoc_insertion_point(field_set:iot_idl.RequestPointInfo.nTime) } // required string strHostName = 5; @@ -1970,7 +1970,7 @@ inline void RequestPointInfo::clear_strhostname() { clear_has_strhostname(); } inline const ::std::string& RequestPointInfo::strhostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.RequestPointInfo.strHostName) + // @@protoc_insertion_point(field_get:iot_idl.RequestPointInfo.strHostName) return *strhostname_; } inline void RequestPointInfo::set_strhostname(const ::std::string& value) { @@ -1979,7 +1979,7 @@ inline void RequestPointInfo::set_strhostname(const ::std::string& value) { strhostname_ = new ::std::string; } strhostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.RequestPointInfo.strHostName) + // @@protoc_insertion_point(field_set:iot_idl.RequestPointInfo.strHostName) } inline void RequestPointInfo::set_strhostname(const char* value) { set_has_strhostname(); @@ -1987,7 +1987,7 @@ inline void RequestPointInfo::set_strhostname(const char* value) { strhostname_ = new ::std::string; } strhostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.RequestPointInfo.strHostName) + // @@protoc_insertion_point(field_set_char:iot_idl.RequestPointInfo.strHostName) } inline void RequestPointInfo::set_strhostname(const char* value, size_t size) { set_has_strhostname(); @@ -1995,14 +1995,14 @@ inline void RequestPointInfo::set_strhostname(const char* value, size_t size) { strhostname_ = new ::std::string; } strhostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.RequestPointInfo.strHostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.RequestPointInfo.strHostName) } inline ::std::string* RequestPointInfo::mutable_strhostname() { set_has_strhostname(); if (strhostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strhostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.RequestPointInfo.strHostName) + // @@protoc_insertion_point(field_mutable:iot_idl.RequestPointInfo.strHostName) return strhostname_; } inline ::std::string* RequestPointInfo::release_strhostname() { @@ -2026,7 +2026,7 @@ inline void RequestPointInfo::set_allocated_strhostname(::std::string* strhostna clear_has_strhostname(); strhostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.RequestPointInfo.strHostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.RequestPointInfo.strHostName) } // ------------------------------------------------------------------- @@ -2050,7 +2050,7 @@ inline void ReplyPointInfo::clear_strgrouptag() { clear_has_strgrouptag(); } inline const ::std::string& ReplyPointInfo::strgrouptag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.strGroupTag) + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.strGroupTag) return *strgrouptag_; } inline void ReplyPointInfo::set_strgrouptag(const ::std::string& value) { @@ -2059,7 +2059,7 @@ inline void ReplyPointInfo::set_strgrouptag(const ::std::string& value) { strgrouptag_ = new ::std::string; } strgrouptag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.ReplyPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set:iot_idl.ReplyPointInfo.strGroupTag) } inline void ReplyPointInfo::set_strgrouptag(const char* value) { set_has_strgrouptag(); @@ -2067,7 +2067,7 @@ inline void ReplyPointInfo::set_strgrouptag(const char* value) { strgrouptag_ = new ::std::string; } strgrouptag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.ReplyPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set_char:iot_idl.ReplyPointInfo.strGroupTag) } inline void ReplyPointInfo::set_strgrouptag(const char* value, size_t size) { set_has_strgrouptag(); @@ -2075,14 +2075,14 @@ inline void ReplyPointInfo::set_strgrouptag(const char* value, size_t size) { strgrouptag_ = new ::std::string; } strgrouptag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.ReplyPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.ReplyPointInfo.strGroupTag) } inline ::std::string* ReplyPointInfo::mutable_strgrouptag() { set_has_strgrouptag(); if (strgrouptag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strgrouptag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ReplyPointInfo.strGroupTag) + // @@protoc_insertion_point(field_mutable:iot_idl.ReplyPointInfo.strGroupTag) return strgrouptag_; } inline ::std::string* ReplyPointInfo::release_strgrouptag() { @@ -2106,126 +2106,126 @@ inline void ReplyPointInfo::set_allocated_strgrouptag(::std::string* strgrouptag clear_has_strgrouptag(); strgrouptag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.ReplyPointInfo.strGroupTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.ReplyPointInfo.strGroupTag) } -// repeated .kbd_idlfile.AiPointInfo aiInfo = 2; +// repeated .iot_idl.AiPointInfo aiInfo = 2; inline int ReplyPointInfo::aiinfo_size() const { return aiinfo_.size(); } inline void ReplyPointInfo::clear_aiinfo() { aiinfo_.Clear(); } -inline const ::kbd_idlfile::AiPointInfo& ReplyPointInfo::aiinfo(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.aiInfo) +inline const ::iot_idl::AiPointInfo& ReplyPointInfo::aiinfo(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.aiInfo) return aiinfo_.Get(index); } -inline ::kbd_idlfile::AiPointInfo* ReplyPointInfo::mutable_aiinfo(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ReplyPointInfo.aiInfo) +inline ::iot_idl::AiPointInfo* ReplyPointInfo::mutable_aiinfo(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.ReplyPointInfo.aiInfo) return aiinfo_.Mutable(index); } -inline ::kbd_idlfile::AiPointInfo* ReplyPointInfo::add_aiinfo() { - // @@protoc_insertion_point(field_add:kbd_idlfile.ReplyPointInfo.aiInfo) +inline ::iot_idl::AiPointInfo* ReplyPointInfo::add_aiinfo() { + // @@protoc_insertion_point(field_add:iot_idl.ReplyPointInfo.aiInfo) return aiinfo_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::AiPointInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::AiPointInfo >& ReplyPointInfo::aiinfo() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.ReplyPointInfo.aiInfo) + // @@protoc_insertion_point(field_list:iot_idl.ReplyPointInfo.aiInfo) return aiinfo_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::AiPointInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::AiPointInfo >* ReplyPointInfo::mutable_aiinfo() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.ReplyPointInfo.aiInfo) + // @@protoc_insertion_point(field_mutable_list:iot_idl.ReplyPointInfo.aiInfo) return &aiinfo_; } -// repeated .kbd_idlfile.PiPointInfo piInfo = 3; +// repeated .iot_idl.PiPointInfo piInfo = 3; inline int ReplyPointInfo::piinfo_size() const { return piinfo_.size(); } inline void ReplyPointInfo::clear_piinfo() { piinfo_.Clear(); } -inline const ::kbd_idlfile::PiPointInfo& ReplyPointInfo::piinfo(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.piInfo) +inline const ::iot_idl::PiPointInfo& ReplyPointInfo::piinfo(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.piInfo) return piinfo_.Get(index); } -inline ::kbd_idlfile::PiPointInfo* ReplyPointInfo::mutable_piinfo(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ReplyPointInfo.piInfo) +inline ::iot_idl::PiPointInfo* ReplyPointInfo::mutable_piinfo(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.ReplyPointInfo.piInfo) return piinfo_.Mutable(index); } -inline ::kbd_idlfile::PiPointInfo* ReplyPointInfo::add_piinfo() { - // @@protoc_insertion_point(field_add:kbd_idlfile.ReplyPointInfo.piInfo) +inline ::iot_idl::PiPointInfo* ReplyPointInfo::add_piinfo() { + // @@protoc_insertion_point(field_add:iot_idl.ReplyPointInfo.piInfo) return piinfo_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::PiPointInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::PiPointInfo >& ReplyPointInfo::piinfo() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.ReplyPointInfo.piInfo) + // @@protoc_insertion_point(field_list:iot_idl.ReplyPointInfo.piInfo) return piinfo_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::PiPointInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::PiPointInfo >* ReplyPointInfo::mutable_piinfo() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.ReplyPointInfo.piInfo) + // @@protoc_insertion_point(field_mutable_list:iot_idl.ReplyPointInfo.piInfo) return &piinfo_; } -// repeated .kbd_idlfile.MiPointInfo miInfo = 4; +// repeated .iot_idl.MiPointInfo miInfo = 4; inline int ReplyPointInfo::miinfo_size() const { return miinfo_.size(); } inline void ReplyPointInfo::clear_miinfo() { miinfo_.Clear(); } -inline const ::kbd_idlfile::MiPointInfo& ReplyPointInfo::miinfo(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.miInfo) +inline const ::iot_idl::MiPointInfo& ReplyPointInfo::miinfo(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.miInfo) return miinfo_.Get(index); } -inline ::kbd_idlfile::MiPointInfo* ReplyPointInfo::mutable_miinfo(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ReplyPointInfo.miInfo) +inline ::iot_idl::MiPointInfo* ReplyPointInfo::mutable_miinfo(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.ReplyPointInfo.miInfo) return miinfo_.Mutable(index); } -inline ::kbd_idlfile::MiPointInfo* ReplyPointInfo::add_miinfo() { - // @@protoc_insertion_point(field_add:kbd_idlfile.ReplyPointInfo.miInfo) +inline ::iot_idl::MiPointInfo* ReplyPointInfo::add_miinfo() { + // @@protoc_insertion_point(field_add:iot_idl.ReplyPointInfo.miInfo) return miinfo_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::MiPointInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::MiPointInfo >& ReplyPointInfo::miinfo() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.ReplyPointInfo.miInfo) + // @@protoc_insertion_point(field_list:iot_idl.ReplyPointInfo.miInfo) return miinfo_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::MiPointInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::MiPointInfo >* ReplyPointInfo::mutable_miinfo() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.ReplyPointInfo.miInfo) + // @@protoc_insertion_point(field_mutable_list:iot_idl.ReplyPointInfo.miInfo) return &miinfo_; } -// repeated .kbd_idlfile.DiPointInfo diInfo = 5; +// repeated .iot_idl.DiPointInfo diInfo = 5; inline int ReplyPointInfo::diinfo_size() const { return diinfo_.size(); } inline void ReplyPointInfo::clear_diinfo() { diinfo_.Clear(); } -inline const ::kbd_idlfile::DiPointInfo& ReplyPointInfo::diinfo(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.diInfo) +inline const ::iot_idl::DiPointInfo& ReplyPointInfo::diinfo(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.diInfo) return diinfo_.Get(index); } -inline ::kbd_idlfile::DiPointInfo* ReplyPointInfo::mutable_diinfo(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ReplyPointInfo.diInfo) +inline ::iot_idl::DiPointInfo* ReplyPointInfo::mutable_diinfo(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.ReplyPointInfo.diInfo) return diinfo_.Mutable(index); } -inline ::kbd_idlfile::DiPointInfo* ReplyPointInfo::add_diinfo() { - // @@protoc_insertion_point(field_add:kbd_idlfile.ReplyPointInfo.diInfo) +inline ::iot_idl::DiPointInfo* ReplyPointInfo::add_diinfo() { + // @@protoc_insertion_point(field_add:iot_idl.ReplyPointInfo.diInfo) return diinfo_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DiPointInfo >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::DiPointInfo >& ReplyPointInfo::diinfo() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.ReplyPointInfo.diInfo) + // @@protoc_insertion_point(field_list:iot_idl.ReplyPointInfo.diInfo) return diinfo_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::DiPointInfo >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::DiPointInfo >* ReplyPointInfo::mutable_diinfo() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.ReplyPointInfo.diInfo) + // @@protoc_insertion_point(field_mutable_list:iot_idl.ReplyPointInfo.diInfo) return &diinfo_; } @@ -2244,13 +2244,13 @@ inline void ReplyPointInfo::clear_ndomainid() { clear_has_ndomainid(); } inline ::google::protobuf::int32 ReplyPointInfo::ndomainid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.nDomainId) + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.nDomainId) return ndomainid_; } inline void ReplyPointInfo::set_ndomainid(::google::protobuf::int32 value) { set_has_ndomainid(); ndomainid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ReplyPointInfo.nDomainId) + // @@protoc_insertion_point(field_set:iot_idl.ReplyPointInfo.nDomainId) } // required int32 nSubSystemId = 7; @@ -2268,13 +2268,13 @@ inline void ReplyPointInfo::clear_nsubsystemid() { clear_has_nsubsystemid(); } inline ::google::protobuf::int32 ReplyPointInfo::nsubsystemid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.nSubSystemId) + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.nSubSystemId) return nsubsystemid_; } inline void ReplyPointInfo::set_nsubsystemid(::google::protobuf::int32 value) { set_has_nsubsystemid(); nsubsystemid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ReplyPointInfo.nSubSystemId) + // @@protoc_insertion_point(field_set:iot_idl.ReplyPointInfo.nSubSystemId) } // optional uint64 nTime = 8; @@ -2292,13 +2292,13 @@ inline void ReplyPointInfo::clear_ntime() { clear_has_ntime(); } inline ::google::protobuf::uint64 ReplyPointInfo::ntime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.nTime) + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.nTime) return ntime_; } inline void ReplyPointInfo::set_ntime(::google::protobuf::uint64 value) { set_has_ntime(); ntime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.ReplyPointInfo.nTime) + // @@protoc_insertion_point(field_set:iot_idl.ReplyPointInfo.nTime) } // required string strHostName = 9; @@ -2318,7 +2318,7 @@ inline void ReplyPointInfo::clear_strhostname() { clear_has_strhostname(); } inline const ::std::string& ReplyPointInfo::strhostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.ReplyPointInfo.strHostName) + // @@protoc_insertion_point(field_get:iot_idl.ReplyPointInfo.strHostName) return *strhostname_; } inline void ReplyPointInfo::set_strhostname(const ::std::string& value) { @@ -2327,7 +2327,7 @@ inline void ReplyPointInfo::set_strhostname(const ::std::string& value) { strhostname_ = new ::std::string; } strhostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.ReplyPointInfo.strHostName) + // @@protoc_insertion_point(field_set:iot_idl.ReplyPointInfo.strHostName) } inline void ReplyPointInfo::set_strhostname(const char* value) { set_has_strhostname(); @@ -2335,7 +2335,7 @@ inline void ReplyPointInfo::set_strhostname(const char* value) { strhostname_ = new ::std::string; } strhostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.ReplyPointInfo.strHostName) + // @@protoc_insertion_point(field_set_char:iot_idl.ReplyPointInfo.strHostName) } inline void ReplyPointInfo::set_strhostname(const char* value, size_t size) { set_has_strhostname(); @@ -2343,14 +2343,14 @@ inline void ReplyPointInfo::set_strhostname(const char* value, size_t size) { strhostname_ = new ::std::string; } strhostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.ReplyPointInfo.strHostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.ReplyPointInfo.strHostName) } inline ::std::string* ReplyPointInfo::mutable_strhostname() { set_has_strhostname(); if (strhostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strhostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.ReplyPointInfo.strHostName) + // @@protoc_insertion_point(field_mutable:iot_idl.ReplyPointInfo.strHostName) return strhostname_; } inline ::std::string* ReplyPointInfo::release_strhostname() { @@ -2374,22 +2374,22 @@ inline void ReplyPointInfo::set_allocated_strhostname(::std::string* strhostname clear_has_strhostname(); strhostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.ReplyPointInfo.strHostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.ReplyPointInfo.strHostName) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enTypeMessage> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enTypeMessage> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enTypeMessage>() { - return ::kbd_idlfile::enTypeMessage_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enTypeMessage>() { + return ::iot_idl::enTypeMessage_descriptor(); } } // namespace google diff --git a/product/src/idl_files/OpcMessage.proto b/product/src/idl_files/OpcMessage.proto index 1f12f55a..245c4f90 100644 --- a/product/src/idl_files/OpcMessage.proto +++ b/product/src/idl_files/OpcMessage.proto @@ -5,7 +5,7 @@ //====================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; enum enTypeMessage { MT_TOOLS_REQUEST_POINT_DATA = 1;//opc 工具请求点数据 diff --git a/product/src/idl_files/SequenceMessage.pb.cc b/product/src/idl_files/SequenceMessage.pb.cc index c9e47029..3c9e8c08 100644 --- a/product/src/idl_files/SequenceMessage.pb.cc +++ b/product/src/idl_files/SequenceMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace sequence { namespace { @@ -374,69 +374,69 @@ void protobuf_AddDesc_SequenceMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\025SequenceMessage.proto\022\024kbd_idlfile.seq" + "\n\025SequenceMessage.proto\022\024iot_idl.seq" "uence\"\242\001\n\nSeqPkgHead\022\022\n\nsource_tag\030\001 \002(\t" - "\0224\n\010msg_type\030\002 \002(\0162\".kbd_idlfile.sequenc" + "\0224\n\010msg_type\030\002 \002(\0162\".iot_idl.sequenc" "e.enSeqMsgType\022\025\n\rsource_domain\030\003 \002(\005\022\025\n" "\rtarget_domain\030\004 \002(\005\022\r\n\005para1\030\005 \002(\005\022\r\n\005p" "ara2\030\006 \002(\005\"`\n\016ErrorParameter\0224\n\tErrorCod" - "e\030\001 \002(\0162!.kbd_idlfile.sequence.enErrorCo" + "e\030\001 \002(\0162!.iot_idl.sequence.enErrorCo" "de\022\030\n\020ErrorDescription\030\002 \002(\t\"f\n\026ExecuteS" "tatusParameter\022\022\n\nStatusCode\030\001 \002(\005\0228\n\ner" - "ro_param\030\002 \001(\0132$.kbd_idlfile.sequence.Er" + "ro_param\030\002 \001(\0132$.iot_idl.sequence.Er" "rorParameter\"\317\001\n\031ActionNodeStatusParamet" "er\022\023\n\013action_name\030\001 \002(\t\022\023\n\013action_desc\030\002" - " \002(\t\022\?\n\013check_state\030\003 \002(\0162*.kbd_idlfile." + " \002(\t\022\?\n\013check_state\030\003 \002(\0162*.iot_idl." "sequence.ENSeqNodeCheckStatus\0225\n\nnode_st" - "ate\030\004 \002(\0162!.kbd_idlfile.sequence.ENSeqSt" + "ate\030\004 \002(\0162!.iot_idl.sequence.ENSeqSt" "atus\022\020\n\010timeflag\030\005 \002(\003\"\211\002\n\026FucNodeStatus" "Parameter\022\020\n\010fuc_name\030\001 \002(\t\022\020\n\010fuc_desc\030" - "\002 \002(\t\022\?\n\013check_state\030\003 \002(\0162*.kbd_idlfile" + "\002 \002(\t\022\?\n\013check_state\030\003 \002(\0162*.iot_idl" ".sequence.ENSeqNodeCheckStatus\022\020\n\010timefl" "ag\030\004 \002(\003\0225\n\nnode_state\030\005 \002(\0162!.kbd_idlfi" "le.sequence.ENSeqStatus\022A\n\010nodelist\030\006 \003(" - "\0132/.kbd_idlfile.sequence.ActionNodeStatu" + "\0132/.iot_idl.sequence.ActionNodeStatu" "sParameter\"\206\002\n\026SeqNodeStatusParameter\022\020\n" "\010seq_name\030\001 \002(\t\022\020\n\010seq_desc\030\002 \002(\t\022\?\n\013che" - "ck_state\030\003 \002(\0162*.kbd_idlfile.sequence.EN" + "ck_state\030\003 \002(\0162*.iot_idl.sequence.EN" "SeqNodeCheckStatus\022\020\n\010timeflag\030\004 \002(\003\0225\n\n" - "node_state\030\005 \002(\0162!.kbd_idlfile.sequence." + "node_state\030\005 \002(\0162!.iot_idl.sequence." "ENSeqStatus\022>\n\010nodelist\030\006 \003(\0132,.kbd_idlf" "ile.sequence.FucNodeStatusParameter\"]\n\016A" "ctorParameter\022\017\n\007user_id\030\001 \002(\005\022\024\n\014user_g" "roupId\030\002 \002(\005\022\021\n\thost_name\030\003 \002(\t\022\021\n\tuser_" "name\030\004 \002(\t\"\317\001\n\023StatusChangeMessage\0222\n\010pk" - "g_head\030\001 \002(\0132 .kbd_idlfile.sequence.SeqP" - "kgHead\022>\n\010nodelist\030\002 \002(\0132,.kbd_idlfile.s" + "g_head\030\001 \002(\0132 .iot_idl.sequence.SeqP" + "kgHead\022>\n\010nodelist\030\002 \002(\0132,.iot_idl.s" "equence.SeqNodeStatusParameter\022D\n\016execut" - "e_status\030\003 \003(\0132,.kbd_idlfile.sequence.Ex" + "e_status\030\003 \003(\0132,.iot_idl.sequence.Ex" "ecuteStatusParameter\"\201\002\n\020UiRequestMessag" - "e\0222\n\010pkg_head\030\001 \002(\0132 .kbd_idlfile.sequen" + "e\0222\n\010pkg_head\030\001 \002(\0132 .iot_idl.sequen" "ce.SeqPkgHead\0223\n\005actor\030\002 \002(\0132$.kbd_idlfi" "le.sequence.ActorParameter\022>\n\010nodelist\030\003" - " \002(\0132,.kbd_idlfile.sequence.SeqNodeStatu" + " \002(\0132,.iot_idl.sequence.SeqNodeStatu" "sParameter\022D\n\016execute_status\030\004 \002(\0132,.kbd" "_idlfile.sequence.ExecuteStatusParameter" "\"\365\001\n\023UiRequestMessageAck\0222\n\010pkg_head\030\001 \002" - "(\0132 .kbd_idlfile.sequence.SeqPkgHead\0223\n\005" - "actor\030\002 \002(\0132$.kbd_idlfile.sequence.Actor" + "(\0132 .iot_idl.sequence.SeqPkgHead\0223\n\005" + "actor\030\002 \002(\0132$.iot_idl.sequence.Actor" "Parameter\022>\n\010nodelist\030\003 \002(\0132,.kbd_idlfil" "e.sequence.SeqNodeStatusParameter\0225\n\006opt" - "ype\030\004 \002(\0162%.kbd_idlfile.sequence.ENUiOpe" + "ype\030\004 \002(\0162%.iot_idl.sequence.ENUiOpe" "rateType\"\372\001\n\021SeqOperateMessage\0222\n\010pkg_he" - "ad\030\001 \002(\0132 .kbd_idlfile.sequence.SeqPkgHe" - "ad\022>\n\010seq_node\030\002 \002(\0132,.kbd_idlfile.seque" + "ad\030\001 \002(\0132 .iot_idl.sequence.SeqPkgHe" + "ad\022>\n\010seq_node\030\002 \002(\0132,.iot_idl.seque" "nce.SeqNodeStatusParameter\0223\n\005actor\030\003 \002(" - "\0132$.kbd_idlfile.sequence.ActorParameter\022" - "<\n\014opreate_type\030\004 \002(\0162&.kbd_idlfile.sequ" + "\0132$.iot_idl.sequence.ActorParameter\022" + "<\n\014opreate_type\030\004 \002(\0162&.iot_idl.sequ" "ence.ENSeqOperateType\"\303\002\n\024SeqOperateMess" - "ageAck\0222\n\010pkg_head\030\001 \002(\0132 .kbd_idlfile.s" + "ageAck\0222\n\010pkg_head\030\001 \002(\0132 .iot_idl.s" "equence.SeqPkgHead\022>\n\010seq_node\030\002 \002(\0132,.k" "bd_idlfile.sequence.SeqNodeStatusParamet" - "er\022<\n\014opreate_type\030\003 \002(\0162&.kbd_idlfile.s" + "er\022<\n\014opreate_type\030\003 \002(\0162&.iot_idl.s" "equence.ENSeqOperateType\0223\n\005actor\030\004 \002(\0132" - "$.kbd_idlfile.sequence.ActorParameter\022D\n" - "\016execute_status\030\005 \002(\0132,.kbd_idlfile.sequ" + "$.iot_idl.sequence.ActorParameter\022D\n" + "\016execute_status\030\005 \002(\0132,.iot_idl.sequ" "ence.ExecuteStatusParameter*J\n\020enChannel" "MsgType\022\033\n\027MT_SEQAGE_CTRL_HMI_DOWN\020\002\022\031\n\025" "MT_SEQAGE_CTRL_HMI_UP\020\003*\225\001\n\014enSeqMsgType" @@ -636,7 +636,7 @@ const int SeqPkgHead::kPara2FieldNumber; SeqPkgHead::SeqPkgHead() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(constructor:iot_idl.sequence.SeqPkgHead) } void SeqPkgHead::InitAsDefaultInstance() { @@ -646,7 +646,7 @@ SeqPkgHead::SeqPkgHead(const SeqPkgHead& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.SeqPkgHead) } void SeqPkgHead::SharedCtor() { @@ -662,7 +662,7 @@ void SeqPkgHead::SharedCtor() { } SeqPkgHead::~SeqPkgHead() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(destructor:iot_idl.sequence.SeqPkgHead) SharedDtor(); } @@ -727,7 +727,7 @@ bool SeqPkgHead::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.SeqPkgHead) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -749,7 +749,7 @@ bool SeqPkgHead::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.enSeqMsgType msg_type = 2; + // required .iot_idl.sequence.enSeqMsgType msg_type = 2; case 2: { if (tag == 16) { parse_msg_type: @@ -757,8 +757,8 @@ bool SeqPkgHead::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::enSeqMsgType_IsValid(value)) { - set_msg_type(static_cast< ::kbd_idlfile::sequence::enSeqMsgType >(value)); + if (::iot_idl::sequence::enSeqMsgType_IsValid(value)) { + set_msg_type(static_cast< ::iot_idl::sequence::enSeqMsgType >(value)); } else { mutable_unknown_fields()->AddVarint(2, value); } @@ -843,17 +843,17 @@ bool SeqPkgHead::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.SeqPkgHead) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.SeqPkgHead) return false; #undef DO_ } void SeqPkgHead::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.SeqPkgHead) // required string source_tag = 1; if (has_source_tag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -864,7 +864,7 @@ void SeqPkgHead::SerializeWithCachedSizes( 1, this->source_tag(), output); } - // required .kbd_idlfile.sequence.enSeqMsgType msg_type = 2; + // required .iot_idl.sequence.enSeqMsgType msg_type = 2; if (has_msg_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 2, this->msg_type(), output); @@ -894,12 +894,12 @@ void SeqPkgHead::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.SeqPkgHead) } ::google::protobuf::uint8* SeqPkgHead::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.SeqPkgHead) // required string source_tag = 1; if (has_source_tag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -911,7 +911,7 @@ void SeqPkgHead::SerializeWithCachedSizes( 1, this->source_tag(), target); } - // required .kbd_idlfile.sequence.enSeqMsgType msg_type = 2; + // required .iot_idl.sequence.enSeqMsgType msg_type = 2; if (has_msg_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 2, this->msg_type(), target); @@ -941,7 +941,7 @@ void SeqPkgHead::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.SeqPkgHead) return target; } @@ -956,7 +956,7 @@ int SeqPkgHead::ByteSize() const { this->source_tag()); } - // required .kbd_idlfile.sequence.enSeqMsgType msg_type = 2; + // required .iot_idl.sequence.enSeqMsgType msg_type = 2; if (has_msg_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->msg_type()); @@ -1090,7 +1090,7 @@ const int ErrorParameter::kErrorDescriptionFieldNumber; ErrorParameter::ErrorParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(constructor:iot_idl.sequence.ErrorParameter) } void ErrorParameter::InitAsDefaultInstance() { @@ -1100,7 +1100,7 @@ ErrorParameter::ErrorParameter(const ErrorParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.ErrorParameter) } void ErrorParameter::SharedCtor() { @@ -1112,7 +1112,7 @@ void ErrorParameter::SharedCtor() { } ErrorParameter::~ErrorParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(destructor:iot_idl.sequence.ErrorParameter) SharedDtor(); } @@ -1162,21 +1162,21 @@ bool ErrorParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.ErrorParameter) 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.sequence.enErrorCode ErrorCode = 1; + // required .iot_idl.sequence.enErrorCode ErrorCode = 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::sequence::enErrorCode_IsValid(value)) { - set_errorcode(static_cast< ::kbd_idlfile::sequence::enErrorCode >(value)); + if (::iot_idl::sequence::enErrorCode_IsValid(value)) { + set_errorcode(static_cast< ::iot_idl::sequence::enErrorCode >(value)); } else { mutable_unknown_fields()->AddVarint(1, value); } @@ -1218,18 +1218,18 @@ bool ErrorParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.ErrorParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.ErrorParameter) return false; #undef DO_ } void ErrorParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.ErrorParameter) - // required .kbd_idlfile.sequence.enErrorCode ErrorCode = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.ErrorParameter) + // required .iot_idl.sequence.enErrorCode ErrorCode = 1; if (has_errorcode()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 1, this->errorcode(), output); @@ -1249,13 +1249,13 @@ void ErrorParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.ErrorParameter) } ::google::protobuf::uint8* ErrorParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.ErrorParameter) - // required .kbd_idlfile.sequence.enErrorCode ErrorCode = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.ErrorParameter) + // required .iot_idl.sequence.enErrorCode ErrorCode = 1; if (has_errorcode()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 1, this->errorcode(), target); @@ -1276,7 +1276,7 @@ void ErrorParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.ErrorParameter) return target; } @@ -1284,7 +1284,7 @@ int ErrorParameter::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.sequence.enErrorCode ErrorCode = 1; + // required .iot_idl.sequence.enErrorCode ErrorCode = 1; if (has_errorcode()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->errorcode()); @@ -1381,18 +1381,18 @@ const int ExecuteStatusParameter::kErroParamFieldNumber; ExecuteStatusParameter::ExecuteStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.sequence.ExecuteStatusParameter) } void ExecuteStatusParameter::InitAsDefaultInstance() { - erro_param_ = const_cast< ::kbd_idlfile::sequence::ErrorParameter*>(&::kbd_idlfile::sequence::ErrorParameter::default_instance()); + erro_param_ = const_cast< ::iot_idl::sequence::ErrorParameter*>(&::iot_idl::sequence::ErrorParameter::default_instance()); } ExecuteStatusParameter::ExecuteStatusParameter(const ExecuteStatusParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.ExecuteStatusParameter) } void ExecuteStatusParameter::SharedCtor() { @@ -1403,7 +1403,7 @@ void ExecuteStatusParameter::SharedCtor() { } ExecuteStatusParameter::~ExecuteStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.sequence.ExecuteStatusParameter) SharedDtor(); } @@ -1438,7 +1438,7 @@ void ExecuteStatusParameter::Clear() { if (_has_bits_[0 / 32] & 3) { statuscode_ = 0; if (has_erro_param()) { - if (erro_param_ != NULL) erro_param_->::kbd_idlfile::sequence::ErrorParameter::Clear(); + if (erro_param_ != NULL) erro_param_->::iot_idl::sequence::ErrorParameter::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1449,7 +1449,7 @@ bool ExecuteStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.ExecuteStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1469,7 +1469,7 @@ bool ExecuteStatusParameter::MergePartialFromCodedStream( break; } - // optional .kbd_idlfile.sequence.ErrorParameter erro_param = 2; + // optional .iot_idl.sequence.ErrorParameter erro_param = 2; case 2: { if (tag == 18) { parse_erro_param: @@ -1496,23 +1496,23 @@ bool ExecuteStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.ExecuteStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.ExecuteStatusParameter) return false; #undef DO_ } void ExecuteStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.ExecuteStatusParameter) // required int32 StatusCode = 1; if (has_statuscode()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->statuscode(), output); } - // optional .kbd_idlfile.sequence.ErrorParameter erro_param = 2; + // optional .iot_idl.sequence.ErrorParameter erro_param = 2; if (has_erro_param()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->erro_param(), output); @@ -1522,18 +1522,18 @@ void ExecuteStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.ExecuteStatusParameter) } ::google::protobuf::uint8* ExecuteStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.ExecuteStatusParameter) // required int32 StatusCode = 1; if (has_statuscode()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->statuscode(), target); } - // optional .kbd_idlfile.sequence.ErrorParameter erro_param = 2; + // optional .iot_idl.sequence.ErrorParameter erro_param = 2; if (has_erro_param()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -1544,7 +1544,7 @@ void ExecuteStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.ExecuteStatusParameter) return target; } @@ -1559,7 +1559,7 @@ int ExecuteStatusParameter::ByteSize() const { this->statuscode()); } - // optional .kbd_idlfile.sequence.ErrorParameter erro_param = 2; + // optional .iot_idl.sequence.ErrorParameter erro_param = 2; if (has_erro_param()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -1597,7 +1597,7 @@ void ExecuteStatusParameter::MergeFrom(const ExecuteStatusParameter& from) { set_statuscode(from.statuscode()); } if (from.has_erro_param()) { - mutable_erro_param()->::kbd_idlfile::sequence::ErrorParameter::MergeFrom(from.erro_param()); + mutable_erro_param()->::iot_idl::sequence::ErrorParameter::MergeFrom(from.erro_param()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1656,7 +1656,7 @@ const int ActionNodeStatusParameter::kTimeflagFieldNumber; ActionNodeStatusParameter::ActionNodeStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.sequence.ActionNodeStatusParameter) } void ActionNodeStatusParameter::InitAsDefaultInstance() { @@ -1666,7 +1666,7 @@ ActionNodeStatusParameter::ActionNodeStatusParameter(const ActionNodeStatusParam : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.ActionNodeStatusParameter) } void ActionNodeStatusParameter::SharedCtor() { @@ -1681,7 +1681,7 @@ void ActionNodeStatusParameter::SharedCtor() { } ActionNodeStatusParameter::~ActionNodeStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.sequence.ActionNodeStatusParameter) SharedDtor(); } @@ -1753,7 +1753,7 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.ActionNodeStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1792,7 +1792,7 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; case 3: { if (tag == 24) { parse_check_state: @@ -1800,8 +1800,8 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqNodeCheckStatus_IsValid(value)) { - set_check_state(static_cast< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus >(value)); + if (::iot_idl::sequence::ENSeqNodeCheckStatus_IsValid(value)) { + set_check_state(static_cast< ::iot_idl::sequence::ENSeqNodeCheckStatus >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -1812,7 +1812,7 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 4; + // required .iot_idl.sequence.ENSeqStatus node_state = 4; case 4: { if (tag == 32) { parse_node_state: @@ -1820,8 +1820,8 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqStatus_IsValid(value)) { - set_node_state(static_cast< ::kbd_idlfile::sequence::ENSeqStatus >(value)); + if (::iot_idl::sequence::ENSeqStatus_IsValid(value)) { + set_node_state(static_cast< ::iot_idl::sequence::ENSeqStatus >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -1861,17 +1861,17 @@ bool ActionNodeStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.ActionNodeStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.ActionNodeStatusParameter) return false; #undef DO_ } void ActionNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.ActionNodeStatusParameter) // required string action_name = 1; if (has_action_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1892,13 +1892,13 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( 2, this->action_desc(), output); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->check_state(), output); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 4; + // required .iot_idl.sequence.ENSeqStatus node_state = 4; if (has_node_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->node_state(), output); @@ -1913,12 +1913,12 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.ActionNodeStatusParameter) } ::google::protobuf::uint8* ActionNodeStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.ActionNodeStatusParameter) // required string action_name = 1; if (has_action_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1941,13 +1941,13 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( 2, this->action_desc(), target); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->check_state(), target); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 4; + // required .iot_idl.sequence.ENSeqStatus node_state = 4; if (has_node_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->node_state(), target); @@ -1962,7 +1962,7 @@ void ActionNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.ActionNodeStatusParameter) return target; } @@ -1984,13 +1984,13 @@ int ActionNodeStatusParameter::ByteSize() const { this->action_desc()); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->check_state()); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 4; + // required .iot_idl.sequence.ENSeqStatus node_state = 4; if (has_node_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->node_state()); @@ -2103,7 +2103,7 @@ const int FucNodeStatusParameter::kNodelistFieldNumber; FucNodeStatusParameter::FucNodeStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.sequence.FucNodeStatusParameter) } void FucNodeStatusParameter::InitAsDefaultInstance() { @@ -2113,7 +2113,7 @@ FucNodeStatusParameter::FucNodeStatusParameter(const FucNodeStatusParameter& fro : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.FucNodeStatusParameter) } void FucNodeStatusParameter::SharedCtor() { @@ -2128,7 +2128,7 @@ void FucNodeStatusParameter::SharedCtor() { } FucNodeStatusParameter::~FucNodeStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.sequence.FucNodeStatusParameter) SharedDtor(); } @@ -2201,7 +2201,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.FucNodeStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2240,7 +2240,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; case 3: { if (tag == 24) { parse_check_state: @@ -2248,8 +2248,8 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqNodeCheckStatus_IsValid(value)) { - set_check_state(static_cast< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus >(value)); + if (::iot_idl::sequence::ENSeqNodeCheckStatus_IsValid(value)) { + set_check_state(static_cast< ::iot_idl::sequence::ENSeqNodeCheckStatus >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -2275,7 +2275,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; case 5: { if (tag == 40) { parse_node_state: @@ -2283,8 +2283,8 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqStatus_IsValid(value)) { - set_node_state(static_cast< ::kbd_idlfile::sequence::ENSeqStatus >(value)); + if (::iot_idl::sequence::ENSeqStatus_IsValid(value)) { + set_node_state(static_cast< ::iot_idl::sequence::ENSeqStatus >(value)); } else { mutable_unknown_fields()->AddVarint(5, value); } @@ -2295,7 +2295,7 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.sequence.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.ActionNodeStatusParameter nodelist = 6; case 6: { if (tag == 50) { parse_nodelist: @@ -2323,17 +2323,17 @@ bool FucNodeStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.FucNodeStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.FucNodeStatusParameter) return false; #undef DO_ } void FucNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.FucNodeStatusParameter) // required string fuc_name = 1; if (has_fuc_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2354,7 +2354,7 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( 2, this->fuc_desc(), output); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->check_state(), output); @@ -2365,13 +2365,13 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(4, this->timeflag(), output); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; if (has_node_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 5, this->node_state(), output); } - // repeated .kbd_idlfile.sequence.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.ActionNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->nodelist(i), output); @@ -2381,12 +2381,12 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.FucNodeStatusParameter) } ::google::protobuf::uint8* FucNodeStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.FucNodeStatusParameter) // required string fuc_name = 1; if (has_fuc_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2409,7 +2409,7 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( 2, this->fuc_desc(), target); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->check_state(), target); @@ -2420,13 +2420,13 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(4, this->timeflag(), target); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; if (has_node_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 5, this->node_state(), target); } - // repeated .kbd_idlfile.sequence.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.ActionNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2437,7 +2437,7 @@ void FucNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.FucNodeStatusParameter) return target; } @@ -2459,7 +2459,7 @@ int FucNodeStatusParameter::ByteSize() const { this->fuc_desc()); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->check_state()); @@ -2472,14 +2472,14 @@ int FucNodeStatusParameter::ByteSize() const { this->timeflag()); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; if (has_node_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->node_state()); } } - // repeated .kbd_idlfile.sequence.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.ActionNodeStatusParameter nodelist = 6; total_size += 1 * this->nodelist_size(); for (int i = 0; i < this->nodelist_size(); i++) { total_size += @@ -2589,7 +2589,7 @@ const int SeqNodeStatusParameter::kNodelistFieldNumber; SeqNodeStatusParameter::SeqNodeStatusParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(constructor:iot_idl.sequence.SeqNodeStatusParameter) } void SeqNodeStatusParameter::InitAsDefaultInstance() { @@ -2599,7 +2599,7 @@ SeqNodeStatusParameter::SeqNodeStatusParameter(const SeqNodeStatusParameter& fro : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.SeqNodeStatusParameter) } void SeqNodeStatusParameter::SharedCtor() { @@ -2614,7 +2614,7 @@ void SeqNodeStatusParameter::SharedCtor() { } SeqNodeStatusParameter::~SeqNodeStatusParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(destructor:iot_idl.sequence.SeqNodeStatusParameter) SharedDtor(); } @@ -2687,7 +2687,7 @@ bool SeqNodeStatusParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.SeqNodeStatusParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2726,7 +2726,7 @@ bool SeqNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; case 3: { if (tag == 24) { parse_check_state: @@ -2734,8 +2734,8 @@ bool SeqNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqNodeCheckStatus_IsValid(value)) { - set_check_state(static_cast< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus >(value)); + if (::iot_idl::sequence::ENSeqNodeCheckStatus_IsValid(value)) { + set_check_state(static_cast< ::iot_idl::sequence::ENSeqNodeCheckStatus >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -2761,7 +2761,7 @@ bool SeqNodeStatusParameter::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; case 5: { if (tag == 40) { parse_node_state: @@ -2769,8 +2769,8 @@ bool SeqNodeStatusParameter::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqStatus_IsValid(value)) { - set_node_state(static_cast< ::kbd_idlfile::sequence::ENSeqStatus >(value)); + if (::iot_idl::sequence::ENSeqStatus_IsValid(value)) { + set_node_state(static_cast< ::iot_idl::sequence::ENSeqStatus >(value)); } else { mutable_unknown_fields()->AddVarint(5, value); } @@ -2781,7 +2781,7 @@ bool SeqNodeStatusParameter::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.sequence.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.FucNodeStatusParameter nodelist = 6; case 6: { if (tag == 50) { parse_nodelist: @@ -2809,17 +2809,17 @@ bool SeqNodeStatusParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.SeqNodeStatusParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.SeqNodeStatusParameter) return false; #undef DO_ } void SeqNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.SeqNodeStatusParameter) // required string seq_name = 1; if (has_seq_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2840,7 +2840,7 @@ void SeqNodeStatusParameter::SerializeWithCachedSizes( 2, this->seq_desc(), output); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->check_state(), output); @@ -2851,13 +2851,13 @@ void SeqNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(4, this->timeflag(), output); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; if (has_node_state()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 5, this->node_state(), output); } - // repeated .kbd_idlfile.sequence.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.FucNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 6, this->nodelist(i), output); @@ -2867,12 +2867,12 @@ void SeqNodeStatusParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.SeqNodeStatusParameter) } ::google::protobuf::uint8* SeqNodeStatusParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.SeqNodeStatusParameter) // required string seq_name = 1; if (has_seq_name()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2895,7 +2895,7 @@ void SeqNodeStatusParameter::SerializeWithCachedSizes( 2, this->seq_desc(), target); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->check_state(), target); @@ -2906,13 +2906,13 @@ void SeqNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(4, this->timeflag(), target); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; if (has_node_state()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 5, this->node_state(), target); } - // repeated .kbd_idlfile.sequence.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.FucNodeStatusParameter nodelist = 6; for (int i = 0; i < this->nodelist_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -2923,7 +2923,7 @@ void SeqNodeStatusParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.SeqNodeStatusParameter) return target; } @@ -2945,7 +2945,7 @@ int SeqNodeStatusParameter::ByteSize() const { this->seq_desc()); } - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; if (has_check_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->check_state()); @@ -2958,14 +2958,14 @@ int SeqNodeStatusParameter::ByteSize() const { this->timeflag()); } - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; if (has_node_state()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->node_state()); } } - // repeated .kbd_idlfile.sequence.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.FucNodeStatusParameter nodelist = 6; total_size += 1 * this->nodelist_size(); for (int i = 0; i < this->nodelist_size(); i++) { total_size += @@ -3073,7 +3073,7 @@ const int ActorParameter::kUserNameFieldNumber; ActorParameter::ActorParameter() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(constructor:iot_idl.sequence.ActorParameter) } void ActorParameter::InitAsDefaultInstance() { @@ -3083,7 +3083,7 @@ ActorParameter::ActorParameter(const ActorParameter& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.ActorParameter) } void ActorParameter::SharedCtor() { @@ -3097,7 +3097,7 @@ void ActorParameter::SharedCtor() { } ActorParameter::~ActorParameter() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(destructor:iot_idl.sequence.ActorParameter) SharedDtor(); } @@ -3169,7 +3169,7 @@ bool ActorParameter::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.ActorParameter) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -3252,17 +3252,17 @@ bool ActorParameter::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.ActorParameter) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.ActorParameter) return false; #undef DO_ } void ActorParameter::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.ActorParameter) // required int32 user_id = 1; if (has_user_id()) { ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->user_id(), output); @@ -3297,12 +3297,12 @@ void ActorParameter::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.ActorParameter) } ::google::protobuf::uint8* ActorParameter::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.ActorParameter) // required int32 user_id = 1; if (has_user_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->user_id(), target); @@ -3339,7 +3339,7 @@ void ActorParameter::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.ActorParameter) return target; } @@ -3468,19 +3468,19 @@ const int StatusChangeMessage::kExecuteStatusFieldNumber; StatusChangeMessage::StatusChangeMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(constructor:iot_idl.sequence.StatusChangeMessage) } void StatusChangeMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::sequence::SeqPkgHead*>(&::kbd_idlfile::sequence::SeqPkgHead::default_instance()); - nodelist_ = const_cast< ::kbd_idlfile::sequence::SeqNodeStatusParameter*>(&::kbd_idlfile::sequence::SeqNodeStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::sequence::SeqPkgHead*>(&::iot_idl::sequence::SeqPkgHead::default_instance()); + nodelist_ = const_cast< ::iot_idl::sequence::SeqNodeStatusParameter*>(&::iot_idl::sequence::SeqNodeStatusParameter::default_instance()); } StatusChangeMessage::StatusChangeMessage(const StatusChangeMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.StatusChangeMessage) } void StatusChangeMessage::SharedCtor() { @@ -3491,7 +3491,7 @@ void StatusChangeMessage::SharedCtor() { } StatusChangeMessage::~StatusChangeMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(destructor:iot_idl.sequence.StatusChangeMessage) SharedDtor(); } @@ -3526,10 +3526,10 @@ StatusChangeMessage* StatusChangeMessage::New() const { void StatusChangeMessage::Clear() { if (_has_bits_[0 / 32] & 3) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); } if (has_nodelist()) { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); } } execute_status_.Clear(); @@ -3541,13 +3541,13 @@ bool StatusChangeMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.StatusChangeMessage) 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.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -3559,7 +3559,7 @@ bool StatusChangeMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 2; case 2: { if (tag == 18) { parse_nodelist: @@ -3572,7 +3572,7 @@ bool StatusChangeMessage::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.sequence.ExecuteStatusParameter execute_status = 3; case 3: { if (tag == 26) { parse_execute_status: @@ -3600,30 +3600,30 @@ bool StatusChangeMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.StatusChangeMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.StatusChangeMessage) return false; #undef DO_ } void StatusChangeMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.StatusChangeMessage) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.StatusChangeMessage) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 2; if (has_nodelist()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->nodelist(), output); } - // repeated .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.sequence.ExecuteStatusParameter execute_status = 3; for (int i = 0; i < this->execute_status_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->execute_status(i), output); @@ -3633,27 +3633,27 @@ void StatusChangeMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.StatusChangeMessage) } ::google::protobuf::uint8* StatusChangeMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.StatusChangeMessage) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.StatusChangeMessage) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 2; if (has_nodelist()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->nodelist(), target); } - // repeated .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.sequence.ExecuteStatusParameter execute_status = 3; for (int i = 0; i < this->execute_status_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -3664,7 +3664,7 @@ void StatusChangeMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.StatusChangeMessage) return target; } @@ -3672,14 +3672,14 @@ int StatusChangeMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 2; if (has_nodelist()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -3687,7 +3687,7 @@ int StatusChangeMessage::ByteSize() const { } } - // repeated .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.sequence.ExecuteStatusParameter execute_status = 3; total_size += 1 * this->execute_status_size(); for (int i = 0; i < this->execute_status_size(); i++) { total_size += @@ -3723,10 +3723,10 @@ void StatusChangeMessage::MergeFrom(const StatusChangeMessage& from) { execute_status_.MergeFrom(from.execute_status_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); } if (from.has_nodelist()) { - mutable_nodelist()->::kbd_idlfile::sequence::SeqNodeStatusParameter::MergeFrom(from.nodelist()); + mutable_nodelist()->::iot_idl::sequence::SeqNodeStatusParameter::MergeFrom(from.nodelist()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -3789,21 +3789,21 @@ const int UiRequestMessage::kExecuteStatusFieldNumber; UiRequestMessage::UiRequestMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(constructor:iot_idl.sequence.UiRequestMessage) } void UiRequestMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::sequence::SeqPkgHead*>(&::kbd_idlfile::sequence::SeqPkgHead::default_instance()); - actor_ = const_cast< ::kbd_idlfile::sequence::ActorParameter*>(&::kbd_idlfile::sequence::ActorParameter::default_instance()); - nodelist_ = const_cast< ::kbd_idlfile::sequence::SeqNodeStatusParameter*>(&::kbd_idlfile::sequence::SeqNodeStatusParameter::default_instance()); - execute_status_ = const_cast< ::kbd_idlfile::sequence::ExecuteStatusParameter*>(&::kbd_idlfile::sequence::ExecuteStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::sequence::SeqPkgHead*>(&::iot_idl::sequence::SeqPkgHead::default_instance()); + actor_ = const_cast< ::iot_idl::sequence::ActorParameter*>(&::iot_idl::sequence::ActorParameter::default_instance()); + nodelist_ = const_cast< ::iot_idl::sequence::SeqNodeStatusParameter*>(&::iot_idl::sequence::SeqNodeStatusParameter::default_instance()); + execute_status_ = const_cast< ::iot_idl::sequence::ExecuteStatusParameter*>(&::iot_idl::sequence::ExecuteStatusParameter::default_instance()); } UiRequestMessage::UiRequestMessage(const UiRequestMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.UiRequestMessage) } void UiRequestMessage::SharedCtor() { @@ -3816,7 +3816,7 @@ void UiRequestMessage::SharedCtor() { } UiRequestMessage::~UiRequestMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(destructor:iot_idl.sequence.UiRequestMessage) SharedDtor(); } @@ -3853,16 +3853,16 @@ UiRequestMessage* UiRequestMessage::New() const { void UiRequestMessage::Clear() { if (_has_bits_[0 / 32] & 15) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); } if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); } if (has_nodelist()) { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); } if (has_execute_status()) { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::sequence::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::sequence::ExecuteStatusParameter::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -3873,13 +3873,13 @@ bool UiRequestMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.UiRequestMessage) 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.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -3891,7 +3891,7 @@ bool UiRequestMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; case 2: { if (tag == 18) { parse_actor: @@ -3904,7 +3904,7 @@ bool UiRequestMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; case 3: { if (tag == 26) { parse_nodelist: @@ -3917,7 +3917,7 @@ bool UiRequestMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 4; case 4: { if (tag == 34) { parse_execute_status: @@ -3944,36 +3944,36 @@ bool UiRequestMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.UiRequestMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.UiRequestMessage) return false; #undef DO_ } void UiRequestMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.UiRequestMessage) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.UiRequestMessage) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->actor(), output); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; if (has_nodelist()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->nodelist(), output); } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 4; if (has_execute_status()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->execute_status(), output); @@ -3983,34 +3983,34 @@ void UiRequestMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.UiRequestMessage) } ::google::protobuf::uint8* UiRequestMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.UiRequestMessage) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.UiRequestMessage) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->actor(), target); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; if (has_nodelist()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->nodelist(), target); } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 4; if (has_execute_status()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4021,7 +4021,7 @@ void UiRequestMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.UiRequestMessage) return target; } @@ -4029,28 +4029,28 @@ int UiRequestMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; if (has_nodelist()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->nodelist()); } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 4; if (has_execute_status()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4085,16 +4085,16 @@ void UiRequestMessage::MergeFrom(const UiRequestMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::sequence::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::sequence::ActorParameter::MergeFrom(from.actor()); } if (from.has_nodelist()) { - mutable_nodelist()->::kbd_idlfile::sequence::SeqNodeStatusParameter::MergeFrom(from.nodelist()); + mutable_nodelist()->::iot_idl::sequence::SeqNodeStatusParameter::MergeFrom(from.nodelist()); } if (from.has_execute_status()) { - mutable_execute_status()->::kbd_idlfile::sequence::ExecuteStatusParameter::MergeFrom(from.execute_status()); + mutable_execute_status()->::iot_idl::sequence::ExecuteStatusParameter::MergeFrom(from.execute_status()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -4163,20 +4163,20 @@ const int UiRequestMessageAck::kOptypeFieldNumber; UiRequestMessageAck::UiRequestMessageAck() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(constructor:iot_idl.sequence.UiRequestMessageAck) } void UiRequestMessageAck::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::sequence::SeqPkgHead*>(&::kbd_idlfile::sequence::SeqPkgHead::default_instance()); - actor_ = const_cast< ::kbd_idlfile::sequence::ActorParameter*>(&::kbd_idlfile::sequence::ActorParameter::default_instance()); - nodelist_ = const_cast< ::kbd_idlfile::sequence::SeqNodeStatusParameter*>(&::kbd_idlfile::sequence::SeqNodeStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::sequence::SeqPkgHead*>(&::iot_idl::sequence::SeqPkgHead::default_instance()); + actor_ = const_cast< ::iot_idl::sequence::ActorParameter*>(&::iot_idl::sequence::ActorParameter::default_instance()); + nodelist_ = const_cast< ::iot_idl::sequence::SeqNodeStatusParameter*>(&::iot_idl::sequence::SeqNodeStatusParameter::default_instance()); } UiRequestMessageAck::UiRequestMessageAck(const UiRequestMessageAck& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.UiRequestMessageAck) } void UiRequestMessageAck::SharedCtor() { @@ -4189,7 +4189,7 @@ void UiRequestMessageAck::SharedCtor() { } UiRequestMessageAck::~UiRequestMessageAck() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(destructor:iot_idl.sequence.UiRequestMessageAck) SharedDtor(); } @@ -4225,13 +4225,13 @@ UiRequestMessageAck* UiRequestMessageAck::New() const { void UiRequestMessageAck::Clear() { if (_has_bits_[0 / 32] & 15) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); } if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); } if (has_nodelist()) { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); } optype_ = 1; } @@ -4243,13 +4243,13 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.UiRequestMessageAck) 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.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4261,7 +4261,7 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; case 2: { if (tag == 18) { parse_actor: @@ -4274,7 +4274,7 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; case 3: { if (tag == 26) { parse_nodelist: @@ -4287,7 +4287,7 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENUiOperateType optype = 4; + // required .iot_idl.sequence.ENUiOperateType optype = 4; case 4: { if (tag == 32) { parse_optype: @@ -4295,8 +4295,8 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENUiOperateType_IsValid(value)) { - set_optype(static_cast< ::kbd_idlfile::sequence::ENUiOperateType >(value)); + if (::iot_idl::sequence::ENUiOperateType_IsValid(value)) { + set_optype(static_cast< ::iot_idl::sequence::ENUiOperateType >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -4321,36 +4321,36 @@ bool UiRequestMessageAck::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.UiRequestMessageAck) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.UiRequestMessageAck) return false; #undef DO_ } void UiRequestMessageAck::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.UiRequestMessageAck) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.UiRequestMessageAck) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->actor(), output); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; if (has_nodelist()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->nodelist(), output); } - // required .kbd_idlfile.sequence.ENUiOperateType optype = 4; + // required .iot_idl.sequence.ENUiOperateType optype = 4; if (has_optype()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->optype(), output); @@ -4360,34 +4360,34 @@ void UiRequestMessageAck::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.UiRequestMessageAck) } ::google::protobuf::uint8* UiRequestMessageAck::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.UiRequestMessageAck) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.UiRequestMessageAck) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->actor(), target); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; if (has_nodelist()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->nodelist(), target); } - // required .kbd_idlfile.sequence.ENUiOperateType optype = 4; + // required .iot_idl.sequence.ENUiOperateType optype = 4; if (has_optype()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->optype(), target); @@ -4397,7 +4397,7 @@ void UiRequestMessageAck::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.UiRequestMessageAck) return target; } @@ -4405,28 +4405,28 @@ int UiRequestMessageAck::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; if (has_nodelist()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->nodelist()); } - // required .kbd_idlfile.sequence.ENUiOperateType optype = 4; + // required .iot_idl.sequence.ENUiOperateType optype = 4; if (has_optype()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->optype()); @@ -4460,13 +4460,13 @@ void UiRequestMessageAck::MergeFrom(const UiRequestMessageAck& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::sequence::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::sequence::ActorParameter::MergeFrom(from.actor()); } if (from.has_nodelist()) { - mutable_nodelist()->::kbd_idlfile::sequence::SeqNodeStatusParameter::MergeFrom(from.nodelist()); + mutable_nodelist()->::iot_idl::sequence::SeqNodeStatusParameter::MergeFrom(from.nodelist()); } if (from.has_optype()) { set_optype(from.optype()); @@ -4535,20 +4535,20 @@ const int SeqOperateMessage::kOpreateTypeFieldNumber; SeqOperateMessage::SeqOperateMessage() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(constructor:iot_idl.sequence.SeqOperateMessage) } void SeqOperateMessage::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::sequence::SeqPkgHead*>(&::kbd_idlfile::sequence::SeqPkgHead::default_instance()); - seq_node_ = const_cast< ::kbd_idlfile::sequence::SeqNodeStatusParameter*>(&::kbd_idlfile::sequence::SeqNodeStatusParameter::default_instance()); - actor_ = const_cast< ::kbd_idlfile::sequence::ActorParameter*>(&::kbd_idlfile::sequence::ActorParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::sequence::SeqPkgHead*>(&::iot_idl::sequence::SeqPkgHead::default_instance()); + seq_node_ = const_cast< ::iot_idl::sequence::SeqNodeStatusParameter*>(&::iot_idl::sequence::SeqNodeStatusParameter::default_instance()); + actor_ = const_cast< ::iot_idl::sequence::ActorParameter*>(&::iot_idl::sequence::ActorParameter::default_instance()); } SeqOperateMessage::SeqOperateMessage(const SeqOperateMessage& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.SeqOperateMessage) } void SeqOperateMessage::SharedCtor() { @@ -4561,7 +4561,7 @@ void SeqOperateMessage::SharedCtor() { } SeqOperateMessage::~SeqOperateMessage() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(destructor:iot_idl.sequence.SeqOperateMessage) SharedDtor(); } @@ -4597,13 +4597,13 @@ SeqOperateMessage* SeqOperateMessage::New() const { void SeqOperateMessage::Clear() { if (_has_bits_[0 / 32] & 15) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); } if (has_seq_node()) { - if (seq_node_ != NULL) seq_node_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (seq_node_ != NULL) seq_node_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); } if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); } opreate_type_ = 0; } @@ -4615,13 +4615,13 @@ bool SeqOperateMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.SeqOperateMessage) 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.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -4633,7 +4633,7 @@ bool SeqOperateMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; case 2: { if (tag == 18) { parse_seq_node: @@ -4646,7 +4646,7 @@ bool SeqOperateMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ActorParameter actor = 3; + // required .iot_idl.sequence.ActorParameter actor = 3; case 3: { if (tag == 26) { parse_actor: @@ -4659,7 +4659,7 @@ bool SeqOperateMessage::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 4; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 4; case 4: { if (tag == 32) { parse_opreate_type: @@ -4667,8 +4667,8 @@ bool SeqOperateMessage::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqOperateType_IsValid(value)) { - set_opreate_type(static_cast< ::kbd_idlfile::sequence::ENSeqOperateType >(value)); + if (::iot_idl::sequence::ENSeqOperateType_IsValid(value)) { + set_opreate_type(static_cast< ::iot_idl::sequence::ENSeqOperateType >(value)); } else { mutable_unknown_fields()->AddVarint(4, value); } @@ -4693,36 +4693,36 @@ bool SeqOperateMessage::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.SeqOperateMessage) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.SeqOperateMessage) return false; #undef DO_ } void SeqOperateMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.SeqOperateMessage) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.SeqOperateMessage) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; if (has_seq_node()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->seq_node(), output); } - // required .kbd_idlfile.sequence.ActorParameter actor = 3; + // required .iot_idl.sequence.ActorParameter actor = 3; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 3, this->actor(), output); } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 4; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 4; if (has_opreate_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 4, this->opreate_type(), output); @@ -4732,34 +4732,34 @@ void SeqOperateMessage::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.SeqOperateMessage) } ::google::protobuf::uint8* SeqOperateMessage::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.SeqOperateMessage) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.SeqOperateMessage) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; if (has_seq_node()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->seq_node(), target); } - // required .kbd_idlfile.sequence.ActorParameter actor = 3; + // required .iot_idl.sequence.ActorParameter actor = 3; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 3, this->actor(), target); } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 4; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 4; if (has_opreate_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 4, this->opreate_type(), target); @@ -4769,7 +4769,7 @@ void SeqOperateMessage::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.SeqOperateMessage) return target; } @@ -4777,28 +4777,28 @@ int SeqOperateMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; if (has_seq_node()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->seq_node()); } - // required .kbd_idlfile.sequence.ActorParameter actor = 3; + // required .iot_idl.sequence.ActorParameter actor = 3; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 4; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 4; if (has_opreate_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->opreate_type()); @@ -4832,13 +4832,13 @@ void SeqOperateMessage::MergeFrom(const SeqOperateMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); } if (from.has_seq_node()) { - mutable_seq_node()->::kbd_idlfile::sequence::SeqNodeStatusParameter::MergeFrom(from.seq_node()); + mutable_seq_node()->::iot_idl::sequence::SeqNodeStatusParameter::MergeFrom(from.seq_node()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::sequence::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::sequence::ActorParameter::MergeFrom(from.actor()); } if (from.has_opreate_type()) { set_opreate_type(from.opreate_type()); @@ -4908,21 +4908,21 @@ const int SeqOperateMessageAck::kExecuteStatusFieldNumber; SeqOperateMessageAck::SeqOperateMessageAck() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(constructor:iot_idl.sequence.SeqOperateMessageAck) } void SeqOperateMessageAck::InitAsDefaultInstance() { - pkg_head_ = const_cast< ::kbd_idlfile::sequence::SeqPkgHead*>(&::kbd_idlfile::sequence::SeqPkgHead::default_instance()); - seq_node_ = const_cast< ::kbd_idlfile::sequence::SeqNodeStatusParameter*>(&::kbd_idlfile::sequence::SeqNodeStatusParameter::default_instance()); - actor_ = const_cast< ::kbd_idlfile::sequence::ActorParameter*>(&::kbd_idlfile::sequence::ActorParameter::default_instance()); - execute_status_ = const_cast< ::kbd_idlfile::sequence::ExecuteStatusParameter*>(&::kbd_idlfile::sequence::ExecuteStatusParameter::default_instance()); + pkg_head_ = const_cast< ::iot_idl::sequence::SeqPkgHead*>(&::iot_idl::sequence::SeqPkgHead::default_instance()); + seq_node_ = const_cast< ::iot_idl::sequence::SeqNodeStatusParameter*>(&::iot_idl::sequence::SeqNodeStatusParameter::default_instance()); + actor_ = const_cast< ::iot_idl::sequence::ActorParameter*>(&::iot_idl::sequence::ActorParameter::default_instance()); + execute_status_ = const_cast< ::iot_idl::sequence::ExecuteStatusParameter*>(&::iot_idl::sequence::ExecuteStatusParameter::default_instance()); } SeqOperateMessageAck::SeqOperateMessageAck(const SeqOperateMessageAck& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(copy_constructor:iot_idl.sequence.SeqOperateMessageAck) } void SeqOperateMessageAck::SharedCtor() { @@ -4936,7 +4936,7 @@ void SeqOperateMessageAck::SharedCtor() { } SeqOperateMessageAck::~SeqOperateMessageAck() { - // @@protoc_insertion_point(destructor:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(destructor:iot_idl.sequence.SeqOperateMessageAck) SharedDtor(); } @@ -4973,17 +4973,17 @@ SeqOperateMessageAck* SeqOperateMessageAck::New() const { void SeqOperateMessageAck::Clear() { if (_has_bits_[0 / 32] & 31) { if (has_pkg_head()) { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); } if (has_seq_node()) { - if (seq_node_ != NULL) seq_node_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (seq_node_ != NULL) seq_node_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); } opreate_type_ = 0; if (has_actor()) { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); } if (has_execute_status()) { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::sequence::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::sequence::ExecuteStatusParameter::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -4994,13 +4994,13 @@ bool SeqOperateMessageAck::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(parse_start:iot_idl.sequence.SeqOperateMessageAck) 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.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; case 1: { if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( @@ -5012,7 +5012,7 @@ bool SeqOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; case 2: { if (tag == 18) { parse_seq_node: @@ -5025,7 +5025,7 @@ bool SeqOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 3; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 3; case 3: { if (tag == 24) { parse_opreate_type: @@ -5033,8 +5033,8 @@ bool SeqOperateMessageAck::MergePartialFromCodedStream( DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( input, &value))); - if (::kbd_idlfile::sequence::ENSeqOperateType_IsValid(value)) { - set_opreate_type(static_cast< ::kbd_idlfile::sequence::ENSeqOperateType >(value)); + if (::iot_idl::sequence::ENSeqOperateType_IsValid(value)) { + set_opreate_type(static_cast< ::iot_idl::sequence::ENSeqOperateType >(value)); } else { mutable_unknown_fields()->AddVarint(3, value); } @@ -5045,7 +5045,7 @@ bool SeqOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ActorParameter actor = 4; + // required .iot_idl.sequence.ActorParameter actor = 4; case 4: { if (tag == 34) { parse_actor: @@ -5058,7 +5058,7 @@ bool SeqOperateMessageAck::MergePartialFromCodedStream( break; } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 5; case 5: { if (tag == 42) { parse_execute_status: @@ -5085,42 +5085,42 @@ bool SeqOperateMessageAck::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(parse_success:iot_idl.sequence.SeqOperateMessageAck) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(parse_failure:iot_idl.sequence.SeqOperateMessageAck) return false; #undef DO_ } void SeqOperateMessageAck::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.sequence.SeqOperateMessageAck) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_start:iot_idl.sequence.SeqOperateMessageAck) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, this->pkg_head(), output); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; if (has_seq_node()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 2, this->seq_node(), output); } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 3; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 3; if (has_opreate_type()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( 3, this->opreate_type(), output); } - // required .kbd_idlfile.sequence.ActorParameter actor = 4; + // required .iot_idl.sequence.ActorParameter actor = 4; if (has_actor()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->actor(), output); } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 5; if (has_execute_status()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->execute_status(), output); @@ -5130,40 +5130,40 @@ void SeqOperateMessageAck::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(serialize_end:iot_idl.sequence.SeqOperateMessageAck) } ::google::protobuf::uint8* SeqOperateMessageAck::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.sequence.SeqOperateMessageAck) - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.sequence.SeqOperateMessageAck) + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, this->pkg_head(), target); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; if (has_seq_node()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 2, this->seq_node(), target); } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 3; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 3; if (has_opreate_type()) { target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( 3, this->opreate_type(), target); } - // required .kbd_idlfile.sequence.ActorParameter actor = 4; + // required .iot_idl.sequence.ActorParameter actor = 4; if (has_actor()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 4, this->actor(), target); } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 5; if (has_execute_status()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -5174,7 +5174,7 @@ void SeqOperateMessageAck::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.sequence.SeqOperateMessageAck) return target; } @@ -5182,34 +5182,34 @@ int SeqOperateMessageAck::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; if (has_pkg_head()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->pkg_head()); } - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; if (has_seq_node()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->seq_node()); } - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 3; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 3; if (has_opreate_type()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->opreate_type()); } - // required .kbd_idlfile.sequence.ActorParameter actor = 4; + // required .iot_idl.sequence.ActorParameter actor = 4; if (has_actor()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->actor()); } - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 5; if (has_execute_status()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -5244,19 +5244,19 @@ void SeqOperateMessageAck::MergeFrom(const SeqOperateMessageAck& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_pkg_head()) { - mutable_pkg_head()->::kbd_idlfile::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); + mutable_pkg_head()->::iot_idl::sequence::SeqPkgHead::MergeFrom(from.pkg_head()); } if (from.has_seq_node()) { - mutable_seq_node()->::kbd_idlfile::sequence::SeqNodeStatusParameter::MergeFrom(from.seq_node()); + mutable_seq_node()->::iot_idl::sequence::SeqNodeStatusParameter::MergeFrom(from.seq_node()); } if (from.has_opreate_type()) { set_opreate_type(from.opreate_type()); } if (from.has_actor()) { - mutable_actor()->::kbd_idlfile::sequence::ActorParameter::MergeFrom(from.actor()); + mutable_actor()->::iot_idl::sequence::ActorParameter::MergeFrom(from.actor()); } if (from.has_execute_status()) { - mutable_execute_status()->::kbd_idlfile::sequence::ExecuteStatusParameter::MergeFrom(from.execute_status()); + mutable_execute_status()->::iot_idl::sequence::ExecuteStatusParameter::MergeFrom(from.execute_status()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -5317,6 +5317,6 @@ void SeqOperateMessageAck::Swap(SeqOperateMessageAck* other) { // @@protoc_insertion_point(namespace_scope) } // namespace sequence -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/SequenceMessage.pb.h b/product/src/idl_files/SequenceMessage.pb.h index 39b3f85a..5c994bed 100644 --- a/product/src/idl_files/SequenceMessage.pb.h +++ b/product/src/idl_files/SequenceMessage.pb.h @@ -27,7 +27,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace sequence { // Internal implementation detail -- do not call these. @@ -270,12 +270,12 @@ class IDL_FILES_EXPORT SeqPkgHead : public ::google::protobuf::Message { inline ::std::string* release_source_tag(); inline void set_allocated_source_tag(::std::string* source_tag); - // required .kbd_idlfile.sequence.enSeqMsgType msg_type = 2; + // required .iot_idl.sequence.enSeqMsgType msg_type = 2; inline bool has_msg_type() const; inline void clear_msg_type(); static const int kMsgTypeFieldNumber = 2; - inline ::kbd_idlfile::sequence::enSeqMsgType msg_type() const; - inline void set_msg_type(::kbd_idlfile::sequence::enSeqMsgType value); + inline ::iot_idl::sequence::enSeqMsgType msg_type() const; + inline void set_msg_type(::iot_idl::sequence::enSeqMsgType value); // required int32 source_domain = 3; inline bool has_source_domain() const; @@ -305,7 +305,7 @@ class IDL_FILES_EXPORT SeqPkgHead : public ::google::protobuf::Message { inline ::google::protobuf::int32 para2() const; inline void set_para2(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.SeqPkgHead) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.SeqPkgHead) private: inline void set_has_source_tag(); inline void clear_has_source_tag(); @@ -392,12 +392,12 @@ class IDL_FILES_EXPORT ErrorParameter : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.sequence.enErrorCode ErrorCode = 1; + // required .iot_idl.sequence.enErrorCode ErrorCode = 1; inline bool has_errorcode() const; inline void clear_errorcode(); static const int kErrorCodeFieldNumber = 1; - inline ::kbd_idlfile::sequence::enErrorCode errorcode() const; - inline void set_errorcode(::kbd_idlfile::sequence::enErrorCode value); + inline ::iot_idl::sequence::enErrorCode errorcode() const; + inline void set_errorcode(::iot_idl::sequence::enErrorCode value); // required string ErrorDescription = 2; inline bool has_errordescription() const; @@ -411,7 +411,7 @@ class IDL_FILES_EXPORT ErrorParameter : public ::google::protobuf::Message { inline ::std::string* release_errordescription(); inline void set_allocated_errordescription(::std::string* errordescription); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.ErrorParameter) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.ErrorParameter) private: inline void set_has_errorcode(); inline void clear_has_errorcode(); @@ -493,16 +493,16 @@ class IDL_FILES_EXPORT ExecuteStatusParameter : public ::google::protobuf::Messa inline ::google::protobuf::int32 statuscode() const; inline void set_statuscode(::google::protobuf::int32 value); - // optional .kbd_idlfile.sequence.ErrorParameter erro_param = 2; + // optional .iot_idl.sequence.ErrorParameter erro_param = 2; inline bool has_erro_param() const; inline void clear_erro_param(); static const int kErroParamFieldNumber = 2; - inline const ::kbd_idlfile::sequence::ErrorParameter& erro_param() const; - inline ::kbd_idlfile::sequence::ErrorParameter* mutable_erro_param(); - inline ::kbd_idlfile::sequence::ErrorParameter* release_erro_param(); - inline void set_allocated_erro_param(::kbd_idlfile::sequence::ErrorParameter* erro_param); + inline const ::iot_idl::sequence::ErrorParameter& erro_param() const; + inline ::iot_idl::sequence::ErrorParameter* mutable_erro_param(); + inline ::iot_idl::sequence::ErrorParameter* release_erro_param(); + inline void set_allocated_erro_param(::iot_idl::sequence::ErrorParameter* erro_param); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.ExecuteStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.ExecuteStatusParameter) private: inline void set_has_statuscode(); inline void clear_has_statuscode(); @@ -513,7 +513,7 @@ class IDL_FILES_EXPORT ExecuteStatusParameter : public ::google::protobuf::Messa ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::sequence::ErrorParameter* erro_param_; + ::iot_idl::sequence::ErrorParameter* erro_param_; ::google::protobuf::int32 statuscode_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); @@ -601,19 +601,19 @@ class IDL_FILES_EXPORT ActionNodeStatusParameter : public ::google::protobuf::Me inline ::std::string* release_action_desc(); inline void set_allocated_action_desc(::std::string* action_desc); - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; inline bool has_check_state() const; inline void clear_check_state(); static const int kCheckStateFieldNumber = 3; - inline ::kbd_idlfile::sequence::ENSeqNodeCheckStatus check_state() const; - inline void set_check_state(::kbd_idlfile::sequence::ENSeqNodeCheckStatus value); + inline ::iot_idl::sequence::ENSeqNodeCheckStatus check_state() const; + inline void set_check_state(::iot_idl::sequence::ENSeqNodeCheckStatus value); - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 4; + // required .iot_idl.sequence.ENSeqStatus node_state = 4; inline bool has_node_state() const; inline void clear_node_state(); static const int kNodeStateFieldNumber = 4; - inline ::kbd_idlfile::sequence::ENSeqStatus node_state() const; - inline void set_node_state(::kbd_idlfile::sequence::ENSeqStatus value); + inline ::iot_idl::sequence::ENSeqStatus node_state() const; + inline void set_node_state(::iot_idl::sequence::ENSeqStatus value); // required int64 timeflag = 5; inline bool has_timeflag() const; @@ -622,7 +622,7 @@ class IDL_FILES_EXPORT ActionNodeStatusParameter : public ::google::protobuf::Me inline ::google::protobuf::int64 timeflag() const; inline void set_timeflag(::google::protobuf::int64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.ActionNodeStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.ActionNodeStatusParameter) private: inline void set_has_action_name(); inline void clear_has_action_name(); @@ -730,12 +730,12 @@ class IDL_FILES_EXPORT FucNodeStatusParameter : public ::google::protobuf::Messa inline ::std::string* release_fuc_desc(); inline void set_allocated_fuc_desc(::std::string* fuc_desc); - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; inline bool has_check_state() const; inline void clear_check_state(); static const int kCheckStateFieldNumber = 3; - inline ::kbd_idlfile::sequence::ENSeqNodeCheckStatus check_state() const; - inline void set_check_state(::kbd_idlfile::sequence::ENSeqNodeCheckStatus value); + inline ::iot_idl::sequence::ENSeqNodeCheckStatus check_state() const; + inline void set_check_state(::iot_idl::sequence::ENSeqNodeCheckStatus value); // required int64 timeflag = 4; inline bool has_timeflag() const; @@ -744,26 +744,26 @@ class IDL_FILES_EXPORT FucNodeStatusParameter : public ::google::protobuf::Messa inline ::google::protobuf::int64 timeflag() const; inline void set_timeflag(::google::protobuf::int64 value); - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; inline bool has_node_state() const; inline void clear_node_state(); static const int kNodeStateFieldNumber = 5; - inline ::kbd_idlfile::sequence::ENSeqStatus node_state() const; - inline void set_node_state(::kbd_idlfile::sequence::ENSeqStatus value); + inline ::iot_idl::sequence::ENSeqStatus node_state() const; + inline void set_node_state(::iot_idl::sequence::ENSeqStatus value); - // repeated .kbd_idlfile.sequence.ActionNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.ActionNodeStatusParameter nodelist = 6; inline int nodelist_size() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 6; - inline const ::kbd_idlfile::sequence::ActionNodeStatusParameter& nodelist(int index) const; - inline ::kbd_idlfile::sequence::ActionNodeStatusParameter* mutable_nodelist(int index); - inline ::kbd_idlfile::sequence::ActionNodeStatusParameter* add_nodelist(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ActionNodeStatusParameter >& + inline const ::iot_idl::sequence::ActionNodeStatusParameter& nodelist(int index) const; + inline ::iot_idl::sequence::ActionNodeStatusParameter* mutable_nodelist(int index); + inline ::iot_idl::sequence::ActionNodeStatusParameter* add_nodelist(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ActionNodeStatusParameter >& nodelist() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ActionNodeStatusParameter >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ActionNodeStatusParameter >* mutable_nodelist(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.FucNodeStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.FucNodeStatusParameter) private: inline void set_has_fuc_name(); inline void clear_has_fuc_name(); @@ -785,7 +785,7 @@ class IDL_FILES_EXPORT FucNodeStatusParameter : public ::google::protobuf::Messa ::google::protobuf::int64 timeflag_; int check_state_; int node_state_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ActionNodeStatusParameter > nodelist_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ActionNodeStatusParameter > nodelist_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); friend void protobuf_ShutdownFile_SequenceMessage_2eproto(); @@ -872,12 +872,12 @@ class IDL_FILES_EXPORT SeqNodeStatusParameter : public ::google::protobuf::Messa inline ::std::string* release_seq_desc(); inline void set_allocated_seq_desc(::std::string* seq_desc); - // required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; + // required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; inline bool has_check_state() const; inline void clear_check_state(); static const int kCheckStateFieldNumber = 3; - inline ::kbd_idlfile::sequence::ENSeqNodeCheckStatus check_state() const; - inline void set_check_state(::kbd_idlfile::sequence::ENSeqNodeCheckStatus value); + inline ::iot_idl::sequence::ENSeqNodeCheckStatus check_state() const; + inline void set_check_state(::iot_idl::sequence::ENSeqNodeCheckStatus value); // required int64 timeflag = 4; inline bool has_timeflag() const; @@ -886,26 +886,26 @@ class IDL_FILES_EXPORT SeqNodeStatusParameter : public ::google::protobuf::Messa inline ::google::protobuf::int64 timeflag() const; inline void set_timeflag(::google::protobuf::int64 value); - // required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; + // required .iot_idl.sequence.ENSeqStatus node_state = 5; inline bool has_node_state() const; inline void clear_node_state(); static const int kNodeStateFieldNumber = 5; - inline ::kbd_idlfile::sequence::ENSeqStatus node_state() const; - inline void set_node_state(::kbd_idlfile::sequence::ENSeqStatus value); + inline ::iot_idl::sequence::ENSeqStatus node_state() const; + inline void set_node_state(::iot_idl::sequence::ENSeqStatus value); - // repeated .kbd_idlfile.sequence.FucNodeStatusParameter nodelist = 6; + // repeated .iot_idl.sequence.FucNodeStatusParameter nodelist = 6; inline int nodelist_size() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 6; - inline const ::kbd_idlfile::sequence::FucNodeStatusParameter& nodelist(int index) const; - inline ::kbd_idlfile::sequence::FucNodeStatusParameter* mutable_nodelist(int index); - inline ::kbd_idlfile::sequence::FucNodeStatusParameter* add_nodelist(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::FucNodeStatusParameter >& + inline const ::iot_idl::sequence::FucNodeStatusParameter& nodelist(int index) const; + inline ::iot_idl::sequence::FucNodeStatusParameter* mutable_nodelist(int index); + inline ::iot_idl::sequence::FucNodeStatusParameter* add_nodelist(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::FucNodeStatusParameter >& nodelist() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::FucNodeStatusParameter >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::FucNodeStatusParameter >* mutable_nodelist(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.SeqNodeStatusParameter) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.SeqNodeStatusParameter) private: inline void set_has_seq_name(); inline void clear_has_seq_name(); @@ -927,7 +927,7 @@ class IDL_FILES_EXPORT SeqNodeStatusParameter : public ::google::protobuf::Messa ::google::protobuf::int64 timeflag_; int check_state_; int node_state_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::FucNodeStatusParameter > nodelist_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::FucNodeStatusParameter > nodelist_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); friend void protobuf_ShutdownFile_SequenceMessage_2eproto(); @@ -1028,7 +1028,7 @@ class IDL_FILES_EXPORT ActorParameter : public ::google::protobuf::Message { inline ::std::string* release_user_name(); inline void set_allocated_user_name(::std::string* user_name); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.ActorParameter) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.ActorParameter) private: inline void set_has_user_id(); inline void clear_has_user_id(); @@ -1109,37 +1109,37 @@ class IDL_FILES_EXPORT StatusChangeMessage : public ::google::protobuf::Message // accessors ------------------------------------------------------- - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::sequence::SeqPkgHead& pkg_head() const; - inline ::kbd_idlfile::sequence::SeqPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::sequence::SeqPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head); + inline const ::iot_idl::sequence::SeqPkgHead& pkg_head() const; + inline ::iot_idl::sequence::SeqPkgHead* mutable_pkg_head(); + inline ::iot_idl::sequence::SeqPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head); - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 2; inline bool has_nodelist() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 2; - inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& nodelist() const; - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* mutable_nodelist(); - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* release_nodelist(); - inline void set_allocated_nodelist(::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist); + inline const ::iot_idl::sequence::SeqNodeStatusParameter& nodelist() const; + inline ::iot_idl::sequence::SeqNodeStatusParameter* mutable_nodelist(); + inline ::iot_idl::sequence::SeqNodeStatusParameter* release_nodelist(); + inline void set_allocated_nodelist(::iot_idl::sequence::SeqNodeStatusParameter* nodelist); - // repeated .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 3; + // repeated .iot_idl.sequence.ExecuteStatusParameter execute_status = 3; inline int execute_status_size() const; inline void clear_execute_status(); static const int kExecuteStatusFieldNumber = 3; - inline const ::kbd_idlfile::sequence::ExecuteStatusParameter& execute_status(int index) const; - inline ::kbd_idlfile::sequence::ExecuteStatusParameter* mutable_execute_status(int index); - inline ::kbd_idlfile::sequence::ExecuteStatusParameter* add_execute_status(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ExecuteStatusParameter >& + inline const ::iot_idl::sequence::ExecuteStatusParameter& execute_status(int index) const; + inline ::iot_idl::sequence::ExecuteStatusParameter* mutable_execute_status(int index); + inline ::iot_idl::sequence::ExecuteStatusParameter* add_execute_status(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ExecuteStatusParameter >& execute_status() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ExecuteStatusParameter >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ExecuteStatusParameter >* mutable_execute_status(); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.StatusChangeMessage) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.StatusChangeMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1150,9 +1150,9 @@ class IDL_FILES_EXPORT StatusChangeMessage : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::sequence::SeqPkgHead* pkg_head_; - ::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ExecuteStatusParameter > execute_status_; + ::iot_idl::sequence::SeqPkgHead* pkg_head_; + ::iot_idl::sequence::SeqNodeStatusParameter* nodelist_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ExecuteStatusParameter > execute_status_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); friend void protobuf_ShutdownFile_SequenceMessage_2eproto(); @@ -1215,43 +1215,43 @@ class IDL_FILES_EXPORT UiRequestMessage : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::sequence::SeqPkgHead& pkg_head() const; - inline ::kbd_idlfile::sequence::SeqPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::sequence::SeqPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head); + inline const ::iot_idl::sequence::SeqPkgHead& pkg_head() const; + inline ::iot_idl::sequence::SeqPkgHead* mutable_pkg_head(); + inline ::iot_idl::sequence::SeqPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head); - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 2; - inline const ::kbd_idlfile::sequence::ActorParameter& actor() const; - inline ::kbd_idlfile::sequence::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::sequence::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor); + inline const ::iot_idl::sequence::ActorParameter& actor() const; + inline ::iot_idl::sequence::ActorParameter* mutable_actor(); + inline ::iot_idl::sequence::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::sequence::ActorParameter* actor); - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; inline bool has_nodelist() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 3; - inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& nodelist() const; - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* mutable_nodelist(); - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* release_nodelist(); - inline void set_allocated_nodelist(::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist); + inline const ::iot_idl::sequence::SeqNodeStatusParameter& nodelist() const; + inline ::iot_idl::sequence::SeqNodeStatusParameter* mutable_nodelist(); + inline ::iot_idl::sequence::SeqNodeStatusParameter* release_nodelist(); + inline void set_allocated_nodelist(::iot_idl::sequence::SeqNodeStatusParameter* nodelist); - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 4; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 4; inline bool has_execute_status() const; inline void clear_execute_status(); static const int kExecuteStatusFieldNumber = 4; - inline const ::kbd_idlfile::sequence::ExecuteStatusParameter& execute_status() const; - inline ::kbd_idlfile::sequence::ExecuteStatusParameter* mutable_execute_status(); - inline ::kbd_idlfile::sequence::ExecuteStatusParameter* release_execute_status(); - inline void set_allocated_execute_status(::kbd_idlfile::sequence::ExecuteStatusParameter* execute_status); + inline const ::iot_idl::sequence::ExecuteStatusParameter& execute_status() const; + inline ::iot_idl::sequence::ExecuteStatusParameter* mutable_execute_status(); + inline ::iot_idl::sequence::ExecuteStatusParameter* release_execute_status(); + inline void set_allocated_execute_status(::iot_idl::sequence::ExecuteStatusParameter* execute_status); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.UiRequestMessage) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.UiRequestMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1266,10 +1266,10 @@ class IDL_FILES_EXPORT UiRequestMessage : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::sequence::SeqPkgHead* pkg_head_; - ::kbd_idlfile::sequence::ActorParameter* actor_; - ::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist_; - ::kbd_idlfile::sequence::ExecuteStatusParameter* execute_status_; + ::iot_idl::sequence::SeqPkgHead* pkg_head_; + ::iot_idl::sequence::ActorParameter* actor_; + ::iot_idl::sequence::SeqNodeStatusParameter* nodelist_; + ::iot_idl::sequence::ExecuteStatusParameter* execute_status_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); friend void protobuf_ShutdownFile_SequenceMessage_2eproto(); @@ -1332,41 +1332,41 @@ class IDL_FILES_EXPORT UiRequestMessageAck : public ::google::protobuf::Message // accessors ------------------------------------------------------- - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::sequence::SeqPkgHead& pkg_head() const; - inline ::kbd_idlfile::sequence::SeqPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::sequence::SeqPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head); + inline const ::iot_idl::sequence::SeqPkgHead& pkg_head() const; + inline ::iot_idl::sequence::SeqPkgHead* mutable_pkg_head(); + inline ::iot_idl::sequence::SeqPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head); - // required .kbd_idlfile.sequence.ActorParameter actor = 2; + // required .iot_idl.sequence.ActorParameter actor = 2; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 2; - inline const ::kbd_idlfile::sequence::ActorParameter& actor() const; - inline ::kbd_idlfile::sequence::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::sequence::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor); + inline const ::iot_idl::sequence::ActorParameter& actor() const; + inline ::iot_idl::sequence::ActorParameter* mutable_actor(); + inline ::iot_idl::sequence::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::sequence::ActorParameter* actor); - // required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; + // required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; inline bool has_nodelist() const; inline void clear_nodelist(); static const int kNodelistFieldNumber = 3; - inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& nodelist() const; - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* mutable_nodelist(); - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* release_nodelist(); - inline void set_allocated_nodelist(::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist); + inline const ::iot_idl::sequence::SeqNodeStatusParameter& nodelist() const; + inline ::iot_idl::sequence::SeqNodeStatusParameter* mutable_nodelist(); + inline ::iot_idl::sequence::SeqNodeStatusParameter* release_nodelist(); + inline void set_allocated_nodelist(::iot_idl::sequence::SeqNodeStatusParameter* nodelist); - // required .kbd_idlfile.sequence.ENUiOperateType optype = 4; + // required .iot_idl.sequence.ENUiOperateType optype = 4; inline bool has_optype() const; inline void clear_optype(); static const int kOptypeFieldNumber = 4; - inline ::kbd_idlfile::sequence::ENUiOperateType optype() const; - inline void set_optype(::kbd_idlfile::sequence::ENUiOperateType value); + inline ::iot_idl::sequence::ENUiOperateType optype() const; + inline void set_optype(::iot_idl::sequence::ENUiOperateType value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.UiRequestMessageAck) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.UiRequestMessageAck) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1381,9 +1381,9 @@ class IDL_FILES_EXPORT UiRequestMessageAck : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::sequence::SeqPkgHead* pkg_head_; - ::kbd_idlfile::sequence::ActorParameter* actor_; - ::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist_; + ::iot_idl::sequence::SeqPkgHead* pkg_head_; + ::iot_idl::sequence::ActorParameter* actor_; + ::iot_idl::sequence::SeqNodeStatusParameter* nodelist_; int optype_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); @@ -1447,41 +1447,41 @@ class IDL_FILES_EXPORT SeqOperateMessage : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::sequence::SeqPkgHead& pkg_head() const; - inline ::kbd_idlfile::sequence::SeqPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::sequence::SeqPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head); + inline const ::iot_idl::sequence::SeqPkgHead& pkg_head() const; + inline ::iot_idl::sequence::SeqPkgHead* mutable_pkg_head(); + inline ::iot_idl::sequence::SeqPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head); - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; inline bool has_seq_node() const; inline void clear_seq_node(); static const int kSeqNodeFieldNumber = 2; - inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& seq_node() const; - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* mutable_seq_node(); - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* release_seq_node(); - inline void set_allocated_seq_node(::kbd_idlfile::sequence::SeqNodeStatusParameter* seq_node); + inline const ::iot_idl::sequence::SeqNodeStatusParameter& seq_node() const; + inline ::iot_idl::sequence::SeqNodeStatusParameter* mutable_seq_node(); + inline ::iot_idl::sequence::SeqNodeStatusParameter* release_seq_node(); + inline void set_allocated_seq_node(::iot_idl::sequence::SeqNodeStatusParameter* seq_node); - // required .kbd_idlfile.sequence.ActorParameter actor = 3; + // required .iot_idl.sequence.ActorParameter actor = 3; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 3; - inline const ::kbd_idlfile::sequence::ActorParameter& actor() const; - inline ::kbd_idlfile::sequence::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::sequence::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor); + inline const ::iot_idl::sequence::ActorParameter& actor() const; + inline ::iot_idl::sequence::ActorParameter* mutable_actor(); + inline ::iot_idl::sequence::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::sequence::ActorParameter* actor); - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 4; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 4; inline bool has_opreate_type() const; inline void clear_opreate_type(); static const int kOpreateTypeFieldNumber = 4; - inline ::kbd_idlfile::sequence::ENSeqOperateType opreate_type() const; - inline void set_opreate_type(::kbd_idlfile::sequence::ENSeqOperateType value); + inline ::iot_idl::sequence::ENSeqOperateType opreate_type() const; + inline void set_opreate_type(::iot_idl::sequence::ENSeqOperateType value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.SeqOperateMessage) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.SeqOperateMessage) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1496,9 +1496,9 @@ class IDL_FILES_EXPORT SeqOperateMessage : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::sequence::SeqPkgHead* pkg_head_; - ::kbd_idlfile::sequence::SeqNodeStatusParameter* seq_node_; - ::kbd_idlfile::sequence::ActorParameter* actor_; + ::iot_idl::sequence::SeqPkgHead* pkg_head_; + ::iot_idl::sequence::SeqNodeStatusParameter* seq_node_; + ::iot_idl::sequence::ActorParameter* actor_; int opreate_type_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); @@ -1562,50 +1562,50 @@ class IDL_FILES_EXPORT SeqOperateMessageAck : public ::google::protobuf::Message // accessors ------------------------------------------------------- - // required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; + // required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool has_pkg_head() const; inline void clear_pkg_head(); static const int kPkgHeadFieldNumber = 1; - inline const ::kbd_idlfile::sequence::SeqPkgHead& pkg_head() const; - inline ::kbd_idlfile::sequence::SeqPkgHead* mutable_pkg_head(); - inline ::kbd_idlfile::sequence::SeqPkgHead* release_pkg_head(); - inline void set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head); + inline const ::iot_idl::sequence::SeqPkgHead& pkg_head() const; + inline ::iot_idl::sequence::SeqPkgHead* mutable_pkg_head(); + inline ::iot_idl::sequence::SeqPkgHead* release_pkg_head(); + inline void set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head); - // required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; + // required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; inline bool has_seq_node() const; inline void clear_seq_node(); static const int kSeqNodeFieldNumber = 2; - inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& seq_node() const; - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* mutable_seq_node(); - inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* release_seq_node(); - inline void set_allocated_seq_node(::kbd_idlfile::sequence::SeqNodeStatusParameter* seq_node); + inline const ::iot_idl::sequence::SeqNodeStatusParameter& seq_node() const; + inline ::iot_idl::sequence::SeqNodeStatusParameter* mutable_seq_node(); + inline ::iot_idl::sequence::SeqNodeStatusParameter* release_seq_node(); + inline void set_allocated_seq_node(::iot_idl::sequence::SeqNodeStatusParameter* seq_node); - // required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 3; + // required .iot_idl.sequence.ENSeqOperateType opreate_type = 3; inline bool has_opreate_type() const; inline void clear_opreate_type(); static const int kOpreateTypeFieldNumber = 3; - inline ::kbd_idlfile::sequence::ENSeqOperateType opreate_type() const; - inline void set_opreate_type(::kbd_idlfile::sequence::ENSeqOperateType value); + inline ::iot_idl::sequence::ENSeqOperateType opreate_type() const; + inline void set_opreate_type(::iot_idl::sequence::ENSeqOperateType value); - // required .kbd_idlfile.sequence.ActorParameter actor = 4; + // required .iot_idl.sequence.ActorParameter actor = 4; inline bool has_actor() const; inline void clear_actor(); static const int kActorFieldNumber = 4; - inline const ::kbd_idlfile::sequence::ActorParameter& actor() const; - inline ::kbd_idlfile::sequence::ActorParameter* mutable_actor(); - inline ::kbd_idlfile::sequence::ActorParameter* release_actor(); - inline void set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor); + inline const ::iot_idl::sequence::ActorParameter& actor() const; + inline ::iot_idl::sequence::ActorParameter* mutable_actor(); + inline ::iot_idl::sequence::ActorParameter* release_actor(); + inline void set_allocated_actor(::iot_idl::sequence::ActorParameter* actor); - // required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 5; + // required .iot_idl.sequence.ExecuteStatusParameter execute_status = 5; inline bool has_execute_status() const; inline void clear_execute_status(); static const int kExecuteStatusFieldNumber = 5; - inline const ::kbd_idlfile::sequence::ExecuteStatusParameter& execute_status() const; - inline ::kbd_idlfile::sequence::ExecuteStatusParameter* mutable_execute_status(); - inline ::kbd_idlfile::sequence::ExecuteStatusParameter* release_execute_status(); - inline void set_allocated_execute_status(::kbd_idlfile::sequence::ExecuteStatusParameter* execute_status); + inline const ::iot_idl::sequence::ExecuteStatusParameter& execute_status() const; + inline ::iot_idl::sequence::ExecuteStatusParameter* mutable_execute_status(); + inline ::iot_idl::sequence::ExecuteStatusParameter* release_execute_status(); + inline void set_allocated_execute_status(::iot_idl::sequence::ExecuteStatusParameter* execute_status); - // @@protoc_insertion_point(class_scope:kbd_idlfile.sequence.SeqOperateMessageAck) + // @@protoc_insertion_point(class_scope:iot_idl.sequence.SeqOperateMessageAck) private: inline void set_has_pkg_head(); inline void clear_has_pkg_head(); @@ -1622,10 +1622,10 @@ class IDL_FILES_EXPORT SeqOperateMessageAck : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::kbd_idlfile::sequence::SeqPkgHead* pkg_head_; - ::kbd_idlfile::sequence::SeqNodeStatusParameter* seq_node_; - ::kbd_idlfile::sequence::ActorParameter* actor_; - ::kbd_idlfile::sequence::ExecuteStatusParameter* execute_status_; + ::iot_idl::sequence::SeqPkgHead* pkg_head_; + ::iot_idl::sequence::SeqNodeStatusParameter* seq_node_; + ::iot_idl::sequence::ActorParameter* actor_; + ::iot_idl::sequence::ExecuteStatusParameter* execute_status_; int opreate_type_; friend void IDL_FILES_EXPORT protobuf_AddDesc_SequenceMessage_2eproto(); friend void protobuf_AssignDesc_SequenceMessage_2eproto(); @@ -1658,7 +1658,7 @@ inline void SeqPkgHead::clear_source_tag() { clear_has_source_tag(); } inline const ::std::string& SeqPkgHead::source_tag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqPkgHead.source_tag) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqPkgHead.source_tag) return *source_tag_; } inline void SeqPkgHead::set_source_tag(const ::std::string& value) { @@ -1667,7 +1667,7 @@ inline void SeqPkgHead::set_source_tag(const ::std::string& value) { source_tag_ = new ::std::string; } source_tag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqPkgHead.source_tag) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqPkgHead.source_tag) } inline void SeqPkgHead::set_source_tag(const char* value) { set_has_source_tag(); @@ -1675,7 +1675,7 @@ inline void SeqPkgHead::set_source_tag(const char* value) { source_tag_ = new ::std::string; } source_tag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.SeqPkgHead.source_tag) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.SeqPkgHead.source_tag) } inline void SeqPkgHead::set_source_tag(const char* value, size_t size) { set_has_source_tag(); @@ -1683,14 +1683,14 @@ inline void SeqPkgHead::set_source_tag(const char* value, size_t size) { source_tag_ = new ::std::string; } source_tag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.SeqPkgHead.source_tag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.SeqPkgHead.source_tag) } inline ::std::string* SeqPkgHead::mutable_source_tag() { set_has_source_tag(); if (source_tag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { source_tag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqPkgHead.source_tag) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqPkgHead.source_tag) return source_tag_; } inline ::std::string* SeqPkgHead::release_source_tag() { @@ -1714,10 +1714,10 @@ inline void SeqPkgHead::set_allocated_source_tag(::std::string* source_tag) { clear_has_source_tag(); source_tag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqPkgHead.source_tag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqPkgHead.source_tag) } -// required .kbd_idlfile.sequence.enSeqMsgType msg_type = 2; +// required .iot_idl.sequence.enSeqMsgType msg_type = 2; inline bool SeqPkgHead::has_msg_type() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1731,15 +1731,15 @@ inline void SeqPkgHead::clear_msg_type() { msg_type_ = 1; clear_has_msg_type(); } -inline ::kbd_idlfile::sequence::enSeqMsgType SeqPkgHead::msg_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqPkgHead.msg_type) - return static_cast< ::kbd_idlfile::sequence::enSeqMsgType >(msg_type_); +inline ::iot_idl::sequence::enSeqMsgType SeqPkgHead::msg_type() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqPkgHead.msg_type) + return static_cast< ::iot_idl::sequence::enSeqMsgType >(msg_type_); } -inline void SeqPkgHead::set_msg_type(::kbd_idlfile::sequence::enSeqMsgType value) { - assert(::kbd_idlfile::sequence::enSeqMsgType_IsValid(value)); +inline void SeqPkgHead::set_msg_type(::iot_idl::sequence::enSeqMsgType value) { + assert(::iot_idl::sequence::enSeqMsgType_IsValid(value)); set_has_msg_type(); msg_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqPkgHead.msg_type) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqPkgHead.msg_type) } // required int32 source_domain = 3; @@ -1757,13 +1757,13 @@ inline void SeqPkgHead::clear_source_domain() { clear_has_source_domain(); } inline ::google::protobuf::int32 SeqPkgHead::source_domain() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqPkgHead.source_domain) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqPkgHead.source_domain) return source_domain_; } inline void SeqPkgHead::set_source_domain(::google::protobuf::int32 value) { set_has_source_domain(); source_domain_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqPkgHead.source_domain) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqPkgHead.source_domain) } // required int32 target_domain = 4; @@ -1781,13 +1781,13 @@ inline void SeqPkgHead::clear_target_domain() { clear_has_target_domain(); } inline ::google::protobuf::int32 SeqPkgHead::target_domain() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqPkgHead.target_domain) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqPkgHead.target_domain) return target_domain_; } inline void SeqPkgHead::set_target_domain(::google::protobuf::int32 value) { set_has_target_domain(); target_domain_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqPkgHead.target_domain) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqPkgHead.target_domain) } // required int32 para1 = 5; @@ -1805,13 +1805,13 @@ inline void SeqPkgHead::clear_para1() { clear_has_para1(); } inline ::google::protobuf::int32 SeqPkgHead::para1() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqPkgHead.para1) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqPkgHead.para1) return para1_; } inline void SeqPkgHead::set_para1(::google::protobuf::int32 value) { set_has_para1(); para1_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqPkgHead.para1) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqPkgHead.para1) } // required int32 para2 = 6; @@ -1829,20 +1829,20 @@ inline void SeqPkgHead::clear_para2() { clear_has_para2(); } inline ::google::protobuf::int32 SeqPkgHead::para2() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqPkgHead.para2) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqPkgHead.para2) return para2_; } inline void SeqPkgHead::set_para2(::google::protobuf::int32 value) { set_has_para2(); para2_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqPkgHead.para2) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqPkgHead.para2) } // ------------------------------------------------------------------- // ErrorParameter -// required .kbd_idlfile.sequence.enErrorCode ErrorCode = 1; +// required .iot_idl.sequence.enErrorCode ErrorCode = 1; inline bool ErrorParameter::has_errorcode() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -1856,15 +1856,15 @@ inline void ErrorParameter::clear_errorcode() { errorcode_ = 0; clear_has_errorcode(); } -inline ::kbd_idlfile::sequence::enErrorCode ErrorParameter::errorcode() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ErrorParameter.ErrorCode) - return static_cast< ::kbd_idlfile::sequence::enErrorCode >(errorcode_); +inline ::iot_idl::sequence::enErrorCode ErrorParameter::errorcode() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.ErrorParameter.ErrorCode) + return static_cast< ::iot_idl::sequence::enErrorCode >(errorcode_); } -inline void ErrorParameter::set_errorcode(::kbd_idlfile::sequence::enErrorCode value) { - assert(::kbd_idlfile::sequence::enErrorCode_IsValid(value)); +inline void ErrorParameter::set_errorcode(::iot_idl::sequence::enErrorCode value) { + assert(::iot_idl::sequence::enErrorCode_IsValid(value)); set_has_errorcode(); errorcode_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ErrorParameter.ErrorCode) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ErrorParameter.ErrorCode) } // required string ErrorDescription = 2; @@ -1884,7 +1884,7 @@ inline void ErrorParameter::clear_errordescription() { clear_has_errordescription(); } inline const ::std::string& ErrorParameter::errordescription() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ErrorParameter.ErrorDescription) return *errordescription_; } inline void ErrorParameter::set_errordescription(const ::std::string& value) { @@ -1893,7 +1893,7 @@ inline void ErrorParameter::set_errordescription(const ::std::string& value) { errordescription_ = new ::std::string; } errordescription_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ErrorParameter.ErrorDescription) } inline void ErrorParameter::set_errordescription(const char* value) { set_has_errordescription(); @@ -1901,7 +1901,7 @@ inline void ErrorParameter::set_errordescription(const char* value) { errordescription_ = new ::std::string; } errordescription_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.ErrorParameter.ErrorDescription) } inline void ErrorParameter::set_errordescription(const char* value, size_t size) { set_has_errordescription(); @@ -1909,14 +1909,14 @@ inline void ErrorParameter::set_errordescription(const char* value, size_t size) errordescription_ = new ::std::string; } errordescription_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.ErrorParameter.ErrorDescription) } inline ::std::string* ErrorParameter::mutable_errordescription() { set_has_errordescription(); if (errordescription_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { errordescription_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.ErrorParameter.ErrorDescription) return errordescription_; } inline ::std::string* ErrorParameter::release_errordescription() { @@ -1940,7 +1940,7 @@ inline void ErrorParameter::set_allocated_errordescription(::std::string* errord clear_has_errordescription(); errordescription_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.ErrorParameter.ErrorDescription) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.ErrorParameter.ErrorDescription) } // ------------------------------------------------------------------- @@ -1962,16 +1962,16 @@ inline void ExecuteStatusParameter::clear_statuscode() { clear_has_statuscode(); } inline ::google::protobuf::int32 ExecuteStatusParameter::statuscode() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ExecuteStatusParameter.StatusCode) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ExecuteStatusParameter.StatusCode) return statuscode_; } inline void ExecuteStatusParameter::set_statuscode(::google::protobuf::int32 value) { set_has_statuscode(); statuscode_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ExecuteStatusParameter.StatusCode) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ExecuteStatusParameter.StatusCode) } -// optional .kbd_idlfile.sequence.ErrorParameter erro_param = 2; +// optional .iot_idl.sequence.ErrorParameter erro_param = 2; inline bool ExecuteStatusParameter::has_erro_param() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -1982,26 +1982,26 @@ inline void ExecuteStatusParameter::clear_has_erro_param() { _has_bits_[0] &= ~0x00000002u; } inline void ExecuteStatusParameter::clear_erro_param() { - if (erro_param_ != NULL) erro_param_->::kbd_idlfile::sequence::ErrorParameter::Clear(); + if (erro_param_ != NULL) erro_param_->::iot_idl::sequence::ErrorParameter::Clear(); clear_has_erro_param(); } -inline const ::kbd_idlfile::sequence::ErrorParameter& ExecuteStatusParameter::erro_param() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ExecuteStatusParameter.erro_param) +inline const ::iot_idl::sequence::ErrorParameter& ExecuteStatusParameter::erro_param() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.ExecuteStatusParameter.erro_param) return erro_param_ != NULL ? *erro_param_ : *default_instance_->erro_param_; } -inline ::kbd_idlfile::sequence::ErrorParameter* ExecuteStatusParameter::mutable_erro_param() { +inline ::iot_idl::sequence::ErrorParameter* ExecuteStatusParameter::mutable_erro_param() { set_has_erro_param(); - if (erro_param_ == NULL) erro_param_ = new ::kbd_idlfile::sequence::ErrorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.ExecuteStatusParameter.erro_param) + if (erro_param_ == NULL) erro_param_ = new ::iot_idl::sequence::ErrorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.ExecuteStatusParameter.erro_param) return erro_param_; } -inline ::kbd_idlfile::sequence::ErrorParameter* ExecuteStatusParameter::release_erro_param() { +inline ::iot_idl::sequence::ErrorParameter* ExecuteStatusParameter::release_erro_param() { clear_has_erro_param(); - ::kbd_idlfile::sequence::ErrorParameter* temp = erro_param_; + ::iot_idl::sequence::ErrorParameter* temp = erro_param_; erro_param_ = NULL; return temp; } -inline void ExecuteStatusParameter::set_allocated_erro_param(::kbd_idlfile::sequence::ErrorParameter* erro_param) { +inline void ExecuteStatusParameter::set_allocated_erro_param(::iot_idl::sequence::ErrorParameter* erro_param) { delete erro_param_; erro_param_ = erro_param; if (erro_param) { @@ -2009,7 +2009,7 @@ inline void ExecuteStatusParameter::set_allocated_erro_param(::kbd_idlfile::sequ } else { clear_has_erro_param(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.ExecuteStatusParameter.erro_param) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.ExecuteStatusParameter.erro_param) } // ------------------------------------------------------------------- @@ -2033,7 +2033,7 @@ inline void ActionNodeStatusParameter::clear_action_name() { clear_has_action_name(); } inline const ::std::string& ActionNodeStatusParameter::action_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActionNodeStatusParameter.action_name) return *action_name_; } inline void ActionNodeStatusParameter::set_action_name(const ::std::string& value) { @@ -2042,7 +2042,7 @@ inline void ActionNodeStatusParameter::set_action_name(const ::std::string& valu action_name_ = new ::std::string; } action_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActionNodeStatusParameter.action_name) } inline void ActionNodeStatusParameter::set_action_name(const char* value) { set_has_action_name(); @@ -2050,7 +2050,7 @@ inline void ActionNodeStatusParameter::set_action_name(const char* value) { action_name_ = new ::std::string; } action_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.ActionNodeStatusParameter.action_name) } inline void ActionNodeStatusParameter::set_action_name(const char* value, size_t size) { set_has_action_name(); @@ -2058,14 +2058,14 @@ inline void ActionNodeStatusParameter::set_action_name(const char* value, size_t action_name_ = new ::std::string; } action_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.ActionNodeStatusParameter.action_name) } inline ::std::string* ActionNodeStatusParameter::mutable_action_name() { set_has_action_name(); if (action_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { action_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.ActionNodeStatusParameter.action_name) return action_name_; } inline ::std::string* ActionNodeStatusParameter::release_action_name() { @@ -2089,7 +2089,7 @@ inline void ActionNodeStatusParameter::set_allocated_action_name(::std::string* clear_has_action_name(); action_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.ActionNodeStatusParameter.action_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.ActionNodeStatusParameter.action_name) } // required string action_desc = 2; @@ -2109,7 +2109,7 @@ inline void ActionNodeStatusParameter::clear_action_desc() { clear_has_action_desc(); } inline const ::std::string& ActionNodeStatusParameter::action_desc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActionNodeStatusParameter.action_desc) return *action_desc_; } inline void ActionNodeStatusParameter::set_action_desc(const ::std::string& value) { @@ -2118,7 +2118,7 @@ inline void ActionNodeStatusParameter::set_action_desc(const ::std::string& valu action_desc_ = new ::std::string; } action_desc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActionNodeStatusParameter.action_desc) } inline void ActionNodeStatusParameter::set_action_desc(const char* value) { set_has_action_desc(); @@ -2126,7 +2126,7 @@ inline void ActionNodeStatusParameter::set_action_desc(const char* value) { action_desc_ = new ::std::string; } action_desc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.ActionNodeStatusParameter.action_desc) } inline void ActionNodeStatusParameter::set_action_desc(const char* value, size_t size) { set_has_action_desc(); @@ -2134,14 +2134,14 @@ inline void ActionNodeStatusParameter::set_action_desc(const char* value, size_t action_desc_ = new ::std::string; } action_desc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.ActionNodeStatusParameter.action_desc) } inline ::std::string* ActionNodeStatusParameter::mutable_action_desc() { set_has_action_desc(); if (action_desc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { action_desc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.ActionNodeStatusParameter.action_desc) return action_desc_; } inline ::std::string* ActionNodeStatusParameter::release_action_desc() { @@ -2165,10 +2165,10 @@ inline void ActionNodeStatusParameter::set_allocated_action_desc(::std::string* clear_has_action_desc(); action_desc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.ActionNodeStatusParameter.action_desc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.ActionNodeStatusParameter.action_desc) } -// required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; +// required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; inline bool ActionNodeStatusParameter::has_check_state() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -2182,18 +2182,18 @@ inline void ActionNodeStatusParameter::clear_check_state() { check_state_ = 0; clear_has_check_state(); } -inline ::kbd_idlfile::sequence::ENSeqNodeCheckStatus ActionNodeStatusParameter::check_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActionNodeStatusParameter.check_state) - return static_cast< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus >(check_state_); +inline ::iot_idl::sequence::ENSeqNodeCheckStatus ActionNodeStatusParameter::check_state() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActionNodeStatusParameter.check_state) + return static_cast< ::iot_idl::sequence::ENSeqNodeCheckStatus >(check_state_); } -inline void ActionNodeStatusParameter::set_check_state(::kbd_idlfile::sequence::ENSeqNodeCheckStatus value) { - assert(::kbd_idlfile::sequence::ENSeqNodeCheckStatus_IsValid(value)); +inline void ActionNodeStatusParameter::set_check_state(::iot_idl::sequence::ENSeqNodeCheckStatus value) { + assert(::iot_idl::sequence::ENSeqNodeCheckStatus_IsValid(value)); set_has_check_state(); check_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActionNodeStatusParameter.check_state) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActionNodeStatusParameter.check_state) } -// required .kbd_idlfile.sequence.ENSeqStatus node_state = 4; +// required .iot_idl.sequence.ENSeqStatus node_state = 4; inline bool ActionNodeStatusParameter::has_node_state() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -2207,15 +2207,15 @@ inline void ActionNodeStatusParameter::clear_node_state() { node_state_ = 0; clear_has_node_state(); } -inline ::kbd_idlfile::sequence::ENSeqStatus ActionNodeStatusParameter::node_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActionNodeStatusParameter.node_state) - return static_cast< ::kbd_idlfile::sequence::ENSeqStatus >(node_state_); +inline ::iot_idl::sequence::ENSeqStatus ActionNodeStatusParameter::node_state() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActionNodeStatusParameter.node_state) + return static_cast< ::iot_idl::sequence::ENSeqStatus >(node_state_); } -inline void ActionNodeStatusParameter::set_node_state(::kbd_idlfile::sequence::ENSeqStatus value) { - assert(::kbd_idlfile::sequence::ENSeqStatus_IsValid(value)); +inline void ActionNodeStatusParameter::set_node_state(::iot_idl::sequence::ENSeqStatus value) { + assert(::iot_idl::sequence::ENSeqStatus_IsValid(value)); set_has_node_state(); node_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActionNodeStatusParameter.node_state) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActionNodeStatusParameter.node_state) } // required int64 timeflag = 5; @@ -2233,13 +2233,13 @@ inline void ActionNodeStatusParameter::clear_timeflag() { clear_has_timeflag(); } inline ::google::protobuf::int64 ActionNodeStatusParameter::timeflag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActionNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActionNodeStatusParameter.timeflag) return timeflag_; } inline void ActionNodeStatusParameter::set_timeflag(::google::protobuf::int64 value) { set_has_timeflag(); timeflag_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActionNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActionNodeStatusParameter.timeflag) } // ------------------------------------------------------------------- @@ -2263,7 +2263,7 @@ inline void FucNodeStatusParameter::clear_fuc_name() { clear_has_fuc_name(); } inline const ::std::string& FucNodeStatusParameter::fuc_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_get:iot_idl.sequence.FucNodeStatusParameter.fuc_name) return *fuc_name_; } inline void FucNodeStatusParameter::set_fuc_name(const ::std::string& value) { @@ -2272,7 +2272,7 @@ inline void FucNodeStatusParameter::set_fuc_name(const ::std::string& value) { fuc_name_ = new ::std::string; } fuc_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set:iot_idl.sequence.FucNodeStatusParameter.fuc_name) } inline void FucNodeStatusParameter::set_fuc_name(const char* value) { set_has_fuc_name(); @@ -2280,7 +2280,7 @@ inline void FucNodeStatusParameter::set_fuc_name(const char* value) { fuc_name_ = new ::std::string; } fuc_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.FucNodeStatusParameter.fuc_name) } inline void FucNodeStatusParameter::set_fuc_name(const char* value, size_t size) { set_has_fuc_name(); @@ -2288,14 +2288,14 @@ inline void FucNodeStatusParameter::set_fuc_name(const char* value, size_t size) fuc_name_ = new ::std::string; } fuc_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.FucNodeStatusParameter.fuc_name) } inline ::std::string* FucNodeStatusParameter::mutable_fuc_name() { set_has_fuc_name(); if (fuc_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { fuc_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.FucNodeStatusParameter.fuc_name) return fuc_name_; } inline ::std::string* FucNodeStatusParameter::release_fuc_name() { @@ -2319,7 +2319,7 @@ inline void FucNodeStatusParameter::set_allocated_fuc_name(::std::string* fuc_na clear_has_fuc_name(); fuc_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.FucNodeStatusParameter.fuc_name) } // required string fuc_desc = 2; @@ -2339,7 +2339,7 @@ inline void FucNodeStatusParameter::clear_fuc_desc() { clear_has_fuc_desc(); } inline const ::std::string& FucNodeStatusParameter::fuc_desc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_get:iot_idl.sequence.FucNodeStatusParameter.fuc_desc) return *fuc_desc_; } inline void FucNodeStatusParameter::set_fuc_desc(const ::std::string& value) { @@ -2348,7 +2348,7 @@ inline void FucNodeStatusParameter::set_fuc_desc(const ::std::string& value) { fuc_desc_ = new ::std::string; } fuc_desc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set:iot_idl.sequence.FucNodeStatusParameter.fuc_desc) } inline void FucNodeStatusParameter::set_fuc_desc(const char* value) { set_has_fuc_desc(); @@ -2356,7 +2356,7 @@ inline void FucNodeStatusParameter::set_fuc_desc(const char* value) { fuc_desc_ = new ::std::string; } fuc_desc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.FucNodeStatusParameter.fuc_desc) } inline void FucNodeStatusParameter::set_fuc_desc(const char* value, size_t size) { set_has_fuc_desc(); @@ -2364,14 +2364,14 @@ inline void FucNodeStatusParameter::set_fuc_desc(const char* value, size_t size) fuc_desc_ = new ::std::string; } fuc_desc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.FucNodeStatusParameter.fuc_desc) } inline ::std::string* FucNodeStatusParameter::mutable_fuc_desc() { set_has_fuc_desc(); if (fuc_desc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { fuc_desc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.FucNodeStatusParameter.fuc_desc) return fuc_desc_; } inline ::std::string* FucNodeStatusParameter::release_fuc_desc() { @@ -2395,10 +2395,10 @@ inline void FucNodeStatusParameter::set_allocated_fuc_desc(::std::string* fuc_de clear_has_fuc_desc(); fuc_desc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.FucNodeStatusParameter.fuc_desc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.FucNodeStatusParameter.fuc_desc) } -// required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; +// required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; inline bool FucNodeStatusParameter::has_check_state() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -2412,15 +2412,15 @@ inline void FucNodeStatusParameter::clear_check_state() { check_state_ = 0; clear_has_check_state(); } -inline ::kbd_idlfile::sequence::ENSeqNodeCheckStatus FucNodeStatusParameter::check_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.FucNodeStatusParameter.check_state) - return static_cast< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus >(check_state_); +inline ::iot_idl::sequence::ENSeqNodeCheckStatus FucNodeStatusParameter::check_state() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.FucNodeStatusParameter.check_state) + return static_cast< ::iot_idl::sequence::ENSeqNodeCheckStatus >(check_state_); } -inline void FucNodeStatusParameter::set_check_state(::kbd_idlfile::sequence::ENSeqNodeCheckStatus value) { - assert(::kbd_idlfile::sequence::ENSeqNodeCheckStatus_IsValid(value)); +inline void FucNodeStatusParameter::set_check_state(::iot_idl::sequence::ENSeqNodeCheckStatus value) { + assert(::iot_idl::sequence::ENSeqNodeCheckStatus_IsValid(value)); set_has_check_state(); check_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.FucNodeStatusParameter.check_state) + // @@protoc_insertion_point(field_set:iot_idl.sequence.FucNodeStatusParameter.check_state) } // required int64 timeflag = 4; @@ -2438,16 +2438,16 @@ inline void FucNodeStatusParameter::clear_timeflag() { clear_has_timeflag(); } inline ::google::protobuf::int64 FucNodeStatusParameter::timeflag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.FucNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_get:iot_idl.sequence.FucNodeStatusParameter.timeflag) return timeflag_; } inline void FucNodeStatusParameter::set_timeflag(::google::protobuf::int64 value) { set_has_timeflag(); timeflag_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.FucNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_set:iot_idl.sequence.FucNodeStatusParameter.timeflag) } -// required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; +// required .iot_idl.sequence.ENSeqStatus node_state = 5; inline bool FucNodeStatusParameter::has_node_state() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -2461,44 +2461,44 @@ inline void FucNodeStatusParameter::clear_node_state() { node_state_ = 0; clear_has_node_state(); } -inline ::kbd_idlfile::sequence::ENSeqStatus FucNodeStatusParameter::node_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.FucNodeStatusParameter.node_state) - return static_cast< ::kbd_idlfile::sequence::ENSeqStatus >(node_state_); +inline ::iot_idl::sequence::ENSeqStatus FucNodeStatusParameter::node_state() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.FucNodeStatusParameter.node_state) + return static_cast< ::iot_idl::sequence::ENSeqStatus >(node_state_); } -inline void FucNodeStatusParameter::set_node_state(::kbd_idlfile::sequence::ENSeqStatus value) { - assert(::kbd_idlfile::sequence::ENSeqStatus_IsValid(value)); +inline void FucNodeStatusParameter::set_node_state(::iot_idl::sequence::ENSeqStatus value) { + assert(::iot_idl::sequence::ENSeqStatus_IsValid(value)); set_has_node_state(); node_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.FucNodeStatusParameter.node_state) + // @@protoc_insertion_point(field_set:iot_idl.sequence.FucNodeStatusParameter.node_state) } -// repeated .kbd_idlfile.sequence.ActionNodeStatusParameter nodelist = 6; +// repeated .iot_idl.sequence.ActionNodeStatusParameter nodelist = 6; inline int FucNodeStatusParameter::nodelist_size() const { return nodelist_.size(); } inline void FucNodeStatusParameter::clear_nodelist() { nodelist_.Clear(); } -inline const ::kbd_idlfile::sequence::ActionNodeStatusParameter& FucNodeStatusParameter::nodelist(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.FucNodeStatusParameter.nodelist) +inline const ::iot_idl::sequence::ActionNodeStatusParameter& FucNodeStatusParameter::nodelist(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.FucNodeStatusParameter.nodelist) return nodelist_.Get(index); } -inline ::kbd_idlfile::sequence::ActionNodeStatusParameter* FucNodeStatusParameter::mutable_nodelist(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.FucNodeStatusParameter.nodelist) +inline ::iot_idl::sequence::ActionNodeStatusParameter* FucNodeStatusParameter::mutable_nodelist(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.FucNodeStatusParameter.nodelist) return nodelist_.Mutable(index); } -inline ::kbd_idlfile::sequence::ActionNodeStatusParameter* FucNodeStatusParameter::add_nodelist() { - // @@protoc_insertion_point(field_add:kbd_idlfile.sequence.FucNodeStatusParameter.nodelist) +inline ::iot_idl::sequence::ActionNodeStatusParameter* FucNodeStatusParameter::add_nodelist() { + // @@protoc_insertion_point(field_add:iot_idl.sequence.FucNodeStatusParameter.nodelist) return nodelist_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ActionNodeStatusParameter >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ActionNodeStatusParameter >& FucNodeStatusParameter::nodelist() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.sequence.FucNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_list:iot_idl.sequence.FucNodeStatusParameter.nodelist) return nodelist_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ActionNodeStatusParameter >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ActionNodeStatusParameter >* FucNodeStatusParameter::mutable_nodelist() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.sequence.FucNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_mutable_list:iot_idl.sequence.FucNodeStatusParameter.nodelist) return &nodelist_; } @@ -2523,7 +2523,7 @@ inline void SeqNodeStatusParameter::clear_seq_name() { clear_has_seq_name(); } inline const ::std::string& SeqNodeStatusParameter::seq_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_name) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqNodeStatusParameter.seq_name) return *seq_name_; } inline void SeqNodeStatusParameter::set_seq_name(const ::std::string& value) { @@ -2532,7 +2532,7 @@ inline void SeqNodeStatusParameter::set_seq_name(const ::std::string& value) { seq_name_ = new ::std::string; } seq_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_name) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqNodeStatusParameter.seq_name) } inline void SeqNodeStatusParameter::set_seq_name(const char* value) { set_has_seq_name(); @@ -2540,7 +2540,7 @@ inline void SeqNodeStatusParameter::set_seq_name(const char* value) { seq_name_ = new ::std::string; } seq_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_name) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.SeqNodeStatusParameter.seq_name) } inline void SeqNodeStatusParameter::set_seq_name(const char* value, size_t size) { set_has_seq_name(); @@ -2548,14 +2548,14 @@ inline void SeqNodeStatusParameter::set_seq_name(const char* value, size_t size) seq_name_ = new ::std::string; } seq_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.SeqNodeStatusParameter.seq_name) } inline ::std::string* SeqNodeStatusParameter::mutable_seq_name() { set_has_seq_name(); if (seq_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { seq_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_name) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqNodeStatusParameter.seq_name) return seq_name_; } inline ::std::string* SeqNodeStatusParameter::release_seq_name() { @@ -2579,7 +2579,7 @@ inline void SeqNodeStatusParameter::set_allocated_seq_name(::std::string* seq_na clear_has_seq_name(); seq_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqNodeStatusParameter.seq_name) } // required string seq_desc = 2; @@ -2599,7 +2599,7 @@ inline void SeqNodeStatusParameter::clear_seq_desc() { clear_has_seq_desc(); } inline const ::std::string& SeqNodeStatusParameter::seq_desc() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_desc) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqNodeStatusParameter.seq_desc) return *seq_desc_; } inline void SeqNodeStatusParameter::set_seq_desc(const ::std::string& value) { @@ -2608,7 +2608,7 @@ inline void SeqNodeStatusParameter::set_seq_desc(const ::std::string& value) { seq_desc_ = new ::std::string; } seq_desc_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_desc) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqNodeStatusParameter.seq_desc) } inline void SeqNodeStatusParameter::set_seq_desc(const char* value) { set_has_seq_desc(); @@ -2616,7 +2616,7 @@ inline void SeqNodeStatusParameter::set_seq_desc(const char* value) { seq_desc_ = new ::std::string; } seq_desc_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_desc) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.SeqNodeStatusParameter.seq_desc) } inline void SeqNodeStatusParameter::set_seq_desc(const char* value, size_t size) { set_has_seq_desc(); @@ -2624,14 +2624,14 @@ inline void SeqNodeStatusParameter::set_seq_desc(const char* value, size_t size) seq_desc_ = new ::std::string; } seq_desc_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_desc) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.SeqNodeStatusParameter.seq_desc) } inline ::std::string* SeqNodeStatusParameter::mutable_seq_desc() { set_has_seq_desc(); if (seq_desc_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { seq_desc_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_desc) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqNodeStatusParameter.seq_desc) return seq_desc_; } inline ::std::string* SeqNodeStatusParameter::release_seq_desc() { @@ -2655,10 +2655,10 @@ inline void SeqNodeStatusParameter::set_allocated_seq_desc(::std::string* seq_de clear_has_seq_desc(); seq_desc_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqNodeStatusParameter.seq_desc) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqNodeStatusParameter.seq_desc) } -// required .kbd_idlfile.sequence.ENSeqNodeCheckStatus check_state = 3; +// required .iot_idl.sequence.ENSeqNodeCheckStatus check_state = 3; inline bool SeqNodeStatusParameter::has_check_state() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -2672,15 +2672,15 @@ inline void SeqNodeStatusParameter::clear_check_state() { check_state_ = 0; clear_has_check_state(); } -inline ::kbd_idlfile::sequence::ENSeqNodeCheckStatus SeqNodeStatusParameter::check_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqNodeStatusParameter.check_state) - return static_cast< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus >(check_state_); +inline ::iot_idl::sequence::ENSeqNodeCheckStatus SeqNodeStatusParameter::check_state() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqNodeStatusParameter.check_state) + return static_cast< ::iot_idl::sequence::ENSeqNodeCheckStatus >(check_state_); } -inline void SeqNodeStatusParameter::set_check_state(::kbd_idlfile::sequence::ENSeqNodeCheckStatus value) { - assert(::kbd_idlfile::sequence::ENSeqNodeCheckStatus_IsValid(value)); +inline void SeqNodeStatusParameter::set_check_state(::iot_idl::sequence::ENSeqNodeCheckStatus value) { + assert(::iot_idl::sequence::ENSeqNodeCheckStatus_IsValid(value)); set_has_check_state(); check_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqNodeStatusParameter.check_state) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqNodeStatusParameter.check_state) } // required int64 timeflag = 4; @@ -2698,16 +2698,16 @@ inline void SeqNodeStatusParameter::clear_timeflag() { clear_has_timeflag(); } inline ::google::protobuf::int64 SeqNodeStatusParameter::timeflag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqNodeStatusParameter.timeflag) return timeflag_; } inline void SeqNodeStatusParameter::set_timeflag(::google::protobuf::int64 value) { set_has_timeflag(); timeflag_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqNodeStatusParameter.timeflag) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqNodeStatusParameter.timeflag) } -// required .kbd_idlfile.sequence.ENSeqStatus node_state = 5; +// required .iot_idl.sequence.ENSeqStatus node_state = 5; inline bool SeqNodeStatusParameter::has_node_state() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -2721,44 +2721,44 @@ inline void SeqNodeStatusParameter::clear_node_state() { node_state_ = 0; clear_has_node_state(); } -inline ::kbd_idlfile::sequence::ENSeqStatus SeqNodeStatusParameter::node_state() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqNodeStatusParameter.node_state) - return static_cast< ::kbd_idlfile::sequence::ENSeqStatus >(node_state_); +inline ::iot_idl::sequence::ENSeqStatus SeqNodeStatusParameter::node_state() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqNodeStatusParameter.node_state) + return static_cast< ::iot_idl::sequence::ENSeqStatus >(node_state_); } -inline void SeqNodeStatusParameter::set_node_state(::kbd_idlfile::sequence::ENSeqStatus value) { - assert(::kbd_idlfile::sequence::ENSeqStatus_IsValid(value)); +inline void SeqNodeStatusParameter::set_node_state(::iot_idl::sequence::ENSeqStatus value) { + assert(::iot_idl::sequence::ENSeqStatus_IsValid(value)); set_has_node_state(); node_state_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqNodeStatusParameter.node_state) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqNodeStatusParameter.node_state) } -// repeated .kbd_idlfile.sequence.FucNodeStatusParameter nodelist = 6; +// repeated .iot_idl.sequence.FucNodeStatusParameter nodelist = 6; inline int SeqNodeStatusParameter::nodelist_size() const { return nodelist_.size(); } inline void SeqNodeStatusParameter::clear_nodelist() { nodelist_.Clear(); } -inline const ::kbd_idlfile::sequence::FucNodeStatusParameter& SeqNodeStatusParameter::nodelist(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqNodeStatusParameter.nodelist) +inline const ::iot_idl::sequence::FucNodeStatusParameter& SeqNodeStatusParameter::nodelist(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqNodeStatusParameter.nodelist) return nodelist_.Get(index); } -inline ::kbd_idlfile::sequence::FucNodeStatusParameter* SeqNodeStatusParameter::mutable_nodelist(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqNodeStatusParameter.nodelist) +inline ::iot_idl::sequence::FucNodeStatusParameter* SeqNodeStatusParameter::mutable_nodelist(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqNodeStatusParameter.nodelist) return nodelist_.Mutable(index); } -inline ::kbd_idlfile::sequence::FucNodeStatusParameter* SeqNodeStatusParameter::add_nodelist() { - // @@protoc_insertion_point(field_add:kbd_idlfile.sequence.SeqNodeStatusParameter.nodelist) +inline ::iot_idl::sequence::FucNodeStatusParameter* SeqNodeStatusParameter::add_nodelist() { + // @@protoc_insertion_point(field_add:iot_idl.sequence.SeqNodeStatusParameter.nodelist) return nodelist_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::FucNodeStatusParameter >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::FucNodeStatusParameter >& SeqNodeStatusParameter::nodelist() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.sequence.SeqNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_list:iot_idl.sequence.SeqNodeStatusParameter.nodelist) return nodelist_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::FucNodeStatusParameter >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::FucNodeStatusParameter >* SeqNodeStatusParameter::mutable_nodelist() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.sequence.SeqNodeStatusParameter.nodelist) + // @@protoc_insertion_point(field_mutable_list:iot_idl.sequence.SeqNodeStatusParameter.nodelist) return &nodelist_; } @@ -2781,13 +2781,13 @@ inline void ActorParameter::clear_user_id() { clear_has_user_id(); } inline ::google::protobuf::int32 ActorParameter::user_id() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActorParameter.user_id) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActorParameter.user_id) return user_id_; } inline void ActorParameter::set_user_id(::google::protobuf::int32 value) { set_has_user_id(); user_id_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActorParameter.user_id) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActorParameter.user_id) } // required int32 user_groupId = 2; @@ -2805,13 +2805,13 @@ inline void ActorParameter::clear_user_groupid() { clear_has_user_groupid(); } inline ::google::protobuf::int32 ActorParameter::user_groupid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActorParameter.user_groupId) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActorParameter.user_groupId) return user_groupid_; } inline void ActorParameter::set_user_groupid(::google::protobuf::int32 value) { set_has_user_groupid(); user_groupid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActorParameter.user_groupId) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActorParameter.user_groupId) } // required string host_name = 3; @@ -2831,7 +2831,7 @@ inline void ActorParameter::clear_host_name() { clear_has_host_name(); } inline const ::std::string& ActorParameter::host_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActorParameter.host_name) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActorParameter.host_name) return *host_name_; } inline void ActorParameter::set_host_name(const ::std::string& value) { @@ -2840,7 +2840,7 @@ inline void ActorParameter::set_host_name(const ::std::string& value) { host_name_ = new ::std::string; } host_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActorParameter.host_name) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActorParameter.host_name) } inline void ActorParameter::set_host_name(const char* value) { set_has_host_name(); @@ -2848,7 +2848,7 @@ inline void ActorParameter::set_host_name(const char* value) { host_name_ = new ::std::string; } host_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.ActorParameter.host_name) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.ActorParameter.host_name) } inline void ActorParameter::set_host_name(const char* value, size_t size) { set_has_host_name(); @@ -2856,14 +2856,14 @@ inline void ActorParameter::set_host_name(const char* value, size_t size) { host_name_ = new ::std::string; } host_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.ActorParameter.host_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.ActorParameter.host_name) } inline ::std::string* ActorParameter::mutable_host_name() { set_has_host_name(); if (host_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { host_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.ActorParameter.host_name) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.ActorParameter.host_name) return host_name_; } inline ::std::string* ActorParameter::release_host_name() { @@ -2887,7 +2887,7 @@ inline void ActorParameter::set_allocated_host_name(::std::string* host_name) { clear_has_host_name(); host_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.ActorParameter.host_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.ActorParameter.host_name) } // required string user_name = 4; @@ -2907,7 +2907,7 @@ inline void ActorParameter::clear_user_name() { clear_has_user_name(); } inline const ::std::string& ActorParameter::user_name() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.ActorParameter.user_name) + // @@protoc_insertion_point(field_get:iot_idl.sequence.ActorParameter.user_name) return *user_name_; } inline void ActorParameter::set_user_name(const ::std::string& value) { @@ -2916,7 +2916,7 @@ inline void ActorParameter::set_user_name(const ::std::string& value) { user_name_ = new ::std::string; } user_name_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.ActorParameter.user_name) + // @@protoc_insertion_point(field_set:iot_idl.sequence.ActorParameter.user_name) } inline void ActorParameter::set_user_name(const char* value) { set_has_user_name(); @@ -2924,7 +2924,7 @@ inline void ActorParameter::set_user_name(const char* value) { user_name_ = new ::std::string; } user_name_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.sequence.ActorParameter.user_name) + // @@protoc_insertion_point(field_set_char:iot_idl.sequence.ActorParameter.user_name) } inline void ActorParameter::set_user_name(const char* value, size_t size) { set_has_user_name(); @@ -2932,14 +2932,14 @@ inline void ActorParameter::set_user_name(const char* value, size_t size) { user_name_ = new ::std::string; } user_name_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.sequence.ActorParameter.user_name) + // @@protoc_insertion_point(field_set_pointer:iot_idl.sequence.ActorParameter.user_name) } inline ::std::string* ActorParameter::mutable_user_name() { set_has_user_name(); if (user_name_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { user_name_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.ActorParameter.user_name) + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.ActorParameter.user_name) return user_name_; } inline ::std::string* ActorParameter::release_user_name() { @@ -2963,14 +2963,14 @@ inline void ActorParameter::set_allocated_user_name(::std::string* user_name) { clear_has_user_name(); user_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.ActorParameter.user_name) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.ActorParameter.user_name) } // ------------------------------------------------------------------- // StatusChangeMessage -// required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; +// required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool StatusChangeMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2981,26 +2981,26 @@ inline void StatusChangeMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void StatusChangeMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::sequence::SeqPkgHead& StatusChangeMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.StatusChangeMessage.pkg_head) +inline const ::iot_idl::sequence::SeqPkgHead& StatusChangeMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.StatusChangeMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* StatusChangeMessage::mutable_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* StatusChangeMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::sequence::SeqPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.StatusChangeMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::sequence::SeqPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.StatusChangeMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* StatusChangeMessage::release_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* StatusChangeMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::sequence::SeqPkgHead* temp = pkg_head_; + ::iot_idl::sequence::SeqPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void StatusChangeMessage::set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head) { +inline void StatusChangeMessage::set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3008,10 +3008,10 @@ inline void StatusChangeMessage::set_allocated_pkg_head(::kbd_idlfile::sequence: } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.StatusChangeMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.StatusChangeMessage.pkg_head) } -// required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 2; +// required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 2; inline bool StatusChangeMessage::has_nodelist() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3022,26 +3022,26 @@ inline void StatusChangeMessage::clear_has_nodelist() { _has_bits_[0] &= ~0x00000002u; } inline void StatusChangeMessage::clear_nodelist() { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); clear_has_nodelist(); } -inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& StatusChangeMessage::nodelist() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.StatusChangeMessage.nodelist) +inline const ::iot_idl::sequence::SeqNodeStatusParameter& StatusChangeMessage::nodelist() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.StatusChangeMessage.nodelist) return nodelist_ != NULL ? *nodelist_ : *default_instance_->nodelist_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* StatusChangeMessage::mutable_nodelist() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* StatusChangeMessage::mutable_nodelist() { set_has_nodelist(); - if (nodelist_ == NULL) nodelist_ = new ::kbd_idlfile::sequence::SeqNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.StatusChangeMessage.nodelist) + if (nodelist_ == NULL) nodelist_ = new ::iot_idl::sequence::SeqNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.StatusChangeMessage.nodelist) return nodelist_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* StatusChangeMessage::release_nodelist() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* StatusChangeMessage::release_nodelist() { clear_has_nodelist(); - ::kbd_idlfile::sequence::SeqNodeStatusParameter* temp = nodelist_; + ::iot_idl::sequence::SeqNodeStatusParameter* temp = nodelist_; nodelist_ = NULL; return temp; } -inline void StatusChangeMessage::set_allocated_nodelist(::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist) { +inline void StatusChangeMessage::set_allocated_nodelist(::iot_idl::sequence::SeqNodeStatusParameter* nodelist) { delete nodelist_; nodelist_ = nodelist; if (nodelist) { @@ -3049,36 +3049,36 @@ inline void StatusChangeMessage::set_allocated_nodelist(::kbd_idlfile::sequence: } else { clear_has_nodelist(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.StatusChangeMessage.nodelist) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.StatusChangeMessage.nodelist) } -// repeated .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 3; +// repeated .iot_idl.sequence.ExecuteStatusParameter execute_status = 3; inline int StatusChangeMessage::execute_status_size() const { return execute_status_.size(); } inline void StatusChangeMessage::clear_execute_status() { execute_status_.Clear(); } -inline const ::kbd_idlfile::sequence::ExecuteStatusParameter& StatusChangeMessage::execute_status(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.StatusChangeMessage.execute_status) +inline const ::iot_idl::sequence::ExecuteStatusParameter& StatusChangeMessage::execute_status(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.StatusChangeMessage.execute_status) return execute_status_.Get(index); } -inline ::kbd_idlfile::sequence::ExecuteStatusParameter* StatusChangeMessage::mutable_execute_status(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.StatusChangeMessage.execute_status) +inline ::iot_idl::sequence::ExecuteStatusParameter* StatusChangeMessage::mutable_execute_status(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.StatusChangeMessage.execute_status) return execute_status_.Mutable(index); } -inline ::kbd_idlfile::sequence::ExecuteStatusParameter* StatusChangeMessage::add_execute_status() { - // @@protoc_insertion_point(field_add:kbd_idlfile.sequence.StatusChangeMessage.execute_status) +inline ::iot_idl::sequence::ExecuteStatusParameter* StatusChangeMessage::add_execute_status() { + // @@protoc_insertion_point(field_add:iot_idl.sequence.StatusChangeMessage.execute_status) return execute_status_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ExecuteStatusParameter >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ExecuteStatusParameter >& StatusChangeMessage::execute_status() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.sequence.StatusChangeMessage.execute_status) + // @@protoc_insertion_point(field_list:iot_idl.sequence.StatusChangeMessage.execute_status) return execute_status_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::sequence::ExecuteStatusParameter >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::sequence::ExecuteStatusParameter >* StatusChangeMessage::mutable_execute_status() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.sequence.StatusChangeMessage.execute_status) + // @@protoc_insertion_point(field_mutable_list:iot_idl.sequence.StatusChangeMessage.execute_status) return &execute_status_; } @@ -3086,7 +3086,7 @@ StatusChangeMessage::mutable_execute_status() { // UiRequestMessage -// required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; +// required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool UiRequestMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3097,26 +3097,26 @@ inline void UiRequestMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void UiRequestMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::sequence::SeqPkgHead& UiRequestMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessage.pkg_head) +inline const ::iot_idl::sequence::SeqPkgHead& UiRequestMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* UiRequestMessage::mutable_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* UiRequestMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::sequence::SeqPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.UiRequestMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::sequence::SeqPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.UiRequestMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* UiRequestMessage::release_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* UiRequestMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::sequence::SeqPkgHead* temp = pkg_head_; + ::iot_idl::sequence::SeqPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head) { +inline void UiRequestMessage::set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3124,10 +3124,10 @@ inline void UiRequestMessage::set_allocated_pkg_head(::kbd_idlfile::sequence::Se } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.UiRequestMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.UiRequestMessage.pkg_head) } -// required .kbd_idlfile.sequence.ActorParameter actor = 2; +// required .iot_idl.sequence.ActorParameter actor = 2; inline bool UiRequestMessage::has_actor() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3138,26 +3138,26 @@ inline void UiRequestMessage::clear_has_actor() { _has_bits_[0] &= ~0x00000002u; } inline void UiRequestMessage::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::sequence::ActorParameter& UiRequestMessage::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessage.actor) +inline const ::iot_idl::sequence::ActorParameter& UiRequestMessage::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessage.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* UiRequestMessage::mutable_actor() { +inline ::iot_idl::sequence::ActorParameter* UiRequestMessage::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::sequence::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.UiRequestMessage.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::sequence::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.UiRequestMessage.actor) return actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* UiRequestMessage::release_actor() { +inline ::iot_idl::sequence::ActorParameter* UiRequestMessage::release_actor() { clear_has_actor(); - ::kbd_idlfile::sequence::ActorParameter* temp = actor_; + ::iot_idl::sequence::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor) { +inline void UiRequestMessage::set_allocated_actor(::iot_idl::sequence::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -3165,10 +3165,10 @@ inline void UiRequestMessage::set_allocated_actor(::kbd_idlfile::sequence::Actor } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.UiRequestMessage.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.UiRequestMessage.actor) } -// required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; +// required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; inline bool UiRequestMessage::has_nodelist() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3179,26 +3179,26 @@ inline void UiRequestMessage::clear_has_nodelist() { _has_bits_[0] &= ~0x00000004u; } inline void UiRequestMessage::clear_nodelist() { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); clear_has_nodelist(); } -inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& UiRequestMessage::nodelist() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessage.nodelist) +inline const ::iot_idl::sequence::SeqNodeStatusParameter& UiRequestMessage::nodelist() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessage.nodelist) return nodelist_ != NULL ? *nodelist_ : *default_instance_->nodelist_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* UiRequestMessage::mutable_nodelist() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* UiRequestMessage::mutable_nodelist() { set_has_nodelist(); - if (nodelist_ == NULL) nodelist_ = new ::kbd_idlfile::sequence::SeqNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.UiRequestMessage.nodelist) + if (nodelist_ == NULL) nodelist_ = new ::iot_idl::sequence::SeqNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.UiRequestMessage.nodelist) return nodelist_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* UiRequestMessage::release_nodelist() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* UiRequestMessage::release_nodelist() { clear_has_nodelist(); - ::kbd_idlfile::sequence::SeqNodeStatusParameter* temp = nodelist_; + ::iot_idl::sequence::SeqNodeStatusParameter* temp = nodelist_; nodelist_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_nodelist(::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist) { +inline void UiRequestMessage::set_allocated_nodelist(::iot_idl::sequence::SeqNodeStatusParameter* nodelist) { delete nodelist_; nodelist_ = nodelist; if (nodelist) { @@ -3206,10 +3206,10 @@ inline void UiRequestMessage::set_allocated_nodelist(::kbd_idlfile::sequence::Se } else { clear_has_nodelist(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.UiRequestMessage.nodelist) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.UiRequestMessage.nodelist) } -// required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 4; +// required .iot_idl.sequence.ExecuteStatusParameter execute_status = 4; inline bool UiRequestMessage::has_execute_status() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -3220,26 +3220,26 @@ inline void UiRequestMessage::clear_has_execute_status() { _has_bits_[0] &= ~0x00000008u; } inline void UiRequestMessage::clear_execute_status() { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::sequence::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::sequence::ExecuteStatusParameter::Clear(); clear_has_execute_status(); } -inline const ::kbd_idlfile::sequence::ExecuteStatusParameter& UiRequestMessage::execute_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessage.execute_status) +inline const ::iot_idl::sequence::ExecuteStatusParameter& UiRequestMessage::execute_status() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessage.execute_status) return execute_status_ != NULL ? *execute_status_ : *default_instance_->execute_status_; } -inline ::kbd_idlfile::sequence::ExecuteStatusParameter* UiRequestMessage::mutable_execute_status() { +inline ::iot_idl::sequence::ExecuteStatusParameter* UiRequestMessage::mutable_execute_status() { set_has_execute_status(); - if (execute_status_ == NULL) execute_status_ = new ::kbd_idlfile::sequence::ExecuteStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.UiRequestMessage.execute_status) + if (execute_status_ == NULL) execute_status_ = new ::iot_idl::sequence::ExecuteStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.UiRequestMessage.execute_status) return execute_status_; } -inline ::kbd_idlfile::sequence::ExecuteStatusParameter* UiRequestMessage::release_execute_status() { +inline ::iot_idl::sequence::ExecuteStatusParameter* UiRequestMessage::release_execute_status() { clear_has_execute_status(); - ::kbd_idlfile::sequence::ExecuteStatusParameter* temp = execute_status_; + ::iot_idl::sequence::ExecuteStatusParameter* temp = execute_status_; execute_status_ = NULL; return temp; } -inline void UiRequestMessage::set_allocated_execute_status(::kbd_idlfile::sequence::ExecuteStatusParameter* execute_status) { +inline void UiRequestMessage::set_allocated_execute_status(::iot_idl::sequence::ExecuteStatusParameter* execute_status) { delete execute_status_; execute_status_ = execute_status; if (execute_status) { @@ -3247,14 +3247,14 @@ inline void UiRequestMessage::set_allocated_execute_status(::kbd_idlfile::sequen } else { clear_has_execute_status(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.UiRequestMessage.execute_status) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.UiRequestMessage.execute_status) } // ------------------------------------------------------------------- // UiRequestMessageAck -// required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; +// required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool UiRequestMessageAck::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3265,26 +3265,26 @@ inline void UiRequestMessageAck::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void UiRequestMessageAck::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::sequence::SeqPkgHead& UiRequestMessageAck::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessageAck.pkg_head) +inline const ::iot_idl::sequence::SeqPkgHead& UiRequestMessageAck::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessageAck.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* UiRequestMessageAck::mutable_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* UiRequestMessageAck::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::sequence::SeqPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.UiRequestMessageAck.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::sequence::SeqPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.UiRequestMessageAck.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* UiRequestMessageAck::release_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* UiRequestMessageAck::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::sequence::SeqPkgHead* temp = pkg_head_; + ::iot_idl::sequence::SeqPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void UiRequestMessageAck::set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head) { +inline void UiRequestMessageAck::set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3292,10 +3292,10 @@ inline void UiRequestMessageAck::set_allocated_pkg_head(::kbd_idlfile::sequence: } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.UiRequestMessageAck.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.UiRequestMessageAck.pkg_head) } -// required .kbd_idlfile.sequence.ActorParameter actor = 2; +// required .iot_idl.sequence.ActorParameter actor = 2; inline bool UiRequestMessageAck::has_actor() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3306,26 +3306,26 @@ inline void UiRequestMessageAck::clear_has_actor() { _has_bits_[0] &= ~0x00000002u; } inline void UiRequestMessageAck::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::sequence::ActorParameter& UiRequestMessageAck::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessageAck.actor) +inline const ::iot_idl::sequence::ActorParameter& UiRequestMessageAck::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessageAck.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* UiRequestMessageAck::mutable_actor() { +inline ::iot_idl::sequence::ActorParameter* UiRequestMessageAck::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::sequence::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.UiRequestMessageAck.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::sequence::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.UiRequestMessageAck.actor) return actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* UiRequestMessageAck::release_actor() { +inline ::iot_idl::sequence::ActorParameter* UiRequestMessageAck::release_actor() { clear_has_actor(); - ::kbd_idlfile::sequence::ActorParameter* temp = actor_; + ::iot_idl::sequence::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void UiRequestMessageAck::set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor) { +inline void UiRequestMessageAck::set_allocated_actor(::iot_idl::sequence::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -3333,10 +3333,10 @@ inline void UiRequestMessageAck::set_allocated_actor(::kbd_idlfile::sequence::Ac } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.UiRequestMessageAck.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.UiRequestMessageAck.actor) } -// required .kbd_idlfile.sequence.SeqNodeStatusParameter nodelist = 3; +// required .iot_idl.sequence.SeqNodeStatusParameter nodelist = 3; inline bool UiRequestMessageAck::has_nodelist() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3347,26 +3347,26 @@ inline void UiRequestMessageAck::clear_has_nodelist() { _has_bits_[0] &= ~0x00000004u; } inline void UiRequestMessageAck::clear_nodelist() { - if (nodelist_ != NULL) nodelist_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (nodelist_ != NULL) nodelist_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); clear_has_nodelist(); } -inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& UiRequestMessageAck::nodelist() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessageAck.nodelist) +inline const ::iot_idl::sequence::SeqNodeStatusParameter& UiRequestMessageAck::nodelist() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessageAck.nodelist) return nodelist_ != NULL ? *nodelist_ : *default_instance_->nodelist_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* UiRequestMessageAck::mutable_nodelist() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* UiRequestMessageAck::mutable_nodelist() { set_has_nodelist(); - if (nodelist_ == NULL) nodelist_ = new ::kbd_idlfile::sequence::SeqNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.UiRequestMessageAck.nodelist) + if (nodelist_ == NULL) nodelist_ = new ::iot_idl::sequence::SeqNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.UiRequestMessageAck.nodelist) return nodelist_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* UiRequestMessageAck::release_nodelist() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* UiRequestMessageAck::release_nodelist() { clear_has_nodelist(); - ::kbd_idlfile::sequence::SeqNodeStatusParameter* temp = nodelist_; + ::iot_idl::sequence::SeqNodeStatusParameter* temp = nodelist_; nodelist_ = NULL; return temp; } -inline void UiRequestMessageAck::set_allocated_nodelist(::kbd_idlfile::sequence::SeqNodeStatusParameter* nodelist) { +inline void UiRequestMessageAck::set_allocated_nodelist(::iot_idl::sequence::SeqNodeStatusParameter* nodelist) { delete nodelist_; nodelist_ = nodelist; if (nodelist) { @@ -3374,10 +3374,10 @@ inline void UiRequestMessageAck::set_allocated_nodelist(::kbd_idlfile::sequence: } else { clear_has_nodelist(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.UiRequestMessageAck.nodelist) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.UiRequestMessageAck.nodelist) } -// required .kbd_idlfile.sequence.ENUiOperateType optype = 4; +// required .iot_idl.sequence.ENUiOperateType optype = 4; inline bool UiRequestMessageAck::has_optype() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -3391,22 +3391,22 @@ inline void UiRequestMessageAck::clear_optype() { optype_ = 1; clear_has_optype(); } -inline ::kbd_idlfile::sequence::ENUiOperateType UiRequestMessageAck::optype() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.UiRequestMessageAck.optype) - return static_cast< ::kbd_idlfile::sequence::ENUiOperateType >(optype_); +inline ::iot_idl::sequence::ENUiOperateType UiRequestMessageAck::optype() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.UiRequestMessageAck.optype) + return static_cast< ::iot_idl::sequence::ENUiOperateType >(optype_); } -inline void UiRequestMessageAck::set_optype(::kbd_idlfile::sequence::ENUiOperateType value) { - assert(::kbd_idlfile::sequence::ENUiOperateType_IsValid(value)); +inline void UiRequestMessageAck::set_optype(::iot_idl::sequence::ENUiOperateType value) { + assert(::iot_idl::sequence::ENUiOperateType_IsValid(value)); set_has_optype(); optype_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.UiRequestMessageAck.optype) + // @@protoc_insertion_point(field_set:iot_idl.sequence.UiRequestMessageAck.optype) } // ------------------------------------------------------------------- // SeqOperateMessage -// required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; +// required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool SeqOperateMessage::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3417,26 +3417,26 @@ inline void SeqOperateMessage::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void SeqOperateMessage::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::sequence::SeqPkgHead& SeqOperateMessage::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessage.pkg_head) +inline const ::iot_idl::sequence::SeqPkgHead& SeqOperateMessage::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessage.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* SeqOperateMessage::mutable_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* SeqOperateMessage::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::sequence::SeqPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqOperateMessage.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::sequence::SeqPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqOperateMessage.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* SeqOperateMessage::release_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* SeqOperateMessage::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::sequence::SeqPkgHead* temp = pkg_head_; + ::iot_idl::sequence::SeqPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void SeqOperateMessage::set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head) { +inline void SeqOperateMessage::set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3444,10 +3444,10 @@ inline void SeqOperateMessage::set_allocated_pkg_head(::kbd_idlfile::sequence::S } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqOperateMessage.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqOperateMessage.pkg_head) } -// required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; +// required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; inline bool SeqOperateMessage::has_seq_node() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3458,26 +3458,26 @@ inline void SeqOperateMessage::clear_has_seq_node() { _has_bits_[0] &= ~0x00000002u; } inline void SeqOperateMessage::clear_seq_node() { - if (seq_node_ != NULL) seq_node_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (seq_node_ != NULL) seq_node_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); clear_has_seq_node(); } -inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& SeqOperateMessage::seq_node() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessage.seq_node) +inline const ::iot_idl::sequence::SeqNodeStatusParameter& SeqOperateMessage::seq_node() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessage.seq_node) return seq_node_ != NULL ? *seq_node_ : *default_instance_->seq_node_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* SeqOperateMessage::mutable_seq_node() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* SeqOperateMessage::mutable_seq_node() { set_has_seq_node(); - if (seq_node_ == NULL) seq_node_ = new ::kbd_idlfile::sequence::SeqNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqOperateMessage.seq_node) + if (seq_node_ == NULL) seq_node_ = new ::iot_idl::sequence::SeqNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqOperateMessage.seq_node) return seq_node_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* SeqOperateMessage::release_seq_node() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* SeqOperateMessage::release_seq_node() { clear_has_seq_node(); - ::kbd_idlfile::sequence::SeqNodeStatusParameter* temp = seq_node_; + ::iot_idl::sequence::SeqNodeStatusParameter* temp = seq_node_; seq_node_ = NULL; return temp; } -inline void SeqOperateMessage::set_allocated_seq_node(::kbd_idlfile::sequence::SeqNodeStatusParameter* seq_node) { +inline void SeqOperateMessage::set_allocated_seq_node(::iot_idl::sequence::SeqNodeStatusParameter* seq_node) { delete seq_node_; seq_node_ = seq_node; if (seq_node) { @@ -3485,10 +3485,10 @@ inline void SeqOperateMessage::set_allocated_seq_node(::kbd_idlfile::sequence::S } else { clear_has_seq_node(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqOperateMessage.seq_node) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqOperateMessage.seq_node) } -// required .kbd_idlfile.sequence.ActorParameter actor = 3; +// required .iot_idl.sequence.ActorParameter actor = 3; inline bool SeqOperateMessage::has_actor() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3499,26 +3499,26 @@ inline void SeqOperateMessage::clear_has_actor() { _has_bits_[0] &= ~0x00000004u; } inline void SeqOperateMessage::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::sequence::ActorParameter& SeqOperateMessage::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessage.actor) +inline const ::iot_idl::sequence::ActorParameter& SeqOperateMessage::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessage.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* SeqOperateMessage::mutable_actor() { +inline ::iot_idl::sequence::ActorParameter* SeqOperateMessage::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::sequence::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqOperateMessage.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::sequence::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqOperateMessage.actor) return actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* SeqOperateMessage::release_actor() { +inline ::iot_idl::sequence::ActorParameter* SeqOperateMessage::release_actor() { clear_has_actor(); - ::kbd_idlfile::sequence::ActorParameter* temp = actor_; + ::iot_idl::sequence::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void SeqOperateMessage::set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor) { +inline void SeqOperateMessage::set_allocated_actor(::iot_idl::sequence::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -3526,10 +3526,10 @@ inline void SeqOperateMessage::set_allocated_actor(::kbd_idlfile::sequence::Acto } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqOperateMessage.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqOperateMessage.actor) } -// required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 4; +// required .iot_idl.sequence.ENSeqOperateType opreate_type = 4; inline bool SeqOperateMessage::has_opreate_type() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -3543,22 +3543,22 @@ inline void SeqOperateMessage::clear_opreate_type() { opreate_type_ = 0; clear_has_opreate_type(); } -inline ::kbd_idlfile::sequence::ENSeqOperateType SeqOperateMessage::opreate_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessage.opreate_type) - return static_cast< ::kbd_idlfile::sequence::ENSeqOperateType >(opreate_type_); +inline ::iot_idl::sequence::ENSeqOperateType SeqOperateMessage::opreate_type() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessage.opreate_type) + return static_cast< ::iot_idl::sequence::ENSeqOperateType >(opreate_type_); } -inline void SeqOperateMessage::set_opreate_type(::kbd_idlfile::sequence::ENSeqOperateType value) { - assert(::kbd_idlfile::sequence::ENSeqOperateType_IsValid(value)); +inline void SeqOperateMessage::set_opreate_type(::iot_idl::sequence::ENSeqOperateType value) { + assert(::iot_idl::sequence::ENSeqOperateType_IsValid(value)); set_has_opreate_type(); opreate_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqOperateMessage.opreate_type) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqOperateMessage.opreate_type) } // ------------------------------------------------------------------- // SeqOperateMessageAck -// required .kbd_idlfile.sequence.SeqPkgHead pkg_head = 1; +// required .iot_idl.sequence.SeqPkgHead pkg_head = 1; inline bool SeqOperateMessageAck::has_pkg_head() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -3569,26 +3569,26 @@ inline void SeqOperateMessageAck::clear_has_pkg_head() { _has_bits_[0] &= ~0x00000001u; } inline void SeqOperateMessageAck::clear_pkg_head() { - if (pkg_head_ != NULL) pkg_head_->::kbd_idlfile::sequence::SeqPkgHead::Clear(); + if (pkg_head_ != NULL) pkg_head_->::iot_idl::sequence::SeqPkgHead::Clear(); clear_has_pkg_head(); } -inline const ::kbd_idlfile::sequence::SeqPkgHead& SeqOperateMessageAck::pkg_head() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessageAck.pkg_head) +inline const ::iot_idl::sequence::SeqPkgHead& SeqOperateMessageAck::pkg_head() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessageAck.pkg_head) return pkg_head_ != NULL ? *pkg_head_ : *default_instance_->pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* SeqOperateMessageAck::mutable_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* SeqOperateMessageAck::mutable_pkg_head() { set_has_pkg_head(); - if (pkg_head_ == NULL) pkg_head_ = new ::kbd_idlfile::sequence::SeqPkgHead; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqOperateMessageAck.pkg_head) + if (pkg_head_ == NULL) pkg_head_ = new ::iot_idl::sequence::SeqPkgHead; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqOperateMessageAck.pkg_head) return pkg_head_; } -inline ::kbd_idlfile::sequence::SeqPkgHead* SeqOperateMessageAck::release_pkg_head() { +inline ::iot_idl::sequence::SeqPkgHead* SeqOperateMessageAck::release_pkg_head() { clear_has_pkg_head(); - ::kbd_idlfile::sequence::SeqPkgHead* temp = pkg_head_; + ::iot_idl::sequence::SeqPkgHead* temp = pkg_head_; pkg_head_ = NULL; return temp; } -inline void SeqOperateMessageAck::set_allocated_pkg_head(::kbd_idlfile::sequence::SeqPkgHead* pkg_head) { +inline void SeqOperateMessageAck::set_allocated_pkg_head(::iot_idl::sequence::SeqPkgHead* pkg_head) { delete pkg_head_; pkg_head_ = pkg_head; if (pkg_head) { @@ -3596,10 +3596,10 @@ inline void SeqOperateMessageAck::set_allocated_pkg_head(::kbd_idlfile::sequence } else { clear_has_pkg_head(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqOperateMessageAck.pkg_head) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqOperateMessageAck.pkg_head) } -// required .kbd_idlfile.sequence.SeqNodeStatusParameter seq_node = 2; +// required .iot_idl.sequence.SeqNodeStatusParameter seq_node = 2; inline bool SeqOperateMessageAck::has_seq_node() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -3610,26 +3610,26 @@ inline void SeqOperateMessageAck::clear_has_seq_node() { _has_bits_[0] &= ~0x00000002u; } inline void SeqOperateMessageAck::clear_seq_node() { - if (seq_node_ != NULL) seq_node_->::kbd_idlfile::sequence::SeqNodeStatusParameter::Clear(); + if (seq_node_ != NULL) seq_node_->::iot_idl::sequence::SeqNodeStatusParameter::Clear(); clear_has_seq_node(); } -inline const ::kbd_idlfile::sequence::SeqNodeStatusParameter& SeqOperateMessageAck::seq_node() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessageAck.seq_node) +inline const ::iot_idl::sequence::SeqNodeStatusParameter& SeqOperateMessageAck::seq_node() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessageAck.seq_node) return seq_node_ != NULL ? *seq_node_ : *default_instance_->seq_node_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* SeqOperateMessageAck::mutable_seq_node() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* SeqOperateMessageAck::mutable_seq_node() { set_has_seq_node(); - if (seq_node_ == NULL) seq_node_ = new ::kbd_idlfile::sequence::SeqNodeStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqOperateMessageAck.seq_node) + if (seq_node_ == NULL) seq_node_ = new ::iot_idl::sequence::SeqNodeStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqOperateMessageAck.seq_node) return seq_node_; } -inline ::kbd_idlfile::sequence::SeqNodeStatusParameter* SeqOperateMessageAck::release_seq_node() { +inline ::iot_idl::sequence::SeqNodeStatusParameter* SeqOperateMessageAck::release_seq_node() { clear_has_seq_node(); - ::kbd_idlfile::sequence::SeqNodeStatusParameter* temp = seq_node_; + ::iot_idl::sequence::SeqNodeStatusParameter* temp = seq_node_; seq_node_ = NULL; return temp; } -inline void SeqOperateMessageAck::set_allocated_seq_node(::kbd_idlfile::sequence::SeqNodeStatusParameter* seq_node) { +inline void SeqOperateMessageAck::set_allocated_seq_node(::iot_idl::sequence::SeqNodeStatusParameter* seq_node) { delete seq_node_; seq_node_ = seq_node; if (seq_node) { @@ -3637,10 +3637,10 @@ inline void SeqOperateMessageAck::set_allocated_seq_node(::kbd_idlfile::sequence } else { clear_has_seq_node(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqOperateMessageAck.seq_node) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqOperateMessageAck.seq_node) } -// required .kbd_idlfile.sequence.ENSeqOperateType opreate_type = 3; +// required .iot_idl.sequence.ENSeqOperateType opreate_type = 3; inline bool SeqOperateMessageAck::has_opreate_type() const { return (_has_bits_[0] & 0x00000004u) != 0; } @@ -3654,18 +3654,18 @@ inline void SeqOperateMessageAck::clear_opreate_type() { opreate_type_ = 0; clear_has_opreate_type(); } -inline ::kbd_idlfile::sequence::ENSeqOperateType SeqOperateMessageAck::opreate_type() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessageAck.opreate_type) - return static_cast< ::kbd_idlfile::sequence::ENSeqOperateType >(opreate_type_); +inline ::iot_idl::sequence::ENSeqOperateType SeqOperateMessageAck::opreate_type() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessageAck.opreate_type) + return static_cast< ::iot_idl::sequence::ENSeqOperateType >(opreate_type_); } -inline void SeqOperateMessageAck::set_opreate_type(::kbd_idlfile::sequence::ENSeqOperateType value) { - assert(::kbd_idlfile::sequence::ENSeqOperateType_IsValid(value)); +inline void SeqOperateMessageAck::set_opreate_type(::iot_idl::sequence::ENSeqOperateType value) { + assert(::iot_idl::sequence::ENSeqOperateType_IsValid(value)); set_has_opreate_type(); opreate_type_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.sequence.SeqOperateMessageAck.opreate_type) + // @@protoc_insertion_point(field_set:iot_idl.sequence.SeqOperateMessageAck.opreate_type) } -// required .kbd_idlfile.sequence.ActorParameter actor = 4; +// required .iot_idl.sequence.ActorParameter actor = 4; inline bool SeqOperateMessageAck::has_actor() const { return (_has_bits_[0] & 0x00000008u) != 0; } @@ -3676,26 +3676,26 @@ inline void SeqOperateMessageAck::clear_has_actor() { _has_bits_[0] &= ~0x00000008u; } inline void SeqOperateMessageAck::clear_actor() { - if (actor_ != NULL) actor_->::kbd_idlfile::sequence::ActorParameter::Clear(); + if (actor_ != NULL) actor_->::iot_idl::sequence::ActorParameter::Clear(); clear_has_actor(); } -inline const ::kbd_idlfile::sequence::ActorParameter& SeqOperateMessageAck::actor() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessageAck.actor) +inline const ::iot_idl::sequence::ActorParameter& SeqOperateMessageAck::actor() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessageAck.actor) return actor_ != NULL ? *actor_ : *default_instance_->actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* SeqOperateMessageAck::mutable_actor() { +inline ::iot_idl::sequence::ActorParameter* SeqOperateMessageAck::mutable_actor() { set_has_actor(); - if (actor_ == NULL) actor_ = new ::kbd_idlfile::sequence::ActorParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqOperateMessageAck.actor) + if (actor_ == NULL) actor_ = new ::iot_idl::sequence::ActorParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqOperateMessageAck.actor) return actor_; } -inline ::kbd_idlfile::sequence::ActorParameter* SeqOperateMessageAck::release_actor() { +inline ::iot_idl::sequence::ActorParameter* SeqOperateMessageAck::release_actor() { clear_has_actor(); - ::kbd_idlfile::sequence::ActorParameter* temp = actor_; + ::iot_idl::sequence::ActorParameter* temp = actor_; actor_ = NULL; return temp; } -inline void SeqOperateMessageAck::set_allocated_actor(::kbd_idlfile::sequence::ActorParameter* actor) { +inline void SeqOperateMessageAck::set_allocated_actor(::iot_idl::sequence::ActorParameter* actor) { delete actor_; actor_ = actor; if (actor) { @@ -3703,10 +3703,10 @@ inline void SeqOperateMessageAck::set_allocated_actor(::kbd_idlfile::sequence::A } else { clear_has_actor(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqOperateMessageAck.actor) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqOperateMessageAck.actor) } -// required .kbd_idlfile.sequence.ExecuteStatusParameter execute_status = 5; +// required .iot_idl.sequence.ExecuteStatusParameter execute_status = 5; inline bool SeqOperateMessageAck::has_execute_status() const { return (_has_bits_[0] & 0x00000010u) != 0; } @@ -3717,26 +3717,26 @@ inline void SeqOperateMessageAck::clear_has_execute_status() { _has_bits_[0] &= ~0x00000010u; } inline void SeqOperateMessageAck::clear_execute_status() { - if (execute_status_ != NULL) execute_status_->::kbd_idlfile::sequence::ExecuteStatusParameter::Clear(); + if (execute_status_ != NULL) execute_status_->::iot_idl::sequence::ExecuteStatusParameter::Clear(); clear_has_execute_status(); } -inline const ::kbd_idlfile::sequence::ExecuteStatusParameter& SeqOperateMessageAck::execute_status() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.sequence.SeqOperateMessageAck.execute_status) +inline const ::iot_idl::sequence::ExecuteStatusParameter& SeqOperateMessageAck::execute_status() const { + // @@protoc_insertion_point(field_get:iot_idl.sequence.SeqOperateMessageAck.execute_status) return execute_status_ != NULL ? *execute_status_ : *default_instance_->execute_status_; } -inline ::kbd_idlfile::sequence::ExecuteStatusParameter* SeqOperateMessageAck::mutable_execute_status() { +inline ::iot_idl::sequence::ExecuteStatusParameter* SeqOperateMessageAck::mutable_execute_status() { set_has_execute_status(); - if (execute_status_ == NULL) execute_status_ = new ::kbd_idlfile::sequence::ExecuteStatusParameter; - // @@protoc_insertion_point(field_mutable:kbd_idlfile.sequence.SeqOperateMessageAck.execute_status) + if (execute_status_ == NULL) execute_status_ = new ::iot_idl::sequence::ExecuteStatusParameter; + // @@protoc_insertion_point(field_mutable:iot_idl.sequence.SeqOperateMessageAck.execute_status) return execute_status_; } -inline ::kbd_idlfile::sequence::ExecuteStatusParameter* SeqOperateMessageAck::release_execute_status() { +inline ::iot_idl::sequence::ExecuteStatusParameter* SeqOperateMessageAck::release_execute_status() { clear_has_execute_status(); - ::kbd_idlfile::sequence::ExecuteStatusParameter* temp = execute_status_; + ::iot_idl::sequence::ExecuteStatusParameter* temp = execute_status_; execute_status_ = NULL; return temp; } -inline void SeqOperateMessageAck::set_allocated_execute_status(::kbd_idlfile::sequence::ExecuteStatusParameter* execute_status) { +inline void SeqOperateMessageAck::set_allocated_execute_status(::iot_idl::sequence::ExecuteStatusParameter* execute_status) { delete execute_status_; execute_status_ = execute_status; if (execute_status) { @@ -3744,53 +3744,53 @@ inline void SeqOperateMessageAck::set_allocated_execute_status(::kbd_idlfile::se } else { clear_has_execute_status(); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.sequence.SeqOperateMessageAck.execute_status) + // @@protoc_insertion_point(field_set_allocated:iot_idl.sequence.SeqOperateMessageAck.execute_status) } // @@protoc_insertion_point(namespace_scope) } // namespace sequence -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::sequence::enChannelMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::sequence::enChannelMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::sequence::enChannelMsgType>() { - return ::kbd_idlfile::sequence::enChannelMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::sequence::enChannelMsgType>() { + return ::iot_idl::sequence::enChannelMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::sequence::enSeqMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::sequence::enSeqMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::sequence::enSeqMsgType>() { - return ::kbd_idlfile::sequence::enSeqMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::sequence::enSeqMsgType>() { + return ::iot_idl::sequence::enSeqMsgType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::sequence::enErrorCode> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::sequence::enErrorCode> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::sequence::enErrorCode>() { - return ::kbd_idlfile::sequence::enErrorCode_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::sequence::enErrorCode>() { + return ::iot_idl::sequence::enErrorCode_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::sequence::ENSeqStatus> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::sequence::ENSeqStatus> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::sequence::ENSeqStatus>() { - return ::kbd_idlfile::sequence::ENSeqStatus_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::sequence::ENSeqStatus>() { + return ::iot_idl::sequence::ENSeqStatus_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::sequence::ENSeqNodeCheckStatus> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::sequence::ENSeqNodeCheckStatus>() { - return ::kbd_idlfile::sequence::ENSeqNodeCheckStatus_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::sequence::ENSeqNodeCheckStatus>() { + return ::iot_idl::sequence::ENSeqNodeCheckStatus_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::sequence::ENUiOperateType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::sequence::ENUiOperateType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::sequence::ENUiOperateType>() { - return ::kbd_idlfile::sequence::ENUiOperateType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::sequence::ENUiOperateType>() { + return ::iot_idl::sequence::ENUiOperateType_descriptor(); } -template <> struct is_proto_enum< ::kbd_idlfile::sequence::ENSeqOperateType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::sequence::ENSeqOperateType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::sequence::ENSeqOperateType>() { - return ::kbd_idlfile::sequence::ENSeqOperateType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::sequence::ENSeqOperateType>() { + return ::iot_idl::sequence::ENSeqOperateType_descriptor(); } } // namespace google diff --git a/product/src/idl_files/SequenceMessage.proto b/product/src/idl_files/SequenceMessage.proto index a363678b..17cd7abe 100644 --- a/product/src/idl_files/SequenceMessage.proto +++ b/product/src/idl_files/SequenceMessage.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -package kbd_idlfile.sequence; +package iot_idl.sequence; //简写说明 //Opt : 操作控制台 diff --git a/product/src/idl_files/VideoControlMessage.pb.cc b/product/src/idl_files/VideoControlMessage.pb.cc index 8abeb26b..8b066006 100644 --- a/product/src/idl_files/VideoControlMessage.pb.cc +++ b/product/src/idl_files/VideoControlMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -133,12 +133,12 @@ void protobuf_AddDesc_VideoControlMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\031VideoControlMessage.proto\022\013kbd_idlfile" + "\n\031VideoControlMessage.proto\022\013iot_idl" "\"=\n\022SVideoControlQueue\022\022\n\nstrKeyName\030\001 \002" "(\t\022\023\n\013strKeyValue\030\002 \002(\t\"\255\001\n\024SVideoContro" "lRequest\022\024\n\014strSourceTag\030\001 \002(\t\022\016\n\006nAppId" "\030\002 \002(\005\022\023\n\013strHostName\030\003 \001(\t\022\016\n\006ulTime\030\004 " - "\002(\004\0223\n\nseqCmdData\030\005 \003(\0132\037.kbd_idlfile.SV" + "\002(\004\0223\n\nseqCmdData\030\005 \003(\0132\037.iot_idl.SV" "ideoControlQueue\022\025\n\rnIfNeedReturn\030\006 \002(\005\"" "b\n\025SVideoControlResponse\022\024\n\014strSourceTag" "\030\001 \002(\t\022\022\n\nnIsSuccess\030\002 \002(\005\022\017\n\007content\030\003 " @@ -191,7 +191,7 @@ const int SVideoControlQueue::kStrKeyValueFieldNumber; SVideoControlQueue::SVideoControlQueue() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(constructor:iot_idl.SVideoControlQueue) } void SVideoControlQueue::InitAsDefaultInstance() { @@ -201,7 +201,7 @@ SVideoControlQueue::SVideoControlQueue(const SVideoControlQueue& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(copy_constructor:iot_idl.SVideoControlQueue) } void SVideoControlQueue::SharedCtor() { @@ -213,7 +213,7 @@ void SVideoControlQueue::SharedCtor() { } SVideoControlQueue::~SVideoControlQueue() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(destructor:iot_idl.SVideoControlQueue) SharedDtor(); } @@ -270,7 +270,7 @@ bool SVideoControlQueue::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(parse_start:iot_idl.SVideoControlQueue) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -323,17 +323,17 @@ bool SVideoControlQueue::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(parse_success:iot_idl.SVideoControlQueue) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(parse_failure:iot_idl.SVideoControlQueue) return false; #undef DO_ } void SVideoControlQueue::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(serialize_start:iot_idl.SVideoControlQueue) // required string strKeyName = 1; if (has_strkeyname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -358,12 +358,12 @@ void SVideoControlQueue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(serialize_end:iot_idl.SVideoControlQueue) } ::google::protobuf::uint8* SVideoControlQueue::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SVideoControlQueue) // required string strKeyName = 1; if (has_strkeyname()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -390,7 +390,7 @@ void SVideoControlQueue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SVideoControlQueue) return target; } @@ -500,7 +500,7 @@ const int SVideoControlRequest::kNIfNeedReturnFieldNumber; SVideoControlRequest::SVideoControlRequest() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(constructor:iot_idl.SVideoControlRequest) } void SVideoControlRequest::InitAsDefaultInstance() { @@ -510,7 +510,7 @@ SVideoControlRequest::SVideoControlRequest(const SVideoControlRequest& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(copy_constructor:iot_idl.SVideoControlRequest) } void SVideoControlRequest::SharedCtor() { @@ -525,7 +525,7 @@ void SVideoControlRequest::SharedCtor() { } SVideoControlRequest::~SVideoControlRequest() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(destructor:iot_idl.SVideoControlRequest) SharedDtor(); } @@ -598,7 +598,7 @@ bool SVideoControlRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(parse_start:iot_idl.SVideoControlRequest) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -667,7 +667,7 @@ bool SVideoControlRequest::MergePartialFromCodedStream( break; } - // repeated .kbd_idlfile.SVideoControlQueue seqCmdData = 5; + // repeated .iot_idl.SVideoControlQueue seqCmdData = 5; case 5: { if (tag == 42) { parse_seqCmdData: @@ -710,17 +710,17 @@ bool SVideoControlRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(parse_success:iot_idl.SVideoControlRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(parse_failure:iot_idl.SVideoControlRequest) return false; #undef DO_ } void SVideoControlRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(serialize_start:iot_idl.SVideoControlRequest) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -751,7 +751,7 @@ void SVideoControlRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->ultime(), output); } - // repeated .kbd_idlfile.SVideoControlQueue seqCmdData = 5; + // repeated .iot_idl.SVideoControlQueue seqCmdData = 5; for (int i = 0; i < this->seqcmddata_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 5, this->seqcmddata(i), output); @@ -766,12 +766,12 @@ void SVideoControlRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(serialize_end:iot_idl.SVideoControlRequest) } ::google::protobuf::uint8* SVideoControlRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SVideoControlRequest) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -804,7 +804,7 @@ void SVideoControlRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->ultime(), target); } - // repeated .kbd_idlfile.SVideoControlQueue seqCmdData = 5; + // repeated .iot_idl.SVideoControlQueue seqCmdData = 5; for (int i = 0; i < this->seqcmddata_size(); i++) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -820,7 +820,7 @@ void SVideoControlRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SVideoControlRequest) return target; } @@ -864,7 +864,7 @@ int SVideoControlRequest::ByteSize() const { } } - // repeated .kbd_idlfile.SVideoControlQueue seqCmdData = 5; + // repeated .iot_idl.SVideoControlQueue seqCmdData = 5; total_size += 1 * this->seqcmddata_size(); for (int i = 0; i < this->seqcmddata_size(); i++) { total_size += @@ -972,7 +972,7 @@ const int SVideoControlResponse::kUlTimeFieldNumber; SVideoControlResponse::SVideoControlResponse() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(constructor:iot_idl.SVideoControlResponse) } void SVideoControlResponse::InitAsDefaultInstance() { @@ -982,7 +982,7 @@ SVideoControlResponse::SVideoControlResponse(const SVideoControlResponse& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(copy_constructor:iot_idl.SVideoControlResponse) } void SVideoControlResponse::SharedCtor() { @@ -996,7 +996,7 @@ void SVideoControlResponse::SharedCtor() { } SVideoControlResponse::~SVideoControlResponse() { - // @@protoc_insertion_point(destructor:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(destructor:iot_idl.SVideoControlResponse) SharedDtor(); } @@ -1068,7 +1068,7 @@ bool SVideoControlResponse::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(parse_start:iot_idl.SVideoControlResponse) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1151,17 +1151,17 @@ bool SVideoControlResponse::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(parse_success:iot_idl.SVideoControlResponse) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(parse_failure:iot_idl.SVideoControlResponse) return false; #undef DO_ } void SVideoControlResponse::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(serialize_start:iot_idl.SVideoControlResponse) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1196,12 +1196,12 @@ void SVideoControlResponse::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(serialize_end:iot_idl.SVideoControlResponse) } ::google::protobuf::uint8* SVideoControlResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SVideoControlResponse) // required string strSourceTag = 1; if (has_strsourcetag()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1238,7 +1238,7 @@ void SVideoControlResponse::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SVideoControlResponse) return target; } @@ -1358,6 +1358,6 @@ void SVideoControlResponse::Swap(SVideoControlResponse* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/idl_files/VideoControlMessage.pb.h b/product/src/idl_files/VideoControlMessage.pb.h index dd5f2a58..abad5f38 100644 --- a/product/src/idl_files/VideoControlMessage.pb.h +++ b/product/src/idl_files/VideoControlMessage.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_VideoControlMessage_2eproto(); @@ -138,7 +138,7 @@ class IDL_FILES_EXPORT SVideoControlQueue : public ::google::protobuf::Message { inline ::std::string* release_strkeyvalue(); inline void set_allocated_strkeyvalue(::std::string* strkeyvalue); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SVideoControlQueue) + // @@protoc_insertion_point(class_scope:iot_idl.SVideoControlQueue) private: inline void set_has_strkeyname(); inline void clear_has_strkeyname(); @@ -251,16 +251,16 @@ class IDL_FILES_EXPORT SVideoControlRequest : public ::google::protobuf::Message inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // repeated .kbd_idlfile.SVideoControlQueue seqCmdData = 5; + // repeated .iot_idl.SVideoControlQueue seqCmdData = 5; inline int seqcmddata_size() const; inline void clear_seqcmddata(); static const int kSeqCmdDataFieldNumber = 5; - inline const ::kbd_idlfile::SVideoControlQueue& seqcmddata(int index) const; - inline ::kbd_idlfile::SVideoControlQueue* mutable_seqcmddata(int index); - inline ::kbd_idlfile::SVideoControlQueue* add_seqcmddata(); - inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVideoControlQueue >& + inline const ::iot_idl::SVideoControlQueue& seqcmddata(int index) const; + inline ::iot_idl::SVideoControlQueue* mutable_seqcmddata(int index); + inline ::iot_idl::SVideoControlQueue* add_seqcmddata(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVideoControlQueue >& seqcmddata() const; - inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVideoControlQueue >* + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVideoControlQueue >* mutable_seqcmddata(); // required int32 nIfNeedReturn = 6; @@ -270,7 +270,7 @@ class IDL_FILES_EXPORT SVideoControlRequest : public ::google::protobuf::Message inline ::google::protobuf::int32 nifneedreturn() const; inline void set_nifneedreturn(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SVideoControlRequest) + // @@protoc_insertion_point(class_scope:iot_idl.SVideoControlRequest) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -292,7 +292,7 @@ class IDL_FILES_EXPORT SVideoControlRequest : public ::google::protobuf::Message ::google::protobuf::uint64 ultime_; ::google::protobuf::int32 nappid_; ::google::protobuf::int32 nifneedreturn_; - ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVideoControlQueue > seqcmddata_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SVideoControlQueue > seqcmddata_; friend void IDL_FILES_EXPORT protobuf_AddDesc_VideoControlMessage_2eproto(); friend void protobuf_AssignDesc_VideoControlMessage_2eproto(); friend void protobuf_ShutdownFile_VideoControlMessage_2eproto(); @@ -393,7 +393,7 @@ class IDL_FILES_EXPORT SVideoControlResponse : public ::google::protobuf::Messag inline ::google::protobuf::uint64 ultime() const; inline void set_ultime(::google::protobuf::uint64 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.SVideoControlResponse) + // @@protoc_insertion_point(class_scope:iot_idl.SVideoControlResponse) private: inline void set_has_strsourcetag(); inline void clear_has_strsourcetag(); @@ -443,7 +443,7 @@ inline void SVideoControlQueue::clear_strkeyname() { clear_has_strkeyname(); } inline const ::std::string& SVideoControlQueue::strkeyname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlQueue.strKeyName) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlQueue.strKeyName) return *strkeyname_; } inline void SVideoControlQueue::set_strkeyname(const ::std::string& value) { @@ -452,7 +452,7 @@ inline void SVideoControlQueue::set_strkeyname(const ::std::string& value) { strkeyname_ = new ::std::string; } strkeyname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlQueue.strKeyName) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlQueue.strKeyName) } inline void SVideoControlQueue::set_strkeyname(const char* value) { set_has_strkeyname(); @@ -460,7 +460,7 @@ inline void SVideoControlQueue::set_strkeyname(const char* value) { strkeyname_ = new ::std::string; } strkeyname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SVideoControlQueue.strKeyName) + // @@protoc_insertion_point(field_set_char:iot_idl.SVideoControlQueue.strKeyName) } inline void SVideoControlQueue::set_strkeyname(const char* value, size_t size) { set_has_strkeyname(); @@ -468,14 +468,14 @@ inline void SVideoControlQueue::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.SVideoControlQueue.strKeyName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SVideoControlQueue.strKeyName) } inline ::std::string* SVideoControlQueue::mutable_strkeyname() { set_has_strkeyname(); if (strkeyname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strkeyname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVideoControlQueue.strKeyName) + // @@protoc_insertion_point(field_mutable:iot_idl.SVideoControlQueue.strKeyName) return strkeyname_; } inline ::std::string* SVideoControlQueue::release_strkeyname() { @@ -499,7 +499,7 @@ inline void SVideoControlQueue::set_allocated_strkeyname(::std::string* strkeyna clear_has_strkeyname(); strkeyname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SVideoControlQueue.strKeyName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SVideoControlQueue.strKeyName) } // required string strKeyValue = 2; @@ -519,7 +519,7 @@ inline void SVideoControlQueue::clear_strkeyvalue() { clear_has_strkeyvalue(); } inline const ::std::string& SVideoControlQueue::strkeyvalue() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlQueue.strKeyValue) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlQueue.strKeyValue) return *strkeyvalue_; } inline void SVideoControlQueue::set_strkeyvalue(const ::std::string& value) { @@ -528,7 +528,7 @@ inline void SVideoControlQueue::set_strkeyvalue(const ::std::string& value) { strkeyvalue_ = new ::std::string; } strkeyvalue_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlQueue.strKeyValue) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlQueue.strKeyValue) } inline void SVideoControlQueue::set_strkeyvalue(const char* value) { set_has_strkeyvalue(); @@ -536,7 +536,7 @@ inline void SVideoControlQueue::set_strkeyvalue(const char* value) { strkeyvalue_ = new ::std::string; } strkeyvalue_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SVideoControlQueue.strKeyValue) + // @@protoc_insertion_point(field_set_char:iot_idl.SVideoControlQueue.strKeyValue) } inline void SVideoControlQueue::set_strkeyvalue(const char* value, size_t size) { set_has_strkeyvalue(); @@ -544,14 +544,14 @@ inline void SVideoControlQueue::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.SVideoControlQueue.strKeyValue) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SVideoControlQueue.strKeyValue) } inline ::std::string* SVideoControlQueue::mutable_strkeyvalue() { set_has_strkeyvalue(); if (strkeyvalue_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strkeyvalue_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVideoControlQueue.strKeyValue) + // @@protoc_insertion_point(field_mutable:iot_idl.SVideoControlQueue.strKeyValue) return strkeyvalue_; } inline ::std::string* SVideoControlQueue::release_strkeyvalue() { @@ -575,7 +575,7 @@ inline void SVideoControlQueue::set_allocated_strkeyvalue(::std::string* strkeyv clear_has_strkeyvalue(); strkeyvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SVideoControlQueue.strKeyValue) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SVideoControlQueue.strKeyValue) } // ------------------------------------------------------------------- @@ -599,7 +599,7 @@ inline void SVideoControlRequest::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SVideoControlRequest::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlRequest.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlRequest.strSourceTag) return *strsourcetag_; } inline void SVideoControlRequest::set_strsourcetag(const ::std::string& value) { @@ -608,7 +608,7 @@ inline void SVideoControlRequest::set_strsourcetag(const ::std::string& value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlRequest.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlRequest.strSourceTag) } inline void SVideoControlRequest::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -616,7 +616,7 @@ inline void SVideoControlRequest::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SVideoControlRequest.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SVideoControlRequest.strSourceTag) } inline void SVideoControlRequest::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -624,14 +624,14 @@ inline void SVideoControlRequest::set_strsourcetag(const char* value, size_t siz strsourcetag_ = new ::std::string; } strsourcetag_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SVideoControlRequest.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SVideoControlRequest.strSourceTag) } inline ::std::string* SVideoControlRequest::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVideoControlRequest.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SVideoControlRequest.strSourceTag) return strsourcetag_; } inline ::std::string* SVideoControlRequest::release_strsourcetag() { @@ -655,7 +655,7 @@ inline void SVideoControlRequest::set_allocated_strsourcetag(::std::string* strs clear_has_strsourcetag(); strsourcetag_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SVideoControlRequest.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SVideoControlRequest.strSourceTag) } // required int32 nAppId = 2; @@ -673,13 +673,13 @@ inline void SVideoControlRequest::clear_nappid() { clear_has_nappid(); } inline ::google::protobuf::int32 SVideoControlRequest::nappid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlRequest.nAppId) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlRequest.nAppId) return nappid_; } inline void SVideoControlRequest::set_nappid(::google::protobuf::int32 value) { set_has_nappid(); nappid_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlRequest.nAppId) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlRequest.nAppId) } // optional string strHostName = 3; @@ -699,7 +699,7 @@ inline void SVideoControlRequest::clear_strhostname() { clear_has_strhostname(); } inline const ::std::string& SVideoControlRequest::strhostname() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlRequest.strHostName) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlRequest.strHostName) return *strhostname_; } inline void SVideoControlRequest::set_strhostname(const ::std::string& value) { @@ -708,7 +708,7 @@ inline void SVideoControlRequest::set_strhostname(const ::std::string& value) { strhostname_ = new ::std::string; } strhostname_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlRequest.strHostName) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlRequest.strHostName) } inline void SVideoControlRequest::set_strhostname(const char* value) { set_has_strhostname(); @@ -716,7 +716,7 @@ inline void SVideoControlRequest::set_strhostname(const char* value) { strhostname_ = new ::std::string; } strhostname_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SVideoControlRequest.strHostName) + // @@protoc_insertion_point(field_set_char:iot_idl.SVideoControlRequest.strHostName) } inline void SVideoControlRequest::set_strhostname(const char* value, size_t size) { set_has_strhostname(); @@ -724,14 +724,14 @@ inline void SVideoControlRequest::set_strhostname(const char* value, size_t size strhostname_ = new ::std::string; } strhostname_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.SVideoControlRequest.strHostName) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SVideoControlRequest.strHostName) } inline ::std::string* SVideoControlRequest::mutable_strhostname() { set_has_strhostname(); if (strhostname_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strhostname_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVideoControlRequest.strHostName) + // @@protoc_insertion_point(field_mutable:iot_idl.SVideoControlRequest.strHostName) return strhostname_; } inline ::std::string* SVideoControlRequest::release_strhostname() { @@ -755,7 +755,7 @@ inline void SVideoControlRequest::set_allocated_strhostname(::std::string* strho clear_has_strhostname(); strhostname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.SVideoControlRequest.strHostName) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SVideoControlRequest.strHostName) } // required uint64 ulTime = 4; @@ -773,42 +773,42 @@ inline void SVideoControlRequest::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SVideoControlRequest::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlRequest.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlRequest.ulTime) return ultime_; } inline void SVideoControlRequest::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlRequest.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlRequest.ulTime) } -// repeated .kbd_idlfile.SVideoControlQueue seqCmdData = 5; +// repeated .iot_idl.SVideoControlQueue seqCmdData = 5; inline int SVideoControlRequest::seqcmddata_size() const { return seqcmddata_.size(); } inline void SVideoControlRequest::clear_seqcmddata() { seqcmddata_.Clear(); } -inline const ::kbd_idlfile::SVideoControlQueue& SVideoControlRequest::seqcmddata(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlRequest.seqCmdData) +inline const ::iot_idl::SVideoControlQueue& SVideoControlRequest::seqcmddata(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlRequest.seqCmdData) return seqcmddata_.Get(index); } -inline ::kbd_idlfile::SVideoControlQueue* SVideoControlRequest::mutable_seqcmddata(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVideoControlRequest.seqCmdData) +inline ::iot_idl::SVideoControlQueue* SVideoControlRequest::mutable_seqcmddata(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SVideoControlRequest.seqCmdData) return seqcmddata_.Mutable(index); } -inline ::kbd_idlfile::SVideoControlQueue* SVideoControlRequest::add_seqcmddata() { - // @@protoc_insertion_point(field_add:kbd_idlfile.SVideoControlRequest.seqCmdData) +inline ::iot_idl::SVideoControlQueue* SVideoControlRequest::add_seqcmddata() { + // @@protoc_insertion_point(field_add:iot_idl.SVideoControlRequest.seqCmdData) return seqcmddata_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVideoControlQueue >& +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SVideoControlQueue >& SVideoControlRequest::seqcmddata() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.SVideoControlRequest.seqCmdData) + // @@protoc_insertion_point(field_list:iot_idl.SVideoControlRequest.seqCmdData) return seqcmddata_; } -inline ::google::protobuf::RepeatedPtrField< ::kbd_idlfile::SVideoControlQueue >* +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SVideoControlQueue >* SVideoControlRequest::mutable_seqcmddata() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.SVideoControlRequest.seqCmdData) + // @@protoc_insertion_point(field_mutable_list:iot_idl.SVideoControlRequest.seqCmdData) return &seqcmddata_; } @@ -827,13 +827,13 @@ inline void SVideoControlRequest::clear_nifneedreturn() { clear_has_nifneedreturn(); } inline ::google::protobuf::int32 SVideoControlRequest::nifneedreturn() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlRequest.nIfNeedReturn) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlRequest.nIfNeedReturn) return nifneedreturn_; } inline void SVideoControlRequest::set_nifneedreturn(::google::protobuf::int32 value) { set_has_nifneedreturn(); nifneedreturn_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlRequest.nIfNeedReturn) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlRequest.nIfNeedReturn) } // ------------------------------------------------------------------- @@ -857,7 +857,7 @@ inline void SVideoControlResponse::clear_strsourcetag() { clear_has_strsourcetag(); } inline const ::std::string& SVideoControlResponse::strsourcetag() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlResponse.strSourceTag) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlResponse.strSourceTag) return *strsourcetag_; } inline void SVideoControlResponse::set_strsourcetag(const ::std::string& value) { @@ -866,7 +866,7 @@ inline void SVideoControlResponse::set_strsourcetag(const ::std::string& value) strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlResponse.strSourceTag) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlResponse.strSourceTag) } inline void SVideoControlResponse::set_strsourcetag(const char* value) { set_has_strsourcetag(); @@ -874,7 +874,7 @@ inline void SVideoControlResponse::set_strsourcetag(const char* value) { strsourcetag_ = new ::std::string; } strsourcetag_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SVideoControlResponse.strSourceTag) + // @@protoc_insertion_point(field_set_char:iot_idl.SVideoControlResponse.strSourceTag) } inline void SVideoControlResponse::set_strsourcetag(const char* value, size_t size) { set_has_strsourcetag(); @@ -882,14 +882,14 @@ inline void SVideoControlResponse::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.SVideoControlResponse.strSourceTag) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SVideoControlResponse.strSourceTag) } inline ::std::string* SVideoControlResponse::mutable_strsourcetag() { set_has_strsourcetag(); if (strsourcetag_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strsourcetag_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVideoControlResponse.strSourceTag) + // @@protoc_insertion_point(field_mutable:iot_idl.SVideoControlResponse.strSourceTag) return strsourcetag_; } inline ::std::string* SVideoControlResponse::release_strsourcetag() { @@ -913,7 +913,7 @@ inline void SVideoControlResponse::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.SVideoControlResponse.strSourceTag) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SVideoControlResponse.strSourceTag) } // required int32 nIsSuccess = 2; @@ -931,13 +931,13 @@ inline void SVideoControlResponse::clear_nissuccess() { clear_has_nissuccess(); } inline ::google::protobuf::int32 SVideoControlResponse::nissuccess() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlResponse.nIsSuccess) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlResponse.nIsSuccess) return nissuccess_; } inline void SVideoControlResponse::set_nissuccess(::google::protobuf::int32 value) { set_has_nissuccess(); nissuccess_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlResponse.nIsSuccess) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlResponse.nIsSuccess) } // optional string content = 3; @@ -957,7 +957,7 @@ inline void SVideoControlResponse::clear_content() { clear_has_content(); } inline const ::std::string& SVideoControlResponse::content() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlResponse.content) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlResponse.content) return *content_; } inline void SVideoControlResponse::set_content(const ::std::string& value) { @@ -966,7 +966,7 @@ inline void SVideoControlResponse::set_content(const ::std::string& value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlResponse.content) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlResponse.content) } inline void SVideoControlResponse::set_content(const char* value) { set_has_content(); @@ -974,7 +974,7 @@ inline void SVideoControlResponse::set_content(const char* value) { content_ = new ::std::string; } content_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.SVideoControlResponse.content) + // @@protoc_insertion_point(field_set_char:iot_idl.SVideoControlResponse.content) } inline void SVideoControlResponse::set_content(const char* value, size_t size) { set_has_content(); @@ -982,14 +982,14 @@ inline void SVideoControlResponse::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.SVideoControlResponse.content) + // @@protoc_insertion_point(field_set_pointer:iot_idl.SVideoControlResponse.content) } inline ::std::string* SVideoControlResponse::mutable_content() { set_has_content(); if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { content_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.SVideoControlResponse.content) + // @@protoc_insertion_point(field_mutable:iot_idl.SVideoControlResponse.content) return content_; } inline ::std::string* SVideoControlResponse::release_content() { @@ -1013,7 +1013,7 @@ inline void SVideoControlResponse::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.SVideoControlResponse.content) + // @@protoc_insertion_point(field_set_allocated:iot_idl.SVideoControlResponse.content) } // required uint64 ulTime = 4; @@ -1031,28 +1031,28 @@ inline void SVideoControlResponse::clear_ultime() { clear_has_ultime(); } inline ::google::protobuf::uint64 SVideoControlResponse::ultime() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.SVideoControlResponse.ulTime) + // @@protoc_insertion_point(field_get:iot_idl.SVideoControlResponse.ulTime) return ultime_; } inline void SVideoControlResponse::set_ultime(::google::protobuf::uint64 value) { set_has_ultime(); ultime_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.SVideoControlResponse.ulTime) + // @@protoc_insertion_point(field_set:iot_idl.SVideoControlResponse.ulTime) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enVideoMsgType> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enVideoMsgType> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enVideoMsgType>() { - return ::kbd_idlfile::enVideoMsgType_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enVideoMsgType>() { + return ::iot_idl::enVideoMsgType_descriptor(); } } // namespace google diff --git a/product/src/idl_files/VideoControlMessage.proto b/product/src/idl_files/VideoControlMessage.proto index 118a7d5b..d2f75b3d 100644 --- a/product/src/idl_files/VideoControlMessage.proto +++ b/product/src/idl_files/VideoControlMessage.proto @@ -5,7 +5,7 @@ //====================================================================================== syntax="proto2"; -package kbd_idlfile; +package iot_idl; enum enVideoMsgType { diff --git a/product/src/include/application/idong_srv_api/CIDongSrvApi.h b/product/src/include/application/idong_srv_api/CIDongSrvApi.h index 035550f0..e1f811dc 100644 --- a/product/src/include/application/idong_srv_api/CIDongSrvApi.h +++ b/product/src/include/application/idong_srv_api/CIDongSrvApi.h @@ -11,7 +11,7 @@ typedef void CURL; -namespace kbd_dbms { +namespace iot_dbms { class CDbApi; } @@ -52,7 +52,7 @@ public: quint64 endTime, const std::string &planName); bool createTaskGroupEx(const std::string &eventUuidBase64, const std::string &taskStandardUUid, const std::string &planName); - bool parseSiteMap(const std::string& jsonDir= kbd_public::CFileUtil::getCurModuleDir() + CN_FilePath_Model, + bool parseSiteMap(const std::string& jsonDir= iot_public::CFileUtil::getCurModuleDir() + CN_FilePath_Model, const std::string& jsonFileName = IDONG_SITEMAP_FILENAME); /** * @brief getTaskGrpStatus @@ -84,7 +84,7 @@ public: bool getTaskGrpLink( const std::string &eventUuidBase64, QString & result ); CURL *m_curl; - kbd_dbms::CDbApi *m_dbApi; + iot_dbms::CDbApi *m_dbApi; QMap m_mapName2Utl; }; diff --git a/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h b/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h index 23fb2dc0..38c63fa1 100644 --- a/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h +++ b/product/src/include/application/linkage_server_api/CLinkageForHmiApi.h @@ -12,7 +12,7 @@ namespace kbd_application { class CLinkageForHmiApiImpl; - using namespace kbd_idlfile::linkage; + using namespace iot_idl::linkage; class LINKAGE_SERVER_API CLinkageForHmiApi { public: diff --git a/product/src/include/application/linkage_server_api/CLinkageForServerApi.h b/product/src/include/application/linkage_server_api/CLinkageForServerApi.h index 82b5afd3..7e5aa131 100644 --- a/product/src/include/application/linkage_server_api/CLinkageForServerApi.h +++ b/product/src/include/application/linkage_server_api/CLinkageForServerApi.h @@ -22,7 +22,7 @@ namespace kbd_application // }; class CLinkageForServerApiImpl; - using namespace kbd_idlfile::linkage; + using namespace iot_idl::linkage; class LINKAGE_SERVER_API CLinkageForServerApi { public: diff --git a/product/src/include/application/sequence_server_api/CSeqForHmiApi.h b/product/src/include/application/sequence_server_api/CSeqForHmiApi.h index b1a3b176..eece24ca 100644 --- a/product/src/include/application/sequence_server_api/CSeqForHmiApi.h +++ b/product/src/include/application/sequence_server_api/CSeqForHmiApi.h @@ -10,7 +10,7 @@ #include "Common.h" namespace kbd_application { - using namespace kbd_idlfile::sequence; + using namespace iot_idl::sequence; class CSeqForHmiApiImpl; class SEQUENCE_SERVER_API CSeqForHmiApi { diff --git a/product/src/include/application/sequence_server_api/CSeqForServerApi.h b/product/src/include/application/sequence_server_api/CSeqForServerApi.h index 92ec5581..b703341a 100644 --- a/product/src/include/application/sequence_server_api/CSeqForServerApi.h +++ b/product/src/include/application/sequence_server_api/CSeqForServerApi.h @@ -12,7 +12,7 @@ #include "SequenceMessage.pb.h" namespace kbd_application { - using namespace kbd_idlfile::sequence; + using namespace iot_idl::sequence; class CSeqForServerApiImpl; class SEQUENCE_SERVER_API CSeqForServerApi diff --git a/product/src/include/sys/sys_file_sync_api/FilesyncApi.h b/product/src/include/sys/sys_file_sync_api/FilesyncApi.h index 49c8ea61..725214b2 100644 --- a/product/src/include/sys/sys_file_sync_api/FilesyncApi.h +++ b/product/src/include/sys/sys_file_sync_api/FilesyncApi.h @@ -5,10 +5,10 @@ #include "FilesyncApiExport.h" #include "FileSynch.pb.h" -namespace kbd_sys +namespace iot_sys { class FilesyncApiImpl; - using namespace kbd_idlfile; + using namespace iot_idl; class FILE_SYNC_API FilesyncApi { public: diff --git a/product/src/include/sys/sys_file_sync_api/FilesyncApiCommon.h b/product/src/include/sys/sys_file_sync_api/FilesyncApiCommon.h index 236102fc..3129f294 100644 --- a/product/src/include/sys/sys_file_sync_api/FilesyncApiCommon.h +++ b/product/src/include/sys/sys_file_sync_api/FilesyncApiCommon.h @@ -3,7 +3,7 @@ #include "Common.h" #include -namespace kbd_sys +namespace iot_sys { enum SYNC_MODEL @@ -38,4 +38,4 @@ namespace kbd_sys }; -} //namespace kbd_sys +} //namespace iot_sys diff --git a/product/src/include/sys/sys_file_sync_api/filesyncapifortool.h b/product/src/include/sys/sys_file_sync_api/filesyncapifortool.h index 3fad6ee2..cee58219 100644 --- a/product/src/include/sys/sys_file_sync_api/filesyncapifortool.h +++ b/product/src/include/sys/sys_file_sync_api/filesyncapifortool.h @@ -6,11 +6,11 @@ #include "FileSynch.pb.h" #include "sys/sys_file_sync_api/FilesyncApi.h" -namespace kbd_sys +namespace iot_sys { class FilesyncApiImpl; - using namespace kbd_idlfile; - class FILE_SYNC_API FilesyncApiForTool : public kbd_sys::FilesyncApi + using namespace iot_idl; + class FILE_SYNC_API FilesyncApiForTool : public iot_sys::FilesyncApi { public: FilesyncApiForTool(int appid = CN_AppId_BASE); diff --git a/product/src/include/sys/sys_svn_file_sync_api/CSysFileSyncApi.h b/product/src/include/sys/sys_svn_file_sync_api/CSysFileSyncApi.h index 48291112..03a08409 100644 --- a/product/src/include/sys/sys_svn_file_sync_api/CSysFileSyncApi.h +++ b/product/src/include/sys/sys_svn_file_sync_api/CSysFileSyncApi.h @@ -6,7 +6,7 @@ #include #include -namespace kbd_sys { +namespace iot_sys { class SVN_FILE_SYNC_API CSysFileSyncApi { @@ -28,7 +28,7 @@ namespace kbd_sys { * 执行命令成功，出错，返回1 */ int exeStatus(QStringList &_qStrFilePathList, - QVector &_vecFileStatus, + QVector &_vecFileStatus, QString &_qStrError, QString _qStrUserName = "", QString _qStrPassword = ""); @@ -170,13 +170,13 @@ namespace kbd_sys { int outPutLog(QStringList &list); private: - void setFirstColumns(char _status,kbd_sys::stFileStatus &_stFileStatus); - void setSecondColumns(char _status,kbd_sys::stFileStatus &_stFileStatus); - void setThirdColumns(char _status,kbd_sys::stFileStatus &_stFileStatus); - void setFourthColumns(char _status,kbd_sys::stFileStatus &_stFileStatus); - void setFifthColumns(char _status,kbd_sys::stFileStatus &_stFileStatus); - void setSixthColumns(char _status,kbd_sys::stFileStatus &_stFileStatus); - void setSeventhColumns(char _status,kbd_sys::stFileStatus &_stFileStatus); + void setFirstColumns(char _status,iot_sys::stFileStatus &_stFileStatus); + void setSecondColumns(char _status,iot_sys::stFileStatus &_stFileStatus); + void setThirdColumns(char _status,iot_sys::stFileStatus &_stFileStatus); + void setFourthColumns(char _status,iot_sys::stFileStatus &_stFileStatus); + void setFifthColumns(char _status,iot_sys::stFileStatus &_stFileStatus); + void setSixthColumns(char _status,iot_sys::stFileStatus &_stFileStatus); + void setSeventhColumns(char _status,iot_sys::stFileStatus &_stFileStatus); @@ -185,5 +185,5 @@ namespace kbd_sys { }; -} //< namespace kbd_sys +} //< namespace iot_sys #endif // SYS_FILE_SYNC_API_H diff --git a/product/src/include/sys/sys_svn_file_sync_api/structdDefine.h b/product/src/include/sys/sys_svn_file_sync_api/structdDefine.h index 5f9b5469..481d1db9 100644 --- a/product/src/include/sys/sys_svn_file_sync_api/structdDefine.h +++ b/product/src/include/sys/sys_svn_file_sync_api/structdDefine.h @@ -3,7 +3,7 @@ #include -namespace kbd_sys { +namespace iot_sys { #define SVN_CMD "svn" //svn 命令 diff --git a/product/src/service/calc_server/CalcDefTable.h b/product/src/service/calc_server/CalcDefTable.h index 6daa7a31..9f4a9636 100644 --- a/product/src/service/calc_server/CalcDefTable.h +++ b/product/src/service/calc_server/CalcDefTable.h @@ -9,7 +9,7 @@ #include "string.h" -namespace kbd_service +namespace iot_service { const std::string CN_TN_CalcDef = "calc_func_def"; #define CALC_DEF_COL_CALC_NAME "func_name" @@ -36,4 +36,4 @@ namespace kbd_service nParamNum = 0; } }STableCalcDef,*PSTableCalcDef; -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/calc_server/CalcInParaTable.h b/product/src/service/calc_server/CalcInParaTable.h index 1cc4843f..a8277b90 100644 --- a/product/src/service/calc_server/CalcInParaTable.h +++ b/product/src/service/calc_server/CalcInParaTable.h @@ -10,7 +10,7 @@ #include "string" #include "vector" -namespace kbd_service { +namespace iot_service { const std::string CN_TN_CalcInPara = "calc_in_para"; #define CALC_COL_FLAG "calc_flag" @@ -44,4 +44,4 @@ namespace kbd_service { } }STableCalcInPara,*PSTableCalcInPara; -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/calc_server/CalcMsgBusMng.cpp b/product/src/service/calc_server/CalcMsgBusMng.cpp index 4c28f98e..364fe7f5 100644 --- a/product/src/service/calc_server/CalcMsgBusMng.cpp +++ b/product/src/service/calc_server/CalcMsgBusMng.cpp @@ -12,21 +12,21 @@ #include "common/MessageChannel.h" using namespace std; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_service; +using namespace iot_net; -kbd_service::CalcMsgBusMng::CalcMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo) +iot_service::CalcMsgBusMng::CalcMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { } -kbd_service::CalcMsgBusMng::~CalcMsgBusMng() +iot_service::CalcMsgBusMng::~CalcMsgBusMng() { } //订阅消息通道 -int kbd_service::CalcMsgBusMng::subMessage() +int iot_service::CalcMsgBusMng::subMessage() { if(!m_objCommunicator.addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE)) { @@ -41,7 +41,7 @@ int kbd_service::CalcMsgBusMng::subMessage() } //取消消息订阅 -int kbd_service::CalcMsgBusMng::unsubMessage() +int iot_service::CalcMsgBusMng::unsubMessage() { std::vector vecSub =m_objCommunicator.getMySub(); for(size_t i=0;i CalcMsgBusMngPtr; -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/calc_server/CalcOutParaTable.h b/product/src/service/calc_server/CalcOutParaTable.h index 548c5477..5314d9c8 100644 --- a/product/src/service/calc_server/CalcOutParaTable.h +++ b/product/src/service/calc_server/CalcOutParaTable.h @@ -10,7 +10,7 @@ #include "string" -namespace kbd_service { +namespace iot_service { const std::string CN_TN_CalcOutPara = "calc_out_para"; #define CALC_COL_FLAG "calc_flag" @@ -42,4 +42,4 @@ namespace kbd_service { } }STableCalcOutPara,*PSTableCalcOutPara; -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/calc_server/CalcRtdbTableOperate.cpp b/product/src/service/calc_server/CalcRtdbTableOperate.cpp index 86041a71..ccfc4fd0 100644 --- a/product/src/service/calc_server/CalcRtdbTableOperate.cpp +++ b/product/src/service/calc_server/CalcRtdbTableOperate.cpp @@ -8,16 +8,16 @@ #include "CalcRtdbTableOperate.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; -kbd_service::CalcRtdbTableOperate::CalcRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo) +iot_service::CalcRtdbTableOperate::CalcRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { } -kbd_service::CalcRtdbTableOperate::~CalcRtdbTableOperate() +iot_service::CalcRtdbTableOperate::~CalcRtdbTableOperate() { if(m_objCalcDefTable.isOpen()) { @@ -34,7 +34,7 @@ kbd_service::CalcRtdbTableOperate::~CalcRtdbTableOperate() } //初始化内存表操作 -int kbd_service::CalcRtdbTableOperate::initialize() +int iot_service::CalcRtdbTableOperate::initialize() { if(!m_objCalcDefTable.open(m_stRunAppInfo.nAppId,CN_TN_CalcDef.c_str())) { @@ -54,7 +54,7 @@ int kbd_service::CalcRtdbTableOperate::initialize() return kbdSuccess; } -int kbd_service::CalcRtdbTableOperate::getCalcDefAllRecord(std::vector &vecCalcDef) +int iot_service::CalcRtdbTableOperate::getCalcDefAllRecord(std::vector &vecCalcDef) { CTableLockGuard tableLock(m_objCalcDefTable); //加锁保护表 if(m_objCalcDefTable.selectJustAll(vecCalcDef)) @@ -92,7 +92,7 @@ int CalcRtdbTableOperate::getCalcDefByKey(const string tagName,STableCalcDef &sC return kbdSuccess; } -int kbd_service::CalcRtdbTableOperate::getCalcParaAllRecord(std::vector &vecCalcPara) +int iot_service::CalcRtdbTableOperate::getCalcParaAllRecord(std::vector &vecCalcPara) { CTableLockGuard tableLock(m_objCalcInParaTable); //加锁保护表 if(m_objCalcInParaTable.selectJustAll(vecCalcPara)) @@ -105,7 +105,7 @@ int kbd_service::CalcRtdbTableOperate::getCalcParaAllRecord(std::vector &vecCalcPara) +int iot_service::CalcRtdbTableOperate::getCalcParaAllRecord(std::vector &vecCalcPara) { CTableLockGuard tableLock(m_objCalcOutParaTable); //加锁保护表 if(m_objCalcOutParaTable.selectJustAll(vecCalcPara)) @@ -119,7 +119,7 @@ int kbd_service::CalcRtdbTableOperate::getCalcParaAllRecord(std::vector vecCol; CRdbPublic::addUpColumnInfo(vecCol,CALC_COL_FLAG, calcParaFlag); @@ -132,7 +132,7 @@ int kbd_service::CalcRtdbTableOperate::updateCalcInParaByKey(const STableCalcInP } return kbdSuccess; } -int kbd_service::CalcRtdbTableOperate::updateCalcOutParaByKey(const STableCalcOutParaKey &stCalcParaKey, int calcParaFlag) +int iot_service::CalcRtdbTableOperate::updateCalcOutParaByKey(const STableCalcOutParaKey &stCalcParaKey, int calcParaFlag) { std::vector vecCol; CRdbPublic::addUpColumnInfo(vecCol,CALC_COL_FLAG, calcParaFlag); diff --git a/product/src/service/calc_server/CalcRtdbTableOperate.h b/product/src/service/calc_server/CalcRtdbTableOperate.h index 73035465..b4ddded9 100644 --- a/product/src/service/calc_server/CalcRtdbTableOperate.h +++ b/product/src/service/calc_server/CalcRtdbTableOperate.h @@ -12,11 +12,11 @@ #include "CalcDefTable.h" #include "CalcOutParaTable.h" #include "CalcInParaTable.h" -namespace kbd_service { +namespace iot_service { class CalcRtdbTableOperate { public: - CalcRtdbTableOperate(const kbd_public::SRunAppInfo &stRunAppInfo); + CalcRtdbTableOperate(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CalcRtdbTableOperate(); /** * @brief initialize 初始化 @@ -40,13 +40,13 @@ namespace kbd_service { int updateCalcInParaByKey(const STableCalcInParaKey &stCalcParaKey,int calcParaFlag); int updateCalcOutParaByKey(const STableCalcOutParaKey &stCalcParaKey,int calcParaFlag); private: - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 - kbd_dbms::CRdbAccessEx m_objCalcDefTable; //CALC_DEF 内存表 - kbd_dbms::CRdbAccessEx m_objCalcInParaTable; //CALC_IN_PARA 内存表 - kbd_dbms::CRdbAccessEx m_objCalcOutParaTable; //CALC_OUT_PARA 内存表 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_dbms::CRdbAccessEx m_objCalcDefTable; //CALC_DEF 内存表 + iot_dbms::CRdbAccessEx m_objCalcInParaTable; //CALC_IN_PARA 内存表 + iot_dbms::CRdbAccessEx m_objCalcOutParaTable; //CALC_OUT_PARA 内存表 }; typedef boost::shared_ptr CalcRtdbTableOperatePtr; -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/calc_server/CalcServerApp.cpp b/product/src/service/calc_server/CalcServerApp.cpp index 31748ba7..bfc73179 100644 --- a/product/src/service/calc_server/CalcServerApp.cpp +++ b/product/src/service/calc_server/CalcServerApp.cpp @@ -12,15 +12,15 @@ #include "CalcServerCommon.h" using namespace std; -using namespace kbd_public; -using namespace kbd_sys; -using namespace kbd_service; -using namespace kbd_net; +using namespace iot_public; +using namespace iot_sys; +using namespace iot_service; +using namespace iot_net; #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -kbd_service::CalcServerApp::CalcServerApp() +iot_service::CalcServerApp::CalcServerApp() :m_ptrSysInfo(NULL), m_ptrProcMng(NULL), m_ptrRedundancyMng(NULL), @@ -28,12 +28,12 @@ kbd_service::CalcServerApp::CalcServerApp() { } -kbd_service::CalcServerApp::~CalcServerApp() +iot_service::CalcServerApp::~CalcServerApp() { CalcServerApp::stop(); } -bool kbd_service::CalcServerApp::start(int argc, char *argv[], int &/*nStatus*/) +bool iot_service::CalcServerApp::start(int argc, char *argv[], int &/*nStatus*/) { //1.解析启动参数 if(!parseCmdLine(argc, argv)) @@ -91,7 +91,7 @@ bool kbd_service::CalcServerApp::start(int argc, char *argv[], int &/*nStatus*/) return true; } -bool kbd_service::CalcServerApp::stop() +bool iot_service::CalcServerApp::stop() { //9.更新当前进程冗余状态 if(m_ptrProcMng !=NULL) @@ -120,7 +120,7 @@ bool kbd_service::CalcServerApp::stop() } -int kbd_service::CalcServerApp::toQuit() +int iot_service::CalcServerApp::toQuit() { if(m_ptrProcMng != NULL) { @@ -130,7 +130,7 @@ int kbd_service::CalcServerApp::toQuit() return kbdSuccess; } -bool kbd_service::CalcServerApp::parseCmdLine(int argc, char *argv[]) +bool iot_service::CalcServerApp::parseCmdLine(int argc, char *argv[]) { //拼接启动参数，用于向进程管理注册 for(int i=1;i CalDefMAP; //保存函数配置 map key为函数名 value为函数结构体 typedef std::map SOutPointInfoMap; //用来保存输出点上次的值和状态 <标签，点信息> typedef std::map > SInOutVecMap; //保存输入和输出的映射 一对多 -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/calc_server/CalcServerMng.cpp b/product/src/service/calc_server/CalcServerMng.cpp index d7b389fd..e576bbaf 100644 --- a/product/src/service/calc_server/CalcServerMng.cpp +++ b/product/src/service/calc_server/CalcServerMng.cpp @@ -8,15 +8,15 @@ #include "CalcServerMng.h" #include "pub_logger_api/logger.h" -kbd_service::CalcServerMng::CalcServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng) +iot_service::CalcServerMng::CalcServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProcMng), m_ptrCalcServerThread(NULL) { } -kbd_service::CalcServerMng::~CalcServerMng() +iot_service::CalcServerMng::~CalcServerMng() { if(m_ptrCalcServerThread != NULL) { @@ -27,7 +27,7 @@ kbd_service::CalcServerMng::~CalcServerMng() } //冗余切换 -int kbd_service::CalcServerMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_service::CalcServerMng::redundantSwitch(bool bMaster, bool bSlave) { LOGINFO("接收到冗余切换指令.Master=[%d],Slave=[%d]",bMaster,bSlave); if(bMaster && !bSlave) //为主 @@ -47,7 +47,7 @@ int kbd_service::CalcServerMng::redundantSwitch(bool bMaster, bool bSlave) } //初始化 -int kbd_service::CalcServerMng::initialize() +int iot_service::CalcServerMng::initialize() { m_ptrCalcServerThread =boost::make_shared(m_stRunAppInfo); if(m_ptrCalcServerThread == NULL) diff --git a/product/src/service/calc_server/CalcServerMng.h b/product/src/service/calc_server/CalcServerMng.h index d7973a8e..10e698b1 100644 --- a/product/src/service/calc_server/CalcServerMng.h +++ b/product/src/service/calc_server/CalcServerMng.h @@ -13,12 +13,12 @@ #include "CalcServerThread.h" -namespace kbd_service { - class CalcServerMng : public kbd_sys::CRedundantSwitchInterface +namespace iot_service { + class CalcServerMng : public iot_sys::CRedundantSwitchInterface { public: - CalcServerMng(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CalcServerMng(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_sys::CProcMngInterfacePtr &ptrProcMng); virtual ~CalcServerMng(); /** * @brief redundantSwitch 冗余切换，应用需要继承并重写，实现自身的冗余切换逻辑 @@ -34,11 +34,11 @@ 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; //进程管理访问库智能指针 CalcServerThreadPtr m_ptrCalcServerThread; //计算量主线程 }; typedef boost::shared_ptr CalcServerMngPtr; -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/calc_server/CalcServerThread.cpp b/product/src/service/calc_server/CalcServerThread.cpp index 077936dd..3addcf66 100644 --- a/product/src/service/calc_server/CalcServerThread.cpp +++ b/product/src/service/calc_server/CalcServerThread.cpp @@ -20,12 +20,12 @@ #include "string" using namespace std; -using namespace kbd_public; -using namespace kbd_service; -using namespace kbd_dbms; -using namespace kbd_net; -using namespace kbd_service; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_service; +using namespace iot_dbms; +using namespace iot_net; +using namespace iot_service; +using namespace iot_idl; lua_State* CalcServerThread::lua_state = NULL; std::string CalcServerThread::m_strPointTag =""; std::string CalcServerThread::m_table =""; @@ -37,8 +37,8 @@ SInPointInfoMap CalcServerThread::m_inPointInfoMAP; //输入 SOutPointInfoMap CalcServerThread::m_outPointInfoMap; //保存上次发送的点值和状态 SInOutVecMap CalcServerThread::m_inOutVecMap; -kbd_service::CalcServerThread::CalcServerThread(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("CalcServerThread",0), +iot_service::CalcServerThread::CalcServerThread(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("CalcServerThread",0), m_stRunAppInfo(stRunAppInfo), m_ptrCalcTableOpt(NULL), m_ptrMsgbusMng(NULL) @@ -47,7 +47,7 @@ kbd_service::CalcServerThread::CalcServerThread(const kbd_public::SRunAppInfo &s m_lastCheckCfgTime = 0; //上次检查配置时间 m_lastCalcTime = 0; } -kbd_service::CalcServerThread::~CalcServerThread() +iot_service::CalcServerThread::~CalcServerThread() { clean(); m_ptrMsgbusMng.reset(); @@ -61,7 +61,7 @@ kbd_service::CalcServerThread::~CalcServerThread() } } //初始化 -int kbd_service::CalcServerThread::initialize() +int iot_service::CalcServerThread::initialize() { //1.初始化内存表操作类 m_ptrCalcTableOpt=boost::make_shared (m_stRunAppInfo); @@ -162,7 +162,7 @@ int kbd_service::CalcServerThread::initialize() return kbdSuccess; } //设置为主 -int kbd_service::CalcServerThread::setMaster() +int iot_service::CalcServerThread::setMaster() { clean(); m_ptrCdpcda->unsubscribeAll(); @@ -171,7 +171,7 @@ int kbd_service::CalcServerThread::setMaster() return res; } //设置为备 -int kbd_service::CalcServerThread::setSlave() +int iot_service::CalcServerThread::setSlave() { clean(); m_ptrCdpcda->unsubscribeAll(); @@ -180,9 +180,9 @@ int kbd_service::CalcServerThread::setSlave() outRecord=0; return kbdSuccess; } -void kbd_service::CalcServerThread::execute() +void iot_service::CalcServerThread::execute() { - int64 nCurTimeMSec = kbd_public::getUTCTimeMsec(); //或取当前时间，单位毫秒 + int64 nCurTimeMSec = iot_public::getUTCTimeMsec(); //或取当前时间，单位毫秒 //1.定时检查配置变化，如果有变化，重新订阅 if(nCurTimeMSec - m_lastCheckCfgTime > 60*1000) //一分钟检查一次，没必要太频繁，提高效率 @@ -226,7 +226,7 @@ void kbd_service::CalcServerThread::execute() return ; } //读标识符，用来进行判断是否需要重新读取配置 -bool kbd_service::CalcServerThread::TryReadConfig() +bool iot_service::CalcServerThread::TryReadConfig() { vector vecCalcInPara; vector vecCalcOutPara; @@ -270,7 +270,7 @@ bool kbd_service::CalcServerThread::TryReadConfig() } return isRead; } -void kbd_service::CalcServerThread::clean() +void iot_service::CalcServerThread::clean() { m_calcInParaMAP.clear(); m_calcOutParaMAP.clear(); @@ -279,7 +279,7 @@ void kbd_service::CalcServerThread::clean() m_inOutVecMap.clear(); } //读配置 -int kbd_service::CalcServerThread::readConfigToSaveAndSubValue() +int iot_service::CalcServerThread::readConfigToSaveAndSubValue() { clean(); vector vecCalcInPara; @@ -317,7 +317,7 @@ int kbd_service::CalcServerThread::readConfigToSaveAndSubValue() } return kbdSuccess; } -int kbd_service::CalcServerThread::updateCalcInPara(const STableCalcInPara &stCalcPara, int calcParaFlag) +int iot_service::CalcServerThread::updateCalcInPara(const STableCalcInPara &stCalcPara, int calcParaFlag) { if(stCalcPara.szCalcFlag==calcParaFlag) { @@ -329,7 +329,7 @@ int kbd_service::CalcServerThread::updateCalcInPara(const STableCalcInPara &stCa } return kbdSuccess; } -int kbd_service::CalcServerThread::updateCalcOutPara(const STableCalcOutPara &stCalcPara, int calcParaFlag) +int iot_service::CalcServerThread::updateCalcOutPara(const STableCalcOutPara &stCalcPara, int calcParaFlag) { if(stCalcPara.szCalcFlag==calcParaFlag) { @@ -341,7 +341,7 @@ int kbd_service::CalcServerThread::updateCalcOutPara(const STableCalcOutPara &st } return kbdSuccess; } -int kbd_service::CalcServerThread::addToCalcInParaMAP( STableCalcInPara &sTableCalcPara) +int iot_service::CalcServerThread::addToCalcInParaMAP( STableCalcInPara &sTableCalcPara) { map >::iterator pos; pos=m_calcInParaMAP.find(sTableCalcPara.stKey.szTagName); @@ -382,7 +382,7 @@ int CalcServerThread::addToInOutVecMAP(STableCalcInPara &sTableCalcPara) } return kbdSuccess; } -int kbd_service::CalcServerThread::addToCalcOutParaMAP( STableCalcOutPara &sTableCalcPara) +int iot_service::CalcServerThread::addToCalcOutParaMAP( STableCalcOutPara &sTableCalcPara) { map::iterator pos; pos=m_calcOutParaMAP.find(sTableCalcPara.stKey.szTagName); @@ -412,7 +412,7 @@ int CalcServerThread::checkStatus(const string &strTableName, int nStatus) } return num; } -int kbd_service::CalcServerThread::addToInPointInfoMAP( STableCalcInPara &sTableCalcPara) +int iot_service::CalcServerThread::addToInPointInfoMAP( STableCalcInPara &sTableCalcPara) { SInPointInfoMap::iterator pos; pos = m_inPointInfoMAP.find(sTableCalcPara.szTagInName); @@ -421,14 +421,14 @@ int kbd_service::CalcServerThread::addToInPointInfoMAP( STableCalcInPara &sTable SInPointInfo pointInfo; pointInfo.value = 0; pointInfo.nStatus = 1; - pointInfo.nTime = kbd_public::getUTCTimeMsec(); + pointInfo.nTime = iot_public::getUTCTimeMsec(); LOGDEBUG("addToInPointInfoMAP():status:[%llu]",(unsigned long long)pointInfo.nStatus); m_inPointInfoMAP.insert(make_pair(sTableCalcPara.szTagInName,pointInfo)); } return kbdSuccess; } -int kbd_service::CalcServerThread::splitFunc(const string &inTag,string &strTableName,string &strTagName,string &strColumnName) +int iot_service::CalcServerThread::splitFunc(const string &inTag,string &strTableName,string &strTagName,string &strColumnName) { vector vecStr; boost::algorithm::split(vecStr,inTag,boost::algorithm::is_any_of("."), boost::algorithm::token_compress_on); @@ -460,17 +460,17 @@ int kbd_service::CalcServerThread::splitFunc(const string &inTag,string &strTabl return kbdSuccess; } //订阅点 -int kbd_service::CalcServerThread::subValue(const string strTableName,const string strTagName,const string strColumnName) +int iot_service::CalcServerThread::subValue(const string strTableName,const string strTagName,const string strColumnName) { m_ptrCdpcda->subscribe(strTableName,strTagName,strColumnName); LOGINFO("订阅点：表名:[%s],标签名:[%s],字段名:[%s] 成功!",strTableName.c_str(),strTagName.c_str(),strColumnName.c_str()); return kbdSuccess; } -int kbd_service::CalcServerThread::processMessageFromDataChange(const CMbMessage &objMsg) +int iot_service::CalcServerThread::processMessageFromDataChange(const CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); switch (nMessageType) { - case kbd_idlfile::MT_DP_CHANGE_DATA: + case iot_idl::MT_DP_CHANGE_DATA: parserMsg(objMsg); break; default: @@ -478,9 +478,9 @@ int kbd_service::CalcServerThread::processMessageFromDataChange(const CMbMessage } return kbdSuccess; } -int kbd_service::CalcServerThread::parserMsg(const CMbMessage &objMsg) +int iot_service::CalcServerThread::parserMsg(const CMbMessage &objMsg) { - ::kbd_idlfile::SRealTimeDataPkg changeDataPackage; + ::iot_idl::SRealTimeDataPkg changeDataPackage; if(true==changeDataPackage.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { //设置需要计算的配置 @@ -497,7 +497,7 @@ int kbd_service::CalcServerThread::parserMsg(const CMbMessage &objMsg) return kbdFailed; } } -int kbd_service::CalcServerThread::setNeedCalcDataMap(const SRealTimeDataPkg & changeDataPackage) +int iot_service::CalcServerThread::setNeedCalcDataMap(const SRealTimeDataPkg & changeDataPackage) { if(kbdFailed==setCalcAiData(changeDataPackage)) { @@ -517,14 +517,14 @@ int kbd_service::CalcServerThread::setNeedCalcDataMap(const SRealTimeDataPkg & c } return kbdSuccess; } -int kbd_service::CalcServerThread::setCalcAiData(const SRealTimeDataPkg & changeDataPackage) +int iot_service::CalcServerThread::setCalcAiData(const SRealTimeDataPkg & changeDataPackage) { try { int aiSize = changeDataPackage.stairtd_size(); if(aiSize>0) { - ::kbd_idlfile::SAiRealTimeData aiStru; + ::iot_idl::SAiRealTimeData aiStru; std::string strTagName=""; ValueType value; int status=0; @@ -551,14 +551,14 @@ int kbd_service::CalcServerThread::setCalcAiData(const SRealTimeDataPkg & change } return kbdSuccess; } -int kbd_service::CalcServerThread::setCalcDiData(const SRealTimeDataPkg & changeDataPackage) +int iot_service::CalcServerThread::setCalcDiData(const SRealTimeDataPkg & changeDataPackage) { try { int diSize = changeDataPackage.stdirtd_size(); if(diSize>0) { - ::kbd_idlfile::SDiRealTimeData diStru; + ::iot_idl::SDiRealTimeData diStru; std::string strTagName=""; ValueType value; int status=0; @@ -584,14 +584,14 @@ int kbd_service::CalcServerThread::setCalcDiData(const SRealTimeDataPkg & change } return kbdSuccess; } -int kbd_service::CalcServerThread::setCalcMiData(const SRealTimeDataPkg & changeDataPackage) +int iot_service::CalcServerThread::setCalcMiData(const SRealTimeDataPkg & changeDataPackage) { try { int miSize = changeDataPackage.stmirtd_size(); if(miSize>0) { - ::kbd_idlfile::SMiRealTimeData miStru; + ::iot_idl::SMiRealTimeData miStru; std::string strTagName=""; ValueType value; int status = 0; @@ -617,14 +617,14 @@ int kbd_service::CalcServerThread::setCalcMiData(const SRealTimeDataPkg & change } return kbdSuccess; } -int kbd_service::CalcServerThread::setCalcPiData(const SRealTimeDataPkg & changeDataPackage) +int iot_service::CalcServerThread::setCalcPiData(const SRealTimeDataPkg & changeDataPackage) { try { int piSize = changeDataPackage.stpirtd_size(); if(piSize>0) { - ::kbd_idlfile::SPiRealTimeData piStru; + ::iot_idl::SPiRealTimeData piStru; std::string strTagName=""; ValueType value; int status=0; @@ -651,7 +651,7 @@ int kbd_service::CalcServerThread::setCalcPiData(const SRealTimeDataPkg & change return kbdSuccess; } //更新接收到的值和状态 -void kbd_service::CalcServerThread::updateInTagInMap(const string &tagValue, const ValueType value, const int status, const std::string &table) +void iot_service::CalcServerThread::updateInTagInMap(const string &tagValue, const ValueType value, const int status, const std::string &table) { SInPointInfoMap::iterator pos; pos = m_inPointInfoMAP.find(tagValue); @@ -674,7 +674,7 @@ void kbd_service::CalcServerThread::updateInTagInMap(const string &tagValue, con } } -int kbd_service::CalcServerThread::calcAndSend() +int iot_service::CalcServerThread::calcAndSend() { CalcOutParaMAP::iterator pos=m_calcOutParaMAP.begin(); for(;pos != m_calcOutParaMAP.end(); pos++) @@ -813,7 +813,7 @@ int CalcServerThread::calcAndSendOne(const string &tagName) return kbdSuccess; } -int kbd_service::CalcServerThread::checkCalcOutParaFunc(const std::string pos_first,std::string &stCalcName,std::string &stCalcDef) +int iot_service::CalcServerThread::checkCalcOutParaFunc(const std::string pos_first,std::string &stCalcName,std::string &stCalcDef) { string strName = pos_first; STableCalcOutPara sTableCalcOutPara; @@ -840,7 +840,7 @@ int kbd_service::CalcServerThread::checkCalcOutParaFunc(const std::string pos_fi return kbdSuccess; } -void kbd_service::CalcServerThread::sendToDp(const std::string strName,const std::string outValue,const int inValid) +void iot_service::CalcServerThread::sendToDp(const std::string strName,const std::string outValue,const int inValid) { //TODO 发送给DP SVariable varValue; @@ -940,12 +940,12 @@ int CalcServerThread::needSend(const string strName, const string outValue, cons pointInfo.stTag = strName; pointInfo.value = outValue; pointInfo.nvalid = inValid; - pointInfo.nTime = kbd_public::getUTCTimeMsec(); + pointInfo.nTime = iot_public::getUTCTimeMsec(); m_outPointInfoMap[strName] = pointInfo; } return kbdSuccess; } -int kbd_service::CalcServerThread::AddOptSetData(const string strTableName, const string strTagName, +int iot_service::CalcServerThread::AddOptSetData(const string strTableName, const string strTagName, const int nAddStatus, const int nDelStatus, const SVariable varValue) { SOptSetDataMsg *OptSetData = m_stOptDataMsg.add_seq_set_data_info() ; @@ -966,7 +966,7 @@ int kbd_service::CalcServerThread::AddOptSetData(const string strTableName, cons return kbdSuccess; } -void kbd_service::CalcServerThread::sendCalcData(const int nPointType, const bool bNotAlarm) +void iot_service::CalcServerThread::sendCalcData(const int nPointType, const bool bNotAlarm) { int nNum = m_stOptDataMsg.seq_set_data_info_size() ; //需要发送的数据为空 @@ -1009,9 +1009,9 @@ void CalcServerThread::timersendtoDp() if(it != m_outPointInfoMap.end()) { SOutPointInfo &sConstTimeOutDataInfo = it->second; - if(kbd_public::getUTCTimeMsec() > (sConstTimeOutDataInfo.nTime + 5000)) + if(iot_public::getUTCTimeMsec() > (sConstTimeOutDataInfo.nTime + 5000)) { - sConstTimeOutDataInfo.nTime = kbd_public::getUTCTimeMsec(); + sConstTimeOutDataInfo.nTime = iot_public::getUTCTimeMsec(); sendToDp(it->first,sConstTimeOutDataInfo.value,sConstTimeOutDataInfo.nvalid); } }else diff --git a/product/src/service/calc_server/CalcServerThread.h b/product/src/service/calc_server/CalcServerThread.h index 6e351775..cbd68b0b 100644 --- a/product/src/service/calc_server/CalcServerThread.h +++ b/product/src/service/calc_server/CalcServerThread.h @@ -28,11 +28,11 @@ #include "data_process_api/DataProcessApi.h" #include "rdb_api/RdbTableMng.h" -namespace kbd_service { - class CalcServerThread : public kbd_public::CTimerThreadBase +namespace iot_service { + class CalcServerThread : public iot_public::CTimerThreadBase { public: - CalcServerThread(const kbd_public::SRunAppInfo &stRunAppInfo); + CalcServerThread(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CalcServerThread(); /** * @brief getDataByIndex 脚本使用的接口 @@ -165,43 +165,43 @@ namespace kbd_service { * @param objMsg * @return 成功返回kbdSuccess，失败返回失败码 */ - int processMessageFromDataChange(const kbd_net::CMbMessage &objMsg); + int processMessageFromDataChange(const iot_net::CMbMessage &objMsg); /** * @brief parserMsg 解析 * @param objMsg 需要解析的json * @return 成功返回kbdSuccess，失败返回失败码 */ - int parserMsg(const kbd_net::CMbMessage &objMsg); + int parserMsg(const iot_net::CMbMessage &objMsg); /** * @brief setNeedCalcDataMap 设置需要计算的数据的map * @param changeDataPackage 解析后的数据 * @return 成功返回kbdSuccess，失败返回失败码 */ - int setNeedCalcDataMap(const kbd_idlfile::SRealTimeDataPkg & changeDataPackage); + int setNeedCalcDataMap(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief setCalcAiData 设置ai * @param changeDataPackage 解析后的数据 * @return 成功返回kbdSuccess，失败返回失败码 */ - int setCalcAiData(const kbd_idlfile::SRealTimeDataPkg & changeDataPackage); + int setCalcAiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief setCalcDiData 设置di * @param changeDataPackage 解析后的数据 * @return 成功返回kbdSuccess，失败返回失败码 */ - int setCalcDiData(const kbd_idlfile::SRealTimeDataPkg & changeDataPackage); + int setCalcDiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief getCalcMiData 设置mi * @param changeDataPackage 解析后的数据 * @return 成功返回kbdSuccess，失败返回失败码 */ - int setCalcMiData(const kbd_idlfile::SRealTimeDataPkg & changeDataPackage); + int setCalcMiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief getCalcPiData 设置pi * @param changeDataPackage 解析后的数据 * @return 成功返回kbdSuccess，失败返回失败码 */ - int setCalcPiData(const kbd_idlfile::SRealTimeDataPkg & changeDataPackage); + int setCalcPiData(const iot_idl::SRealTimeDataPkg & changeDataPackage); /** * @brief updateInTagInMap 更新点的值和状态 * @param tagValue 接收到的值名称 （表名+标签名+其他） @@ -251,7 +251,7 @@ namespace kbd_service { * @param bSendImme 是否发送 */ int AddOptSetData(const std::string strTableName,const std::string strTagName,const int nAddStatus, - const int nDelStatus,const kbd_idlfile::SVariable varValue); + const int nDelStatus,const iot_idl::SVariable varValue); /** * @brief sendCalcData 发送计算量输出到dp * @param nPointType 类型 @@ -281,15 +281,15 @@ namespace kbd_service { private: int64 m_lastCheckCfgTime; //上次检查配置时间 int64 m_lastCalcTime; //上次计算公式时间 - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用运行参数 CalcRtdbTableOperatePtr m_ptrCalcTableOpt; //计算量相关内存表操作类 CalcMsgBusMngPtr m_ptrMsgbusMng; //消息总线管理类 - kbd_service::CDpcdaForAppPtr m_ptrCdpcda; //订阅点 + iot_service::CDpcdaForAppPtr m_ptrCdpcda; //订阅点 - kbd_idlfile::SOptSetDataPkg m_stOptDataMsg; //操作数据 + iot_idl::SOptSetDataPkg m_stOptDataMsg; //操作数据 CDataProcessApiPtr m_ptrDataProcApi; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; std::map m_mapAiState; std::map m_mapDiState; //数字量状态 diff --git a/product/src/service/calc_server/main.cpp b/product/src/service/calc_server/main.cpp index ab705972..dc5e4d5a 100644 --- a/product/src/service/calc_server/main.cpp +++ b/product/src/service/calc_server/main.cpp @@ -11,6 +11,6 @@ using namespace std; int main(int argc, char *argv[]) { - kbd_service::CalcServerApp objApp; + iot_service::CalcServerApp objApp; return objApp.main(argc,argv); } diff --git a/product/src/service/stat_server/stat_server/CComputeTask.cpp b/product/src/service/stat_server/stat_server/CComputeTask.cpp index 6838d96d..9569b5ea 100644 --- a/product/src/service/stat_server/stat_server/CComputeTask.cpp +++ b/product/src/service/stat_server/stat_server/CComputeTask.cpp @@ -1,175 +1,175 @@ #include "CComputeTask.h" #include "StatCommon.h" -kbd_service::CStatTemplatePtr kbd_service::CComputeTask::statTemplate() const +iot_service::CStatTemplatePtr iot_service::CComputeTask::statTemplate() const { return m_statTemplate; } -int kbd_service::CComputeTask::period() const +int iot_service::CComputeTask::period() const { return m_period; } -void kbd_service::CComputeTask::setPeriod(int period) +void iot_service::CComputeTask::setPeriod(int period) { m_period = period; } -int kbd_service::CComputeTask::triggerMethod() const +int iot_service::CComputeTask::triggerMethod() const { return m_triggerMethod; } -void kbd_service::CComputeTask::setTriggerMethod(int triggerMethod) +void iot_service::CComputeTask::setTriggerMethod(int triggerMethod) { this->m_triggerMethod = triggerMethod; } -int kbd_service::CComputeTask::timerMode() const +int iot_service::CComputeTask::timerMode() const { return this->m_timerMode; } -void kbd_service::CComputeTask::setTimerMode(int timerMode) +void iot_service::CComputeTask::setTimerMode(int timerMode) { this->m_timerMode = timerMode; } -int kbd_service::CComputeTask::month() const +int iot_service::CComputeTask::month() const { return m_month; } -void kbd_service::CComputeTask::setMonth(int month) +void iot_service::CComputeTask::setMonth(int month) { this->m_month = month; } -int kbd_service::CComputeTask::day() const +int iot_service::CComputeTask::day() const { return m_day; } -void kbd_service::CComputeTask::setDay(int day) +void iot_service::CComputeTask::setDay(int day) { m_day = day; } -int kbd_service::CComputeTask::weekday() const +int iot_service::CComputeTask::weekday() const { return m_weekday; } -void kbd_service::CComputeTask::setWeekday(int weekday) +void iot_service::CComputeTask::setWeekday(int weekday) { this->m_weekday = weekday; } -int kbd_service::CComputeTask::hour() const +int iot_service::CComputeTask::hour() const { return m_hour; } -void kbd_service::CComputeTask::setHour(int hour) +void iot_service::CComputeTask::setHour(int hour) { this->m_hour = hour; } -int kbd_service::CComputeTask::minute() const +int iot_service::CComputeTask::minute() const { return m_minute; } -void kbd_service::CComputeTask::setMinute(int minute) +void iot_service::CComputeTask::setMinute(int minute) { this->m_minute = minute; } -int kbd_service::CComputeTask::second() const +int iot_service::CComputeTask::second() const { return m_second; } -void kbd_service::CComputeTask::setSecond(int second) +void iot_service::CComputeTask::setSecond(int second) { m_second = second; } -bool kbd_service::CComputeTask::isPeriodMode() +bool iot_service::CComputeTask::isPeriodMode() { return this->m_triggerMethod == COL_TRIGGER_METHOD_PERIOD; } -bool kbd_service::CComputeTask::isTimerMode() +bool iot_service::CComputeTask::isTimerMode() { return this->m_triggerMethod == COL_TRIGGER_METHOD_TIMER; } -bool kbd_service::CComputeTask::isParaChgMode() +bool iot_service::CComputeTask::isParaChgMode() { return this->m_triggerMethod == COL_TRIGGER_METHOD_PARACHG; } -kbd_service::CComputeTask::CComputeTask(const char *tagName): +iot_service::CComputeTask::CComputeTask(const char *tagName): m_configState(TASK_CFG_GOOD), m_sInstTag(tagName) { } -void kbd_service::CComputeTask::setStatTemplate(CStatTemplatePtr statTemplate) +void iot_service::CComputeTask::setStatTemplate(CStatTemplatePtr statTemplate) { m_statTemplate = statTemplate; } -std::string kbd_service::CComputeTask::tagName() +std::string iot_service::CComputeTask::tagName() { return m_sInstTag; } -int kbd_service::CComputeTask::paraSize() const +int iot_service::CComputeTask::paraSize() const { return static_cast(m_vecPara.size()); } -int kbd_service::CComputeTask::retSize() const +int iot_service::CComputeTask::retSize() const { return static_cast(m_vecRet.size()); } -kbd_service::CParaPtr kbd_service::CComputeTask::getPara(int no) +iot_service::CParaPtr iot_service::CComputeTask::getPara(int no) { return m_vecPara[no]; } -kbd_service::CRetPtr kbd_service::CComputeTask::getRet(int no) +iot_service::CRetPtr iot_service::CComputeTask::getRet(int no) { return m_vecRet[no]; } -int kbd_service::CComputeTask::getParaType(int no) +int iot_service::CComputeTask::getParaType(int no) { return m_vecPara.at(no)->type(); } -bool kbd_service::CComputeTask::isParaGrp(int no) +bool iot_service::CComputeTask::isParaGrp(int no) { return m_vecPara.at(no)->isGrp(); } -std::string kbd_service::CComputeTask::getParaTag(int no) +std::string iot_service::CComputeTask::getParaTag(int no) { return m_vecPara.at(no)->paraTag(); } -std::string kbd_service::CComputeTask::getParaArgName(int no) +std::string iot_service::CComputeTask::getParaArgName(int no) { return m_vecPara.at(no)->argName(); } -std::vector kbd_service::CComputeTask::getParaGrpNo() +std::vector iot_service::CComputeTask::getParaGrpNo() { std::vector result; for(std::size_t i = 0; i < m_vecPara.size();i++) @@ -180,7 +180,7 @@ std::vector kbd_service::CComputeTask::getParaGrpNo() return result; } -std::vector kbd_service::CComputeTask::getRetGrpNo() +std::vector iot_service::CComputeTask::getRetGrpNo() { std::vector result; for(std::size_t i = 0; i < m_vecPara.size();i++) @@ -191,17 +191,17 @@ std::vector kbd_service::CComputeTask::getRetGrpNo() return result; } -void kbd_service::CComputeTask::addPara(kbd_service::CParaPtr para) +void iot_service::CComputeTask::addPara(iot_service::CParaPtr para) { m_vecPara.push_back(para); } -void kbd_service::CComputeTask::addRet(CRetPtr ret) +void iot_service::CComputeTask::addRet(CRetPtr ret) { m_vecRet.push_back(ret); } -void kbd_service::CComputeTask::setConfigState(int configState) +void iot_service::CComputeTask::setConfigState(int configState) { m_configState = configState; } diff --git a/product/src/service/stat_server/stat_server/CComputeTask.h b/product/src/service/stat_server/stat_server/CComputeTask.h index e6baf54e..a0a50302 100644 --- a/product/src/service/stat_server/stat_server/CComputeTask.h +++ b/product/src/service/stat_server/stat_server/CComputeTask.h @@ -17,7 +17,7 @@ #define TASK_CFG_PARA_ERR 2 #define TASK_CFG_RET_ERR 3 -namespace kbd_service { +namespace iot_service { //< 前置声明 class CStatTemplate; typedef boost::shared_ptr CStatTemplatePtr; @@ -123,6 +123,6 @@ private: typedef boost::shared_ptr CComputeTaskPtr; -} //< namespace kbd_service +} //< namespace iot_service #endif // CCOMPUTETASK_H diff --git a/product/src/service/stat_server/stat_server/CComputeUnit.cpp b/product/src/service/stat_server/stat_server/CComputeUnit.cpp index 32eeadad..7855a4ae 100644 --- a/product/src/service/stat_server/stat_server/CComputeUnit.cpp +++ b/product/src/service/stat_server/stat_server/CComputeUnit.cpp @@ -15,7 +15,7 @@ #include "../stat_server_function/CStatServerFunc.h" #include "../stat_server_function/global_var.h" -kbd_service::CComputeUnit::CComputeUnit(QObject *parent, CComputeTaskPtr taskPtr, CComputeWorker *parentWorker): +iot_service::CComputeUnit::CComputeUnit(QObject *parent, CComputeTaskPtr taskPtr, CComputeWorker *parentWorker): QObject(parent), m_inCaseRepeatCnt(-1), m_iteration(0), @@ -43,7 +43,7 @@ kbd_service::CComputeUnit::CComputeUnit(QObject *parent, CComputeTaskPtr taskPtr } -kbd_service::CComputeUnit::~CComputeUnit() +iot_service::CComputeUnit::~CComputeUnit() { m_timer.stop(); @@ -67,7 +67,7 @@ kbd_service::CComputeUnit::~CComputeUnit() } } -void kbd_service::CComputeUnit::compute() +void iot_service::CComputeUnit::compute() { if( g_is_need_stopcompute ) { @@ -83,7 +83,7 @@ void kbd_service::CComputeUnit::compute() LOGTRACE("统计实例%s计算完成",m_taskPtr->tagName().c_str()); } -void kbd_service::CComputeUnit::periodModeWork() +void iot_service::CComputeUnit::periodModeWork() { // LOGTRACE("doWork() 触发"); if(m_iteration == 0) @@ -98,7 +98,7 @@ void kbd_service::CComputeUnit::periodModeWork() } } -void kbd_service::CComputeUnit::timerModeWork() +void iot_service::CComputeUnit::timerModeWork() { if(isComputed() == false && isTimeUp()){ LOGTRACE("定时模式设定时间触发"); @@ -110,18 +110,18 @@ void kbd_service::CComputeUnit::timerModeWork() } -void kbd_service::CComputeUnit::stop() +void iot_service::CComputeUnit::stop() { m_timer.stop(); } -void kbd_service::CComputeUnit::restart() +void iot_service::CComputeUnit::restart() { stop(); start(); } -void kbd_service::CComputeUnit::start() +void iot_service::CComputeUnit::start() { if(m_taskPtr->isPeriodMode()){ compute();//< 先计算 @@ -138,7 +138,7 @@ void kbd_service::CComputeUnit::start() } } -bool kbd_service::CComputeUnit::isComputed() +bool iot_service::CComputeUnit::isComputed() { if(m_inCaseRepeatCnt > 0) { @@ -148,14 +148,14 @@ bool kbd_service::CComputeUnit::isComputed() return false; } -int kbd_service::CComputeUnit::state() +int iot_service::CComputeUnit::state() { return m_state; } -void kbd_service::CComputeUnit::setComputeMethod() +void iot_service::CComputeUnit::setComputeMethod() { if(m_taskPtr->isPeriodMode()){ @@ -253,7 +253,7 @@ void kbd_service::CComputeUnit::setComputeMethod() } -void kbd_service::CComputeUnit::computeNextTimestamp() +void iot_service::CComputeUnit::computeNextTimestamp() { switch (m_taskPtr->timerMode()) { case TIMER_MODE_YEAR: @@ -366,7 +366,7 @@ void kbd_service::CComputeUnit::computeNextTimestamp() LOGTRACE("下一个时间戳为%lld",(long long)m_nextComputeTimestamp); } -bool kbd_service::CComputeUnit::isTimeUp() +bool iot_service::CComputeUnit::isTimeUp() { long long diff = QDateTime::currentSecsSinceEpoch() - m_nextComputeTimestamp; if( diff > TIMER_PRECISION_S_N && diff < TIMER_PRECISION_S ) //< 判断误差是否小于10秒以内 @@ -380,7 +380,7 @@ bool kbd_service::CComputeUnit::isTimeUp() } } -int kbd_service::CComputeUnit::initLuaEnv() +int iot_service::CComputeUnit::initLuaEnv() { luaL_openlibs(m_luaState); if(m_luaState == NULL) @@ -411,7 +411,7 @@ int kbd_service::CComputeUnit::initLuaEnv() return kbdSuccess; } -uint64 kbd_service::CComputeUnit::getTimeStampByPara(CParaTimePtr para) +uint64 iot_service::CComputeUnit::getTimeStampByPara(CParaTimePtr para) { //< 绝对模式直接返回时间戳 if(para->timemode() == TIME_MODE_ABSOLUTE) @@ -490,7 +490,7 @@ uint64 kbd_service::CComputeUnit::getTimeStampByPara(CParaTimePtr para) } } -void kbd_service::CComputeUnit::fillPara(std::vector &vecArgs) +void iot_service::CComputeUnit::fillPara(std::vector &vecArgs) { for(int i = 0; i < m_taskPtr->paraSize(); i++) { @@ -529,7 +529,7 @@ void kbd_service::CComputeUnit::fillPara(std::vector &vecArgs } } -int kbd_service::CComputeUnit::callFunction(std::vector &vecArgs, luabridge::LuaRef &ret) +int iot_service::CComputeUnit::callFunction(std::vector &vecArgs, luabridge::LuaRef &ret) { try{ //< 调用函数 根据函数个数调用 @@ -574,7 +574,7 @@ int kbd_service::CComputeUnit::callFunction(std::vector &vecA return kbdSuccess; } -void kbd_service::CComputeUnit::publishRet(luabridge::LuaRef &ret) +void iot_service::CComputeUnit::publishRet(luabridge::LuaRef &ret) { /*发布结果 * ret肯定是一个表格 diff --git a/product/src/service/stat_server/stat_server/CComputeUnit.h b/product/src/service/stat_server/stat_server/CComputeUnit.h index 1e84db0f..b3e21cb0 100644 --- a/product/src/service/stat_server/stat_server/CComputeUnit.h +++ b/product/src/service/stat_server/stat_server/CComputeUnit.h @@ -23,7 +23,7 @@ #include #include -namespace kbd_service { +namespace iot_service { class CComputeWorker; class CComputeUnit:public QObject @@ -84,5 +84,5 @@ private: void publishRet(luabridge::LuaRef &ret); }; typedef boost::shared_ptr CComputeUnitPtr; -} //< namespace kbd_service +} //< namespace iot_service #endif // CCOMPUTEUNIT_H diff --git a/product/src/service/stat_server/stat_server/CComputeWorker.cpp b/product/src/service/stat_server/stat_server/CComputeWorker.cpp index 6fcb9c34..79b29fd0 100644 --- a/product/src/service/stat_server/stat_server/CComputeWorker.cpp +++ b/product/src/service/stat_server/stat_server/CComputeWorker.cpp @@ -7,7 +7,7 @@ #include "pub_logger_api/logger.h" -kbd_service::CComputeWorker::CComputeWorker(QObject *parent, mapTagTaskPtr mapTask): +iot_service::CComputeWorker::CComputeWorker(QObject *parent, mapTagTaskPtr mapTask): QObject(parent), m_mapTagTask(mapTask), m_mapTagUnit(boost::make_shared>()) @@ -15,13 +15,13 @@ kbd_service::CComputeWorker::CComputeWorker(QObject *parent, mapTagTaskPtr mapTa } -kbd_service::CComputeWorker::~CComputeWorker() +iot_service::CComputeWorker::~CComputeWorker() { stopAll(); m_mapTagUnit.reset(); } -void kbd_service::CComputeWorker::initialize() +void iot_service::CComputeWorker::initialize() { for (std::map::iterator it = m_mapTagTask->begin(); it != m_mapTagTask->end(); ++it) { @@ -37,7 +37,7 @@ void kbd_service::CComputeWorker::initialize() } } -void kbd_service::CComputeWorker::compute(QString instTag) +void iot_service::CComputeWorker::compute(QString instTag) { if(m_mapTagUnit->find(instTag.toStdString()) != m_mapTagUnit->end()) { @@ -49,7 +49,7 @@ void kbd_service::CComputeWorker::compute(QString instTag) } } -void kbd_service::CComputeWorker::stopAll() +void iot_service::CComputeWorker::stopAll() { LOGINFO("stopAll(),关闭全部计算"); for (std::map::iterator it = m_mapTagUnit->begin(); it != m_mapTagUnit->end(); ++it) @@ -60,7 +60,7 @@ void kbd_service::CComputeWorker::stopAll() } -void kbd_service::CComputeWorker::restartAll() +void iot_service::CComputeWorker::restartAll() { for (std::map::iterator it = m_mapTagUnit->begin(); it != m_mapTagUnit->end(); ++it) { @@ -69,7 +69,7 @@ void kbd_service::CComputeWorker::restartAll() } } -void kbd_service::CComputeWorker::startAll() +void iot_service::CComputeWorker::startAll() { for (std::map::iterator it = m_mapTagUnit->begin(); it != m_mapTagUnit->end(); ++it) { diff --git a/product/src/service/stat_server/stat_server/CComputeWorker.h b/product/src/service/stat_server/stat_server/CComputeWorker.h index 5d75f7dc..6802256b 100644 --- a/product/src/service/stat_server/stat_server/CComputeWorker.h +++ b/product/src/service/stat_server/stat_server/CComputeWorker.h @@ -6,7 +6,7 @@ #include "StatCommon.h" #include -namespace kbd_service { +namespace iot_service { class CComputeWorker : public QObject { @@ -41,6 +41,6 @@ private: }; -} //< namespace kbd_service +} //< namespace iot_service #endif // CCOMPUTEWORKER_H diff --git a/product/src/service/stat_server/stat_server/CMainThreadMng.cpp b/product/src/service/stat_server/stat_server/CMainThreadMng.cpp index 7111536b..2bc8a5ca 100644 --- a/product/src/service/stat_server/stat_server/CMainThreadMng.cpp +++ b/product/src/service/stat_server/stat_server/CMainThreadMng.cpp @@ -8,7 +8,7 @@ #include "../stat_server_function/global_var.h" -kbd_service::CMainThreadMng::CMainThreadMng(QObject *parent, const kbd_public::SRunAppInfo &stRunAppInfo): +iot_service::CMainThreadMng::CMainThreadMng(QObject *parent, const iot_public::SRunAppInfo &stRunAppInfo): m_mapTagTask(boost::make_shared>()), m_mapTagTemplate(boost::make_shared>()), m_stRunAppInfo(stRunAppInfo), @@ -17,7 +17,7 @@ kbd_service::CMainThreadMng::CMainThreadMng(QObject *parent, const kbd_public::S Q_UNUSED(parent); } -kbd_service::CMainThreadMng::~CMainThreadMng() +iot_service::CMainThreadMng::~CMainThreadMng() { m_computeThread.quit(); m_computeThread.wait(); @@ -38,7 +38,7 @@ kbd_service::CMainThreadMng::~CMainThreadMng() m_mapTagTask.reset(); } -int kbd_service::CMainThreadMng::initialize() +int iot_service::CMainThreadMng::initialize() { CRdbReloadWorker *rdbReloadWorker = new CRdbReloadWorker(NULL,m_stRunAppInfo,m_mapTagTask,m_mapTagTemplate); if(rdbReloadWorker->initialize() == kbdFailed){ @@ -99,22 +99,22 @@ int kbd_service::CMainThreadMng::initialize() return kbdSuccess; } -void kbd_service::CMainThreadMng::startCompute() +void iot_service::CMainThreadMng::startCompute() { LOGDEBUG("startCompute()"); emit start(); } -void kbd_service::CMainThreadMng::stopCompute() +void iot_service::CMainThreadMng::stopCompute() { LOGDEBUG("stopCompute()"); g_is_need_stopcompute = true; emit this->stop(); } -void kbd_service::CMainThreadMng::removeCache() +void iot_service::CMainThreadMng::removeCache() { - QDir data_dir(kbd_public::CFileUtil::CFileUtil::getCurModuleDir().c_str()); + QDir data_dir(iot_public::CFileUtil::CFileUtil::getCurModuleDir().c_str()); data_dir.cdUp();//< platform data_dir.cdUp();//< home data_dir.cd("data");//< data diff --git a/product/src/service/stat_server/stat_server/CMainThreadMng.h b/product/src/service/stat_server/stat_server/CMainThreadMng.h index f8287487..4ff2f8bb 100644 --- a/product/src/service/stat_server/stat_server/CMainThreadMng.h +++ b/product/src/service/stat_server/stat_server/CMainThreadMng.h @@ -12,13 +12,13 @@ #include #include "pub_sysinfo_api/SysInfoApi.h" -namespace kbd_service { +namespace iot_service { class CMainThreadMng : public QObject { Q_OBJECT public: - explicit CMainThreadMng(QObject *parent ,const kbd_public::SRunAppInfo &stRunAppInfo); + explicit CMainThreadMng(QObject *parent ,const iot_public::SRunAppInfo &stRunAppInfo); ~CMainThreadMng(); /** * @brief initialize 初始化 @@ -49,10 +49,10 @@ private: mapTagTaskPtr m_mapTagTask; mapTagTemplatePtr m_mapTagTemplate; - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 void removeCache(); }; -} // CParaPtr; -} //< namespace kbd_service +} //< namespace iot_service diff --git a/product/src/service/stat_server/stat_server/CParaGrp.cpp b/product/src/service/stat_server/stat_server/CParaGrp.cpp index cc0b6ce4..4ffc1ef7 100644 --- a/product/src/service/stat_server/stat_server/CParaGrp.cpp +++ b/product/src/service/stat_server/stat_server/CParaGrp.cpp @@ -1,6 +1,6 @@ #include "CParaGrp.h" -kbd_service::CParaGrp::CParaGrp( +iot_service::CParaGrp::CParaGrp( const std::string &sParaTag, const std::string &sArgName, int pointType):CPara(sParaTag,sArgName,true),m_pointType(pointType) @@ -8,31 +8,31 @@ kbd_service::CParaGrp::CParaGrp( } -kbd_service::CParaGrp::~CParaGrp() +iot_service::CParaGrp::~CParaGrp() { } -int kbd_service::CParaGrp::type() +int iot_service::CParaGrp::type() { return GRP_TYPE; } -kbd_service::CParaPtr kbd_service::CParaGrp::getPara(int no) +iot_service::CParaPtr iot_service::CParaGrp::getPara(int no) { return m_vecPara.at(no); } -void kbd_service::CParaGrp::addPara(CParaPtr para) +void iot_service::CParaGrp::addPara(CParaPtr para) { m_vecPara.push_back(para); } -int kbd_service::CParaGrp::size() +int iot_service::CParaGrp::size() { return static_cast(m_vecPara.size()); } -int kbd_service::CParaGrp::pointType() +int iot_service::CParaGrp::pointType() { return m_pointType; } diff --git a/product/src/service/stat_server/stat_server/CParaGrp.h b/product/src/service/stat_server/stat_server/CParaGrp.h index cb82ecb5..5498eb7e 100644 --- a/product/src/service/stat_server/stat_server/CParaGrp.h +++ b/product/src/service/stat_server/stat_server/CParaGrp.h @@ -4,7 +4,7 @@ #include "CPara.h" -namespace kbd_service { +namespace iot_service { class CParaGrp:public CPara { diff --git a/product/src/service/stat_server/stat_server/CParaPoint.cpp b/product/src/service/stat_server/stat_server/CParaPoint.cpp index 56229ccf..e468537e 100644 --- a/product/src/service/stat_server/stat_server/CParaPoint.cpp +++ b/product/src/service/stat_server/stat_server/CParaPoint.cpp @@ -2,32 +2,32 @@ -kbd_service::CParaPoint::CParaPoint(const std::string &sParaTag, const std::string &sArgName):CPara(sParaTag,sArgName,false) +iot_service::CParaPoint::CParaPoint(const std::string &sParaTag, const std::string &sArgName):CPara(sParaTag,sArgName,false) { } -kbd_service::CParaPoint::CParaPoint(const std::string &sParaTag):CPara(sParaTag,false) +iot_service::CParaPoint::CParaPoint(const std::string &sParaTag):CPara(sParaTag,false) { } -kbd_service::CParaPoint::CParaPoint(const std::string &sParaTag,const std::string &sArgName,const std::string &pointTag):CPara(sParaTag,sArgName,false),m_sPointTag(pointTag) +iot_service::CParaPoint::CParaPoint(const std::string &sParaTag,const std::string &sArgName,const std::string &pointTag):CPara(sParaTag,sArgName,false),m_sPointTag(pointTag) { } -int kbd_service::CParaPoint::type() +int iot_service::CParaPoint::type() { return POINT_TYPE; } -std::string kbd_service::CParaPoint::PointTag() const +std::string iot_service::CParaPoint::PointTag() const { return m_sPointTag; } -void kbd_service::CParaPoint::setPointTag(const std::string &sPointTag) +void iot_service::CParaPoint::setPointTag(const std::string &sPointTag) { m_sPointTag = sPointTag; } diff --git a/product/src/service/stat_server/stat_server/CParaPoint.h b/product/src/service/stat_server/stat_server/CParaPoint.h index 59d408a3..c25fa961 100644 --- a/product/src/service/stat_server/stat_server/CParaPoint.h +++ b/product/src/service/stat_server/stat_server/CParaPoint.h @@ -3,7 +3,7 @@ #include "CPara.h" -namespace kbd_service { +namespace iot_service { class CParaPoint:public CPara { @@ -23,6 +23,6 @@ private: }; typedef boost::shared_ptr CParaPointPtr; -} //< namespace kbd_service +} //< namespace iot_service #endif // CPARAPOINT_H diff --git a/product/src/service/stat_server/stat_server/CParaTime.cpp b/product/src/service/stat_server/stat_server/CParaTime.cpp index 9b252c85..822170ca 100644 --- a/product/src/service/stat_server/stat_server/CParaTime.cpp +++ b/product/src/service/stat_server/stat_server/CParaTime.cpp @@ -1,107 +1,107 @@ #include "CParaTime.h" -kbd_service::CParaTime::CParaTime(const std::string &sParaTag, const std::string &sArgName):CPara(sParaTag,sArgName,false) +iot_service::CParaTime::CParaTime(const std::string &sParaTag, const std::string &sArgName):CPara(sParaTag,sArgName,false) { } -kbd_service::CParaTime::CParaTime(const std::string &sParaTag):CPara(sParaTag,false) +iot_service::CParaTime::CParaTime(const std::string &sParaTag):CPara(sParaTag,false) { } -int kbd_service::CParaTime::type() +int iot_service::CParaTime::type() { return TIME_TYPE; } -uint64 kbd_service::CParaTime::Second_R() const +uint64 iot_service::CParaTime::Second_R() const { return m_nSecond_R; } -void kbd_service::CParaTime::setSecond_R(const uint64 &nSecond_R) +void iot_service::CParaTime::setSecond_R(const uint64 &nSecond_R) { m_nSecond_R = nSecond_R; } -int kbd_service::CParaTime::Minute_R() const +int iot_service::CParaTime::Minute_R() const { return m_nMinute_R; } -void kbd_service::CParaTime::setMinute_R(int nMinute_R) +void iot_service::CParaTime::setMinute_R(int nMinute_R) { m_nMinute_R = nMinute_R; } -int kbd_service::CParaTime::Hour_R() const +int iot_service::CParaTime::Hour_R() const { return m_nHour_R; } -void kbd_service::CParaTime::setHour_R(int nHour_R) +void iot_service::CParaTime::setHour_R(int nHour_R) { m_nHour_R = nHour_R; } -int kbd_service::CParaTime::Weekday_R() const +int iot_service::CParaTime::Weekday_R() const { return m_nWeekday_R; } -void kbd_service::CParaTime::setWeekday_R(int nWeekday_R) +void iot_service::CParaTime::setWeekday_R(int nWeekday_R) { m_nWeekday_R = nWeekday_R; } -int kbd_service::CParaTime::Day_R() const +int iot_service::CParaTime::Day_R() const { return m_nDay_R; } -void kbd_service::CParaTime::setDay_R(int nDay_R) +void iot_service::CParaTime::setDay_R(int nDay_R) { m_nDay_R = nDay_R; } -int kbd_service::CParaTime::Month_R() const +int iot_service::CParaTime::Month_R() const { return m_nMonth_R; } -void kbd_service::CParaTime::setMonth_R(int nMonth_R) +void iot_service::CParaTime::setMonth_R(int nMonth_R) { m_nMonth_R = nMonth_R; } -int kbd_service::CParaTime::YEAR_R() const +int iot_service::CParaTime::YEAR_R() const { return m_nYEAR_R; } -void kbd_service::CParaTime::setYEAR_R(int nYEAR_R) +void iot_service::CParaTime::setYEAR_R(int nYEAR_R) { m_nYEAR_R = nYEAR_R; } -uint64 kbd_service::CParaTime::timestamp() const +uint64 iot_service::CParaTime::timestamp() const { return m_nTimestamp; } -void kbd_service::CParaTime::setTimestamp(const uint64 &nTimestamp) +void iot_service::CParaTime::setTimestamp(const uint64 &nTimestamp) { m_nTimestamp = nTimestamp; } -int kbd_service::CParaTime::timemode() const +int iot_service::CParaTime::timemode() const { return m_nTimemode; } -void kbd_service::CParaTime::setTimemode(int nTimemode) +void iot_service::CParaTime::setTimemode(int nTimemode) { m_nTimemode = nTimemode; } diff --git a/product/src/service/stat_server/stat_server/CParaTime.h b/product/src/service/stat_server/stat_server/CParaTime.h index ffa7f76e..d95ba5a6 100644 --- a/product/src/service/stat_server/stat_server/CParaTime.h +++ b/product/src/service/stat_server/stat_server/CParaTime.h @@ -5,7 +5,7 @@ #include "common/DataType.h" -namespace kbd_service { +namespace iot_service { class CParaTime:public CPara { @@ -57,6 +57,6 @@ private: }; typedef boost::shared_ptr CParaTimePtr; -} //namespace kbd_service +} //namespace iot_service #endif // CPARATIME_H diff --git a/product/src/service/stat_server/stat_server/CPublishWorker.cpp b/product/src/service/stat_server/stat_server/CPublishWorker.cpp index 81e075d0..5aad1637 100644 --- a/product/src/service/stat_server/stat_server/CPublishWorker.cpp +++ b/product/src/service/stat_server/stat_server/CPublishWorker.cpp @@ -12,13 +12,13 @@ #include "boost/lexical_cast.hpp" #include "common/MessageChannel.h" -kbd_service::CPublishWorker::CPublishWorker(QObject *parent, const kbd_public::SRunAppInfo &stRunAppInfo): +iot_service::CPublishWorker::CPublishWorker(QObject *parent, const iot_public::SRunAppInfo &stRunAppInfo): QObject(parent),m_stRunAppInfo(stRunAppInfo) { } -kbd_service::CPublishWorker::~CPublishWorker() +iot_service::CPublishWorker::~CPublishWorker() { //< 关闭表格 if(m_InstRetPara.isOpen()){ @@ -30,7 +30,7 @@ kbd_service::CPublishWorker::~CPublishWorker() m_ptrRdbTableMng.reset();//< ???存疑 } -int kbd_service::CPublishWorker::initialize() +int iot_service::CPublishWorker::initialize() { //< 消息总线管理类 @@ -55,7 +55,7 @@ int kbd_service::CPublishWorker::initialize() } //<.RDB管理实例 - m_ptrRdbTableMng = boost::make_shared(m_stRunAppInfo.strAppName); + m_ptrRdbTableMng = boost::make_shared(m_stRunAppInfo.strAppName); if (m_ptrRdbTableMng == NULL) { LOGERROR("CDigProcess::initialize(), make_shared fail!\n"); @@ -87,7 +87,7 @@ int kbd_service::CPublishWorker::initialize() } -void kbd_service::CPublishWorker::publishResult(QString instTag, double value, int status, bool isBind, QString pointTag) +void iot_service::CPublishWorker::publishResult(QString instTag, double value, int status, bool isBind, QString pointTag) { // checkMainThread(); LOGTRACE("发布结果,返回值标签%s,值%f,状态%d(1有效,0无效),是否绑定测点%d(1绑定,0不绑定),绑定测点标签%s",instTag.toStdString().c_str(),value,status,(int)isBind,pointTag.toStdString().c_str()); @@ -103,11 +103,11 @@ void kbd_service::CPublishWorker::publishResult(QString instTag, double value, i } } -void kbd_service::CPublishWorker::sendToDp(const std::string &strName, const double &Value, bool isValid) +void iot_service::CPublishWorker::sendToDp(const std::string &strName, const double &Value, bool isValid) { std::string outValue = boost::lexical_cast(Value); - kbd_idlfile::SVariable varValue; + iot_idl::SVariable varValue; std::string strTableName; std::string strTagName; std::string strColumnName; @@ -119,7 +119,7 @@ void kbd_service::CPublishWorker::sendToDp(const std::string &strName, const dou if(strTableName==RT_DIG_TBL) { nPointType=POINT_TYPE_DIG; - varValue.set_edatatype( kbd_idlfile::CN_DATATYPE_INT32 ); + varValue.set_edatatype( iot_idl::CN_DATATYPE_INT32 ); varValue.set_nvalue(atoi(outValue.c_str())); if(isValid == true) //有效 { @@ -133,7 +133,7 @@ void kbd_service::CPublishWorker::sendToDp(const std::string &strName, const dou else if(strTableName==RT_MIX_TBL) { nPointType=POINT_TYPE_MIX; - varValue.set_edatatype( kbd_idlfile::CN_DATATYPE_INT32 ); + varValue.set_edatatype( iot_idl::CN_DATATYPE_INT32 ); varValue.set_nvalue(atoi(outValue.c_str())); if(isValid == true) //有效 { @@ -147,7 +147,7 @@ void kbd_service::CPublishWorker::sendToDp(const std::string &strName, const dou else if(strTableName==RT_ACC_TBL) { nPointType=POINT_TYPE_ACC; - varValue.set_edatatype( kbd_idlfile::CN_DATATYPE_DOUBLE ); + varValue.set_edatatype( iot_idl::CN_DATATYPE_DOUBLE ); varValue.set_dvalue(atof(outValue.c_str())); if(isValid == true) //有效 { @@ -162,7 +162,7 @@ void kbd_service::CPublishWorker::sendToDp(const std::string &strName, const dou else { nPointType=POINT_TYPE_ANA; - varValue.set_edatatype( kbd_idlfile::CN_DATATYPE_DOUBLE ); + varValue.set_edatatype( iot_idl::CN_DATATYPE_DOUBLE ); varValue.set_dvalue(atof(outValue.c_str())); if(isValid == true) //有效 { @@ -174,14 +174,14 @@ void kbd_service::CPublishWorker::sendToDp(const std::string &strName, const dou } } - kbd_idlfile::SOptSetDataPkg stOptDataMsg; //操作数据 + iot_idl::SOptSetDataPkg stOptDataMsg; //操作数据 AddOptSetData(stOptDataMsg,strTableName,strTagName,nAddStatus,nDelStatus,varValue); sendData(stOptDataMsg,nPointType,false); } -int kbd_service::CPublishWorker::splitFunc(const std::string &inTag, std::string &strTableName, std::string &strTagName, std::string &strColumnName) +int iot_service::CPublishWorker::splitFunc(const std::string &inTag, std::string &strTableName, std::string &strTagName, std::string &strColumnName) { std::vector vecStr; boost::algorithm::split(vecStr,inTag,boost::algorithm::is_any_of("."), boost::algorithm::token_compress_on); @@ -213,9 +213,9 @@ int kbd_service::CPublishWorker::splitFunc(const std::string &inTag, std::string return kbdSuccess; } -void kbd_service::CPublishWorker::AddOptSetData(kbd_idlfile::SOptSetDataPkg &stOptDataMsg, const std::string &strTableName, const std::string &strTagName, const int &nAddStatus, const int &nDelStatus, const kbd_idlfile::SVariable &varValue) +void iot_service::CPublishWorker::AddOptSetData(iot_idl::SOptSetDataPkg &stOptDataMsg, const std::string &strTableName, const std::string &strTagName, const int &nAddStatus, const int &nDelStatus, const iot_idl::SVariable &varValue) { - kbd_idlfile::SOptSetDataMsg *OptSetData = stOptDataMsg.add_seq_set_data_info() ; + iot_idl::SOptSetDataMsg *OptSetData = stOptDataMsg.add_seq_set_data_info() ; if(OptSetData) { OptSetData->set_str_tag_name(strTagName); @@ -232,7 +232,7 @@ void kbd_service::CPublishWorker::AddOptSetData(kbd_idlfile::SOptSetDataPkg &stO return ; } -void kbd_service::CPublishWorker::sendData(kbd_idlfile::SOptSetDataPkg &stOptDataMsg, const int nPointType, const bool bNotAlarm) +void iot_service::CPublishWorker::sendData(iot_idl::SOptSetDataPkg &stOptDataMsg, const int nPointType, const bool bNotAlarm) { int nNum = stOptDataMsg.seq_set_data_info_size() ; //需要发送的数据为空 @@ -241,18 +241,18 @@ void kbd_service::CPublishWorker::sendData(kbd_idlfile::SOptSetDataPkg &stOptDat return; } - kbd_idlfile::SOptDataPkgHead stHead; + iot_idl::SOptDataPkgHead stHead; stHead.set_str_src_tag(STAT_SERVER_PROCESSNAME); stHead.set_b_not_alarm(bNotAlarm); //是否初始化 stHead.set_n_point_type(nPointType); //点类型 - stHead.set_n_opt_time(kbd_public::getUTCTimeMsec()); + stHead.set_n_opt_time(iot_public::getUTCTimeMsec()); stOptDataMsg.mutable_package_head()->CopyFrom(stHead); std::string strSendBuff; stOptDataMsg.SerializeToString(&strSendBuff) ; - int nRetCode = m_ptrMsgbusMng->sendToHost(kbd_idlfile::MT_OPT_SET_CAL_DATA_DOWN,CH_OPT_TO_SCADA_VALUE_SET,strSendBuff); + int nRetCode = m_ptrMsgbusMng->sendToHost(iot_idl::MT_OPT_SET_CAL_DATA_DOWN,CH_OPT_TO_SCADA_VALUE_SET,strSendBuff); if (nRetCode == false) { LOGERROR("发送dp数据:SendOptData(), nRetCode = %d, buf_size = %d, sendToHost Error", @@ -261,7 +261,7 @@ void kbd_service::CPublishWorker::sendData(kbd_idlfile::SOptSetDataPkg &stOptDat return; } -int kbd_service::CPublishWorker::openRdbTable() +int iot_service::CPublishWorker::openRdbTable() { if(!m_InstRetPara.open(m_stRunAppInfo.nAppId,INST_RET_PARA)) { @@ -271,9 +271,9 @@ int kbd_service::CPublishWorker::openRdbTable() return kbdSuccess; } -int kbd_service::CPublishWorker::updateRdb(const std::string & instTag, double value, int status) +int iot_service::CPublishWorker::updateRdb(const std::string & instTag, double value, int status) { - kbd_dbms::CTableLockGuard tableLock(m_InstRetPara); + iot_dbms::CTableLockGuard tableLock(m_InstRetPara); char key[64]; memset(key, 0, sizeof(key)); diff --git a/product/src/service/stat_server/stat_server/CPublishWorker.h b/product/src/service/stat_server/stat_server/CPublishWorker.h index 11debd94..1adf0e5f 100644 --- a/product/src/service/stat_server/stat_server/CPublishWorker.h +++ b/product/src/service/stat_server/stat_server/CPublishWorker.h @@ -15,14 +15,14 @@ #include "CStatMsgBusMng.h" #include "StatCommon.h" -namespace kbd_service { +namespace iot_service { class CPublishWorker : public QObject { Q_OBJECT public: - explicit CPublishWorker(QObject *parent, const kbd_public::SRunAppInfo &stRunAppInfo); + explicit CPublishWorker(QObject *parent, const iot_public::SRunAppInfo &stRunAppInfo); ~CPublishWorker(); int initialize(); @@ -41,13 +41,13 @@ public slots: private: CStatMsgBusMngPtr m_ptrMsgbusMng; //消息总线管理类 - kbd_public::SRunAppInfo m_stRunAppInfo; // 运行app信息 + iot_public::SRunAppInfo m_stRunAppInfo; // 运行app信息 - kbd_dbms::CRdbAccessEx m_InstRetPara; //< 更新内存库相关 + iot_dbms::CRdbAccessEx m_InstRetPara; //< 更新内存库相关 //dp_api相关 CDataProcessApiPtr m_ptrDataProcApi; - kbd_dbms::CRdbTableMngPtr m_ptrRdbTableMng; + iot_dbms::CRdbTableMngPtr m_ptrRdbTableMng; std::map m_mapAiState; std::map m_mapDiState; @@ -92,7 +92,7 @@ private: * @param strValue 发送的数据 * @param bSendImme 是否发送 */ - void AddOptSetData(kbd_idlfile::SOptSetDataPkg &stOptDataMsg,const std::string &strTableName,const std::string &strTagName,const int &nAddStatus,const int &nDelStatus,const kbd_idlfile::SVariable &varValue); + void AddOptSetData(iot_idl::SOptSetDataPkg &stOptDataMsg,const std::string &strTableName,const std::string &strTagName,const int &nAddStatus,const int &nDelStatus,const iot_idl::SVariable &varValue); /** * @brief sendCalcData 发送计算量输出到dp @@ -101,7 +101,7 @@ private: * @param bInit 是否初始化 * @param nDstDomain 默认为本域 */ - void sendData(kbd_idlfile::SOptSetDataPkg &stOptDataMsg,const int nPointType,const bool bNotAlarm = false); //-1为本域 + void sendData(iot_idl::SOptSetDataPkg &stOptDataMsg,const int nPointType,const bool bNotAlarm = false); //-1为本域 /** * @brief openRdbTable 打开内存库表 @@ -119,5 +119,5 @@ private: int updateRdb(const std::string &instTag, double value, int status); }; -} //< namespace kbd_service +} //< namespace iot_service #endif // CPUBLISHWORKER_H diff --git a/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp b/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp index 019bcd4e..65a3ad17 100644 --- a/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp +++ b/product/src/service/stat_server/stat_server/CRdbReloadWorker.cpp @@ -12,7 +12,7 @@ #include "CComputeTask.h" #include "CStatTemplate.h" -kbd_service::CRdbReloadWorker::CRdbReloadWorker(QObject *parent, const kbd_public::SRunAppInfo &stRunAppInfo, mapTagTaskPtr mapTask, mapTagTemplatePtr mapTemplate): +iot_service::CRdbReloadWorker::CRdbReloadWorker(QObject *parent, const iot_public::SRunAppInfo &stRunAppInfo, mapTagTaskPtr mapTask, mapTagTemplatePtr mapTemplate): QObject(parent), m_stRunAppInfo(stRunAppInfo), m_mapTagTask(mapTask), @@ -21,7 +21,7 @@ kbd_service::CRdbReloadWorker::CRdbReloadWorker(QObject *parent, const kbd_publi } -kbd_service::CRdbReloadWorker::~CRdbReloadWorker() +iot_service::CRdbReloadWorker::~CRdbReloadWorker() { if(m_InstDef.isOpen()) { @@ -71,7 +71,7 @@ kbd_service::CRdbReloadWorker::~CRdbReloadWorker() // LOGINFO("关闭所有内存库表完成"); } -int kbd_service::CRdbReloadWorker::initialize() +int iot_service::CRdbReloadWorker::initialize() { if(openRdbTable() == kbdFailed) { @@ -90,7 +90,7 @@ int kbd_service::CRdbReloadWorker::initialize() return kbdSuccess; } -int kbd_service::CRdbReloadWorker::loadRdb() +int iot_service::CRdbReloadWorker::loadRdb() { // 加载统计实例 std::vector vecInstEnabled; @@ -119,7 +119,7 @@ int kbd_service::CRdbReloadWorker::loadRdb() return kbdSuccess; } -int kbd_service::CRdbReloadWorker::openRdbTable() +int iot_service::CRdbReloadWorker::openRdbTable() { if(!m_InstDef.open(m_stRunAppInfo.nAppId,INST_DEF)) { @@ -179,17 +179,17 @@ int kbd_service::CRdbReloadWorker::openRdbTable() return kbdSuccess; } -int kbd_service::CRdbReloadWorker::getAllEnabledInst(std::vector &vecInst) +int iot_service::CRdbReloadWorker::getAllEnabledInst(std::vector &vecInst) { std::vector vecCol; - std::vector vecCond; + std::vector vecCond; //< 触发方式为不触发的实例 不触发的值为0 和周期触发，而不计算的值 - kbd_dbms::CRdbPublic::addCondInfo(vecCond, COL_TRIGGER_METHOD, COL_TRIGGER_METHOD_DISABLED_VALUE,ATTRCOND_NOTEQU); - kbd_dbms::CRdbPublic::addCondInfo(vecCond, INST_DEF_COL_PERIOD,INST_DEF_COL_PERIOD_DISABLED_VALUE ,ATTRCOND_NOTEQU); + iot_dbms::CRdbPublic::addCondInfo(vecCond, COL_TRIGGER_METHOD, COL_TRIGGER_METHOD_DISABLED_VALUE,ATTRCOND_NOTEQU); + iot_dbms::CRdbPublic::addCondInfo(vecCond, INST_DEF_COL_PERIOD,INST_DEF_COL_PERIOD_DISABLED_VALUE ,ATTRCOND_NOTEQU); //< 获取锁 - kbd_dbms::CTableLockGuard tableLock(m_InstDef); + iot_dbms::CTableLockGuard tableLock(m_InstDef); if(!m_InstDef.selectAllVec(vecCond,vecInst,vecCol)) { LOGERROR("CRdbReloadWorker::getAllEnabledInst():查询表[%s]所有的启用的统计实例失败.", INST_DEF); @@ -198,7 +198,7 @@ int kbd_service::CRdbReloadWorker::getAllEnabledInst(std::vector & return kbdSuccess; } -int kbd_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) +int iot_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) { CComputeTaskPtr task = boost::make_shared(sInst.szTag); @@ -289,7 +289,7 @@ int kbd_service::CRdbReloadWorker::addTask(SStatInstDef &sInst) return kbdSuccess; } -int kbd_service::CRdbReloadWorker::addParaToTask(const char *sInstTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::addParaToTask(const char *sInstTag, CComputeTaskPtr &outTaskPtr) { //< 参数模板添加 { @@ -335,7 +335,7 @@ int kbd_service::CRdbReloadWorker::addParaToTask(const char *sInstTag, CComputeT return kbdSuccess; } -int kbd_service::CRdbReloadWorker::addRetToTask(const char *sInstTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::addRetToTask(const char *sInstTag, CComputeTaskPtr &outTaskPtr) { //< 返回值模板添加 { @@ -383,7 +383,7 @@ int kbd_service::CRdbReloadWorker::addRetToTask(const char *sInstTag, CComputeTa } int -kbd_service::CRdbReloadWorker::getTemplate(const char *szTemplateTag, CStatTemplatePtr &outTemplatePtr) +iot_service::CRdbReloadWorker::getTemplate(const char *szTemplateTag, CStatTemplatePtr &outTemplatePtr) { if(m_mapTagTemplate->find(szTemplateTag) != m_mapTagTemplate->end()) { @@ -416,15 +416,15 @@ kbd_service::CRdbReloadWorker::getTemplate(const char *szTemplateTag, CStatTempl } } -int kbd_service::CRdbReloadWorker::addTemplateParaToTask(const char *sTemplateTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::addTemplateParaToTask(const char *sTemplateTag, CComputeTaskPtr &outTaskPtr) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,TEMPLATE_DEF_COL_TERMPLATE_TAG,std::string(sTemplateTag)); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,TEMPLATE_DEF_COL_TERMPLATE_TAG,std::string(sTemplateTag)); std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_TemplatePara); + iot_dbms::CTableLockGuard tableLock(m_TemplatePara); if(!m_TemplatePara.selectAllVec(vecCond,vecRecord,vecCol,TEMPLATE_PARA_COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询统计模板参数表失败"); @@ -464,7 +464,7 @@ int kbd_service::CRdbReloadWorker::addTemplateParaToTask(const char *sTemplateTa return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr) { for(int i = 0;i < outTaskPtr->paraSize();i++) { @@ -521,7 +521,7 @@ int kbd_service::CRdbReloadWorker::fillFirstRankPara(const char *sInstTag, CComp return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillSecondRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillSecondRankPara(const char *sInstTag, CComputeTaskPtr &outTaskPtr) { for(int i = 0;i < outTaskPtr->paraSize();i++) { @@ -566,16 +566,16 @@ int kbd_service::CRdbReloadWorker::fillSecondRankPara(const char *sInstTag, CCom return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillInstParaGrp(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillInstParaGrp(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstParaGrp); + iot_dbms::CTableLockGuard tableLock(m_InstParaGrp); if(!m_InstParaGrp.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计输入参数组失败"); return kbdFailedRdb; @@ -591,17 +591,17 @@ int kbd_service::CRdbReloadWorker::fillInstParaGrp(const char *sInstTag, int sor return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillInstParaPoint(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillInstParaPoint(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_TOP); // 一级参数 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_TOP); // 一级参数 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstParaPoint); + iot_dbms::CTableLockGuard tableLock(m_InstParaPoint); if(!m_InstParaPoint.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计输入测点类参数失败"); return kbdFailed; @@ -621,17 +621,17 @@ int kbd_service::CRdbReloadWorker::fillInstParaPoint(const char *sInstTag, int s return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillInstParaTime(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillInstParaTime(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_TOP); // 一级参数 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_TOP); // 一级参数 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstParaTime); + iot_dbms::CTableLockGuard tableLock(m_InstParaTime); if(!m_InstParaTime.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计输入时间参数失败"); return kbdFailed; @@ -660,17 +660,17 @@ int kbd_service::CRdbReloadWorker::fillInstParaTime(const char *sInstTag, int so return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillInstParaPointSecondRank(const char *szInstTag, const char *szGrpTag, CParaGrpPtr &grpPara) +int iot_service::CRdbReloadWorker::fillInstParaPointSecondRank(const char *szInstTag, const char *szGrpTag, CParaGrpPtr &grpPara) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(szInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_GRP_TAG,std::string(szGrpTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_SECOND); // 二级参数 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(szInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_GRP_TAG,std::string(szGrpTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_SECOND); // 二级参数 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstParaPoint); + iot_dbms::CTableLockGuard tableLock(m_InstParaPoint); if(!m_InstParaPoint.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询二级统计输入测点类参数失败"); return kbdFailed; @@ -687,17 +687,17 @@ int kbd_service::CRdbReloadWorker::fillInstParaPointSecondRank(const char *szIns return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillInstParaTimeSecondRank(const char *szInstTag, const char *szGrpTag, CParaGrpPtr &grpPara) +int iot_service::CRdbReloadWorker::fillInstParaTimeSecondRank(const char *szInstTag, const char *szGrpTag, CParaGrpPtr &grpPara) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(szInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_GRP_TAG,std::string(szGrpTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_SECOND); // 二级参数 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(szInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_GRP_TAG,std::string(szGrpTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_SECOND); // 二级参数 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstParaTime); + iot_dbms::CTableLockGuard tableLock(m_InstParaTime); if(!m_InstParaTime.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询二级统计输入时间类参数失败"); return kbdFailed; @@ -724,15 +724,15 @@ int kbd_service::CRdbReloadWorker::fillInstParaTimeSecondRank(const char *szInst return kbdSuccess; } -int kbd_service::CRdbReloadWorker::addTemplateRetToTask(const char *sTemplateTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::addTemplateRetToTask(const char *sTemplateTag, CComputeTaskPtr &outTaskPtr) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,TEMPLATE_DEF_COL_TERMPLATE_TAG,std::string(sTemplateTag)); + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,TEMPLATE_DEF_COL_TERMPLATE_TAG,std::string(sTemplateTag)); std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_TemplateRet); + iot_dbms::CTableLockGuard tableLock(m_TemplateRet); if(!m_TemplateRet.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询统计模板返回值表失败"); return kbdFailedRdb; @@ -760,7 +760,7 @@ int kbd_service::CRdbReloadWorker::addTemplateRetToTask(const char *sTemplateTag return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillFirstRankRet(const char *sInstTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillFirstRankRet(const char *sInstTag, CComputeTaskPtr &outTaskPtr) { int size = outTaskPtr->retSize(); for(int i = 0; i < size;i++) @@ -796,16 +796,16 @@ int kbd_service::CRdbReloadWorker::fillFirstRankRet(const char *sInstTag, CCompu return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillInstRetGrp(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillInstRetGrp(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstRetGrp); + iot_dbms::CTableLockGuard tableLock(m_InstRetGrp); if(!m_InstRetGrp.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计实例返回值参数组失败,内存库有误"); return kbdFailedRdb; @@ -821,17 +821,17 @@ int kbd_service::CRdbReloadWorker::fillInstRetGrp(const char *sInstTag, int sort return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillInstRetPara(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillInstRetPara(const char *sInstTag, int sort, CComputeTaskPtr &outTaskPtr) { std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_TOP); // 一级参数 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_SORT,sort+1); // 因为实例的参数排序从1开始计数,这里是分界线 + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_TOP); // 一级参数 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstRetPara); + iot_dbms::CTableLockGuard tableLock(m_InstRetPara); if(!m_InstRetPara.selectAllVec(vecCond,vecRecord,vecCol)){ LOGERROR("查询统计实例返回值参数表失败,内存库异常"); return kbdFailedRdb; @@ -853,7 +853,7 @@ int kbd_service::CRdbReloadWorker::fillInstRetPara(const char *sInstTag, int sor return kbdSuccess; } -int kbd_service::CRdbReloadWorker::fillSecondRankRet(const char *sInstTag, CComputeTaskPtr &outTaskPtr) +int iot_service::CRdbReloadWorker::fillSecondRankRet(const char *sInstTag, CComputeTaskPtr &outTaskPtr) { for(int i = 0;i < outTaskPtr->retSize();i++) { @@ -861,14 +861,14 @@ int kbd_service::CRdbReloadWorker::fillSecondRankRet(const char *sInstTag, CComp { CRetGrpPtr grpRet = boost::static_pointer_cast(outTaskPtr->getRet(i)); std::vector vecCol; - std::vector vecCond; - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_GRP_TAG,std::string(grpRet->RetTag())); - kbd_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_SECOND); // 一级参数 + std::vector vecCond; + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_INST_TAG,std::string(sInstTag)); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_GRP_TAG,std::string(grpRet->RetTag())); + iot_dbms::CRdbPublic::addCondInfo(vecCond,COL_RANK,COL_RANK_SECOND); // 一级参数 std::vector vecRecord; //< 查询结果 - kbd_dbms::CTableLockGuard tableLock(m_InstRetPara); + iot_dbms::CTableLockGuard tableLock(m_InstRetPara); if(!m_InstRetPara.selectAllVec(vecCond,vecRecord,vecCol,COL_SORT,1)){ // 以sort 列为升序查询 LOGERROR("查询二级统计实例返回值参数表失败,内存库异常"); return kbdFailedRdb; @@ -888,7 +888,7 @@ int kbd_service::CRdbReloadWorker::fillSecondRankRet(const char *sInstTag, CComp } template -void kbd_service::CRdbReloadWorker::genSingleConditionInfo(kbd_dbms::CONDINFO &stCond, std::string strColName, const T &value, unsigned char uRelation, unsigned char uLogic) +void iot_service::CRdbReloadWorker::genSingleConditionInfo(iot_dbms::CONDINFO &stCond, std::string strColName, const T &value, unsigned char uRelation, unsigned char uLogic) { strcpy( stCond.name, strColName.c_str() ); stCond.conditionval = value; diff --git a/product/src/service/stat_server/stat_server/CRdbReloadWorker.h b/product/src/service/stat_server/stat_server/CRdbReloadWorker.h index b94b52b2..0b9ccc4f 100644 --- a/product/src/service/stat_server/stat_server/CRdbReloadWorker.h +++ b/product/src/service/stat_server/stat_server/CRdbReloadWorker.h @@ -12,13 +12,13 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "CParaGrp.h" -namespace kbd_service { +namespace iot_service { class CRdbReloadWorker : public QObject { Q_OBJECT public: - explicit CRdbReloadWorker(QObject *parent,const kbd_public::SRunAppInfo &stRunAppInfo,mapTagTaskPtr mapTask,mapTagTemplatePtr mapTemplate); + explicit CRdbReloadWorker(QObject *parent,const iot_public::SRunAppInfo &stRunAppInfo,mapTagTaskPtr mapTask,mapTagTemplatePtr mapTemplate); virtual ~CRdbReloadWorker(); /** * @brief initialize 初始化 @@ -44,7 +44,7 @@ private: int openRdbTable(); // 运行app信息 - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; mapTagTaskPtr m_mapTagTask; mapTagTemplatePtr m_mapTagTemplate; @@ -52,15 +52,15 @@ private: //< 各个内存库操控的表 - kbd_dbms::CRdbAccessEx m_InstDef; - kbd_dbms::CRdbAccessEx m_TemplateDef; - kbd_dbms::CRdbAccessEx m_InstParaTime; - kbd_dbms::CRdbAccessEx m_InstParaPoint; - kbd_dbms::CRdbAccessEx m_InstParaGrp; - kbd_dbms::CRdbAccessEx m_InstRetPara; - kbd_dbms::CRdbAccessEx m_InstRetGrp; - kbd_dbms::CRdbAccessEx m_TemplatePara; - kbd_dbms::CRdbAccessEx m_TemplateRet; + iot_dbms::CRdbAccessEx m_InstDef; + iot_dbms::CRdbAccessEx m_TemplateDef; + iot_dbms::CRdbAccessEx m_InstParaTime; + iot_dbms::CRdbAccessEx m_InstParaPoint; + iot_dbms::CRdbAccessEx m_InstParaGrp; + iot_dbms::CRdbAccessEx m_InstRetPara; + iot_dbms::CRdbAccessEx m_InstRetGrp; + iot_dbms::CRdbAccessEx m_TemplatePara; + iot_dbms::CRdbAccessEx m_TemplateRet; //< 操控内存库的一些接口 /** @@ -207,9 +207,9 @@ private: int fillSecondRankRet(const char *sInstTag, CComputeTaskPtr &outTaskPtr); template - static void genSingleConditionInfo(kbd_dbms::CONDINFO &stCond, std::string strColName, const T& value,unsigned char uRelation = ATTRCOND_EQU, unsigned char uLogic = ATTRCOND_AND ); + static void genSingleConditionInfo(iot_dbms::CONDINFO &stCond, std::string strColName, const T& value,unsigned char uRelation = ATTRCOND_EQU, unsigned char uLogic = ATTRCOND_AND ); }; -} //< namespace kbd_service +} //< namespace iot_service #endif // CRDBRELOADWORKER_H diff --git a/product/src/service/stat_server/stat_server/CRet.cpp b/product/src/service/stat_server/stat_server/CRet.cpp index 688c4a38..8951c4b3 100644 --- a/product/src/service/stat_server/stat_server/CRet.cpp +++ b/product/src/service/stat_server/stat_server/CRet.cpp @@ -1,6 +1,6 @@ #include "CRet.h" -kbd_service::CRet::CRet(const std::string &sRetTag, const std::string &sRetName, bool isGrp): +iot_service::CRet::CRet(const std::string &sRetTag, const std::string &sRetName, bool isGrp): m_sRetTag(sRetTag), m_sRetName(sRetName), m_isGrp(isGrp) @@ -8,34 +8,34 @@ kbd_service::CRet::CRet(const std::string &sRetTag, const std::string &sRetName, } -kbd_service::CRet::CRet(const std::string &sRetTag, bool isGrp): +iot_service::CRet::CRet(const std::string &sRetTag, bool isGrp): m_sRetTag(sRetTag), m_isGrp(isGrp) { } -kbd_service::CRet::~CRet() +iot_service::CRet::~CRet() { } -bool kbd_service::CRet::isGrp() +bool iot_service::CRet::isGrp() { return m_isGrp; } -const std::string &kbd_service::CRet::RetTag() const +const std::string &iot_service::CRet::RetTag() const { return m_sRetTag; } -const std::string &kbd_service::CRet::RetName() const +const std::string &iot_service::CRet::RetName() const { return m_sRetName; } -void kbd_service::CRet::setRetTag(const std::string &retTag) +void iot_service::CRet::setRetTag(const std::string &retTag) { m_sRetTag = retTag; } diff --git a/product/src/service/stat_server/stat_server/CRet.h b/product/src/service/stat_server/stat_server/CRet.h index 58ab8c77..eeb5ad92 100644 --- a/product/src/service/stat_server/stat_server/CRet.h +++ b/product/src/service/stat_server/stat_server/CRet.h @@ -4,7 +4,7 @@ #include -namespace kbd_service { +namespace iot_service { class CRet { public: @@ -30,7 +30,7 @@ private: }; typedef boost::shared_ptr CRetPtr; -}//< namespace kbd_service +}//< namespace iot_service #endif // CRET_H diff --git a/product/src/service/stat_server/stat_server/CRetGrp.cpp b/product/src/service/stat_server/stat_server/CRetGrp.cpp index af69b42a..c3f549dd 100644 --- a/product/src/service/stat_server/stat_server/CRetGrp.cpp +++ b/product/src/service/stat_server/stat_server/CRetGrp.cpp @@ -1,27 +1,27 @@ #include "CRetGrp.h" -kbd_service::CRetGrp::CRetGrp(const std::string &sRetTag, const std::string &sRetName):CRet(sRetTag,sRetName,true) +iot_service::CRetGrp::CRetGrp(const std::string &sRetTag, const std::string &sRetName):CRet(sRetTag,sRetName,true) { } -kbd_service::CRetGrp::~CRetGrp() +iot_service::CRetGrp::~CRetGrp() { m_vecRet.clear(); } -kbd_service::CRetPtr kbd_service::CRetGrp::getRet(int no) +iot_service::CRetPtr iot_service::CRetGrp::getRet(int no) { return m_vecRet[no]; } -void kbd_service::CRetGrp::addRet(kbd_service::CRetPtr ret) +void iot_service::CRetGrp::addRet(iot_service::CRetPtr ret) { m_vecRet.push_back(ret); } -int kbd_service::CRetGrp::size() +int iot_service::CRetGrp::size() { return static_cast(m_vecRet.size()); } diff --git a/product/src/service/stat_server/stat_server/CRetGrp.h b/product/src/service/stat_server/stat_server/CRetGrp.h index f032d975..194f6cf6 100644 --- a/product/src/service/stat_server/stat_server/CRetGrp.h +++ b/product/src/service/stat_server/stat_server/CRetGrp.h @@ -6,7 +6,7 @@ #include "CRet.h" -namespace kbd_service { +namespace iot_service { class CRetGrp:public CRet { public: @@ -32,7 +32,7 @@ private: typedef boost::shared_ptr CRetGrpPtr; -} //namespace kbd_service +} //namespace iot_service diff --git a/product/src/service/stat_server/stat_server/CRetPara.cpp b/product/src/service/stat_server/stat_server/CRetPara.cpp index 7a57a1ec..2f083934 100644 --- a/product/src/service/stat_server/stat_server/CRetPara.cpp +++ b/product/src/service/stat_server/stat_server/CRetPara.cpp @@ -1,51 +1,51 @@ #include "CRetPara.h" -kbd_service::CRetPara::CRetPara(const std::string &sRetTag, const std::string &sRetName):CRet(sRetTag,sRetName,false) +iot_service::CRetPara::CRetPara(const std::string &sRetTag, const std::string &sRetName):CRet(sRetTag,sRetName,false) { } -kbd_service::CRetPara::CRetPara(const std::string &sRetTag):CRet(sRetTag,false) +iot_service::CRetPara::CRetPara(const std::string &sRetTag):CRet(sRetTag,false) { } -std::string kbd_service::CRetPara::bindPointTag() const +std::string iot_service::CRetPara::bindPointTag() const { return m_sBindPointTag; } -void kbd_service::CRetPara::setBindPointTag(const std::string &sBindPointTag) +void iot_service::CRetPara::setBindPointTag(const std::string &sBindPointTag) { m_sBindPointTag = sBindPointTag; } -double kbd_service::CRetPara::value() const +double iot_service::CRetPara::value() const { return m_dValue; } -void kbd_service::CRetPara::setValue(double value) +void iot_service::CRetPara::setValue(double value) { m_dValue = value; } -int kbd_service::CRetPara::status() const +int iot_service::CRetPara::status() const { return m_nStatus; } -void kbd_service::CRetPara::setStatus(int nStatus) +void iot_service::CRetPara::setStatus(int nStatus) { m_nStatus = nStatus; } -bool kbd_service::CRetPara::isBind() const +bool iot_service::CRetPara::isBind() const { return m_bIsBind; } -void kbd_service::CRetPara::setIsBind(bool bIsBind) +void iot_service::CRetPara::setIsBind(bool bIsBind) { m_bIsBind = bIsBind; } diff --git a/product/src/service/stat_server/stat_server/CRetPara.h b/product/src/service/stat_server/stat_server/CRetPara.h index b3a7bd7c..5574c948 100644 --- a/product/src/service/stat_server/stat_server/CRetPara.h +++ b/product/src/service/stat_server/stat_server/CRetPara.h @@ -4,7 +4,7 @@ #include #include "CRet.h" -namespace kbd_service { +namespace iot_service { class CRetPara:public CRet { @@ -32,7 +32,7 @@ private: }; typedef boost::shared_ptr CRetParaPtr; -} //< namespace kbd_service +} //< namespace iot_service #endif // CRETPARA_H diff --git a/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp b/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp index 7005baf8..71a704f0 100644 --- a/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp +++ b/product/src/service/stat_server/stat_server/CStatMsgBusMng.cpp @@ -3,26 +3,26 @@ #include "common/MessageChannel.h" -kbd_service::CStatMsgBusMng::CStatMsgBusMng(const kbd_public::SRunAppInfo &stRunAppInfo) +iot_service::CStatMsgBusMng::CStatMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo) :m_stRunAppInfo(stRunAppInfo) { } -kbd_service::CStatMsgBusMng::CStatMsgBusMng() +iot_service::CStatMsgBusMng::CStatMsgBusMng() { } -kbd_service::CStatMsgBusMng::~CStatMsgBusMng() +iot_service::CStatMsgBusMng::~CStatMsgBusMng() { // unsubMessage(); } -bool kbd_service::CStatMsgBusMng::sendToHost(int nMessageType, int nChannel, const std::string &strMessage, const std::string &strHostName) +bool iot_service::CStatMsgBusMng::sendToHost(int nMessageType, int nChannel, const std::string &strMessage, const std::string &strHostName) { bool bRet = false; - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; objMsg.setMsgType(nMessageType); //指定消息类型 objMsg.setSubject(m_stRunAppInfo.nAppId,nChannel); //下发通道 @@ -41,7 +41,7 @@ bool kbd_service::CStatMsgBusMng::sendToHost(int nMessageType, int nChannel, con } -int kbd_service::CStatMsgBusMng::subMessage() +int iot_service::CStatMsgBusMng::subMessage() { if(!m_objCommunicator.addSub(0,CH_SCADA_TO_HMI_DATA_CHANGE)) { @@ -55,9 +55,9 @@ int kbd_service::CStatMsgBusMng::subMessage() return kbdSuccess; } -int kbd_service::CStatMsgBusMng::unsubMessage() +int iot_service::CStatMsgBusMng::unsubMessage() { - using namespace kbd_net; + using namespace iot_net; std::vector vecSub =m_objCommunicator.getMySub(); for(size_t i=0;i CStatMsgBusMngPtr; -} //< namespace kbd_service +} //< namespace iot_service #endif // CSTATMSGBUSMNG_H diff --git a/product/src/service/stat_server/stat_server/CStatSrvApp.cpp b/product/src/service/stat_server/stat_server/CStatSrvApp.cpp index 0d49a096..9bfa94cc 100644 --- a/product/src/service/stat_server/stat_server/CStatSrvApp.cpp +++ b/product/src/service/stat_server/stat_server/CStatSrvApp.cpp @@ -9,17 +9,17 @@ -kbd_service::CStatSrvApp::CStatSrvApp() +iot_service::CStatSrvApp::CStatSrvApp() { } -kbd_service::CStatSrvApp::~CStatSrvApp() +iot_service::CStatSrvApp::~CStatSrvApp() { } -bool kbd_service::CStatSrvApp::start(int argc, char *argv[], int &nStatus) +bool iot_service::CStatSrvApp::start(int argc, char *argv[], int &nStatus) { //< 1.解析启动参数 if(!parseCmdLine(argc, argv)) @@ -66,7 +66,7 @@ bool kbd_service::CStatSrvApp::start(int argc, char *argv[], int &nStatus) } //< 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("创建冗余管理失败"); @@ -99,7 +99,7 @@ bool kbd_service::CStatSrvApp::start(int argc, char *argv[], int &nStatus) return true; } -bool kbd_service::CStatSrvApp::stop() +bool iot_service::CStatSrvApp::stop() { //< 10.更新当前进程冗余状态 if(m_ptrProcMng !=NULL) @@ -129,7 +129,7 @@ bool kbd_service::CStatSrvApp::stop() } //< 4.销毁消息总线接口 - if(!kbd_net::releaseMsgBus() || !kbd_dbms::releaseTsdbApi()) + if(!iot_net::releaseMsgBus() || !iot_dbms::releaseTsdbApi()) { LOGERROR("销毁消息总线资源和TSDB失败"); return false; @@ -137,12 +137,12 @@ bool kbd_service::CStatSrvApp::stop() // LOGINFO("销毁消息总线资源和TSDB成功"); //< 2.销毁日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return true; } -int kbd_service::CStatSrvApp::toQuit() +int iot_service::CStatSrvApp::toQuit() { if(m_ptrProcMng != NULL) { @@ -152,7 +152,7 @@ int kbd_service::CStatSrvApp::toQuit() return kbdSuccess; } -bool kbd_service::CStatSrvApp::parseCmdLine(int argc, char *argv[]) +bool iot_service::CStatSrvApp::parseCmdLine(int argc, char *argv[]) { //拼接启动参数，用于向进程管理注册 for(int i=1;i(m_stRunAppInfo,m_ptrProcMng); @@ -286,7 +286,7 @@ bool kbd_service::CStatSrvApp::initSrvMng() return true; } -bool kbd_service::CStatSrvApp::clean() +bool iot_service::CStatSrvApp::clean() { return true; } diff --git a/product/src/service/stat_server/stat_server/CStatSrvApp.h b/product/src/service/stat_server/stat_server/CStatSrvApp.h index 9f115821..e21a6707 100644 --- a/product/src/service/stat_server/stat_server/CStatSrvApp.h +++ b/product/src/service/stat_server/stat_server/CStatSrvApp.h @@ -11,11 +11,11 @@ -namespace kbd_service{ +namespace iot_service{ class CStatSrvApp: - public kbd_public::CBaseService, - public kbd_sys::CProcessQuitInterface + public iot_public::CBaseService, + public iot_sys::CProcessQuitInterface { public: CStatSrvApp(); @@ -97,16 +97,16 @@ private: // bool regDpChange(); std::string m_strAppName; //应用名 - kbd_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 + iot_public::SRunAppInfo m_stRunAppInfo; //本应用相关运行参数 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //创建系统信息访问智能库指针 std::string m_strStartArgs; //保存进程启动参数 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //创建进程管理访问智能库指针 - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //冗余管理类 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //创建进程管理访问智能库指针 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //冗余管理类 CStatSrvMngPtr m_ptrStatSrvMng; //统计服务管理类 }; -} //namespace kbd_service +} //namespace iot_service #endif // CSTATSRVAPP_H diff --git a/product/src/service/stat_server/stat_server/CStatSrvMng.cpp b/product/src/service/stat_server/stat_server/CStatSrvMng.cpp index f1c3aab5..07b45df3 100644 --- a/product/src/service/stat_server/stat_server/CStatSrvMng.cpp +++ b/product/src/service/stat_server/stat_server/CStatSrvMng.cpp @@ -1,19 +1,19 @@ #include "CStatSrvMng.h" -kbd_service::CStatSrvMng::CStatSrvMng(kbd_public::SRunAppInfo &stRunAppInfo, const kbd_sys::CProcMngInterfacePtr &ptrProcMng): +iot_service::CStatSrvMng::CStatSrvMng(iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProcMng): m_mng(NULL,stRunAppInfo), m_bMaster(false), m_ptrProcMng(ptrProcMng) { } -kbd_service::CStatSrvMng::~CStatSrvMng() +iot_service::CStatSrvMng::~CStatSrvMng() { // LOGINFO("~CStatSrvMng()"); m_mng.stopCompute(); } -int kbd_service::CStatSrvMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_service::CStatSrvMng::redundantSwitch(bool bMaster, bool bSlave) { //< 非主非备 转向备时 无任何操作 //< 非主非备 转向主时 开启计算 @@ -43,7 +43,7 @@ int kbd_service::CStatSrvMng::redundantSwitch(bool bMaster, bool bSlave) return kbdSuccess; } -int kbd_service::CStatSrvMng::initialize() +int iot_service::CStatSrvMng::initialize() { if(m_mng.initialize() == kbdFailed) { diff --git a/product/src/service/stat_server/stat_server/CStatSrvMng.h b/product/src/service/stat_server/stat_server/CStatSrvMng.h index 3667856c..6ac805c1 100644 --- a/product/src/service/stat_server/stat_server/CStatSrvMng.h +++ b/product/src/service/stat_server/stat_server/CStatSrvMng.h @@ -8,13 +8,13 @@ #include -namespace kbd_service { +namespace iot_service { class CStatSrvMng: - public kbd_sys::CRedundantSwitchInterface + public iot_sys::CRedundantSwitchInterface { public: - CStatSrvMng(kbd_public::SRunAppInfo &stRunAppInfo,const kbd_sys::CProcMngInterfacePtr &ptrProcMng); + CStatSrvMng(iot_public::SRunAppInfo &stRunAppInfo,const iot_sys::CProcMngInterfacePtr &ptrProcMng); ~CStatSrvMng(); /** @@ -35,11 +35,11 @@ public: private: CMainThreadMng m_mng; bool m_bMaster; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 + iot_sys::CProcMngInterfacePtr m_ptrProcMng; //进程管理访问库智能指针 }; typedef boost::shared_ptr CStatSrvMngPtr; -} // -namespace kbd_service { +namespace iot_service { class CStatTemplate { @@ -26,5 +26,5 @@ public: typedef boost::shared_ptr CStatTemplatePtr; -} //< namespace kbd_service +} //< namespace iot_service #endif // CSTATTEMPLATE_H diff --git a/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp b/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp index 25090b29..55c1449f 100644 --- a/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp +++ b/product/src/service/stat_server/stat_server/CSubDpChgWorker.cpp @@ -12,7 +12,7 @@ #include -bool kbd_service::CSubDpChgWorker::isValChg(const std::string &tagName, float val) +bool iot_service::CSubDpChgWorker::isValChg(const std::string &tagName, float val) { //< 没有记录，不属于变化,插入记录 //< 有记录，值不变，不属于变化 @@ -36,7 +36,7 @@ bool kbd_service::CSubDpChgWorker::isValChg(const std::string &tagName, float va } } -bool kbd_service::CSubDpChgWorker::isValChg(const std::string &tagName, double val) +bool iot_service::CSubDpChgWorker::isValChg(const std::string &tagName, double val) { //< 没有记录，属于变化,插入记录 //< 有记录，值不变，不属于变化 @@ -60,7 +60,7 @@ bool kbd_service::CSubDpChgWorker::isValChg(const std::string &tagName, double v } } -bool kbd_service::CSubDpChgWorker::isValChg(const std::string &tagName, int val) +bool iot_service::CSubDpChgWorker::isValChg(const std::string &tagName, int val) { //< 没有记录，属于变化,插入记录 //< 有记录，值不变，不属于变化 @@ -86,7 +86,7 @@ bool kbd_service::CSubDpChgWorker::isValChg(const std::string &tagName, int val) -kbd_service::CSubDpChgWorker::CSubDpChgWorker(QObject *parent, kbd_service::mapTagTaskPtr mapTask) +iot_service::CSubDpChgWorker::CSubDpChgWorker(QObject *parent, iot_service::mapTagTaskPtr mapTask) : QObject(parent), m_mapTagTask(mapTask) { @@ -95,7 +95,7 @@ kbd_service::CSubDpChgWorker::CSubDpChgWorker(QObject *parent, kbd_service::mapT } -kbd_service::CSubDpChgWorker::~CSubDpChgWorker() +iot_service::CSubDpChgWorker::~CSubDpChgWorker() { unsub(); m_ptrMsgbusMng.reset(); @@ -104,7 +104,7 @@ kbd_service::CSubDpChgWorker::~CSubDpChgWorker() } -void kbd_service::CSubDpChgWorker::initialize() +void iot_service::CSubDpChgWorker::initialize() { //< 建立监测映射数据结构 addDpChgTrigTask2Map(); @@ -138,7 +138,7 @@ void kbd_service::CSubDpChgWorker::initialize() connect(m_timer,&QTimer::timeout,this,&CSubDpChgWorker::recvDpChg); } -void kbd_service::CSubDpChgWorker::sub() +void iot_service::CSubDpChgWorker::sub() { subAllPointTag(); m_ptrMsgbusMng->subMessage(); @@ -146,17 +146,17 @@ void kbd_service::CSubDpChgWorker::sub() m_timer->start(); } -void kbd_service::CSubDpChgWorker::unsub() +void iot_service::CSubDpChgWorker::unsub() { m_ptrCdpcda->unsubscribeAll(); m_ptrMsgbusMng->unsubMessage(); m_timer->stop(); } -void kbd_service::CSubDpChgWorker::recvDpChg() +void iot_service::CSubDpChgWorker::recvDpChg() { //< 接收数据 - kbd_net::CMbMessage objRecvMsg; + iot_net::CMbMessage objRecvMsg; if(m_ptrMsgbusMng->recvMsg(objRecvMsg,0)) { switch (objRecvMsg.getChannelID()) { @@ -170,7 +170,7 @@ void kbd_service::CSubDpChgWorker::recvDpChg() } } -void kbd_service::CSubDpChgWorker::addPointTag2Map(const std::string ¶, const QString &instTag) +void iot_service::CSubDpChgWorker::addPointTag2Map(const std::string ¶, const QString &instTag) { if(para == "" || instTag == "") return; @@ -190,7 +190,7 @@ void kbd_service::CSubDpChgWorker::addPointTag2Map(const std::string ¶, cons } } -void kbd_service::CSubDpChgWorker::addTask2Map(kbd_service::CComputeTaskPtr task) +void iot_service::CSubDpChgWorker::addTask2Map(iot_service::CComputeTaskPtr task) { for(int i = 0; i < task->paraSize(); i++) { @@ -217,7 +217,7 @@ void kbd_service::CSubDpChgWorker::addTask2Map(kbd_service::CComputeTaskPtr task -void kbd_service::CSubDpChgWorker::addDpChgTrigTask2Map() +void iot_service::CSubDpChgWorker::addDpChgTrigTask2Map() { for (std::map::iterator it = m_mapTagTask->begin(); it != m_mapTagTask->end(); ++it) { @@ -228,7 +228,7 @@ void kbd_service::CSubDpChgWorker::addDpChgTrigTask2Map() } } -void kbd_service::CSubDpChgWorker::subAllPointTag() +void iot_service::CSubDpChgWorker::subAllPointTag() { for (std::map::iterator it = m_mapPointTagTask.begin(); it != m_mapPointTagTask.end(); ++it) { @@ -246,7 +246,7 @@ void kbd_service::CSubDpChgWorker::subAllPointTag() } -int kbd_service::CSubDpChgWorker::splitTagName(const std::string &inTag, std::string &outTableName, std::string &outTagName) +int iot_service::CSubDpChgWorker::splitTagName(const std::string &inTag, std::string &outTableName, std::string &outTagName) { std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) @@ -275,11 +275,11 @@ int kbd_service::CSubDpChgWorker::splitTagName(const std::string &inTag, std::st return kbdSuccess; } -int kbd_service::CSubDpChgWorker::processMessageFromDataChange(const kbd_net::CMbMessage &objMsg) +int iot_service::CSubDpChgWorker::processMessageFromDataChange(const iot_net::CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); switch (nMessageType) { - case kbd_idlfile::MT_DP_CHANGE_DATA: + case iot_idl::MT_DP_CHANGE_DATA: parserMsg(objMsg); break; default: @@ -289,9 +289,9 @@ int kbd_service::CSubDpChgWorker::processMessageFromDataChange(const kbd_net::CM return kbdSuccess; } -int kbd_service::CSubDpChgWorker::parserMsg(const kbd_net::CMbMessage &objMsg) +int iot_service::CSubDpChgWorker::parserMsg(const iot_net::CMbMessage &objMsg) { - kbd_idlfile::SRealTimeDataPkg changeDataPackage; + iot_idl::SRealTimeDataPkg changeDataPackage; if(true == changeDataPackage.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize())) { dispatchDpChg(changeDataPackage); @@ -305,7 +305,7 @@ int kbd_service::CSubDpChgWorker::parserMsg(const kbd_net::CMbMessage &objMsg) } -int kbd_service::CSubDpChgWorker::dispatchDpChg(const kbd_idlfile::SRealTimeDataPkg &changeDataPackage) +int iot_service::CSubDpChgWorker::dispatchDpChg(const iot_idl::SRealTimeDataPkg &changeDataPackage) { if(kbdFailed == parseAiData(changeDataPackage)) { @@ -326,7 +326,7 @@ int kbd_service::CSubDpChgWorker::dispatchDpChg(const kbd_idlfile::SRealTimeData return kbdSuccess; } -void kbd_service::CSubDpChgWorker::dispatchTagName(std::string ¶) +void iot_service::CSubDpChgWorker::dispatchTagName(std::string ¶) { if(para == "") return; @@ -340,14 +340,14 @@ void kbd_service::CSubDpChgWorker::dispatchTagName(std::string ¶) } } -int kbd_service::CSubDpChgWorker::parseAiData(const kbd_idlfile::SRealTimeDataPkg &changeDataPackage) +int iot_service::CSubDpChgWorker::parseAiData(const iot_idl::SRealTimeDataPkg &changeDataPackage) { try { int aiSize = changeDataPackage.stairtd_size(); if(aiSize>0) { - kbd_idlfile::SAiRealTimeData aiStru; + iot_idl::SAiRealTimeData aiStru; std::string strTagName; int status=0; for(int j=0;j0) { - kbd_idlfile::SDiRealTimeData diStru; + iot_idl::SDiRealTimeData diStru; std::string strTagName; int status=0; for(int j=0;j0) { - ::kbd_idlfile::SMiRealTimeData miStru; + ::iot_idl::SMiRealTimeData miStru; std::string strTagName; int status=0; for(int j=0;j0) { - ::kbd_idlfile::SPiRealTimeData piStru; + ::iot_idl::SPiRealTimeData piStru; std::string strTagName; int status=0; for(int j=0;j CComputeTaskPtr; @@ -119,7 +119,7 @@ typedef boost::shared_ptr> mapTagUnitPtr; -} //< namespace kbd_service +} //< namespace iot_service #endif // CSTATCOMMON_H diff --git a/product/src/service/stat_server/stat_server/main.cpp b/product/src/service/stat_server/stat_server/main.cpp index 9cf0cc86..cc90adc4 100644 --- a/product/src/service/stat_server/stat_server/main.cpp +++ b/product/src/service/stat_server/stat_server/main.cpp @@ -5,6 +5,6 @@ int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); - kbd_service::CStatSrvApp app; + iot_service::CStatSrvApp app; app.main(argc,argv); } diff --git a/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp b/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp index 5ed5bd39..0013cc19 100644 --- a/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp +++ b/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.cpp @@ -17,12 +17,12 @@ #include "global_var.h" #include -using namespace kbd_service::StatUtil; +using namespace iot_service::StatUtil; bool g_is_need_stopcompute = false; -void kbd_service::CLuaBuiltInFunc::loadKbdFunctions(lua_State *luaState) +void iot_service::CLuaBuiltInFunc::loadKbdFunctions(lua_State *luaState) { //< 线程暂停测试 @@ -217,7 +217,7 @@ void kbd_service::CLuaBuiltInFunc::loadKbdFunctions(lua_State *luaState) } -void kbd_service::CLuaBuiltInFunc::threadStop(){ +void iot_service::CLuaBuiltInFunc::threadStop(){ for(int i = 0; i < 300; i++) { if( g_is_need_stopcompute ) @@ -229,7 +229,7 @@ void kbd_service::CLuaBuiltInFunc::threadStop(){ } } -double kbd_service::CLuaBuiltInFunc::getChangeCnt(const std::string &tag, int period) +double iot_service::CLuaBuiltInFunc::getChangeCnt(const std::string &tag, int period) { QDateTime startDate,endDate = QDateTime::currentDateTime(); @@ -252,13 +252,13 @@ double kbd_service::CLuaBuiltInFunc::getChangeCnt(const std::string &tag, int pe } //< 构造influx连接 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); return 0; } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); //> 构造influx连接 @@ -301,27 +301,27 @@ double kbd_service::CLuaBuiltInFunc::getChangeCnt(const std::string &tag, int pe return result; } -double kbd_service::CLuaBuiltInFunc::getHourChangeCnt(std::string tag) +double iot_service::CLuaBuiltInFunc::getHourChangeCnt(std::string tag) { return getChangeCnt(tag,1); } -double kbd_service::CLuaBuiltInFunc::getDayChangeCnt(std::string tag) +double iot_service::CLuaBuiltInFunc::getDayChangeCnt(std::string tag) { return getChangeCnt(tag,2); } -double kbd_service::CLuaBuiltInFunc::getMonthChangeCnt(std::string tag) +double iot_service::CLuaBuiltInFunc::getMonthChangeCnt(std::string tag) { return getChangeCnt(tag,3); } -double kbd_service::CLuaBuiltInFunc::getYearChangeCnt(std::string tag) +double iot_service::CLuaBuiltInFunc::getYearChangeCnt(std::string tag) { return getChangeCnt(tag,4); } -double kbd_service::CLuaBuiltInFunc::getRunningTime(const std::string &tag, int period) +double iot_service::CLuaBuiltInFunc::getRunningTime(const std::string &tag, int period) { QDateTime startDate,endDate = QDateTime::currentDateTime(); @@ -343,13 +343,13 @@ double kbd_service::CLuaBuiltInFunc::getRunningTime(const std::string &tag, int } //< 构造influx连接 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); return 0; } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); //> 构造influx连接 @@ -392,47 +392,47 @@ double kbd_service::CLuaBuiltInFunc::getRunningTime(const std::string &tag, int return result; } -double kbd_service::CLuaBuiltInFunc::getHourRunningTime(std::string tag) +double iot_service::CLuaBuiltInFunc::getHourRunningTime(std::string tag) { return getRunningTime(tag,1); } -double kbd_service::CLuaBuiltInFunc::getDayRunningTime(std::string tag) +double iot_service::CLuaBuiltInFunc::getDayRunningTime(std::string tag) { return getRunningTime(tag,2); } -double kbd_service::CLuaBuiltInFunc::getMonthRunningTime(std::string tag) +double iot_service::CLuaBuiltInFunc::getMonthRunningTime(std::string tag) { return getRunningTime(tag,3); } -double kbd_service::CLuaBuiltInFunc::getYearRunningTime(std::string tag) +double iot_service::CLuaBuiltInFunc::getYearRunningTime(std::string tag) { return getRunningTime(tag,4); } -double kbd_service::CLuaBuiltInFunc::getHourRatio(std::string tagA, std::string tagB) +double iot_service::CLuaBuiltInFunc::getHourRatio(std::string tagA, std::string tagB) { return getRatio(tagA,tagB,1); } -double kbd_service::CLuaBuiltInFunc::getDayRatio(std::string tagA, std::string tagB) +double iot_service::CLuaBuiltInFunc::getDayRatio(std::string tagA, std::string tagB) { return getRatio(tagA,tagB,2); } -double kbd_service::CLuaBuiltInFunc::getMonthRatio(std::string tagA, std::string tagB) +double iot_service::CLuaBuiltInFunc::getMonthRatio(std::string tagA, std::string tagB) { return getRatio(tagA,tagB,3); } -double kbd_service::CLuaBuiltInFunc::getYearRatio(std::string tagA, std::string tagB) +double iot_service::CLuaBuiltInFunc::getYearRatio(std::string tagA, std::string tagB) { return getRatio(tagA,tagB,4); } -double kbd_service::CLuaBuiltInFunc::getRatio(std::string tagA, std::string tagB, int period) +double iot_service::CLuaBuiltInFunc::getRatio(std::string tagA, std::string tagB, int period) { QDateTime startDate,endDate = QDateTime::currentDateTime(); @@ -454,7 +454,7 @@ double kbd_service::CLuaBuiltInFunc::getRatio(std::string tagA, std::string tagB } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if( NULL == conn) { LOGERROR("influxdb connection error"); @@ -467,7 +467,7 @@ double kbd_service::CLuaBuiltInFunc::getRatio(std::string tagA, std::string tagB double startVal = 0, endVal = 0; //< 用于查询的主键 - std::vector key(1); + std::vector key(1); //< 主键赋值 std::string tagName; @@ -496,7 +496,7 @@ double kbd_service::CLuaBuiltInFunc::getRatio(std::string tagA, std::string tagB double startVal = 0, endVal = 0; //< 用于查询的主键 - std::vector key(1); + std::vector key(1); //< 主键赋值 std::string tagName; @@ -532,7 +532,7 @@ double kbd_service::CLuaBuiltInFunc::getRatio(std::string tagA, std::string tagB } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PvIncomeAndPerPeriod(std::string curve, std::string price, std::string discharge, lua_State *LuaState) +luabridge::LuaRef iot_service::CLuaBuiltInFunc::PvIncomeAndPerPeriod(std::string curve, std::string price, std::string discharge, lua_State *LuaState) { luabridge::LuaRef result = luabridge::newTable(LuaState); double resultTmp[10] = {0}; @@ -562,7 +562,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PvIncomeAndPerPeriod(std::string } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -576,9 +576,9 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PvIncomeAndPerPeriod(std::string } //< 接口用于查询的主键 - std::vector curveKey(1); - std::vector chargeKey(1); - std::vector priceKey(1); + std::vector curveKey(1); + std::vector chargeKey(1); + std::vector priceKey(1); //< 主键赋值 std::string curveTagName; @@ -639,7 +639,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PvIncomeAndPerPeriod(std::string //< 寻找拐点 LOGTRACE("开始寻找拐点"); - std::vector yieldPoints; + std::vector yieldPoints; if(!findYieldPoints(*conn.get(),curveKey,firstCurveTime,currentTimeEpoch,&vecStatusNotHave,yieldPoints)) { LOGERROR("查询拐点失败"); @@ -682,7 +682,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PvIncomeAndPerPeriod(std::string return result; } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::getCurveChg(std::string discharge, std::string curve, lua_State *LuaState) +luabridge::LuaRef iot_service::CLuaBuiltInFunc::getCurveChg(std::string discharge, std::string curve, lua_State *LuaState) { luabridge::LuaRef result = luabridge::newTable(LuaState); double resultTmp[5] = {0}; @@ -691,7 +691,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::getCurveChg(std::string discharg //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -705,8 +705,8 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::getCurveChg(std::string discharg } //< 接口用于查询的主键 - std::vector curveKey(1); - std::vector chargeKey(1); + std::vector curveKey(1); + std::vector chargeKey(1); //< 主键赋值 std::string curveTagName; @@ -754,7 +754,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::getCurveChg(std::string discharg //< 寻找拐点 LOGTRACE("开始寻找拐点"); - std::vector yieldPoints; + std::vector yieldPoints; if(!findYieldPoints(*conn.get(),curveKey,firstCurveTime,currentTimeEpoch,&vecStatusNotHave,yieldPoints)) { LOGERROR("查询拐点失败"); @@ -789,7 +789,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::getCurveChg(std::string discharg } -double kbd_service::CLuaBuiltInFunc::getLatestDiff(const std::string keyIdTag, int period) +double iot_service::CLuaBuiltInFunc::getLatestDiff(const std::string keyIdTag, int period) { QDateTime startDate,endDate = QDateTime::currentDateTime();\ switch (period) { @@ -810,7 +810,7 @@ double kbd_service::CLuaBuiltInFunc::getLatestDiff(const std::string keyIdTag, i } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if( NULL == conn) { LOGERROR("influxdb connection error"); @@ -823,7 +823,7 @@ double kbd_service::CLuaBuiltInFunc::getLatestDiff(const std::string keyIdTag, i double startVal = 0, endVal = 0; //< 用于查询的主键 - std::vector key(1); + std::vector key(1); //< 主键赋值 std::string tagName; @@ -852,28 +852,28 @@ double kbd_service::CLuaBuiltInFunc::getLatestDiff(const std::string keyIdTag, i return diffA; } -double kbd_service::CLuaBuiltInFunc::getLatestHourDiff(const std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getLatestHourDiff(const std::string keyIdTag) { return getLatestDiff(keyIdTag,1); } -double kbd_service::CLuaBuiltInFunc::getLatestDayDiff(const std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getLatestDayDiff(const std::string keyIdTag) { return getLatestDiff(keyIdTag,2); } -double kbd_service::CLuaBuiltInFunc::getLatestMonthDiff(const std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getLatestMonthDiff(const std::string keyIdTag) { return getLatestDiff(keyIdTag,3); } -double kbd_service::CLuaBuiltInFunc::getLatestYearDiff(const std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getLatestYearDiff(const std::string keyIdTag) { return getLatestDiff(keyIdTag,4); } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PcsIncomeAndPerPeriod(std::string curve, +luabridge::LuaRef iot_service::CLuaBuiltInFunc::PcsIncomeAndPerPeriod(std::string curve, std::string discharge, std::string charge, std::string price, @@ -941,7 +941,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PcsIncomeAndPerPeriod(std::strin //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -956,10 +956,10 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PcsIncomeAndPerPeriod(std::strin //< 接口用于查询的主键 - std::vector curveKey(1); - std::vector chargeKey(1); - std::vector priceKey(1); - std::vector dischargeKey(1); + std::vector curveKey(1); + std::vector chargeKey(1); + std::vector priceKey(1); + std::vector dischargeKey(1); //< 主键赋值 std::string curveTagName; @@ -1017,7 +1017,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PcsIncomeAndPerPeriod(std::strin //< 查找拐点 LOGTRACE("开始寻找拐点"); - std::vector yieldPoints; + std::vector yieldPoints; if(findYieldPoints(*conn.get(),curveKey,firstCurveTime,currentTimeEpoch,&vecStatusNotHave,yieldPoints) == false) { LOGERROR("查询拐点失败"); @@ -1058,7 +1058,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::PcsIncomeAndPerPeriod(std::strin } -double kbd_service::CLuaBuiltInFunc::getPeriodDiff(const std::string keyIdTag, int period) +double iot_service::CLuaBuiltInFunc::getPeriodDiff(const std::string keyIdTag, int period) { quint64 startTime= 0,endTime=0; endTime = QDateTime::currentMSecsSinceEpoch(); @@ -1080,7 +1080,7 @@ double kbd_service::CLuaBuiltInFunc::getPeriodDiff(const std::string keyIdTag, i } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1091,7 +1091,7 @@ double kbd_service::CLuaBuiltInFunc::getPeriodDiff(const std::string keyIdTag, i } //< 用于查询的主键 - std::vector key(1); + std::vector key(1); //< 主键赋值 std::string tagName; @@ -1119,22 +1119,22 @@ double kbd_service::CLuaBuiltInFunc::getPeriodDiff(const std::string keyIdTag, i return endVal - startVal; } -double kbd_service::CLuaBuiltInFunc::getDayDiff(std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getDayDiff(std::string keyIdTag) { return getPeriodDiff(keyIdTag,1); } -double kbd_service::CLuaBuiltInFunc::getMonthDiff(std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getMonthDiff(std::string keyIdTag) { return getPeriodDiff(keyIdTag,2); } -double kbd_service::CLuaBuiltInFunc::getYearDiff(std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getYearDiff(std::string keyIdTag) { return getPeriodDiff(keyIdTag,3); } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::genPrice(std::string curve, std::string price, lua_State *LuaState) +luabridge::LuaRef iot_service::CLuaBuiltInFunc::genPrice(std::string curve, std::string price, lua_State *LuaState) { luabridge::LuaRef result = luabridge::newTable(LuaState); // 返回结果 @@ -1149,7 +1149,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::genPrice(std::string curve, std: quint64 currentTimeSinceEpoch = QDateTime::currentMSecsSinceEpoch(); // 当前进入函数的时间 //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1157,14 +1157,14 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::genPrice(std::string curve, std: } else{ } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); //< 接口用于查询的主键 - std::vector curveKey(4); - std::vector priceKey(1); + std::vector curveKey(4); + std::vector priceKey(1); std::vector vecStatusNotHave(4); std::vector vecValue(4); - std::vector *> vecResult(4); + std::vector *> vecResult(4); std::string curveTagName; splitTagName(curve,curveKey[0],curveTagName); @@ -1179,13 +1179,13 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::genPrice(std::string curve, std: curveKey[i].m_pszTagName = curveTagName.c_str(); vecStatusNotHave[i] = getStatusNotHave(); vecValue[i] = boost::int32_t(i+1); - vecResult[i] = new std::vector(); + vecResult[i] = new std::vector(); } LOGTRACE("主键赋值完成"); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),curveKey,-1,currentTimeSinceEpoch,NULL,&vecStatusNotHave,&vecValue,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult.size() != 4) + if(iot_dbms::getHisValue(objConn,getTimeOut(),curveKey,-1,currentTimeSinceEpoch,NULL,&vecStatusNotHave,&vecValue,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult.size() != 4) { LOGERROR("查询时段错误"); for(int i = 0; i < 4; i ++) @@ -1225,7 +1225,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::genPrice(std::string curve, std: return result; } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::hourPerDay(std::string keyIdTag, lua_State *LuaState) +luabridge::LuaRef iot_service::CLuaBuiltInFunc::hourPerDay(std::string keyIdTag, lua_State *LuaState) { // quint64 start = QDateTime::currentMSecsSinceEpoch(); @@ -1244,7 +1244,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::hourPerDay(std::string keyIdTag, //< 初始环境 //================================================================= //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1252,9 +1252,9 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::hourPerDay(std::string keyIdTag, } else{ } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); - std::vector key(1); + std::vector key(1); std::string tag_name; splitTagName(keyIdTag,key[0],tag_name); key[0].m_pszTagName = tag_name.c_str(); @@ -1294,7 +1294,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::hourPerDay(std::string keyIdTag, return result; } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::MonthPerYear(std::string keyIdTag, lua_State *LuaState) +luabridge::LuaRef iot_service::CLuaBuiltInFunc::MonthPerYear(std::string keyIdTag, lua_State *LuaState) { luabridge::LuaRef result = luabridge::newTable(LuaState); @@ -1309,7 +1309,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::MonthPerYear(std::string keyIdTa //< 初始环境 //================================================================= //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1317,9 +1317,9 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::MonthPerYear(std::string keyIdTa } else{ } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); - std::vector key(1); + std::vector key(1); std::string tag_name; splitTagName(keyIdTag,key[0],tag_name); key[0].m_pszTagName = tag_name.c_str(); @@ -1356,7 +1356,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::MonthPerYear(std::string keyIdTa return result; } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::DayPerMonth(std::string keyIdTag, lua_State *LuaState) +luabridge::LuaRef iot_service::CLuaBuiltInFunc::DayPerMonth(std::string keyIdTag, lua_State *LuaState) { luabridge::LuaRef result = luabridge::newTable(LuaState); @@ -1372,16 +1372,16 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::DayPerMonth(std::string keyIdTag //< 初始环境 //================================================================= //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); return result; } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); - std::vector key(1); + std::vector key(1); std::string tag_name; splitTagName(keyIdTag,key[0],tag_name); key[0].m_pszTagName = tag_name.c_str(); @@ -1424,14 +1424,14 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::DayPerMonth(std::string keyIdTag return result; } -double kbd_service::CLuaBuiltInFunc::getLastVal(std::string keyIdTag) +double iot_service::CLuaBuiltInFunc::getLastVal(std::string keyIdTag) { double result = 0; //< 初始环境 //================================================================= //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1439,9 +1439,9 @@ double kbd_service::CLuaBuiltInFunc::getLastVal(std::string keyIdTag) } else{ } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); - std::vector key(1); + std::vector key(1); std::string tag_name; splitTagName(keyIdTag,key[0],tag_name); key[0].m_pszTagName = tag_name.c_str(); @@ -1486,7 +1486,7 @@ void setChargeInfo(const std::string &keyIdTag,const SChargeInfo& ci) } -luabridge::LuaRef kbd_service::CLuaBuiltInFunc::chargeCount(std::string keyIdTag, double jitterVal, lua_State *LuaState) +luabridge::LuaRef iot_service::CLuaBuiltInFunc::chargeCount(std::string keyIdTag, double jitterVal, lua_State *LuaState) { const double JVal = jitterVal; // 正向抖动值 const double NJVal = 0 - jitterVal; // 负向抖动值 @@ -1501,7 +1501,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::chargeCount(std::string keyIdTag //< influx连接 //=============================================================== - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -1511,9 +1511,9 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::chargeCount(std::string keyIdTag } else{ } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); - std::vector key(1); + std::vector key(1); std::string tag_name; splitTagName(keyIdTag,key[0],tag_name); key[0].m_pszTagName = tag_name.c_str(); @@ -1722,7 +1722,7 @@ luabridge::LuaRef kbd_service::CLuaBuiltInFunc::chargeCount(std::string keyIdTag } -double kbd_service::CLuaBuiltInFunc::getAccFromDaily(std::string keyIdTag, int startDayToNow, int endDayToNow) +double iot_service::CLuaBuiltInFunc::getAccFromDaily(std::string keyIdTag, int startDayToNow, int endDayToNow) { if(startDayToNow <= 0 ) { @@ -1737,13 +1737,13 @@ double kbd_service::CLuaBuiltInFunc::getAccFromDaily(std::string keyIdTag, int s } //< 构造influx连接 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); return 0; } - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); //> 构造influx连接 diff --git a/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.h b/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.h index ff817789..338321d9 100644 --- a/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.h +++ b/product/src/service/stat_server/stat_server_function/CLuaBuiltInFunc.h @@ -21,7 +21,7 @@ #include #include -namespace kbd_service { +namespace iot_service { class CLuaBuiltInFunc @@ -123,7 +123,7 @@ public: }; -}//< namespace kbd_service +}//< namespace iot_service #endif // CLUABUILTINFUNC_H diff --git a/product/src/service/stat_server/stat_server_function/CStatServerFunc.cpp b/product/src/service/stat_server/stat_server_function/CStatServerFunc.cpp index 21a28500..21adfa54 100644 --- a/product/src/service/stat_server/stat_server_function/CStatServerFunc.cpp +++ b/product/src/service/stat_server/stat_server_function/CStatServerFunc.cpp @@ -1,7 +1,7 @@ #include "CLuaBuiltInFunc.h" #include "CStatServerFunc.h" -void kbd_service::loadKbdFunc(lua_State *luaState) +void iot_service::loadKbdFunc(lua_State *luaState) { CLuaBuiltInFunc::loadKbdFunctions(luaState); } diff --git a/product/src/service/stat_server/stat_server_function/CStatServerFunc.h b/product/src/service/stat_server/stat_server_function/CStatServerFunc.h index 23453ab5..abdabc5d 100644 --- a/product/src/service/stat_server/stat_server_function/CStatServerFunc.h +++ b/product/src/service/stat_server/stat_server_function/CStatServerFunc.h @@ -13,7 +13,7 @@ #define STAT_SERVER_FUNCTION_API G_DECL_IMPORT #endif -namespace kbd_service { +namespace iot_service { STAT_SERVER_FUNCTION_API void loadKbdFunc(lua_State* luaState); } diff --git a/product/src/service/stat_server/stat_server_function/StatUtil.cpp b/product/src/service/stat_server/stat_server_function/StatUtil.cpp index 094d1667..443e274c 100644 --- a/product/src/service/stat_server/stat_server_function/StatUtil.cpp +++ b/product/src/service/stat_server/stat_server_function/StatUtil.cpp @@ -19,10 +19,10 @@ #include "rapidjson/error/en.h" #include "rapidjson/document.h" -using namespace kbd_service::StatUtil; +using namespace iot_service::StatUtil; -int kbd_service::StatUtil::splitTagName(const std::string &inTag, kbd_dbms::SMeasPointKey &outPoint, std::string &outTagName) +int iot_service::StatUtil::splitTagName(const std::string &inTag, iot_dbms::SMeasPointKey &outPoint, std::string &outTagName) { std::size_t firstDotindex = inTag.find_first_of('.'); @@ -34,16 +34,16 @@ int kbd_service::StatUtil::splitTagName(const std::string &inTag, kbd_dbms::SMea // 赋值表名; if(inTag.substr(0,firstDotindex) == std::string("analog")) { - outPoint.m_enType = kbd_dbms::MPT_AI; + outPoint.m_enType = iot_dbms::MPT_AI; } else if(inTag.substr(0,firstDotindex) == std::string("accuml")){ - outPoint.m_enType = kbd_dbms::MPT_ACC; + outPoint.m_enType = iot_dbms::MPT_ACC; } else if(inTag.substr(0,firstDotindex) == std::string("digital")){ - outPoint.m_enType = kbd_dbms::MPT_DI; + outPoint.m_enType = iot_dbms::MPT_DI; } else if(inTag.substr(0,firstDotindex) == std::string("mix")){ - outPoint.m_enType = kbd_dbms::MPT_MIX; + outPoint.m_enType = iot_dbms::MPT_MIX; }else{ return kbdFailed; } @@ -52,7 +52,7 @@ int kbd_service::StatUtil::splitTagName(const std::string &inTag, kbd_dbms::SMea return kbdSuccess; } -int kbd_service::StatUtil::splitTagName(const std::string &inTag, std::string &outTableName, std::string &outTagName) +int iot_service::StatUtil::splitTagName(const std::string &inTag, std::string &outTableName, std::string &outTagName) { std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) @@ -81,7 +81,7 @@ int kbd_service::StatUtil::splitTagName(const std::string &inTag, std::string &o return kbdSuccess; } -bool kbd_service::StatUtil::loadPVCfg(const std::string &curve, const std::string &charge, quint64 &outStartTime, double *resultTmp) +bool iot_service::StatUtil::loadPVCfg(const std::string &curve, const std::string &charge, quint64 &outStartTime, double *resultTmp) { QString path; if(!getPvDir(path)) @@ -135,7 +135,7 @@ bool kbd_service::StatUtil::loadPVCfg(const std::string &curve, const std::strin return false; } -bool kbd_service::StatUtil::savePVCfg(const std::string &curve, const std::string &charge, const quint64 &inStartTime, const double *resultTmp) +bool iot_service::StatUtil::savePVCfg(const std::string &curve, const std::string &charge, const quint64 &inStartTime, const double *resultTmp) { QString path; if(!getPvDir(path)) @@ -203,17 +203,17 @@ bool kbd_service::StatUtil::savePVCfg(const std::string &curve, const std::strin } } -bool kbd_service::StatUtil::findYieldPoints(kbd_dbms::CTsdbConn &objConn, const std::vector &vecMpKey, quint64 inTimeBegin, quint64 inTimeEnd, const std::vector *pVecStatusNotHave, std::vector &outYieldPoints) +bool iot_service::StatUtil::findYieldPoints(iot_dbms::CTsdbConn &objConn, const std::vector &vecMpKey, quint64 inTimeBegin, quint64 inTimeEnd, const std::vector *pVecStatusNotHave, std::vector &outYieldPoints) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(inTimeBegin); boost::int64_t nTimeEnd = boost::int64_t(inTimeEnd); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),vecMpKey,nTimeBegin,nTimeEnd,NULL,pVecStatusNotHave, + if(iot_dbms::getHisValue(objConn,getTimeOut(),vecMpKey,nTimeBegin,nTimeEnd,NULL,pVecStatusNotHave, NULL,NULL,NULL, - kbd_dbms::CM_DIFFERENCE,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false) + iot_dbms::CM_DIFFERENCE,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false) { LOGERROR("查询拐点错误"); delete vecResult[0]; @@ -232,20 +232,20 @@ bool kbd_service::StatUtil::findYieldPoints(kbd_dbms::CTsdbConn &objConn, const return true; } -bool kbd_service::StatUtil::findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, quint64 lastComputeTime, quint64 currentTimeEpoch, const std::vector curveKey, const std::vector chargeKey, std::vector *vecStatusNotHave, quint64 &firstCurveTime, int &firstCurveVal, double &firstChargeVal) +bool iot_service::StatUtil::findPvFirstPoints(iot_dbms::CTsdbConn &objConn, quint64 lastComputeTime, quint64 currentTimeEpoch, const std::vector curveKey, const std::vector chargeKey, std::vector *vecStatusNotHave, quint64 &firstCurveTime, int &firstCurveVal, double &firstChargeVal) { quint64 firstChargeTime; //< 查询第一个电度量/时间点 这种算法可能存在问题 LOGTRACE("开始查询第一个时间点/电度量"); if(lastComputeTime == 0) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(1); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),curveKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),curveKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询第一个时间点错误"); delete vecResult[0]; @@ -258,13 +258,13 @@ bool kbd_service::StatUtil::findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, quin } else{ //< 计算第一个电度量的值firstChargeVal, last(lastComputeTime) - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(1); boost::int64_t nTimeEnd = boost::int64_t(lastComputeTime); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询第一个电度量值错误"); delete vecResult[0]; @@ -280,14 +280,14 @@ bool kbd_service::StatUtil::findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, quin { //< 查询第一个计划曲线时间点之后第一个有意义的电度量点 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(firstCurveTime); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("开始查询第一个计划曲线时间点之后第一个有意义的电度量点错误"); delete vecResult[0]; @@ -302,13 +302,13 @@ bool kbd_service::StatUtil::findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, quin //< 再查询第一个有意义的计划曲线点,第一个有意义的电度量之后的第一个计划曲线点 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(firstChargeTime); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),curveKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),curveKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询第一个有意义的电度量之后的第一个计划曲线点错误"); delete vecResult[0]; @@ -324,15 +324,15 @@ bool kbd_service::StatUtil::findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, quin firstChargeTime = lastComputeTime; //< 查询当前初始时间段的计划曲线值 - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(1); boost::int64_t nTimeEnd = boost::int64_t(lastComputeTime); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),curveKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),curveKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询当前初始时间段的计划曲线值错误"); delete vecResult[0]; @@ -348,7 +348,7 @@ bool kbd_service::StatUtil::findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, quin } -bool kbd_service::StatUtil::handleChgYieldPoints(kbd_dbms::CTsdbConn &objConn, const std::vector chargeKey, std::vector *vecStatusNotHave, int startCurveVal, double startChargeVal, quint64 startCurveTime, quint64 currentTimeEpoch, std::vector &yieldPoints, quint64 &lastChargeTime, double *resultTmp) +bool iot_service::StatUtil::handleChgYieldPoints(iot_dbms::CTsdbConn &objConn, const std::vector chargeKey, std::vector *vecStatusNotHave, int startCurveVal, double startChargeVal, quint64 startCurveTime, quint64 currentTimeEpoch, std::vector &yieldPoints, quint64 &lastChargeTime, double *resultTmp) { //< 处理拐点 for(std::size_t i = 0; i < yieldPoints.size(); i ++) @@ -360,13 +360,13 @@ bool kbd_service::StatUtil::handleChgYieldPoints(kbd_dbms::CTsdbConn &objConn, c //< 寻找拐点的上一个各时段计划曲线值 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(1); boost::int64_t nTimeEnd = boost::int64_t(yieldPoints.at(i).m_nTime); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询该区间各时段值失败"); delete vecResult[0]; @@ -399,13 +399,13 @@ bool kbd_service::StatUtil::handleChgYieldPoints(kbd_dbms::CTsdbConn &objConn, c double lastChargeVal; //< 只处理一段,寻找最后一个last 电度量 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(1); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最后一个区间的电度量失败"); delete vecResult[0]; @@ -426,14 +426,14 @@ bool kbd_service::StatUtil::handleChgYieldPoints(kbd_dbms::CTsdbConn &objConn, c } -bool kbd_service::StatUtil::handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn, const std::vector chargeKey, - const std::vector priceKey, +bool iot_service::StatUtil::handlePvYieldPoints(iot_dbms::CTsdbConn &objConn, const std::vector chargeKey, + const std::vector priceKey, std::vector *vecStatusNotHave, int startCurveVal, double startChargeVal, quint64 startCurveTime, quint64 currentTimeEpoch, - std::vector &yieldPoints, + std::vector &yieldPoints, quint64 &lastChargeTime, double *resultTmp) { @@ -447,13 +447,13 @@ bool kbd_service::StatUtil::handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn, co //< 寻找拐点的上一个各时段计划曲线值 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(1); boost::int64_t nTimeEnd = boost::int64_t(yieldPoints.at(i).m_nTime); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询该区间各时段值失败"); delete vecResult[0]; @@ -495,13 +495,13 @@ bool kbd_service::StatUtil::handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn, co } //< 计算收益 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = 1 ; boost::int64_t nTimeEnd = boost::int64_t(yieldPoints.at(i).m_nTime) - 1; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),priceKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),priceKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询电价错误，当前开始时间[%sms],当前结束时间[%sms],当前电价标签%s,查询数量%d",QString::number(startCurveTime).toStdString().c_str(), QString::number(nTimeEnd).toStdString().c_str(), @@ -533,13 +533,13 @@ bool kbd_service::StatUtil::handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn, co double lastChargeVal; //< 只处理一段,寻找最后一个last 电度量 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = boost::int64_t(1); boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),chargeKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最后一个区间的电度量失败"); delete vecResult[0]; @@ -568,13 +568,13 @@ bool kbd_service::StatUtil::handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn, co //< 计算最后一段的收益 { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = 1 ; boost::int64_t nTimeEnd = boost::int64_t(currentTimeEpoch) -1 ; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),priceKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),priceKey,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最后一个区间的电价错误"); delete vecResult[0]; @@ -592,16 +592,16 @@ bool kbd_service::StatUtil::handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn, co return true; } -bool kbd_service::StatUtil::findFirstTime(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &result) +bool iot_service::StatUtil::findFirstTime(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最早时间错误"); delete vecResult[0]; @@ -613,16 +613,16 @@ bool kbd_service::StatUtil::findFirstTime(kbd_dbms::CTsdbConn &objConn, const st return true; } -bool kbd_service::StatUtil::findFirstTimeAndVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &resultTime, int &resultVal) +bool iot_service::StatUtil::findFirstTimeAndVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &resultTime, int &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最早时间为和值错误"); delete vecResult[0]; @@ -636,10 +636,10 @@ bool kbd_service::StatUtil::findFirstTimeAndVal(kbd_dbms::CTsdbConn &objConn, co } -bool kbd_service::StatUtil::findFirstLargerValAndTime(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, double k, quint64 &resultTime, double &resultVal) +bool iot_service::StatUtil::findFirstLargerValAndTime(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, double k, quint64 &resultTime, double &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); //< 所有查询的量的状态,模拟量和累计量两个正常的状态目前都是2(2019年7月8日) std::vector vecStatusNotHave = getVecStatusNotHave(); @@ -650,11 +650,11 @@ bool kbd_service::StatUtil::findFirstLargerValAndTime(kbd_dbms::CTsdbConn &objCo std::vector vecValueMethod(1); vecValueMethod[0] = boost::int32_t(1); // 大于 - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key, + if(iot_dbms::getHisValue(objConn,getTimeOut(),key, timeBegin+1,QDateTime::currentMSecsSinceEpoch(), NULL,&vecStatusNotHave,NULL, &vecValueCompare,&vecValueMethod, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最早[%s]大于值[%f]错误",QDateTime::fromMSecsSinceEpoch(timeBegin).toString().toStdString().c_str(),k); delete vecResult[0]; @@ -668,10 +668,10 @@ bool kbd_service::StatUtil::findFirstLargerValAndTime(kbd_dbms::CTsdbConn &objCo } -bool kbd_service::StatUtil::findFirstLessOrEqualValAndTime(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, double k, quint64 &resultTime, double &resultVal) +bool iot_service::StatUtil::findFirstLessOrEqualValAndTime(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, double k, quint64 &resultTime, double &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); //< 所有查询的量的状态,模拟量和累计量两个正常的状态目前都是2(2019年7月8日) std::vector vecStatusNotHave = getVecStatusNotHave(); @@ -682,11 +682,11 @@ bool kbd_service::StatUtil::findFirstLessOrEqualValAndTime(kbd_dbms::CTsdbConn & std::vector vecValueMethod(1); vecValueMethod[0] = boost::int32_t(-1); // 小于等于 - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key, + if(iot_dbms::getHisValue(objConn,getTimeOut(),key, timeBegin+1,QDateTime::currentMSecsSinceEpoch(), NULL,&vecStatusNotHave,NULL, &vecValueCompare,&vecValueMethod, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最早[%s]小于等于值[%f]错误",QDateTime::fromMSecsSinceEpoch(timeBegin).toString().toStdString().c_str(),k); delete vecResult[0]; @@ -700,16 +700,16 @@ bool kbd_service::StatUtil::findFirstLessOrEqualValAndTime(kbd_dbms::CTsdbConn & } -bool kbd_service::StatUtil::findLastTime(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &result) +bool iot_service::StatUtil::findLastTime(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -721,16 +721,16 @@ bool kbd_service::StatUtil::findLastTime(kbd_dbms::CTsdbConn &objConn, const std return true; } -bool kbd_service::StatUtil::findLastTimeAndVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &resultTime, int &resultVal) +bool iot_service::StatUtil::findLastTimeAndVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &resultTime, int &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间和最晚值错误，值的数量%d",(int)vecResult[0]->size()); delete vecResult[0]; @@ -745,16 +745,16 @@ bool kbd_service::StatUtil::findLastTimeAndVal(kbd_dbms::CTsdbConn &objConn, con -bool kbd_service::StatUtil::findLastTimeAndVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &resultTime, double &resultVal) +bool iot_service::StatUtil::findLastTimeAndVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &resultTime, double &resultVal) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -769,14 +769,14 @@ bool kbd_service::StatUtil::findLastTimeAndVal(kbd_dbms::CTsdbConn &objConn, con -bool kbd_service::StatUtil::findLastTimeAndVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeEnd, quint64 &resultTime, double &resultVal) +bool iot_service::StatUtil::findLastTimeAndVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeEnd, quint64 &resultTime, double &resultVal) { //< 所有查询的量的状态,模拟量和累计量两个正常的状态目前都是2(2019年7月8日) std::vector vecStatusNotHave = getVecStatusNotHave(); return findLastTimeAndVal(objConn,key,1,timeEnd,&vecStatusNotHave,resultTime,resultVal); } -quint64 kbd_service::StatUtil::getLastestVal(quint64 a, quint64 b, quint64 c) +quint64 iot_service::StatUtil::getLastestVal(quint64 a, quint64 b, quint64 c) { quint64 result = a; if(b>result) result = b; @@ -784,17 +784,17 @@ quint64 kbd_service::StatUtil::getLastestVal(quint64 a, quint64 b, quint64 c) return result; } -quint64 kbd_service::StatUtil::getOlderVal(quint64 a, quint64 b) +quint64 iot_service::StatUtil::getOlderVal(quint64 a, quint64 b) { quint64 result = a; if(b &key, quint64 timeBegin, quint64 timeEnd, double &result) +bool iot_service::StatUtil::findFirstVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, double &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; @@ -802,8 +802,8 @@ bool kbd_service::StatUtil::findFirstVal(kbd_dbms::CTsdbConn &objConn, const std //< 所有查询的量的状态,模拟量和累计量两个正常的状态目前都是2(2019年7月8日) std::vector vecStatusNotHave = getVecStatusNotHave(); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,&vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_FIRST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,&vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_FIRST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最早时间错误，当前TimeBegin[%s],查询结果数量%d",QString::number(nTimeBegin).toStdString().c_str(),(int)vecResult[0]->size()); delete vecResult[0]; @@ -816,16 +816,16 @@ bool kbd_service::StatUtil::findFirstVal(kbd_dbms::CTsdbConn &objConn, const std return true; } -bool kbd_service::StatUtil::findLastVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, double &result) +bool iot_service::StatUtil::findLastVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, double &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = boost::int64_t(timeEnd); - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -837,16 +837,16 @@ bool kbd_service::StatUtil::findLastVal(kbd_dbms::CTsdbConn &objConn, const std: return true; } -bool kbd_service::StatUtil::findLastVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, int &result) +bool iot_service::StatUtil::findLastVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, int &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询最晚时间错误"); delete vecResult[0]; @@ -858,10 +858,10 @@ bool kbd_service::StatUtil::findLastVal(kbd_dbms::CTsdbConn &objConn, const std: return true; } -bool kbd_service::StatUtil::findLastVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, double &result) +bool iot_service::StatUtil::findLastVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, double &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = boost::int64_t(timeEnd); @@ -869,8 +869,8 @@ bool kbd_service::StatUtil::findLastVal(kbd_dbms::CTsdbConn &objConn, const std: //< 所有查询的量的状态,模拟量和累计量两个正常的状态目前都是2(2019年7月8日) std::vector vecStatusNotHave = getVecStatusNotHave();; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,&vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_LAST,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,&vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_LAST,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false) { LOGERROR("getHisValue出现错误，当前TimeBegin[%s],当前TimeEnd[%s],查询结果数量%d",QString::number(nTimeBegin).toStdString().c_str(),QString::number(nTimeEnd).toStdString().c_str(),(int)vecResult[0]->size()); delete vecResult[0]; @@ -890,16 +890,16 @@ bool kbd_service::StatUtil::findLastVal(kbd_dbms::CTsdbConn &objConn, const std: return true; } -bool kbd_service::StatUtil::findMedianVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, double &result) +bool iot_service::StatUtil::findMedianVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, double &result) { - std::vector *> vecResult(1); - vecResult[0] = new std::vector(); + std::vector *> vecResult(1); + vecResult[0] = new std::vector(); boost::int64_t nTimeBegin = timeBegin ; boost::int64_t nTimeEnd = timeEnd; - if(kbd_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, - kbd_dbms::CM_MEDIAN,-1,kbd_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) + if(iot_dbms::getHisValue(objConn,getTimeOut(),key,nTimeBegin,nTimeEnd,NULL,vecStatusNotHave,NULL,NULL,NULL, + iot_dbms::CM_MEDIAN,-1,iot_dbms::FM_NULL_METHOD,vecResult) == false || vecResult[0]->size() != 1) { LOGERROR("查询众数错误"); delete vecResult[0]; @@ -911,7 +911,7 @@ bool kbd_service::StatUtil::findMedianVal(kbd_dbms::CTsdbConn &objConn, const st return true; } -bool kbd_service::StatUtil::findPcsFirstPoints(kbd_dbms::CTsdbConn &objConn, quint64 lastDischargeTime, quint64 lastChargeTime, quint64 currentTimeEpoch, const std::vector curveKey, const std::vector dischargeKey, const std::vector chargeKey, std::vector *vecStatusNotHave, quint64 &firstCurveTime, int &firstCurveVal, double &firstChargeVal, double &firstDischargeVal) +bool iot_service::StatUtil::findPcsFirstPoints(iot_dbms::CTsdbConn &objConn, quint64 lastDischargeTime, quint64 lastChargeTime, quint64 currentTimeEpoch, const std::vector curveKey, const std::vector dischargeKey, const std::vector chargeKey, std::vector *vecStatusNotHave, quint64 &firstCurveTime, int &firstCurveVal, double &firstChargeVal, double &firstDischargeVal) { quint64 firstDischargeTime = 0,firstChargeTime = 0; if(lastDischargeTime == 0 && lastChargeTime == 0) //< 无缓存计算 @@ -988,7 +988,7 @@ bool kbd_service::StatUtil::findPcsFirstPoints(kbd_dbms::CTsdbConn &objConn, qui return true; } -bool kbd_service::StatUtil::loadPcsCfg(const std::string &curve, const std::string &discharge, const std::string &charge, quint64 &lastDischargeTime, quint64 &lastChargeTime, double *resultTmp) +bool iot_service::StatUtil::loadPcsCfg(const std::string &curve, const std::string &discharge, const std::string &charge, quint64 &lastDischargeTime, quint64 &lastChargeTime, double *resultTmp) { QString path; if(!getPcsDir(path)) @@ -1047,7 +1047,7 @@ bool kbd_service::StatUtil::loadPcsCfg(const std::string &curve, const std::stri return false; } -void kbd_service::StatUtil::setElement(QDomElement &elem, quint64 lastDischargeTime, quint64 lastChargeTime, const double *resultTmp) +void iot_service::StatUtil::setElement(QDomElement &elem, quint64 lastDischargeTime, quint64 lastChargeTime, const double *resultTmp) { elem.setAttribute( "lastDischargeTime", QString::number(lastDischargeTime)); elem.setAttribute( "lastChargeTime", QString::number(lastChargeTime)); @@ -1058,7 +1058,7 @@ void kbd_service::StatUtil::setElement(QDomElement &elem, quint64 lastDischargeT } -void kbd_service::StatUtil::setElement(QDomElement &elem, const std::string &curve, const std::string &discharge, const std::string &charge, quint64 lastDischargeTime, quint64 lastChargeTime, const double *resultTmp) +void iot_service::StatUtil::setElement(QDomElement &elem, const std::string &curve, const std::string &discharge, const std::string &charge, quint64 lastDischargeTime, quint64 lastChargeTime, const double *resultTmp) { elem.setAttribute( "curve", QString(curve.c_str())); elem.setAttribute( "discharge", QString(discharge.c_str())); @@ -1066,7 +1066,7 @@ void kbd_service::StatUtil::setElement(QDomElement &elem, const std::string &cur setElement(elem,lastDischargeTime,lastChargeTime,resultTmp); } -bool kbd_service::StatUtil::savePcsCfg(const std::string &curve, +bool iot_service::StatUtil::savePcsCfg(const std::string &curve, const std::string &discharge, const std::string &charge, quint64 lastDischargeTime, @@ -1137,17 +1137,17 @@ bool kbd_service::StatUtil::savePcsCfg(const std::string &curve, } } -bool kbd_service::StatUtil::handlePcsYieldPoints(kbd_dbms::CTsdbConn &objConn, - const std::vector dischargeKey, - const std::vector chargeKey, - const std::vector priceKey, +bool iot_service::StatUtil::handlePcsYieldPoints(iot_dbms::CTsdbConn &objConn, + const std::vector dischargeKey, + const std::vector chargeKey, + const std::vector priceKey, std::vector *vecStatusNotHave, int startCurveVal, double startDischargeVal, double startChargeVal, quint64 startCurveTime, quint64 currentTimeEpoch, - std::vector &yieldPoints, + std::vector &yieldPoints, quint64 &lastDischargeTime, quint64 &lastChargeTime, double *resultTmp) @@ -1332,23 +1332,23 @@ bool kbd_service::StatUtil::handlePcsYieldPoints(kbd_dbms::CTsdbConn &objConn, return true; } -quint64 kbd_service::StatUtil::getCurDayFirstMSecsSinceEpoch() +quint64 iot_service::StatUtil::getCurDayFirstMSecsSinceEpoch() { return QDateTime(QDate::currentDate(),QTime(0,0)).toMSecsSinceEpoch(); } -quint64 kbd_service::StatUtil::getCurMonthFirstMSecsSinceEpoch() +quint64 iot_service::StatUtil::getCurMonthFirstMSecsSinceEpoch() { return QDateTime(QDate(QDate::currentDate().year(),QDate::currentDate().month(),1),QTime(0,0)).toMSecsSinceEpoch(); } -quint64 kbd_service::StatUtil::getCurYearFirstMSecsSinceEpoch() +quint64 iot_service::StatUtil::getCurYearFirstMSecsSinceEpoch() { return QDateTime(QDate(QDate::currentDate().year(),1,1),QTime(0,0)).toMSecsSinceEpoch(); } -bool kbd_service::StatUtil::savePerFuncCfg(std::string funcName, std::string keyIdTag, double *dataArray) +bool iot_service::StatUtil::savePerFuncCfg(std::string funcName, std::string keyIdTag, double *dataArray) { Q_UNUSED(funcName); Q_UNUSED(keyIdTag); @@ -1356,7 +1356,7 @@ bool kbd_service::StatUtil::savePerFuncCfg(std::string funcName, std::string key return false; } -bool kbd_service::StatUtil::diffVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 startTimeSinceEpoch, quint64 endTimeSinceEpoch, double &result) +bool iot_service::StatUtil::diffVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 startTimeSinceEpoch, quint64 endTimeSinceEpoch, double &result) { //< 原查询 //============================== @@ -1387,7 +1387,7 @@ bool kbd_service::StatUtil::diffVal(kbd_dbms::CTsdbConn &objConn, const std::vec } -bool kbd_service::StatUtil::parseJson(const std::string &strJson, double &result) +bool iot_service::StatUtil::parseJson(const std::string &strJson, double &result) { result = 0; @@ -1498,12 +1498,12 @@ bool kbd_service::StatUtil::parseJson(const std::string &strJson, double &result } -double kbd_service::StatUtil::getHourFromMs(quint64 ts1) +double iot_service::StatUtil::getHourFromMs(quint64 ts1) { return ts1/3600000.0; } -bool kbd_service::StatUtil::isSameDay(quint64 ts1, quint64 ts2) +bool iot_service::StatUtil::isSameDay(quint64 ts1, quint64 ts2) { if(QDateTime::fromMSecsSinceEpoch(ts1).date() == QDateTime::fromMSecsSinceEpoch(ts2).date()) //< 日期相同 return true; @@ -1511,7 +1511,7 @@ bool kbd_service::StatUtil::isSameDay(quint64 ts1, quint64 ts2) return false; } -bool kbd_service::StatUtil::isSameMonth(quint64 ts1, quint64 ts2) +bool iot_service::StatUtil::isSameMonth(quint64 ts1, quint64 ts2) { if(QDateTime::fromMSecsSinceEpoch(ts1).date().month() == QDateTime::fromMSecsSinceEpoch(ts2).date().month()) //< 当前月相同 return true; @@ -1519,9 +1519,9 @@ bool kbd_service::StatUtil::isSameMonth(quint64 ts1, quint64 ts2) return false; } -bool kbd_service::StatUtil::getDataStatDir(QString &path) +bool iot_service::StatUtil::getDataStatDir(QString &path) { - QDir dir(kbd_public::CFileUtil::CFileUtil::getCurModuleDir().c_str()); //< 不同的平台 + QDir dir(iot_public::CFileUtil::CFileUtil::getCurModuleDir().c_str()); //< 不同的平台 dir.cdUp(); //< platform dir.cdUp(); //< home if(dir.cd("data") == false) @@ -1540,7 +1540,7 @@ bool kbd_service::StatUtil::getDataStatDir(QString &path) return true; } -bool kbd_service::StatUtil::getPcsDir(QString &path) +bool iot_service::StatUtil::getPcsDir(QString &path) { if(!getDataStatDir(path)) { @@ -1559,7 +1559,7 @@ bool kbd_service::StatUtil::getPcsDir(QString &path) return true; } -bool kbd_service::StatUtil::getChargeDir(QString &path) +bool iot_service::StatUtil::getChargeDir(QString &path) { if(!getDataStatDir(path)) { @@ -1578,7 +1578,7 @@ bool kbd_service::StatUtil::getChargeDir(QString &path) return true; } -bool kbd_service::StatUtil::getPvDir(QString &path) +bool iot_service::StatUtil::getPvDir(QString &path) { if(!getDataStatDir(path)) { @@ -1604,24 +1604,24 @@ bool kbd_service::StatUtil::getPvDir(QString &path) } #define STAUS_NOT_HAVE 4 -std::vector kbd_service::StatUtil::getVecStatusNotHave() +std::vector iot_service::StatUtil::getVecStatusNotHave() { std::vector vecNotStatusHave(1); vecNotStatusHave[0] = boost::int32_t(STAUS_NOT_HAVE); return vecNotStatusHave; } -int32_t kbd_service::StatUtil::getStatusNotHave() +int32_t iot_service::StatUtil::getStatusNotHave() { return boost::int32_t(STAUS_NOT_HAVE); } -int kbd_service::StatUtil::getTimeOut() +int iot_service::StatUtil::getTimeOut() { return 1000; } -void kbd_service::StatUtil::dumpCiInfo(SChargeInfo &ci) +void iot_service::StatUtil::dumpCiInfo(SChargeInfo &ci) { LOGTRACE("当前CI状态机"); LOGTRACE("ci.state = %d",ci.state); @@ -1632,7 +1632,7 @@ void kbd_service::StatUtil::dumpCiInfo(SChargeInfo &ci) LOGTRACE("ci.dischargeNum = %f",ci.dischargeNum); } -bool kbd_service::StatUtil::clearPcsCfg(const std::string &curve, const std::string &discharge, const std::string &charge) +bool iot_service::StatUtil::clearPcsCfg(const std::string &curve, const std::string &discharge, const std::string &charge) { QString path; if(!getPcsDir(path)) @@ -1648,7 +1648,7 @@ bool kbd_service::StatUtil::clearPcsCfg(const std::string &curve, const std::str return file.remove(); } -bool kbd_service::StatUtil::clearPvCfg(const std::string &curve, const std::string &charge) +bool iot_service::StatUtil::clearPvCfg(const std::string &curve, const std::string &charge) { QString path; if(!getPvDir(path)) diff --git a/product/src/service/stat_server/stat_server_function/StatUtil.h b/product/src/service/stat_server/stat_server_function/StatUtil.h index ddeeb105..b37c1da4 100644 --- a/product/src/service/stat_server/stat_server_function/StatUtil.h +++ b/product/src/service/stat_server/stat_server_function/StatUtil.h @@ -23,7 +23,7 @@ #define STATE_NULL 0 -namespace kbd_service { +namespace iot_service { namespace StatUtil { @@ -70,15 +70,15 @@ namespace StatUtil { bool clearPvCfg(const std::string &curve, const std::string &charge); bool handlePcsYieldPoints( - kbd_dbms::CTsdbConn &objConn, - const std::vector dischargeKey, - const std::vector chargeKey, - const std::vector priceKey, + iot_dbms::CTsdbConn &objConn, + const std::vector dischargeKey, + const std::vector chargeKey, + const std::vector priceKey, std::vector *vecStatusNotHave, int startCurveVal,double startDischargeVal,double startChargeVal, quint64 startCurveTime, quint64 currentTimeEpoch, - std::vector &yieldPoints, + std::vector &yieldPoints, quint64 & lastDischargeTime,quint64 &lastChargeTime, double *resultTmp ); @@ -94,88 +94,88 @@ namespace StatUtil { * @param outYeildPoints * @return */ - bool findYieldPoints(kbd_dbms::CTsdbConn &objConn, const std::vector &vecMpKey, quint64 inTimeBegin, quint64 inTimeEnd, const std::vector *pVecStatusNotHave, std::vector &outYieldPoints); + bool findYieldPoints(iot_dbms::CTsdbConn &objConn, const std::vector &vecMpKey, quint64 inTimeBegin, quint64 inTimeEnd, const std::vector *pVecStatusNotHave, std::vector &outYieldPoints); - bool findPvFirstPoints(kbd_dbms::CTsdbConn &objConn, + bool findPvFirstPoints(iot_dbms::CTsdbConn &objConn, quint64 lastComputeTime, quint64 currentTimeEpoch, - const std::vector curveKey, - const std::vector chargeKey, + const std::vector curveKey, + const std::vector chargeKey, std::vector *vecStatusNotHave, quint64 &firstCurveTime,int &firstCurveVal,double &firstChargeVal); - bool handlePvYieldPoints(kbd_dbms::CTsdbConn &objConn, - const std::vector chargeKey, - const std::vector priceKey, + bool handlePvYieldPoints(iot_dbms::CTsdbConn &objConn, + const std::vector chargeKey, + const std::vector priceKey, std::vector *vecStatusNotHave, - int startCurveVal,double startChargeVal,quint64 startCurveTime,quint64 currentTimeEpoch,std::vector &yieldPoints,quint64 & lastChargeTime,double *resultTmp); + int startCurveVal,double startChargeVal,quint64 startCurveTime,quint64 currentTimeEpoch,std::vector &yieldPoints,quint64 & lastChargeTime,double *resultTmp); - bool handleChgYieldPoints(kbd_dbms::CTsdbConn &objConn, - const std::vector chargeKey, + bool handleChgYieldPoints(iot_dbms::CTsdbConn &objConn, + const std::vector chargeKey, std::vector *vecStatusNotHave, int startCurveVal,double startChargeVal,quint64 startCurveTime, - quint64 currentTimeEpoch,std::vector &yieldPoints, + quint64 currentTimeEpoch,std::vector &yieldPoints, quint64 & lastChargeTime,double *resultTmp); bool savePerFuncCfg(std::string funcName,std::string keyIdTag,double *dataArray); - bool diffVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key, + bool diffVal(iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 startTimeSinceEpoch,quint64 endTimeSinceEpoch,double &result); - bool findFirstTime(kbd_dbms::CTsdbConn &objConn, const std::vector &key, + bool findFirstTime(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &result); - bool findFirstTimeAndVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, + bool findFirstTimeAndVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeBegin, quint64 timeEnd, std::vector *vecStatusNotHave, quint64 &resultTime, int &resultVal); - bool findFirstLargerValAndTime(kbd_dbms::CTsdbConn &objConn, - const std::vector &key, + bool findFirstLargerValAndTime(iot_dbms::CTsdbConn &objConn, + const std::vector &key, quint64 timeBegin, double k, quint64 &resultTime, double &resultVal); - bool findFirstLessOrEqualValAndTime(kbd_dbms::CTsdbConn &objConn, - const std::vector &key, + bool findFirstLessOrEqualValAndTime(iot_dbms::CTsdbConn &objConn, + const std::vector &key, quint64 timeBegin,double k, quint64 &resultTime,double &resultVal); bool findLastTime( - kbd_dbms::CTsdbConn &objConn,const std::vector &key, + iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatusNotHave,quint64 &result); bool findLastTimeAndVal( - kbd_dbms::CTsdbConn &objConn,const std::vector &key, + iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatusNotHave,quint64 &resultTime, int &resultVal); bool findLastTimeAndVal( - kbd_dbms::CTsdbConn &objConn,const std::vector &key, + iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatusNotHave,quint64 &resultTime, double &resultVal); - bool findLastTimeAndVal(kbd_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeEnd,quint64 &resultTime, double &resultVal); + bool findLastTimeAndVal(iot_dbms::CTsdbConn &objConn, const std::vector &key, quint64 timeEnd,quint64 &resultTime, double &resultVal); - bool findFirstVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key,quint64 timeBegin,quint64 timeEnd,double &result); - bool findLastVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key, + bool findFirstVal(iot_dbms::CTsdbConn &objConn,const std::vector &key,quint64 timeBegin,quint64 timeEnd,double &result); + bool findLastVal(iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatusNotHave,double &result); - bool findLastVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key, + bool findLastVal(iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatusNotHave,int &result); - bool findLastVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key, + bool findLastVal(iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 timeBegin,quint64 timeEnd,double &result); - bool findMedianVal(kbd_dbms::CTsdbConn &objConn,const std::vector &key, + bool findMedianVal(iot_dbms::CTsdbConn &objConn,const std::vector &key, quint64 timeBegin,quint64 timeEnd,std::vector *vecStatusNotHave,double &result); bool findPcsFirstPoints( - kbd_dbms::CTsdbConn &objConn, + iot_dbms::CTsdbConn &objConn, quint64 lastDischargeTime,quint64 lastChargeTime, quint64 currentTimeEpoch, - const std::vector curveKey, - const std::vector dischargeKey, - const std::vector chargeKey, + const std::vector curveKey, + const std::vector dischargeKey, + const std::vector chargeKey, std::vector *vecStatusNotHave, quint64 &firstCurveTime, int &firstCurveVal,double &firstChargeVal,double &firstDischargeVal @@ -230,12 +230,12 @@ namespace StatUtil { double getHourFromMs(quint64 ts1); - int splitTagName(const std::string &inTag,kbd_dbms::SMeasPointKey &outPoint,std::string &outTagName); + int splitTagName(const std::string &inTag,iot_dbms::SMeasPointKey &outPoint,std::string &outTagName); int splitTagName(const std::string &inTag,std::string &outTableName,std::string &outTagName); } //< namespace StatUtil -}//< namespace kbd_service +}//< namespace iot_service #endif // STATUTIL_H diff --git a/product/src/sys/sys_file_sync/appconfigparse.cpp b/product/src/sys/sys_file_sync/appconfigparse.cpp index b4442a3b..6fbd1f6a 100644 --- a/product/src/sys/sys_file_sync/appconfigparse.cpp +++ b/product/src/sys/sys_file_sync/appconfigparse.cpp @@ -13,7 +13,7 @@ AppConfigParse::AppConfigParse() bool AppConfigParse::loadConfig() { - if (kbdSuccess != m_configParse.load(kbd_public::CFileUtil::getPathOfCfgFile(APP_CONFIG_FILE))) + if (kbdSuccess != m_configParse.load(iot_public::CFileUtil::getPathOfCfgFile(APP_CONFIG_FILE))) { LOGERROR("加载配置文件[%s]失败,使用默认配置", APP_CONFIG_FILE.c_str()); @@ -84,7 +84,7 @@ bool AppConfigParse::loadConfig() ptr->nameFilter = ignoreCfgTmp.split(","); } - ptr->syncModel = (kbd_sys::SYNC_MODEL)nIsAuto; + ptr->syncModel = (iot_sys::SYNC_MODEL)nIsAuto; ptr->isEnable = nIsEnable == 1; m_pathConfig[ptr->pathFile] = ptr; @@ -143,38 +143,38 @@ void AppConfigParse::initDefault() PathFileConfigPtr ptr = boost::make_shared(); ptr->pathFile = "../../data"; ptr->isEnable = true; - ptr->syncModel = kbd_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; + ptr->syncModel = iot_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; // ptr->ignoreList <<"cache"; m_pathConfig[ptr->pathFile] = ptr; ptr = boost::make_shared(); ptr->pathFile = "../../web/nginx/html/back_pixmap"; ptr->isEnable = true; - ptr->syncModel = kbd_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; + ptr->syncModel = iot_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; m_pathConfig[ptr->pathFile] = ptr; ptr = boost::make_shared(); ptr->pathFile = "../../web/nginx/html/json"; ptr->isEnable = true; - ptr->syncModel = kbd_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; + ptr->syncModel = iot_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; m_pathConfig[ptr->pathFile] = ptr; ptr = boost::make_shared(); ptr->pathFile = "../../web/nginx/html/page"; ptr->isEnable = true; - ptr->syncModel = kbd_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; + ptr->syncModel = iot_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; m_pathConfig[ptr->pathFile] = ptr; ptr = boost::make_shared(); ptr->pathFile = "../../web/nginx/html/dark"; ptr->isEnable = true; - ptr->syncModel = kbd_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; + ptr->syncModel = iot_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; m_pathConfig[ptr->pathFile] = ptr; ptr = boost::make_shared(); ptr->pathFile = "../../web/nginx/html/light"; ptr->isEnable = true; - ptr->syncModel = kbd_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; + ptr->syncModel = iot_sys::SYNC_MODEL::SYNC_MODEL_MANUAL; m_pathConfig[ptr->pathFile] = ptr; } diff --git a/product/src/sys/sys_file_sync/appconfigparse.h b/product/src/sys/sys_file_sync/appconfigparse.h index a9948d4b..2922c730 100644 --- a/product/src/sys/sys_file_sync/appconfigparse.h +++ b/product/src/sys/sys_file_sync/appconfigparse.h @@ -13,7 +13,7 @@ struct PathFileConfig QString pathFile; QStringList nameFilter; bool isEnable; - kbd_sys::SYNC_MODEL syncModel; + iot_sys::SYNC_MODEL syncModel; }; typedef boost::shared_ptr PathFileConfigPtr; @@ -34,7 +34,7 @@ private: void initDefault(); private: - kbd_public::CCommonConfigParse m_configParse; + iot_public::CCommonConfigParse m_configParse; int m_dirCount = 0; PathFileConfigMap m_pathConfig; diff --git a/product/src/sys/sys_file_sync/appprocessquit.h b/product/src/sys/sys_file_sync/appprocessquit.h index a9c010fa..060cc85f 100644 --- a/product/src/sys/sys_file_sync/appprocessquit.h +++ b/product/src/sys/sys_file_sync/appprocessquit.h @@ -10,7 +10,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" class CAppService; -class CAppProcessQuit : public kbd_sys::CProcessQuitInterface +class CAppProcessQuit : public iot_sys::CProcessQuitInterface { public: CAppProcessQuit(CAppService* service); diff --git a/product/src/sys/sys_file_sync/appredundant.h b/product/src/sys/sys_file_sync/appredundant.h index 88642a7d..a8b27ede 100644 --- a/product/src/sys/sys_file_sync/appredundant.h +++ b/product/src/sys/sys_file_sync/appredundant.h @@ -10,7 +10,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" class CAppService; -class CAppRedundant : public kbd_sys::CRedundantSwitchInterface +class CAppRedundant : public iot_sys::CRedundantSwitchInterface { public: CAppRedundant(CAppService* service); diff --git a/product/src/sys/sys_file_sync/appservice.cpp b/product/src/sys/sys_file_sync/appservice.cpp index 7f914679..836c2504 100644 --- a/product/src/sys/sys_file_sync/appservice.cpp +++ b/product/src/sys/sys_file_sync/appservice.cpp @@ -31,7 +31,7 @@ int CAppService::redundantSwitch(bool bMaster, bool bSlave) return 0; } -bool CAppService::initService(const kbd_public::SRunAppInfo& info, +bool CAppService::initService(const iot_public::SRunAppInfo& info, const std::string& param) { if (!getProcessInfo(info, param)) @@ -54,11 +54,11 @@ bool CAppService::initService(const kbd_public::SRunAppInfo& info, } bool CAppService::getProcessInfo( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param) { - using namespace kbd_public; - using namespace kbd_sys; + using namespace iot_public; + using namespace iot_sys; using namespace boost; SProcessInfoKey processInfo; processInfo.nAppId = info.nAppId; @@ -81,10 +81,10 @@ bool CAppService::getProcessInfo( return true; } -bool CAppService::getRedundantMngInstance(const kbd_public::SRunAppInfo& info) +bool CAppService::getRedundantMngInstance(const iot_public::SRunAppInfo& info) { m_ptrRedundantMng = - kbd_sys::getRedundantMngInstance( + iot_sys::getRedundantMngInstance( info.nDomainId, info.nAppId, info.strLocalNodeName); @@ -124,7 +124,7 @@ bool CAppService::quitService() bool CAppService::isAlreadyRunning(const std::string &strAppName) { - if (kbd_public::CSingleProcInstance:: + if (iot_public::CSingleProcInstance:: hasInstanceRunning(getInstanceName(strAppName))) { LOGERROR("已经有一个实例正在运行!"); diff --git a/product/src/sys/sys_file_sync/appservice.h b/product/src/sys/sys_file_sync/appservice.h index 4a07345c..ef010f50 100644 --- a/product/src/sys/sys_file_sync/appservice.h +++ b/product/src/sys/sys_file_sync/appservice.h @@ -12,7 +12,7 @@ #include "appredundant.h" #include "appprocessquit.h" -class CAppService : public kbd_public::CBaseService +class CAppService : public iot_public::CBaseService { public: CAppService(); @@ -23,21 +23,21 @@ public: protected: bool initService( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param); bool quitService(); bool isAlreadyRunning(const std::string &strAppName);//判断是否是 唯一运行程序 private: bool getProcessInfo( - const kbd_public::SRunAppInfo& info, + const iot_public::SRunAppInfo& info, const std::string& param);//获取进程管理对象 bool getRedundantMngInstance( - const kbd_public::SRunAppInfo& info);//获取冗余管理对象 + const iot_public::SRunAppInfo& info);//获取冗余管理对象 private: bool m_bMaster; bool m_bSlave; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng;//冗余管理 - kbd_sys::CProcMngInterfacePtr m_ptrProcMng;//进程管理 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng;//冗余管理 + iot_sys::CProcMngInterfacePtr m_ptrProcMng;//进程管理 CAppRedundantPtr m_ptrAppRedundant;//冗余操作 CAppProcessQuitPtr m_ptrAppProcessQuit;//进程退出 diff --git a/product/src/sys/sys_file_sync/appservicethread.cpp b/product/src/sys/sys_file_sync/appservicethread.cpp index 096f2b1c..d4641162 100644 --- a/product/src/sys/sys_file_sync/appservicethread.cpp +++ b/product/src/sys/sys_file_sync/appservicethread.cpp @@ -2,7 +2,7 @@ #include "pub_logger_api/logger.h" CAppServiceThread::CAppServiceThread( - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, const std::string& threadName) : CTimerThreadBase(threadName, 500, 0), m_stAppInfo(appInfo) diff --git a/product/src/sys/sys_file_sync/appservicethread.h b/product/src/sys/sys_file_sync/appservicethread.h index 25beaa24..02f373e5 100644 --- a/product/src/sys/sys_file_sync/appservicethread.h +++ b/product/src/sys/sys_file_sync/appservicethread.h @@ -5,16 +5,16 @@ #include "pub_utility_api/TimerThreadBase.h" #include "pub_sysinfo_api/SysInfoApi.h" -class CAppServiceThread : public kbd_public::CTimerThreadBase +class CAppServiceThread : public iot_public::CTimerThreadBase { public: CAppServiceThread( - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, const std::string& threadName); virtual ~CAppServiceThread(); protected: - const kbd_public::SRunAppInfo& m_stAppInfo; + const iot_public::SRunAppInfo& m_stAppInfo; }; #endif // APPSERVICETHREAD_H diff --git a/product/src/sys/sys_file_sync/checkignore.cpp b/product/src/sys/sys_file_sync/checkignore.cpp index bf8f42f2..e8a32f3c 100644 --- a/product/src/sys/sys_file_sync/checkignore.cpp +++ b/product/src/sys/sys_file_sync/checkignore.cpp @@ -6,7 +6,7 @@ #include "def.h" #include -using namespace kbd_public; +using namespace iot_public; CheckIgnore::CheckIgnore() { diff --git a/product/src/sys/sys_file_sync/def.h b/product/src/sys/sys_file_sync/def.h index b15141b4..8fcd9be6 100644 --- a/product/src/sys/sys_file_sync/def.h +++ b/product/src/sys/sys_file_sync/def.h @@ -5,7 +5,7 @@ #include "Common.h" #include "sys/sys_file_sync_api/FilesyncApiCommon.h" -using namespace kbd_sys; +using namespace iot_sys; static const std::string APP_PROCESSNAME = "sys_file_sync"; static const std::string APP_CONFIG_FILE = "file_sync_config.xml"; diff --git a/product/src/sys/sys_file_sync/exebroadcasttask.cpp b/product/src/sys/sys_file_sync/exebroadcasttask.cpp index 3b8ad47c..4f6b1922 100644 --- a/product/src/sys/sys_file_sync/exebroadcasttask.cpp +++ b/product/src/sys/sys_file_sync/exebroadcasttask.cpp @@ -70,11 +70,11 @@ void ExeBroadcastTask::execute() bool ExeBroadcastTask::executeOnePathFile(const FileNode& fileNode) { - using namespace kbd_idlfile; + using namespace iot_idl; //父节点先发 QString pathFile = QString::fromStdString(fileNode.pathfile()); - bool isNeedSendFile = (m_createTask.operate() == kbd_idlfile::enTaskType_DATA_NODE); + bool isNeedSendFile = (m_createTask.operate() == iot_idl::enTaskType_DATA_NODE); if (isNeedSendFile ) { if (!sendFileInfo(fileNode)) @@ -84,7 +84,7 @@ bool ExeBroadcastTask::executeOnePathFile(const FileNode& fileNode) } } - bool isSendNode = (m_createTask.operate() == kbd_idlfile::enTaskType_ONLY_NODE); + bool isSendNode = (m_createTask.operate() == iot_idl::enTaskType_ONLY_NODE); if (isSendNode && fileNode.isdir()) { sendFileTaskReuslt(pathFile, true, QString("正在同步目录结构![%1]").arg(pathFile)); diff --git a/product/src/sys/sys_file_sync/exebroadcasttask.h b/product/src/sys/sys_file_sync/exebroadcasttask.h index 2df97b25..586252e5 100644 --- a/product/src/sys/sys_file_sync/exebroadcasttask.h +++ b/product/src/sys/sys_file_sync/exebroadcasttask.h @@ -2,7 +2,7 @@ #include "FileSynch.pb.h" #include "checkignore.h" -using namespace kbd_idlfile; +using namespace iot_idl; class SenderThread; diff --git a/product/src/sys/sys_file_sync/exetaskfilenode.cpp b/product/src/sys/sys_file_sync/exetaskfilenode.cpp index 9c9cf875..c96427c9 100644 --- a/product/src/sys/sys_file_sync/exetaskfilenode.cpp +++ b/product/src/sys/sys_file_sync/exetaskfilenode.cpp @@ -5,7 +5,7 @@ #include "localfilewriter.h" #include "checkignore.h" -using namespace kbd_idlfile; +using namespace iot_idl; ExeTaskFileNode::ExeTaskFileNode( ReceiverThread& receiver, const FileNode& fileNode) diff --git a/product/src/sys/sys_file_sync/exetaskfilenode.h b/product/src/sys/sys_file_sync/exetaskfilenode.h index 014dbf77..1323f9d9 100644 --- a/product/src/sys/sys_file_sync/exetaskfilenode.h +++ b/product/src/sys/sys_file_sync/exetaskfilenode.h @@ -2,7 +2,7 @@ #include "receiverthread.h" #include "FileSynch.pb.h" -using namespace kbd_idlfile; +using namespace iot_idl; class ExeTaskFileNode { public: diff --git a/product/src/sys/sys_file_sync/filesyncserver.cpp b/product/src/sys/sys_file_sync/filesyncserver.cpp index 94f57a8a..7d473b10 100644 --- a/product/src/sys/sys_file_sync/filesyncserver.cpp +++ b/product/src/sys/sys_file_sync/filesyncserver.cpp @@ -113,9 +113,9 @@ bool FileSyncServer::start(int argc, char *argv[], int &) return false; } - kbd_public::StartLogSystem(appName.c_str(),APP_PROCESSNAME.c_str()); + iot_public::StartLogSystem(appName.c_str(),APP_PROCESSNAME.c_str()); - kbd_public::initI18N("sys_file_sync/translate","sys_file_sync"); + iot_public::initI18N("sys_file_sync/translate","sys_file_sync"); if (!getAppInfo(appName, m_stRunAppInfo)) { @@ -151,17 +151,17 @@ bool FileSyncServer::stop() deleteThread(); CAppService::quitService(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return true; } bool FileSyncServer::getAppInfo( const std::string &strAppName, - kbd_public::SRunAppInfo & info) const + iot_public::SRunAppInfo & info) const { - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if (kbd_public::createSysInfoInstance(sysInfoPtr) == false) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if (iot_public::createSysInfoInstance(sysInfoPtr) == false) { return false; } @@ -177,7 +177,7 @@ bool FileSyncServer::getAppInfo( bool FileSyncServer::initMsgBus() { - bool bRet = kbd_net::initMsgBus(APP_PROCESSNAME.c_str(), + bool bRet = iot_net::initMsgBus(APP_PROCESSNAME.c_str(), getInstanceName(m_stRunAppInfo.strAppName).c_str()); if (!bRet) { diff --git a/product/src/sys/sys_file_sync/filesyncserver.h b/product/src/sys/sys_file_sync/filesyncserver.h index bb5925ee..9c42ea9b 100644 --- a/product/src/sys/sys_file_sync/filesyncserver.h +++ b/product/src/sys/sys_file_sync/filesyncserver.h @@ -38,7 +38,7 @@ private: //获取app信息 bool getAppInfo( const std::string &strAppName, - kbd_public::SRunAppInfo & info) const; + iot_public::SRunAppInfo & info) const; bool initMsgBus();//初始化总线 bool creatThread();//创建执行线程 @@ -50,7 +50,7 @@ private: //测试线程 boost::shared_ptr m_ptrTestThread; - kbd_public::SRunAppInfo m_stRunAppInfo; + iot_public::SRunAppInfo m_stRunAppInfo; //服务主线程 FileSyncServiceThreadPtr m_ptrServiceThread; diff --git a/product/src/sys/sys_file_sync/filesyncservicethread.cpp b/product/src/sys/sys_file_sync/filesyncservicethread.cpp index e38058da..934db675 100644 --- a/product/src/sys/sys_file_sync/filesyncservicethread.cpp +++ b/product/src/sys/sys_file_sync/filesyncservicethread.cpp @@ -2,7 +2,7 @@ #include "pub_logger_api/logger.h" #include "exebroadcasttask.h" -FileSyncServiceThread::FileSyncServiceThread(const kbd_public::SRunAppInfo &stAppInfo) +FileSyncServiceThread::FileSyncServiceThread(const iot_public::SRunAppInfo &stAppInfo) :CAppServiceThread(stAppInfo, "FileSyncServiceThread"), m_mbComm(stAppInfo), m_receiver(*this,stAppInfo, m_mbComm), @@ -25,20 +25,20 @@ FileSyncServiceThread::~FileSyncServiceThread() void FileSyncServiceThread::execute() { //请求的同步任务 - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; while (m_mbComm.recvFileVersionMsg(msg)) { exeFileNodeReqMsg(msg); } } -bool FileSyncServiceThread::exeFileNodeReqMsg(kbd_net::CMbMessage& msg) +bool FileSyncServiceThread::exeFileNodeReqMsg(iot_net::CMbMessage& msg) { try { int msgType = msg.getPara1(); switch (msgType) { - case kbd_sys::FILE_LIST_REQ_MSG_TYPE: + case iot_sys::FILE_LIST_REQ_MSG_TYPE: { FileNodeReqMsg reqMsg; bool isParse = reqMsg.ParseFromArray(msg.getDataPtr(),(int) msg.getDataSize()); diff --git a/product/src/sys/sys_file_sync/filesyncservicethread.h b/product/src/sys/sys_file_sync/filesyncservicethread.h index 748b98e5..d98f029a 100644 --- a/product/src/sys/sys_file_sync/filesyncservicethread.h +++ b/product/src/sys/sys_file_sync/filesyncservicethread.h @@ -11,13 +11,13 @@ class FileSyncServiceThread { public: FileSyncServiceThread( - const kbd_public::SRunAppInfo& stAppInfo); + const iot_public::SRunAppInfo& stAppInfo); ~FileSyncServiceThread(); void execute(); private: - bool exeFileNodeReqMsg(kbd_net::CMbMessage& msg); + bool exeFileNodeReqMsg(iot_net::CMbMessage& msg); bool exeFileNodeReqMsg(const FileNodeReqMsg& msg); bool isHaveRoot(const QString& msg); private: diff --git a/product/src/sys/sys_file_sync/localfilereader.cpp b/product/src/sys/sys_file_sync/localfilereader.cpp index 4a7e8032..6e53b4b5 100644 --- a/product/src/sys/sys_file_sync/localfilereader.cpp +++ b/product/src/sys/sys_file_sync/localfilereader.cpp @@ -3,7 +3,7 @@ #include #include -using namespace kbd_public; +using namespace iot_public; LocalFileReader::LocalFileReader(const QString& pathFile): m_pathFile(pathFile), diff --git a/product/src/sys/sys_file_sync/localfilereader.h b/product/src/sys/sys_file_sync/localfilereader.h index edd0930b..d4417bca 100644 --- a/product/src/sys/sys_file_sync/localfilereader.h +++ b/product/src/sys/sys_file_sync/localfilereader.h @@ -5,7 +5,7 @@ #include #include "pub_sysinfo_api/SysInfoApi.h" -using namespace kbd_idlfile; +using namespace iot_idl; struct DataBlockInfo { diff --git a/product/src/sys/sys_file_sync/localfilewriter.cpp b/product/src/sys/sys_file_sync/localfilewriter.cpp index 9393529c..e1835ff2 100644 --- a/product/src/sys/sys_file_sync/localfilewriter.cpp +++ b/product/src/sys/sys_file_sync/localfilewriter.cpp @@ -8,7 +8,7 @@ #include #include -using namespace kbd_public; +using namespace iot_public; LocalFileWriter::LocalFileWriter(const DataPack &msg) :m_msg(msg) { diff --git a/product/src/sys/sys_file_sync/localfilewriter.h b/product/src/sys/sys_file_sync/localfilewriter.h index 283bee61..b7720fb6 100644 --- a/product/src/sys/sys_file_sync/localfilewriter.h +++ b/product/src/sys/sys_file_sync/localfilewriter.h @@ -4,7 +4,7 @@ #include #include "def.h" -using namespace kbd_idlfile; +using namespace iot_idl; class LocalFileWriter { public: diff --git a/product/src/sys/sys_file_sync/modulembcomm.cpp b/product/src/sys/sys_file_sync/modulembcomm.cpp index 94b5c57f..ec3a91c2 100644 --- a/product/src/sys/sys_file_sync/modulembcomm.cpp +++ b/product/src/sys/sys_file_sync/modulembcomm.cpp @@ -3,10 +3,10 @@ #include "MessageChannel.h" #include "sys/sys_file_sync_api/FilesyncApiCommon.h" -using namespace kbd_sys; -using namespace kbd_idlfile; +using namespace iot_sys; +using namespace iot_idl; -CModuleMbComm::CModuleMbComm(const kbd_public::SRunAppInfo& appInfo) +CModuleMbComm::CModuleMbComm(const iot_public::SRunAppInfo& appInfo) :mAppInfo(appInfo) { } @@ -24,7 +24,7 @@ bool CModuleMbComm::sendFileNode(ExeBroadcastMsg& msg) { msg.set_hostname(mAppInfo.strLocalNodeName); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(EXE_TASK_MSG_TYPE); if(!objMessage.setData(msg.SerializeAsString())) { @@ -63,7 +63,7 @@ bool CModuleMbComm::sendFileData(FileChangeExeMsg &msg) { msg.set_hostname(mAppInfo.strLocalNodeName); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(FILE_DATA_MSG_TYPE); if(!objMessage.setData(msg.SerializeAsString())) @@ -87,7 +87,7 @@ bool CModuleMbComm::sendFileListResp(FileNodeRespMsg& msg, const std::string& ho { msg.set_hostname(mAppInfo.strLocalNodeName); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(FILE_LIST_RESP_MSG_TYPE); if(!objMessage.setData(msg.SerializeAsString())) { @@ -110,7 +110,7 @@ bool CModuleMbComm::sendExeTaskResult(BroadcastResultMsg& msg, const std::string { msg.set_hostname(mAppInfo.strLocalNodeName); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(RESULT_TASK_MSG_TYPE); if(!objMessage.setData(msg.SerializeAsString())) { @@ -129,7 +129,7 @@ bool CModuleMbComm::sendExeTaskResult(BroadcastResultMsg& msg, const std::string return m_objCltToSvrMb.sendMsgToHost(objMessage, hostName.c_str()); } -bool CModuleMbComm::recvSvrToSvrMsg(kbd_net::CMbMessage &msg) +bool CModuleMbComm::recvSvrToSvrMsg(iot_net::CMbMessage &msg) { if (m_objSvrToSvrMb.recvMsg(msg, 0)) { @@ -139,7 +139,7 @@ bool CModuleMbComm::recvSvrToSvrMsg(kbd_net::CMbMessage &msg) return false; } -bool CModuleMbComm::recvCltToSvrMsg(kbd_net::CMbMessage& msg) +bool CModuleMbComm::recvCltToSvrMsg(iot_net::CMbMessage& msg) { if (m_objCltToSvrMb.recvMsg(msg, 0)) { @@ -149,7 +149,7 @@ bool CModuleMbComm::recvCltToSvrMsg(kbd_net::CMbMessage& msg) return false; } -bool CModuleMbComm::recvFileVersionMsg(kbd_net::CMbMessage& msg) +bool CModuleMbComm::recvFileVersionMsg(iot_net::CMbMessage& msg) { if (m_objFileVersionMb.recvMsg(msg, 500)) { diff --git a/product/src/sys/sys_file_sync/modulembcomm.h b/product/src/sys/sys_file_sync/modulembcomm.h index 945292dd..f9bab856 100644 --- a/product/src/sys/sys_file_sync/modulembcomm.h +++ b/product/src/sys/sys_file_sync/modulembcomm.h @@ -5,12 +5,12 @@ #include "pub_sysinfo_api/SysInfoBase.h" #include "FileSynch.pb.h" -using namespace kbd_idlfile; +using namespace iot_idl; class CModuleMbComm { public: - CModuleMbComm(const kbd_public::SRunAppInfo& appInfo); + CModuleMbComm(const iot_public::SRunAppInfo& appInfo); ~CModuleMbComm(); std::string getHostName(); @@ -20,9 +20,9 @@ public: bool sendFileListResp(FileNodeRespMsg& msg,const std::string& hostName); bool sendExeTaskResult(BroadcastResultMsg& msg, const std::string& hostName); - bool recvSvrToSvrMsg(kbd_net::CMbMessage& msg); - bool recvCltToSvrMsg(kbd_net::CMbMessage& msg); - bool recvFileVersionMsg(kbd_net::CMbMessage& msg); + bool recvSvrToSvrMsg(iot_net::CMbMessage& msg); + bool recvCltToSvrMsg(iot_net::CMbMessage& msg); + bool recvFileVersionMsg(iot_net::CMbMessage& msg); void addSub(); void delSub(); @@ -30,12 +30,12 @@ public: private: private: - const kbd_public::SRunAppInfo& mAppInfo; - kbd_net::CMbCommunicator m_objSvrToSvrMb;//发送域内广播 - kbd_net::CMbCommunicator m_objCltToSvrMb;//发送域内广播 - kbd_net::CMbCommunicator m_objFileVersionMb; + const iot_public::SRunAppInfo& mAppInfo; + iot_net::CMbCommunicator m_objSvrToSvrMb;//发送域内广播 + iot_net::CMbCommunicator m_objCltToSvrMb;//发送域内广播 + iot_net::CMbCommunicator m_objFileVersionMb; - //kbd_net::CMbMessage m_objRecvMsg; + //iot_net::CMbMessage m_objRecvMsg; }; #endif // MODULEMBCOMM_H diff --git a/product/src/sys/sys_file_sync/receiverthread.cpp b/product/src/sys/sys_file_sync/receiverthread.cpp index 0ddf1c39..b47f3617 100644 --- a/product/src/sys/sys_file_sync/receiverthread.cpp +++ b/product/src/sys/sys_file_sync/receiverthread.cpp @@ -11,14 +11,14 @@ ReceiverThread::ReceiverThread( FileSyncServiceThread& server, - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, CModuleMbComm& comm): CTimerThreadBase("ReceiverThread"), m_server(server), mAppInfo(appInfo), mComm(comm) { - m_clearTmpTime = kbd_public::getUTCTimeSec(); + m_clearTmpTime = iot_public::getUTCTimeSec(); } ReceiverThread::~ReceiverThread() @@ -28,32 +28,32 @@ ReceiverThread::~ReceiverThread() void ReceiverThread::execute() { - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; while (mComm.recvSvrToSvrMsg(msg)) { bool ret = exeSvrToSvrMsg(msg); if (ret) { - m_clearTmpTime = kbd_public::getUTCTimeSec(); + m_clearTmpTime = iot_public::getUTCTimeSec(); } } - uint64 curTime = kbd_public::getUTCTimeSec(); + uint64 curTime = iot_public::getUTCTimeSec(); if (curTime - m_clearTmpTime > APP_CLEAR_TMP_TIME_OUT) { clearAllTmp(); - m_clearTmpTime = kbd_public::getUTCTimeSec(); + m_clearTmpTime = iot_public::getUTCTimeSec(); } } -bool ReceiverThread::exeSvrToSvrMsg(kbd_net::CMbMessage& msg) +bool ReceiverThread::exeSvrToSvrMsg(iot_net::CMbMessage& msg) { try { int msgType = msg.getPara1(); switch (msgType) { - case kbd_sys::FILE_DATA_MSG_TYPE: + case iot_sys::FILE_DATA_MSG_TYPE: { FileChangeExeMsg recvMsg; bool isParse = recvMsg.ParseFromArray(msg.getDataPtr(), (int)msg.getDataSize()); @@ -74,7 +74,7 @@ bool ReceiverThread::exeSvrToSvrMsg(kbd_net::CMbMessage& msg) return true; } break; - case kbd_sys::EXE_TASK_MSG_TYPE: + case iot_sys::EXE_TASK_MSG_TYPE: { ExeBroadcastMsg ExeBroadcastMsg; bool isParse = ExeBroadcastMsg.ParseFromArray(msg.getDataPtr(), (int)msg.getDataSize()); diff --git a/product/src/sys/sys_file_sync/receiverthread.h b/product/src/sys/sys_file_sync/receiverthread.h index c6f78616..a2662d31 100644 --- a/product/src/sys/sys_file_sync/receiverthread.h +++ b/product/src/sys/sys_file_sync/receiverthread.h @@ -7,19 +7,19 @@ #include "appconfigparse.h" class FileSyncServiceThread; -class ReceiverThread : public kbd_public::CTimerThreadBase +class ReceiverThread : public iot_public::CTimerThreadBase { public: ReceiverThread( FileSyncServiceThread& server, - const kbd_public::SRunAppInfo& appInfo, + const iot_public::SRunAppInfo& appInfo, CModuleMbComm& comm); ~ReceiverThread(); void execute(); - bool exeSvrToSvrMsg(kbd_net::CMbMessage& msg); + bool exeSvrToSvrMsg(iot_net::CMbMessage& msg); bool isExePathFile(FileOptInfoPtr ptr); void setCurFileOpt(const QString& pathFile); @@ -33,7 +33,7 @@ private: private: FileSyncServiceThread& m_server; - const kbd_public::SRunAppInfo& mAppInfo; + const iot_public::SRunAppInfo& mAppInfo; CModuleMbComm& mComm; boost::mutex m_muWait; diff --git a/product/src/sys/sys_file_sync/senderthread.cpp b/product/src/sys/sys_file_sync/senderthread.cpp index 54c3ac89..222e096f 100644 --- a/product/src/sys/sys_file_sync/senderthread.cpp +++ b/product/src/sys/sys_file_sync/senderthread.cpp @@ -3,7 +3,7 @@ #include "pub_logger_api/logger.h" #include "exebroadcasttask.h" #include "funcfilechange.h" -using namespace kbd_public; +using namespace iot_public; SenderThread::SenderThread( CModuleMbComm& comm, @@ -33,7 +33,7 @@ void SenderThread::execute() } //请求的同步任务 - kbd_net::CMbMessage msg; + iot_net::CMbMessage msg; while (mComm.recvCltToSvrMsg(msg)) { exeCltToSvrMsg(msg); @@ -149,13 +149,13 @@ bool SenderThread::sendFileOpt(FileOptInfoPtr info) } -bool SenderThread::exeCltToSvrMsg(kbd_net::CMbMessage& msg) +bool SenderThread::exeCltToSvrMsg(iot_net::CMbMessage& msg) { try { int msgType = msg.getPara1(); switch (msgType) { - case kbd_sys::CREAT_TASK_MSG_TYPE: + case iot_sys::CREAT_TASK_MSG_TYPE: { BroadcastTaskMsg reqMsg; bool isParse = reqMsg.ParseFromArray(msg.getDataPtr(), (int)msg.getDataSize()); @@ -170,7 +170,7 @@ bool SenderThread::exeCltToSvrMsg(kbd_net::CMbMessage& msg) exeBroadcastTaskMsg(reqMsg); return true; } - case kbd_sys::FILE_CHANGE_REQ_MSG_TYPE: + case iot_sys::FILE_CHANGE_REQ_MSG_TYPE: { FileChangeReqMsg reqMsg; bool isParse = reqMsg.ParseFromArray(msg.getDataPtr(), (int)msg.getDataSize()); diff --git a/product/src/sys/sys_file_sync/senderthread.h b/product/src/sys/sys_file_sync/senderthread.h index 9cbf312a..46380df0 100644 --- a/product/src/sys/sys_file_sync/senderthread.h +++ b/product/src/sys/sys_file_sync/senderthread.h @@ -10,9 +10,9 @@ #include "checkignore.h" #include "exebroadcasttask.h" -using namespace kbd_idlfile; +using namespace iot_idl; -class SenderThread : public kbd_public::CTimerThreadBase +class SenderThread : public iot_public::CTimerThreadBase { public: SenderThread( @@ -31,7 +31,7 @@ private: bool sendFileOpt(FileOptInfoPtr info); //发送端处理创建任务的命令 - bool exeCltToSvrMsg(kbd_net::CMbMessage& msg); + bool exeCltToSvrMsg(iot_net::CMbMessage& msg); bool exeBroadcastTaskMsg(const BroadcastTaskMsg& reqMsg); private: diff --git a/product/src/sys/sys_file_sync_api/FilesyncApi.cpp b/product/src/sys/sys_file_sync_api/FilesyncApi.cpp index 950b8c6c..0c3e7fa5 100644 --- a/product/src/sys/sys_file_sync_api/FilesyncApi.cpp +++ b/product/src/sys/sys_file_sync_api/FilesyncApi.cpp @@ -1,8 +1,8 @@ #include "sys/sys_file_sync_api/FilesyncApi.h" #include "SimpleFilesyncApiImpl.h" -using namespace kbd_sys; -//using namespace kbd_idlfile; +using namespace iot_sys; +//using namespace iot_idl; FilesyncApi::FilesyncApi(int appid) { diff --git a/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp b/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp index f510cec9..1f1dee88 100644 --- a/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp +++ b/product/src/sys/sys_file_sync_api/FilesyncApiImpl.cpp @@ -6,9 +6,9 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "sys/sys_file_sync_api/filesyncapifortool.h" -using namespace kbd_sys; -using namespace kbd_idlfile; -using namespace kbd_public; +using namespace iot_sys; +using namespace iot_idl; +using namespace iot_public; FilesyncApiImpl::FilesyncApiImpl( int appid, @@ -59,7 +59,7 @@ bool FilesyncApiImpl::commitLocalFileModify(const std::string &pathFile) msg.set_opttype(FileOptType::FILE_MODIFY); msg.set_pathfile(pathFile); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(FILE_CHANGE_REQ_MSG_TYPE); objMessage.setData(msg.SerializeAsString()); @@ -82,7 +82,7 @@ bool FilesyncApiImpl::commitLocalFileDel(const std::string &pathFile) msg.set_opttype(FileOptType::FILE_DEL); msg.set_pathfile(pathFile); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(FILE_CHANGE_REQ_MSG_TYPE); objMessage.setData(msg.SerializeAsString()); @@ -102,7 +102,7 @@ bool FilesyncApiImpl::sendBroadcastTaskMsg(BroadcastTaskMsg &msg, const std::str { msg.set_hostname(m_curHostName); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(CREAT_TASK_MSG_TYPE); objMessage.setData(msg.SerializeAsString()); @@ -131,7 +131,7 @@ bool FilesyncApiImpl::sendFileNodeReqMsg(FileNodeReqMsg &msg,const std::string& { msg.set_hostname(m_curHostName); - kbd_net::CMbMessage objMessage; + iot_net::CMbMessage objMessage; objMessage.setPara1(FILE_LIST_REQ_MSG_TYPE); objMessage.setData(msg.SerializeAsString()); @@ -148,7 +148,7 @@ bool FilesyncApiImpl::sendFileNodeReqMsg(FileNodeReqMsg &msg,const std::string& bool FilesyncApiImpl::handleFileNodeRespMsg(const FileNodeRespMsg &msg) { - FilesyncApiForTool* ptr = dynamic_cast( m_ptrInterface ); + FilesyncApiForTool* ptr = dynamic_cast( m_ptrInterface ); if(!ptr) { return false; @@ -181,18 +181,18 @@ void FilesyncApiImpl::afterSuspend() void FilesyncApiImpl::execute() { - using namespace kbd_idlfile; + using namespace iot_idl; while (m_objSendToSvrCMb.recvMsg(m_objRecvMsg,500)) { recvSvrMsg(m_objRecvMsg); } } -bool FilesyncApiImpl::recvSvrMsg(kbd_net::CMbMessage &msg) +bool FilesyncApiImpl::recvSvrMsg(iot_net::CMbMessage &msg) { try { - using namespace kbd_idlfile; + using namespace iot_idl; int msgType = msg.getPara1(); switch (msgType) diff --git a/product/src/sys/sys_file_sync_api/SimpleFilesyncApiImpl.h b/product/src/sys/sys_file_sync_api/SimpleFilesyncApiImpl.h index f2daa7d5..284b911a 100644 --- a/product/src/sys/sys_file_sync_api/SimpleFilesyncApiImpl.h +++ b/product/src/sys/sys_file_sync_api/SimpleFilesyncApiImpl.h @@ -6,11 +6,11 @@ #include "sys/sys_file_sync_api/FilesyncApi.h" #include "FileSynch.pb.h" -namespace kbd_sys +namespace iot_sys { - using namespace kbd_idlfile; + using namespace iot_idl; class FilesyncApiImpl - : public kbd_public::CTimerThreadBase + : public iot_public::CTimerThreadBase { public: FilesyncApiImpl(int appid, FilesyncApi* api); @@ -40,12 +40,12 @@ namespace kbd_sys void execute(); private: - bool recvSvrMsg(kbd_net::CMbMessage& msg); + bool recvSvrMsg(iot_net::CMbMessage& msg); private: FilesyncApi* m_ptrInterface; - kbd_net::CMbMessage m_objRecvMsg; + iot_net::CMbMessage m_objRecvMsg; - kbd_net::CMbCommunicator m_objSendToSvrCMb;//发送 至服务 + iot_net::CMbCommunicator m_objSendToSvrCMb;//发送 至服务 const int m_nServerAppid; std::string m_curHostName; diff --git a/product/src/sys/sys_file_sync_api/filesyncapifortool.cpp b/product/src/sys/sys_file_sync_api/filesyncapifortool.cpp index 004de99b..9fcf7310 100644 --- a/product/src/sys/sys_file_sync_api/filesyncapifortool.cpp +++ b/product/src/sys/sys_file_sync_api/filesyncapifortool.cpp @@ -1,10 +1,10 @@ #include "sys/sys_file_sync_api/filesyncapifortool.h" #include "SimpleFilesyncApiImpl.h" -using namespace kbd_sys; +using namespace iot_sys; FilesyncApiForTool::FilesyncApiForTool(int appid) : - kbd_sys::FilesyncApi(appid) + iot_sys::FilesyncApi(appid) { } diff --git a/product/src/sys/sys_startup/BrushDataThread.cpp b/product/src/sys/sys_startup/BrushDataThread.cpp index 2cb9ab9e..5407d4d0 100644 --- a/product/src/sys/sys_startup/BrushDataThread.cpp +++ b/product/src/sys/sys_startup/BrushDataThread.cpp @@ -128,7 +128,7 @@ bool BrushDataThread::queryRunInfo() bool BrushDataThread::queryAppRunInfo() { bool bRet = false; - kbd_idlfile::RdbRet objRdbRet; + iot_idl::RdbRet objRdbRet; const std::vector vecColumn = {"app_id","node_name","is_active","is_master","is_slave"}; bRet = m_objRdbNetApi.queryTotal(CN_TN_SysRunRedundancyInfo,vecColumn,objRdbRet,false,false); if(!bRet ||objRdbRet.msgrecord_size() < 0) @@ -163,7 +163,7 @@ bool BrushDataThread::queryAppRunInfo() bool BrushDataThread::queryProcRunInfo() { bool bRet = false; - kbd_idlfile::RdbRet objRdbRet; + iot_idl::RdbRet objRdbRet; vector vecColumn = {"app_id","node_name","proc_name","proc_param","proc_id","is_startup","to_quit","is_quit","is_master","is_slave"}; bRet=m_objRdbNetApi.queryTotal(CN_TN_SysRunProcInfo,vecColumn,objRdbRet,false,false); diff --git a/product/src/sys/sys_startup/BrushDataThread.h b/product/src/sys/sys_startup/BrushDataThread.h index 9dd8dc09..0efe4491 100644 --- a/product/src/sys/sys_startup/BrushDataThread.h +++ b/product/src/sys/sys_startup/BrushDataThread.h @@ -12,9 +12,9 @@ using namespace std; using namespace sys_startup; -using namespace kbd_dbms; +using namespace iot_dbms; -class BrushDataThread : public kbd_public::CTimerThreadBase +class BrushDataThread : public iot_public::CTimerThreadBase { public: diff --git a/product/src/sys/sys_startup/ButtonForm.cpp b/product/src/sys/sys_startup/ButtonForm.cpp index 8e31bc57..0284ad64 100644 --- a/product/src/sys/sys_startup/ButtonForm.cpp +++ b/product/src/sys/sys_startup/ButtonForm.cpp @@ -143,8 +143,8 @@ void ButtonForm::executeTask(QString cmd,QString param) if(cmd.endsWith(".exe")) { const std::string strFileName = - cmd.remove(cmd.size()-4,4).toStdString() + kbd_public::CFileUtil::getProcSuffix(); - std::string strPath = std::move( kbd_public::CFileUtil::getPathOfBinFile(strFileName)); + cmd.remove(cmd.size()-4,4).toStdString() + iot_public::CFileUtil::getProcSuffix(); + std::string strPath = std::move( iot_public::CFileUtil::getPathOfBinFile(strFileName)); if(strPath.empty()) { //< 也许配置的是外部程序，不在我们的路径中 @@ -163,7 +163,7 @@ void ButtonForm::executeTask(QString cmd,QString param) { #ifdef Q_OS_WIN const std::string strFileName = std::move(cmd.toStdString()); - std::string strPath = std::move( kbd_public::CFileUtil::getPathOfBinFile(strFileName)); + std::string strPath = std::move( iot_public::CFileUtil::getPathOfBinFile(strFileName)); if(strPath.empty()) { //< 也许配置的是外部脚本，不在我们的路径中 @@ -172,7 +172,7 @@ void ButtonForm::executeTask(QString cmd,QString param) system(strPath.c_str()); #else const std::string strFileName = cmd.remove(cmd.size()-4,4).toStdString() + ".sh"; - std::string strPath = std::move( kbd_public::CFileUtil::getPathOfBinFile(strFileName)); + std::string strPath = std::move( iot_public::CFileUtil::getPathOfBinFile(strFileName)); if(strPath.empty()) { //< 也许配置的是外部脚本，不在我们的路径中 @@ -190,12 +190,12 @@ void ButtonForm::autoStartDlg() bool isHmi = false; bool isSys = false; - isSys = kbd_sys::isSysService(strSysErr); + isSys = iot_sys::isSysService(strSysErr); #ifdef OS_WINDOWS - isHmi = kbd_sys::isSysStartupVbsExist(); + isHmi = iot_sys::isSysStartupVbsExist(); #endif #ifdef OS_LINUX - isHmi = kbd_sys::isHmiAutoStart(strHmiErr); + isHmi = iot_sys::isHmiAutoStart(strHmiErr); #endif AutoStart *dlg =new AutoStart(isHmi,isSys,this); @@ -236,7 +236,7 @@ void ButtonForm::setSysAuto(bool enable, QString &text) QString strErr; if(enable==true) { - if(kbd_sys::regSysService(strErr)) + if(iot_sys::regSysService(strErr)) { text+=tr("设置系统开机自启动成功..."); } @@ -247,7 +247,7 @@ void ButtonForm::setSysAuto(bool enable, QString &text) } else if(enable==false) { - if(kbd_sys::unregSysService(strErr)) + if(iot_sys::unregSysService(strErr)) { text+=tr("注销系统开机自启动成功..."); } @@ -264,10 +264,10 @@ void ButtonForm::setHmiAuto(bool enable,QString &text) if(enable==true) { #ifdef OS_WINDOWS - if (kbd_sys::setSysStartupAutoStartByVbs(strErr)) + if (iot_sys::setSysStartupAutoStartByVbs(strErr)) #endif #ifdef OS_LINUX - if (kbd_sys::setHmiAutoStart(strErr)) + if (iot_sys::setHmiAutoStart(strErr)) #endif { text+=tr("设置HMI开机自启动成功..."); @@ -280,10 +280,10 @@ void ButtonForm::setHmiAuto(bool enable,QString &text) else if(enable==false) { #ifdef OS_WINDOWS - if (kbd_sys::unsetSysStartupAutoStartByVbs(strErr)) + if (iot_sys::unsetSysStartupAutoStartByVbs(strErr)) #endif #ifdef OS_LINUX - if (kbd_sys::unsetHmiAutoStart(strErr)) + if (iot_sys::unsetHmiAutoStart(strErr)) #endif { text+=tr("注销HMI开机自启动成功..."); diff --git a/product/src/sys/sys_startup/DataMng.cpp b/product/src/sys/sys_startup/DataMng.cpp index b02647cc..b8397788 100644 --- a/product/src/sys/sys_startup/DataMng.cpp +++ b/product/src/sys/sys_startup/DataMng.cpp @@ -16,7 +16,7 @@ using namespace sys_startup; using namespace std; -using namespace kbd_public; +using namespace iot_public; DataMng *DataMng::m_pInstance = Q_NULLPTR; @@ -55,7 +55,7 @@ void DataMng::destory() bool DataMng::loadJson() { - QFile loadFile(kbd_public::CFileUtil::getPathOfCfgFile("sys_startup.json").c_str()); + QFile loadFile(iot_public::CFileUtil::getPathOfCfgFile("sys_startup.json").c_str()); if(!loadFile.exists() || !loadFile.open(QIODevice::ReadOnly | QIODevice::Text)) { return false; @@ -168,7 +168,7 @@ void DataMng::loadVersion() { m_versionMap.clear(); CCommonConfigParse config; - config.load(kbd_public::CFileUtil::getPathOfCfgFile(VERSIONXMLNAME)); + config.load(iot_public::CFileUtil::getPathOfCfgFile(VERSIONXMLNAME)); std::string strValue; config.getStringValue(MODULENAME,SOFTWARE_VERSION,strValue); m_versionMap.insert(QString::fromStdString(SOFTWARE_VERSION),QString::fromStdString(strValue)); diff --git a/product/src/sys/sys_startup/DbCheck.cpp b/product/src/sys/sys_startup/DbCheck.cpp index 79b75a27..018667d6 100644 --- a/product/src/sys/sys_startup/DbCheck.cpp +++ b/product/src/sys/sys_startup/DbCheck.cpp @@ -7,8 +7,8 @@ #include #include -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; struct SInfo { @@ -226,9 +226,9 @@ bool DbCheckThread::initDbInfoVec() return false; } - kbd_public::SDatabaseInfo stFirstConnect; - std::vector vecLocalDBInfo; - std::vector vecRemoteDBInfo; + iot_public::SDatabaseInfo stFirstConnect; + std::vector vecLocalDBInfo; + std::vector vecRemoteDBInfo; res = m_ptrSysInfo->getDBInfoByDomainId(domainInfo.nId, stFirstConnect, @@ -263,7 +263,7 @@ bool DbCheckThread::initDbInfoVec() firstInfo.isFirst = true; m_mapDBInfo.insert(firstInfo.sNodeName,firstInfo); - std::vector::iterator iter = vecLocalDBInfo.begin(); + std::vector::iterator iter = vecLocalDBInfo.begin(); for(; iter!=vecLocalDBInfo.end(); ++iter) { if(iter->strNodeName == stFirstConnect.strNodeName) diff --git a/product/src/sys/sys_startup/DbCheck.h b/product/src/sys/sys_startup/DbCheck.h index 88c12b3c..a1e45805 100644 --- a/product/src/sys/sys_startup/DbCheck.h +++ b/product/src/sys/sys_startup/DbCheck.h @@ -42,7 +42,7 @@ struct DbItemData struct SDbItemInfo { - kbd_public::SDatabaseInfo connect; + iot_public::SDatabaseInfo connect; QString first; bool isFirst; @@ -91,13 +91,13 @@ private: bool checkDbInfo(SDbItemInfo& info); bool check(SDbItemInfo &stConnect, - kbd_public::SNodeInfo &stNodeInfo); + iot_public::SNodeInfo &stNodeInfo); private slots: void slotReceiveNetKeepAlivedInfo(); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; SModelInfo mModelInfo;//模型状态 QMutex m_mapDbInfoMx; @@ -116,7 +116,7 @@ public: explicit DbCheck(QWidget *parent = 0); ~DbCheck(); - static bool getDbPara(kbd_public::SDatabaseInfo &stConnect, kbd_dbms::CDbPara ¶); + static bool getDbPara(iot_public::SDatabaseInfo &stConnect, iot_dbms::CDbPara ¶); protected: void closeEvent(QCloseEvent *event); private slots: diff --git a/product/src/sys/sys_startup/DbCheckSync.cpp b/product/src/sys/sys_startup/DbCheckSync.cpp index 35794e07..6e49f295 100644 --- a/product/src/sys/sys_startup/DbCheckSync.cpp +++ b/product/src/sys/sys_startup/DbCheckSync.cpp @@ -3,8 +3,8 @@ #include "pub_logger_api/logger.h" #include "DbCheck.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; DbCheckSync::DbCheckSync() { diff --git a/product/src/sys/sys_startup/DbCheckSync.h b/product/src/sys/sys_startup/DbCheckSync.h index b12a2d53..500f964b 100644 --- a/product/src/sys/sys_startup/DbCheckSync.h +++ b/product/src/sys/sys_startup/DbCheckSync.h @@ -5,20 +5,20 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "db_base_api/CDbBaseApi.h" -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; class DbCheckSync { public: DbCheckSync(); - DbCheckSync( kbd_public::CSysInfoInterfacePtr sysInfo); + DbCheckSync( iot_public::CSysInfoInterfacePtr sysInfo); //返回非 -1 则查询成功 int getSyncMaxId(SDatabaseInfo &info); static int getSyncMaxId(SDatabaseInfo &stConnect, SNodeInfo &stNodeInfo); static int getSyncMaxId(CDbBaseApi& baseApi); private: - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; }; #endif // DBCHECKSYNC_H diff --git a/product/src/sys/sys_startup/DogCheck.cpp b/product/src/sys/sys_startup/DogCheck.cpp index c52c4cd5..bfba9fa7 100644 --- a/product/src/sys/sys_startup/DogCheck.cpp +++ b/product/src/sys/sys_startup/DogCheck.cpp @@ -2,7 +2,7 @@ #include "ui_DogCheck.h" #include "sys_dog_auth_api/DogAuthInterface.h" -using namespace kbd_sys; +using namespace iot_sys; DogCheck::DogCheck(QWidget *parent) : QDialog(parent), ui(new Ui::DogCheck) diff --git a/product/src/sys/sys_startup/Main.cpp b/product/src/sys/sys_startup/Main.cpp index 4e5dbaf4..e3193f5e 100644 --- a/product/src/sys/sys_startup/Main.cpp +++ b/product/src/sys/sys_startup/Main.cpp @@ -18,10 +18,10 @@ int main(int argc, char *argv[]) SingleApplication a(argc, argv); - QDir::setCurrent(kbd_public::CFileUtil::getCurModuleDir().c_str()); + QDir::setCurrent(iot_public::CFileUtil::getCurModuleDir().c_str()); - const std::string strLanguage = std::move( kbd_public::getCurLanguage()); - const std::string strQmFile = std::move( kbd_public::CFileUtil::getPathOfResFile( + const std::string strLanguage = std::move( iot_public::getCurLanguage()); + const std::string strQmFile = std::move( iot_public::CFileUtil::getPathOfResFile( "sys_startup/translate/" + strLanguage + ".qm" )); if ( !strQmFile.empty()) { diff --git a/product/src/sys/sys_startup/MainWindow.cpp b/product/src/sys/sys_startup/MainWindow.cpp index 53cfa921..acb9a7be 100644 --- a/product/src/sys/sys_startup/MainWindow.cpp +++ b/product/src/sys/sys_startup/MainWindow.cpp @@ -31,9 +31,9 @@ #include "pub_utility_api/FileUtil.h" using namespace sys_startup; -using namespace kbd_public; -using namespace kbd_idlfile; -using namespace kbd_sys; +using namespace iot_public; +using namespace iot_idl; +using namespace iot_sys; static QString restartAppName = QString(); @@ -182,12 +182,12 @@ MainWindow::~MainWindow() DataMng::instance()->destory(); - if(! kbd_net::releaseMsgBus()) + if(! iot_net::releaseMsgBus()) { LOGERROR("释放消息总线失败"); } - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); if (m_pLocalServer) { @@ -338,8 +338,8 @@ void MainWindow::initVariables() m_updateSysTimer->setInterval(1000); m_pProcess=new QProcess(this); { - const std::string strProc = std::move( kbd_public::CFileUtil::getPathOfBinFile( - std::string("sys_ctrl") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move( iot_public::CFileUtil::getPathOfBinFile( + std::string("sys_ctrl") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) LOGERROR("未找到可执行文件sys_ctrl"); else @@ -487,13 +487,13 @@ void MainWindow::initConn() void MainWindow::initLog() { //注册日志 - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(),STARTUP_SERVER_NAME); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(),STARTUP_SERVER_NAME); } void MainWindow::initMsgBus() { //初始化消息总线 - if(! kbd_net::initMsgBus(STARTUP_SERVER_NAME,STARTUP_SERVER_NAME)) + if(! iot_net::initMsgBus(STARTUP_SERVER_NAME,STARTUP_SERVER_NAME)) { LOGERROR("初始化消息总线失败"); } @@ -764,7 +764,7 @@ bool MainWindow::stopProc(int appId, const QString procName) QString logText = QString(tr("开始停止进程:%1")).arg(QString::fromStdString(procVec[index].m_procName)); LOGDEBUG("stopProc()-%s",logText.toStdString().c_str()); m_pStatusMng->slotLogText(logText); - kbd_idlfile::RdbUpdate rdbupdate; + iot_idl::RdbUpdate rdbupdate; rdbupdate.set_strtablename(CN_TN_SysRunProcInfo); @@ -850,7 +850,7 @@ void MainWindow::forceStopProc(int appId, const QString procName) QString logText = QString(tr("强制停止进程:%1")).arg(QString::fromStdString(procVec[index].m_procName)); LOGDEBUG("forceStopProc()-%s",logText.toStdString().c_str()); m_pStatusMng->slotLogText(logText); - kbd_idlfile::RdbUpdate rdbupdate; + iot_idl::RdbUpdate rdbupdate; rdbupdate.set_strtablename(CN_TN_SysRunProcInfo); @@ -965,10 +965,10 @@ void MainWindow::autoStartHmi() QString strHmiErr; bool isHmi = false; #ifdef OS_WINDOWS - isHmi = kbd_sys::isSysStartupVbsExist(); + isHmi = iot_sys::isSysStartupVbsExist(); #endif #ifdef OS_LINUX - isHmi = kbd_sys::isHmiAutoStart(strHmiErr); + isHmi = iot_sys::isHmiAutoStart(strHmiErr); #endif if(!isHmi) { @@ -1028,8 +1028,8 @@ void MainWindow::startSystem(int res,QProcess::ExitStatus exit) QMessageBox::StandardButton result = QMessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统建模工具检查配置并导出?")); if(result == QMessageBox::Yes) { - const std::string strProc = std::move( kbd_public::CFileUtil::getPathOfBinFile( - std::string("model_system_config") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move( iot_public::CFileUtil::getPathOfBinFile( + std::string("model_system_config") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) { LOGERROR("未找到可执行文件model_system_config"); @@ -1233,7 +1233,7 @@ void MainWindow::verifyIp() void MainWindow::updateVerifyIp(int verifyValue) { - QString path = kbd_public::CFileUtil::getPathOfCfgFile("sys_ctrl.xml",CN_DIR_PLATFORM).c_str(); + QString path = iot_public::CFileUtil::getPathOfCfgFile("sys_ctrl.xml",CN_DIR_PLATFORM).c_str(); QFile file(path); if(!file.open(QFile::ReadOnly)) { @@ -1285,7 +1285,7 @@ void MainWindow::openHmi() { #ifdef Q_OS_WIN const std::string strFileName = "hmi_explorer.bat"; - const std::string strPath = std::move( kbd_public::CFileUtil::getPathOfBinFile(strFileName)); + const std::string strPath = std::move( iot_public::CFileUtil::getPathOfBinFile(strFileName)); if(strPath.empty()) { LOGERROR("未找到脚本文件[%s]",strFileName.c_str()); @@ -1294,7 +1294,7 @@ void MainWindow::openHmi() system(strPath.c_str()); #else const std::string strFileName = "hmi_explorer.sh"; - const std::string strPath = std::move( kbd_public::CFileUtil::getPathOfBinFile(strFileName)); + const std::string strPath = std::move( iot_public::CFileUtil::getPathOfBinFile(strFileName)); if(strPath.empty()) { LOGERROR("未找到脚本文件[%s]",strFileName.c_str()); diff --git a/product/src/sys/sys_startup/MainWindow.h b/product/src/sys/sys_startup/MainWindow.h index b72a9124..7bcf47ad 100644 --- a/product/src/sys/sys_startup/MainWindow.h +++ b/product/src/sys/sys_startup/MainWindow.h @@ -172,7 +172,7 @@ private: QProcess *m_pStopProcess=nullptr; //< 用来启停系统 //加密狗相关 - kbd_sys::CDogAuthInterfacePtr m_ptrDogAuthApi; //< 加密狗接口 + iot_sys::CDogAuthInterfacePtr m_ptrDogAuthApi; //< 加密狗接口 bool m_bLastDogStatus; //< 上一次狗状态 QMessageBox* m_pDogMessBox; //< 加密狗退出提示框 diff --git a/product/src/sys/sys_startup/OnTimeCheckThread.cpp b/product/src/sys/sys_startup/OnTimeCheckThread.cpp index cd0f9755..697eb929 100644 --- a/product/src/sys/sys_startup/OnTimeCheckThread.cpp +++ b/product/src/sys/sys_startup/OnTimeCheckThread.cpp @@ -17,7 +17,7 @@ OnTimeCheckThread::~OnTimeCheckThread() bool OnTimeCheckThread::isSystemRunning() { - kbd_dbms::CRdbMngIntereface objRunProcInfoTable; + iot_dbms::CRdbMngIntereface objRunProcInfoTable; if (objRunProcInfoTable.isLoadAppDb()) return true; diff --git a/product/src/sys/sys_startup/ProcMngForm.cpp b/product/src/sys/sys_startup/ProcMngForm.cpp index adfd1fc8..24ca29d1 100644 --- a/product/src/sys/sys_startup/ProcMngForm.cpp +++ b/product/src/sys/sys_startup/ProcMngForm.cpp @@ -7,14 +7,14 @@ #include -using namespace kbd_public; +using namespace iot_public; ProcMngForm::ProcMngForm(QWidget *parent) : QWidget(parent), ui(new Ui::ProcMngForm) { ui->setupUi(this); - m_ntime = (uint64)kbd_public::getUTCTimeSec(); + m_ntime = (uint64)iot_public::getUTCTimeSec(); ui->procTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu); initProcTree(); connect(ui->procTreeWidget,&QTreeWidget::customContextMenuRequested,this,&ProcMngForm::customContext); @@ -415,7 +415,7 @@ int ProcMngForm::getCurAppRdbStatus(int appId) void ProcMngForm::outLog(const std::vector &procInfo) { - if(m_ntime + 60 < (uint64)kbd_public::getUTCTimeSec()) + if(m_ntime + 60 < (uint64)iot_public::getUTCTimeSec()) { if(!DataMng::instance()->getSysStatus()) { @@ -425,6 +425,6 @@ void ProcMngForm::outLog(const std::vector &procInfo) { LOGDEBUG("进程名:%s,进程应用id:%d,进程pid:%lld,内存:%f",procInfo[index].m_procName.c_str(),procInfo[index].m_appId,procInfo[index].m_procId,procInfo[index].m_disk); } - m_ntime = kbd_public::getUTCTimeSec(); + m_ntime = iot_public::getUTCTimeSec(); } } diff --git a/product/src/sys/sys_startup/SetupFunc.h b/product/src/sys/sys_startup/SetupFunc.h index 93f8f574..1a6ae4a2 100644 --- a/product/src/sys/sys_startup/SetupFunc.h +++ b/product/src/sys/sys_startup/SetupFunc.h @@ -12,7 +12,7 @@ #include #include -namespace kbd_sys +namespace iot_sys { //< 注册系统服务，并设置自启动 @@ -52,5 +52,5 @@ bool unsetSysStartupAutoStartByVbs(QString &strErr); //-------------------------------------- -} //< kbd_sys +} //< iot_sys diff --git a/product/src/sys/sys_startup/SetupFuncLinux.cpp b/product/src/sys/sys_startup/SetupFuncLinux.cpp index fbb0b8dc..c49afa2b 100644 --- a/product/src/sys/sys_startup/SetupFuncLinux.cpp +++ b/product/src/sys/sys_startup/SetupFuncLinux.cpp @@ -14,7 +14,7 @@ #include "pub_utility_api/FileUtil.h" #include "SetupFunc.h" -namespace kbd_sys +namespace iot_sys { static const char *pszSystemdCfgFile = "/tmp/iscs6000_launcher.service"; @@ -33,7 +33,7 @@ bool regSysService(QString &strErr) return false; } - const QString strExec = kbd_public::CFileUtil::getPathOfBinFile("sys_launcher_srv").c_str(); + const QString strExec = iot_public::CFileUtil::getPathOfBinFile("sys_launcher_srv").c_str(); //< 判断文件存在并设置可执行权限 if (strExec.length() > 0) @@ -155,7 +155,7 @@ bool setHmiAutoStart(QString &strErr) return false; } - //< 自身肯定在同级目录，获取其他程序路径需使用 kbd_public::CFileUtil::getPathOfBinFile() + //< 自身肯定在同级目录，获取其他程序路径需使用 iot_public::CFileUtil::getPathOfBinFile() const QString strExec = QCoreApplication::applicationDirPath() + "/sys_startup"; //< 判断文件存在并设置可执行权限 @@ -282,6 +282,6 @@ bool removeShortcut(QString &strErr) } -} //< kbd_sys +} //< iot_sys #endif //< #ifdef OS_LINUX diff --git a/product/src/sys/sys_startup/SetupFuncWindows.cpp b/product/src/sys/sys_startup/SetupFuncWindows.cpp index 1e1b9dd0..08f1e927 100644 --- a/product/src/sys/sys_startup/SetupFuncWindows.cpp +++ b/product/src/sys/sys_startup/SetupFuncWindows.cpp @@ -22,7 +22,7 @@ #include "pub_utility_api/FileUtil.h" #include "SetupFunc.h" -namespace kbd_sys +namespace iot_sys { static const TCHAR *pszServiceName = _T("iscs6000_launcher"); @@ -34,7 +34,7 @@ bool regSysService(QString &strErr) { bool bRet = false; - const QString strExec = kbd_public::CFileUtil::getPathOfBinFile("sys_launcher_srv").c_str(); + const QString strExec = iot_public::CFileUtil::getPathOfBinFile("sys_launcher_srv").c_str(); //< 判断文件存在 if (strExec.isEmpty()) @@ -226,7 +226,7 @@ bool setSysStartupAutoStartByVbs(QString &strErr,QString path) QString vbsTxt; vbsTxt += "Set WshShell = CreateObject(\"WScript.Shell\" )\n"; - //< 自身肯定在同级目录，获取其他程序路径需使用 kbd_public::CFileUtil::getPathOfBinFile() + //< 自身肯定在同级目录，获取其他程序路径需使用 iot_public::CFileUtil::getPathOfBinFile() vbsTxt += QString("WshShell.Run \"") + "\"\"" + QDir::toNativeSeparators(path + "\\sys_startup.exe\"\" -hide") + "\"\n"; vbsTxt += "Set WshShell = Nothing"; @@ -268,7 +268,7 @@ bool unsetSysStartupAutoStartByVbs(QString &strErr) -} //< kbd_sys +} //< iot_sys diff --git a/product/src/sys/sys_startup/SheetStyle.cpp b/product/src/sys/sys_startup/SheetStyle.cpp index 80348619..4a9d8995 100644 --- a/product/src/sys/sys_startup/SheetStyle.cpp +++ b/product/src/sys/sys_startup/SheetStyle.cpp @@ -6,7 +6,7 @@ SheetStyle::SheetStyle(): m_stSheet("") { - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("sys_startup.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("sys_startup.qss") ; QFile qssfile(QString::fromStdString(strFullPath)) ; qssfile.open(QFile::ReadOnly); if (qssfile.isOpen()) diff --git a/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp b/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp index 6be3b6e0..7d13a78d 100644 --- a/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp +++ b/product/src/sys/sys_svn_file_sync/CFileSyncThread.cpp @@ -14,10 +14,10 @@ -kbd_sys::CFileSyncThread::CFileSyncThread(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::SNodeInfo &stLocalNodeInfo, - const kbd_public::SLocationInfo &stLocationInfo): - kbd_public::CTimerThreadBase("CFileSyncThread",CN_RunPeriodMsec), +iot_sys::CFileSyncThread::CFileSyncThread(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::SNodeInfo &stLocalNodeInfo, + const iot_public::SLocationInfo &stLocationInfo): + iot_public::CTimerThreadBase("CFileSyncThread",CN_RunPeriodMsec), m_isFirst(true), m_bISAlarm(false), m_stLocalNodeInfo(stLocalNodeInfo), @@ -27,7 +27,7 @@ kbd_sys::CFileSyncThread::CFileSyncThread(const kbd_public::SRunAppInfo &stRunAp m_nIntervalMsec = 0; } -kbd_sys::CFileSyncThread::~CFileSyncThread() +iot_sys::CFileSyncThread::~CFileSyncThread() { if(NULL != m_ptrAlarmApi) { @@ -39,12 +39,12 @@ kbd_sys::CFileSyncThread::~CFileSyncThread() m_objComm.delSub(CN_AppId_BASE,CH_FILE_COMMIT_NOTICE); } -int kbd_sys::CFileSyncThread::beforeExecute() +int iot_sys::CFileSyncThread::beforeExecute() { return kbdSuccess; } -void kbd_sys::CFileSyncThread::execute() +void iot_sys::CFileSyncThread::execute() { if(m_isFirst) { @@ -67,7 +67,7 @@ void kbd_sys::CFileSyncThread::execute() dealOtherProblem(); } -int kbd_sys::CFileSyncThread::initialize() +int iot_sys::CFileSyncThread::initialize() { if(!m_objComm.addSub(CN_AppId_BASE,CH_FILE_COMMIT_NOTICE)) @@ -76,7 +76,7 @@ int kbd_sys::CFileSyncThread::initialize() return kbdFailed; } - m_ptrAlarmApi = boost::make_shared(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId); + m_ptrAlarmApi = boost::make_shared(m_stRunAppInfo.nDomainId,m_stRunAppInfo.nAppId); if(NULL == m_ptrAlarmApi) { LOGERROR("创造应用报警API智能指针失败"); @@ -97,16 +97,16 @@ int kbd_sys::CFileSyncThread::initialize() return kbdSuccess; } -void kbd_sys::CFileSyncThread::afterResume() +void iot_sys::CFileSyncThread::afterResume() { } -void kbd_sys::CFileSyncThread::testUpdate() +void iot_sys::CFileSyncThread::testUpdate() { QString qStrAbsPath; QStringList qStrListAbsPath; - QVector vecFileStatus; + QVector vecFileStatus; QMap::iterator it; QString relativeDirName; stSyncDirInfo dirInfo; @@ -122,7 +122,7 @@ void kbd_sys::CFileSyncThread::testUpdate() } } -int kbd_sys::CFileSyncThread::svnRevert(QString &_qStrtabsPath) +int iot_sys::CFileSyncThread::svnRevert(QString &_qStrtabsPath) { QStringList list; list.clear(); @@ -130,7 +130,7 @@ int kbd_sys::CFileSyncThread::svnRevert(QString &_qStrtabsPath) return svnRevert(list); } -int kbd_sys::CFileSyncThread::svnRevert(QStringList &_qStrListabsPath) +int iot_sys::CFileSyncThread::svnRevert(QStringList &_qStrListabsPath) { QString strOutput,strError; int ret = m_objFileSyncApi.exeRevert(_qStrListabsPath, @@ -155,7 +155,7 @@ int kbd_sys::CFileSyncThread::svnRevert(QStringList &_qStrListabsPath) return ret; } //输入文件的绝对路径，添加到版本库写日志 -int kbd_sys::CFileSyncThread::svnAdd(QStringList &_qStrListabsPath) +int iot_sys::CFileSyncThread::svnAdd(QStringList &_qStrListabsPath) { QString strOutput,strError; int ret = m_objFileSyncApi.exeAdd(_qStrListabsPath, @@ -183,7 +183,7 @@ int kbd_sys::CFileSyncThread::svnAdd(QStringList &_qStrListabsPath) return ret; } -int kbd_sys::CFileSyncThread::svnAdd(QString &_qStrtabsPath) +int iot_sys::CFileSyncThread::svnAdd(QString &_qStrtabsPath) { QStringList list; list.clear(); @@ -191,7 +191,7 @@ int kbd_sys::CFileSyncThread::svnAdd(QString &_qStrtabsPath) return svnAdd(list); } //提交至版本库 -int kbd_sys::CFileSyncThread::svnCommit(QStringList &_qStrListabsPath) +int iot_sys::CFileSyncThread::svnCommit(QStringList &_qStrListabsPath) { QString strOutput,strError; int ret = m_objFileSyncApi.exeCommit(_qStrListabsPath,strOutput,strError,m_qStrUserName,m_qStrPassword); @@ -218,7 +218,7 @@ int kbd_sys::CFileSyncThread::svnCommit(QStringList &_qStrListabsPath) return ret; } -int kbd_sys::CFileSyncThread::svnCommit(QString &_qStrtabsPath) +int iot_sys::CFileSyncThread::svnCommit(QString &_qStrtabsPath) { QStringList list; list.clear(); @@ -226,7 +226,7 @@ int kbd_sys::CFileSyncThread::svnCommit(QString &_qStrtabsPath) return svnCommit(list); } // 输入文件的绝对路径，更新，写入日志。 -int kbd_sys::CFileSyncThread::svnUpdate(QStringList &_qStrListabsPath, bool _bIsUpdateNotice) +int iot_sys::CFileSyncThread::svnUpdate(QStringList &_qStrListabsPath, bool _bIsUpdateNotice) { QString strOutput,strError; @@ -260,7 +260,7 @@ int kbd_sys::CFileSyncThread::svnUpdate(QStringList &_qStrListabsPath, bool _bIs return ret; } -int kbd_sys::CFileSyncThread::svnUpdate(const QString &_qStrabsPath, bool _bIsUpdateNotice) +int iot_sys::CFileSyncThread::svnUpdate(const QString &_qStrabsPath, bool _bIsUpdateNotice) { QStringList list; list.clear(); @@ -268,7 +268,7 @@ int kbd_sys::CFileSyncThread::svnUpdate(const QString &_qStrabsPath, bool _bIsUp return svnUpdate(list,_bIsUpdateNotice); } //传入绝对路径和“文件状态vector”,获取该路径下的文件状态 -int kbd_sys::CFileSyncThread::svnStatus(QStringList &_qStrListabsPath, QVector &_vecFileStatus) +int iot_sys::CFileSyncThread::svnStatus(QStringList &_qStrListabsPath, QVector &_vecFileStatus) { _vecFileStatus.clear(); QString strError; @@ -295,7 +295,7 @@ int kbd_sys::CFileSyncThread::svnStatus(QStringList &_qStrListabsPath, QVector vecFileStatus; + QVector vecFileStatus; QStringList vecSuccessCommitFiles; QMap::iterator it; QString relativeDirName; @@ -422,7 +422,7 @@ void kbd_sys::CFileSyncThread::autoCommitSendMsg() } } -void kbd_sys::CFileSyncThread::onlyDealLocalMiss(QString &_qStrdirName, QVector &_qVecFileStatus) +void iot_sys::CFileSyncThread::onlyDealLocalMiss(QString &_qStrdirName, QVector &_qVecFileStatus) { QString absPath; QStringList updateList; @@ -436,7 +436,7 @@ void kbd_sys::CFileSyncThread::onlyDealLocalMiss(QString &_qStrdirName, QVector< { switch (_qVecFileStatus.at(i).itemChange) { - case kbd_sys::enFirstColums::FIRST_MISS: //该项目已经遗失（被非SVN命令删除）或不完整 + case iot_sys::enFirstColums::FIRST_MISS: //该项目已经遗失（被非SVN命令删除）或不完整 if(isDir) { updateList.clear(); @@ -460,8 +460,8 @@ void kbd_sys::CFileSyncThread::onlyDealLocalMiss(QString &_qStrdirName, QVector< } } //根据文件状态进行添加或者提交，并将提交成功的文件记录到vector中 -void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, - QVector &_qVecFileStatus, +void iot_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, + QVector &_qVecFileStatus, QStringList &_qStrListSuccessCommitFiles) { QStringList addList; @@ -479,9 +479,9 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, { switch (_qVecFileStatus.at(i).itemChange) { - case kbd_sys::enFirstColums::FIRST_NO_CHANGED: + case iot_sys::enFirstColums::FIRST_NO_CHANGED: break; - case kbd_sys::enFirstColums::FIRST_NOT_VERSION_CONTROL: //未纳入版本控制 + case iot_sys::enFirstColums::FIRST_NOT_VERSION_CONTROL: //未纳入版本控制 if(isDir) { addList.clear(); @@ -500,7 +500,7 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, _qStrListSuccessCommitFiles.append(absPath.mid(m_qStrHomeDir.size())); } break; - case kbd_sys::enFirstColums::FIRST_ADD: //已加入版本控制 + case iot_sys::enFirstColums::FIRST_ADD: //已加入版本控制 if(isDir) { commitList.clear(); @@ -516,7 +516,7 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, } break; - case kbd_sys::enFirstColums::FIRST_MODIFIED: //被修改的 + case iot_sys::enFirstColums::FIRST_MODIFIED: //被修改的 if(isDir) { commitList.clear(); @@ -531,7 +531,7 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, _qStrListSuccessCommitFiles.append(absPath.mid(m_qStrHomeDir.size())); } break; - case kbd_sys::enFirstColums::FIRST_DELETED: //被删除的 + case iot_sys::enFirstColums::FIRST_DELETED: //被删除的 if(isDir) { commitList.clear(); @@ -546,7 +546,7 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, _qStrListSuccessCommitFiles.append(absPath.mid(m_qStrHomeDir.size())); } break; - case kbd_sys::enFirstColums::FIRST_REPLACED: //替换状态 + case iot_sys::enFirstColums::FIRST_REPLACED: //替换状态 if(isDir) { LOGERROR("如果是文件夹不应该到此处!"); @@ -557,17 +557,17 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, _qStrListSuccessCommitFiles.append(absPath.mid(m_qStrHomeDir.size())); } break; - case kbd_sys::enFirstColums::FIRST_IGNORED: //忽略 + case iot_sys::enFirstColums::FIRST_IGNORED: //忽略 { - m_qmapCurrentIgnoredFiles.insert(absPath,kbd_public::getUTCTimeSec()); + m_qmapCurrentIgnoredFiles.insert(absPath,iot_public::getUTCTimeSec()); } break; - case kbd_sys::enFirstColums::FIRST_EXTERNALS_DEFINE: //未纳入版本控制的目录，被外部引用的目录所创建 + case iot_sys::enFirstColums::FIRST_EXTERNALS_DEFINE: //未纳入版本控制的目录，被外部引用的目录所创建 { - m_qmapCurrentExternalsDeineFiles.insert(absPath,kbd_public::getUTCTimeSec()); + m_qmapCurrentExternalsDeineFiles.insert(absPath,iot_public::getUTCTimeSec()); } break; - case kbd_sys::enFirstColums::FIRST_CONFLICTED: //处于冲突状态的文件 + case iot_sys::enFirstColums::FIRST_CONFLICTED: //处于冲突状态的文件 if(isDir) { LOGERROR("如果是文件夹不应该到此处!"); @@ -576,12 +576,12 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, { revertList.append(absPath); updateList.append(absPath); - m_qmapCurrentConflictFiles.insert(absPath,kbd_public::getUTCTimeSec()); + m_qmapCurrentConflictFiles.insert(absPath,iot_public::getUTCTimeSec()); } break; - case kbd_sys::enFirstColums::FIRST_MISS: //该项目已经遗失（被非SVN命令删除）或不完整 - case kbd_sys::enFirstColums::FIRST_OBSTRUCTED: //版本控制下的项目与其他类型的项目重名 + case iot_sys::enFirstColums::FIRST_MISS: //该项目已经遗失（被非SVN命令删除）或不完整 + case iot_sys::enFirstColums::FIRST_OBSTRUCTED: //版本控制下的项目与其他类型的项目重名 if(isDir) { updateList.clear(); @@ -596,13 +596,13 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, } break; default: - m_qmapCurrentIllegaFiles.insert(absPath,kbd_public::getUTCTimeSec()); + m_qmapCurrentIllegaFiles.insert(absPath,iot_public::getUTCTimeSec()); break; } } else //第二列到第七列属性不正常 { - m_qmapCurrentOtherColuFiles.insert(absPath,kbd_public::getUTCTimeSec()); + m_qmapCurrentOtherColuFiles.insert(absPath,iot_public::getUTCTimeSec()); } } } @@ -624,9 +624,9 @@ void kbd_sys::CFileSyncThread::addAndCommitByStatus(QString &_qStrdirName, } } //发送最近提交的文件，通知及时更新 -bool kbd_sys::CFileSyncThread::sendUpdateNotice(QStringList &_qStrListSuccessCommitFiles) +bool iot_sys::CFileSyncThread::sendUpdateNotice(QStringList &_qStrListSuccessCommitFiles) { - kbd_idlfile::fileSyncNotice objSyncNotice; + iot_idl::fileSyncNotice objSyncNotice; std::string *pStr = NULL; for(int i = 0 ; i < _qStrListSuccessCommitFiles.size() ; ++i) { @@ -640,15 +640,15 @@ bool kbd_sys::CFileSyncThread::sendUpdateNotice(QStringList &_qStrListSuccessCom objSyncNotice.set_domainid(m_stRunAppInfo.nDomainId); objSyncNotice.set_locationid(m_stRunAppInfo.nLocationId); objSyncNotice.set_appid(m_stRunAppInfo.nAppId); - kbd_net::CMbMessage objMsg(objSyncNotice.SerializeAsString(), + iot_net::CMbMessage objMsg(objSyncNotice.SerializeAsString(), m_stRunAppInfo.nAppId, CH_FILE_COMMIT_NOTICE, - kbd_idlfile::enFileSyncMsgType::SVN_COMMIT_SUCCESS); + iot_idl::enFileSyncMsgType::SVN_COMMIT_SUCCESS); return m_objComm.sendMsgToDomain(objMsg); } //更新全目录，全部更新 -void kbd_sys::CFileSyncThread::updateAll(E_SYNC_TYPE enType) +void iot_sys::CFileSyncThread::updateAll(E_SYNC_TYPE enType) { switch (enType) { case E_SYNC_FIRST_TYPE: @@ -662,7 +662,7 @@ void kbd_sys::CFileSyncThread::updateAll(E_SYNC_TYPE enType) } } -void kbd_sys::CFileSyncThread::firstUpdateAll() +void iot_sys::CFileSyncThread::firstUpdateAll() { QString absPath; QMap::iterator it; @@ -678,7 +678,7 @@ void kbd_sys::CFileSyncThread::firstUpdateAll() } } -void kbd_sys::CFileSyncThread::periodUpdateAll() +void iot_sys::CFileSyncThread::periodUpdateAll() { QString absPath; QMap::iterator it; @@ -687,7 +687,7 @@ void kbd_sys::CFileSyncThread::periodUpdateAll() stSyncDirInfo &st = it.value(); if(st.bIsPeriodCheckOut) { - uint64 nTime = kbd_public::getUTCTimeMsec(); + uint64 nTime = iot_public::getUTCTimeMsec(); if(nTime - st.nPeriodInterval >= st.nLastUpdateTime) { absPath = m_qStrHomeDir + it.key(); @@ -699,7 +699,7 @@ void kbd_sys::CFileSyncThread::periodUpdateAll() } } -bool kbd_sys::CFileSyncThread::isSyncType(QString &_dirName, QString &_absPathFileName,bool &isDir) +bool iot_sys::CFileSyncThread::isSyncType(QString &_dirName, QString &_absPathFileName,bool &isDir) { if(m_mapSyncDirInfo.end() == m_mapSyncDirInfo.find(_dirName)) { @@ -728,10 +728,10 @@ bool kbd_sys::CFileSyncThread::isSyncType(QString &_dirName, QString &_absPathFi return ret; } -int kbd_sys::CFileSyncThread::readConfig() +int iot_sys::CFileSyncThread::readConfig() { - kbd_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(kbd_public::CFileUtil::getPathOfCfgFile(CN_XML_CONFIG_FILE_NAME))) + iot_public::CCommonConfigParse objCfgParse; + if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile(CN_XML_CONFIG_FILE_NAME))) { LOGERROR("加载配置文件%s失败",CN_XML_CONFIG_FILE_NAME.c_str()); return kbdFailed; @@ -802,7 +802,7 @@ int kbd_sys::CFileSyncThread::readConfig() return kbdSuccess; } -int kbd_sys::CFileSyncThread::getHomeDir() +int iot_sys::CFileSyncThread::getHomeDir() { boost::system::error_code ec; std::string strHomeDir = boost::filesystem::initial_path(ec).parent_path().parent_path().string(); @@ -816,13 +816,13 @@ int kbd_sys::CFileSyncThread::getHomeDir() return kbdSuccess; } -void kbd_sys::CFileSyncThread::dealConflict() +void iot_sys::CFileSyncThread::dealConflict() { if(!m_qmapCurrentConflictFiles.empty()) { - kbd_idlfile::SAppAddAlm objAlarm; - kbd_idlfile::SAlmInfoFromApp* pSingleAlmInfo = NULL; - kbd_idlfile::SAlmKeyword* pSingleAlmKv = NULL; + iot_idl::SAppAddAlm objAlarm; + iot_idl::SAlmInfoFromApp* pSingleAlmInfo = NULL; + iot_idl::SAlmKeyword* pSingleAlmKv = NULL; QMap::iterator currentIt,lastIt; QString fileName; for(currentIt = m_qmapCurrentConflictFiles.begin();currentIt != m_qmapCurrentConflictFiles.end();++currentIt) @@ -849,7 +849,7 @@ void kbd_sys::CFileSyncThread::dealConflict() pSingleAlmInfo = objAlarm.add_alm_info(); pSingleAlmInfo->set_alm_type(5); pSingleAlmInfo->set_status(1060); - pSingleAlmInfo->set_time_stamp(kbd_public::getUTCTimeMsec()); + pSingleAlmInfo->set_time_stamp(iot_public::getUTCTimeMsec()); pSingleAlmInfo->set_location_id(m_stRunAppInfo.nLocationId); pSingleAlmKv = pSingleAlmInfo->add_alm_keyword(); @@ -899,7 +899,7 @@ void kbd_sys::CFileSyncThread::dealConflict() } } -void kbd_sys::CFileSyncThread::dealOtherProblem() +void iot_sys::CFileSyncThread::dealOtherProblem() { QString strError = "处于Ignored状态"; updateOldMap(m_qmapLastIgnoredFiles,m_qmapCurrentIgnoredFiles,strError); @@ -923,12 +923,12 @@ void kbd_sys::CFileSyncThread::dealOtherProblem() //更新后写本地的日志，是否通知本机 -void kbd_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotice) +void iot_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotice) { QStringList fileList = strOutput.split("\n"); std::string strLine,fileName; - kbd_idlfile::updateSuccessNotice objNotice; - kbd_idlfile::messageFileInfo * pFileInfo = NULL; + iot_idl::updateSuccessNotice objNotice; + iot_idl::messageFileInfo * pFileInfo = NULL; char zerothColumn,firstColumn,secondColumn,thridColumn; for(int i = 0 ; i < fileList.size(); ++i) { @@ -968,7 +968,7 @@ void kbd_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotic { pFileInfo = objNotice.add_fileinfo(); pFileInfo->set_filename(fileName); - pFileInfo->set_type(kbd_idlfile::enUpdateType::UPDATE_ADD); + pFileInfo->set_type(iot_idl::enUpdateType::UPDATE_ADD); } LOGINFO("文件%s在本地update增加",fileName.c_str()); } @@ -979,7 +979,7 @@ void kbd_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotic { pFileInfo = objNotice.add_fileinfo(); pFileInfo->set_filename(fileName); - pFileInfo->set_type(kbd_idlfile::enUpdateType::UPDATE_DELETE); + pFileInfo->set_type(iot_idl::enUpdateType::UPDATE_DELETE); } LOGINFO("文件%s在本地update删除",fileName.c_str()); } @@ -990,7 +990,7 @@ void kbd_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotic { pFileInfo = objNotice.add_fileinfo(); pFileInfo->set_filename(fileName); - pFileInfo->set_type(kbd_idlfile::enUpdateType::UPDATE_UPDATE); + pFileInfo->set_type(iot_idl::enUpdateType::UPDATE_UPDATE); } LOGINFO("文件%s在本地update更新",fileName.c_str()); } @@ -1006,7 +1006,7 @@ void kbd_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotic { pFileInfo = objNotice.add_fileinfo(); pFileInfo->set_filename(fileName); - pFileInfo->set_type(kbd_idlfile::enUpdateType::UPDATE_MERGE); + pFileInfo->set_type(iot_idl::enUpdateType::UPDATE_MERGE); } LOGINFO("文件%s在本地合并成功",fileName.c_str()); } @@ -1031,7 +1031,7 @@ void kbd_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotic //如果是需要通知，并且有通知 if(_bIsNotice && objNotice.fileinfo_size() > 0) { - kbd_net::CMbMessage objMessage(objNotice.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_UPDATE_NOTICE,kbd_idlfile::enFileSyncMsgType::SVN_UPDATE_SUCCESS); + iot_net::CMbMessage objMessage(objNotice.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_UPDATE_NOTICE,iot_idl::enFileSyncMsgType::SVN_UPDATE_SUCCESS); if(!m_objComm.sendMsgToHost(objMessage)) { LOGERROR("发送文件更新消息通知失败"); @@ -1039,7 +1039,7 @@ void kbd_sys::CFileSyncThread::updateLogNotice(QString &strOutput,bool _bIsNotic } } -bool kbd_sys::CFileSyncThread::isUpdateNotice(QString &_relativePath) +bool iot_sys::CFileSyncThread::isUpdateNotice(QString &_relativePath) { QMap::iterator it; int fileNameSize = _relativePath.size(); @@ -1061,7 +1061,7 @@ bool kbd_sys::CFileSyncThread::isUpdateNotice(QString &_relativePath) /*判断第二列和第七列属性是否正常*/ -bool kbd_sys::CFileSyncThread::secondToSeventhColumnIsNormal(const kbd_sys::stFileStatus &fileStatus) +bool iot_sys::CFileSyncThread::secondToSeventhColumnIsNormal(const iot_sys::stFileStatus &fileStatus) { if(enSecondColumn::SECOND_NO_CHANGED == fileStatus.propertiesChange && enThirdColumns::THIRD_NOT_LOCKED == fileStatus.workingCopyLocked && @@ -1076,7 +1076,7 @@ bool kbd_sys::CFileSyncThread::secondToSeventhColumnIsNormal(const kbd_sys::stFi return false; } -void kbd_sys::CFileSyncThread::updateOldMap(QMap &_oldMap, QMap &_newMap, QString &errorStr) +void iot_sys::CFileSyncThread::updateOldMap(QMap &_oldMap, QMap &_newMap, QString &errorStr) { QMap::iterator it; for(it = _oldMap.begin();it != _oldMap.end() ;) //去掉已经解决的文件 diff --git a/product/src/sys/sys_svn_file_sync/CFileSyncThread.h b/product/src/sys/sys_svn_file_sync/CFileSyncThread.h index 9bd639a3..294d6361 100644 --- a/product/src/sys/sys_svn_file_sync/CFileSyncThread.h +++ b/product/src/sys/sys_svn_file_sync/CFileSyncThread.h @@ -13,16 +13,16 @@ #include "FileSyncBySvn.pb.h" -namespace kbd_sys { +namespace iot_sys { - class CFileSyncThread : public kbd_public::CTimerThreadBase + class CFileSyncThread : public iot_public::CTimerThreadBase { public: - CFileSyncThread(const kbd_public::SRunAppInfo &stRunAppInfo, - const kbd_public::SNodeInfo &stLocalNodeInfo, - const kbd_public::SLocationInfo &stLocationInfo); + CFileSyncThread(const iot_public::SRunAppInfo &stRunAppInfo, + const iot_public::SNodeInfo &stLocalNodeInfo, + const iot_public::SLocationInfo &stLocationInfo); virtual ~CFileSyncThread(); virtual int beforeExecute(); virtual void execute(); @@ -54,7 +54,7 @@ namespace kbd_sys { int svnUpdate(const QString &_qStrabsPath, bool _bIsUpdateNotice); // 输入文件的绝对路径，查看文件的状态，写日志 - int svnStatus(QStringList &_qStrListabsPath,QVector& _vecFileStatus); + int svnStatus(QStringList &_qStrListabsPath,QVector& _vecFileStatus); //输入文件的绝对路径，查看当前的版本号。 int svnVersion(QString &_absPath,int &_nVersion); @@ -71,14 +71,14 @@ namespace kbd_sys { void autoCommitSendMsg(); void onlyDealLocalMiss(QString &_qStrdirName, - QVector& _qVecFileStatus); + QVector& _qVecFileStatus); /* * @brief 依据文件的状态对文件进行添加，提交等操作,并且把成功提交的文件的相对路径,存放到对应的 * */ void addAndCommitByStatus(QString &_qStrdirName, - QVector& _qVecFileStatus, + QVector& _qVecFileStatus, QStringList &_qStrListSuccessCommitFiles); /* @@ -146,7 +146,7 @@ namespace kbd_sys { * @brief 返回第七列 * @in 文件的状态结构体 */ - bool secondToSeventhColumnIsNormal(const kbd_sys::stFileStatus &fileStatus); + bool secondToSeventhColumnIsNormal(const iot_sys::stFileStatus &fileStatus); /* * @ 更新旧的Map,写日志 @@ -164,16 +164,16 @@ namespace kbd_sys { QString m_qStrUserName; //svn用户名 QString m_qStrPassword; //svn密码 CSysFileSyncApi m_objFileSyncApi; // <- 文件同步接口对象 - std::vector m_vecFileStatus; // <- 记录文件状态的vector - kbd_net::CMbCommunicator m_objComm; // <-通讯器对象 + std::vector m_vecFileStatus; // <- 记录文件状态的vector + iot_net::CMbCommunicator m_objComm; // <-通讯器对象 uint m_nIntervalMsec; //<- 间隔时间，单位毫秒 - kbd_service::CAlmApiForAppPtr m_ptrAlarmApi{NULL}; //<- 发送报警的应用 + iot_service::CAlmApiForAppPtr m_ptrAlarmApi{NULL}; //<- 发送报警的应用 QMap m_mapSyncDirInfo; //所有需要同步的文件夹 - kbd_public::SNodeInfo m_stLocalNodeInfo; //<- 本节点信息 - kbd_public::SRunAppInfo m_stRunAppInfo; //<- 进程运行常用信息 - kbd_public::SLocationInfo m_stLocationInfo; //<- 本车站相关信息 + iot_public::SNodeInfo m_stLocalNodeInfo; //<- 本节点信息 + iot_public::SRunAppInfo m_stRunAppInfo; //<- 进程运行常用信息 + iot_public::SLocationInfo m_stLocationInfo; //<- 本车站相关信息 QMap m_qmapLastConflictFiles; //<- 上一次冲突的文件成功添加报警的时间 @@ -196,6 +196,6 @@ namespace kbd_sys { typedef boost::shared_ptr CFileSyncThreadPtr; -} //end namespace kbd_sys +} //end namespace iot_sys #endif // CFILESYNCTHREAD_H diff --git a/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp b/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp index 455a5fb9..66780014 100644 --- a/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp +++ b/product/src/sys/sys_svn_file_sync/CSysFileSync.cpp @@ -8,7 +8,7 @@ #include "boost/program_options.hpp" -kbd_sys::CSysFileSync::CSysFileSync(): +iot_sys::CSysFileSync::CSysFileSync(): m_ptrSysInfo(NULL), m_ptrProMng(NULL), m_ptrFileSyncThread(NULL) @@ -16,12 +16,12 @@ kbd_sys::CSysFileSync::CSysFileSync(): } -kbd_sys::CSysFileSync::~CSysFileSync() +iot_sys::CSysFileSync::~CSysFileSync() { CSysFileSync::stop(); } -bool kbd_sys::CSysFileSync::start(int argc, char *argv[], int &nStatus) +bool iot_sys::CSysFileSync::start(int argc, char *argv[], int &nStatus) { (void)nStatus; @@ -73,7 +73,7 @@ bool kbd_sys::CSysFileSync::start(int argc, char *argv[], int &nStatus) return true; } -bool kbd_sys::CSysFileSync::stop() +bool iot_sys::CSysFileSync::stop() { //6、销毁业务资源 clean(); @@ -92,14 +92,14 @@ bool kbd_sys::CSysFileSync::stop() //3、避免重复启动 //2、销毁日志访问库 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); //1、解析启动参数 return true; } -int kbd_sys::CSysFileSync::toQuit() +int iot_sys::CSysFileSync::toQuit() { LOGINFO("接收到进程退出通知"); if(NULL != m_ptrProMng) @@ -111,7 +111,7 @@ int kbd_sys::CSysFileSync::toQuit() } -bool kbd_sys::CSysFileSync::parseCmdLine(int argc, char *argv[]) +bool iot_sys::CSysFileSync::parseCmdLine(int argc, char *argv[]) { (void)argc; (void)argv; @@ -119,20 +119,20 @@ bool kbd_sys::CSysFileSync::parseCmdLine(int argc, char *argv[]) return true; } -bool kbd_sys::CSysFileSync::isAlreadyRunning() +bool iot_sys::CSysFileSync::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning(m_strUniqueName); + return iot_public::CSingleProcInstance::hasInstanceRunning(m_strUniqueName); } -bool kbd_sys::CSysFileSync::initLog() +bool iot_sys::CSysFileSync::initLog() { - kbd_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_fileSync.c_str()); + iot_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_fileSync.c_str()); return true; } -bool kbd_sys::CSysFileSync::getSystemInfo() +bool iot_sys::CSysFileSync::getSystemInfo() { - if(!kbd_public::createSysInfoInstance(m_ptrSysInfo)) + if(!iot_public::createSysInfoInstance(m_ptrSysInfo)) { LOGERROR("创建系统信息访问库失败"); return false; @@ -155,15 +155,15 @@ bool kbd_sys::CSysFileSync::getSystemInfo() return true; } -bool kbd_sys::CSysFileSync::registerToProcMng() +bool iot_sys::CSysFileSync::registerToProcMng() { - kbd_sys::SProcessInfoKey stProcKey; + iot_sys::SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stLocalNodeInfo.nDomainId; stProcKey.nAppId = CN_AppId_BASE; stProcKey.strNodeName = m_stLocalNodeInfo.strName; stProcKey.strProcName = CN_ProcName_fileSync; stProcKey.strProcParam = ""; - m_ptrProMng = kbd_sys::getProcMngInstance(stProcKey); + m_ptrProMng = iot_sys::getProcMngInstance(stProcKey); if(NULL == m_ptrProMng) { LOGERROR("创建进程管理访问库失败"); @@ -177,10 +177,10 @@ bool kbd_sys::CSysFileSync::registerToProcMng() return true; } -bool kbd_sys::CSysFileSync::initialize() +bool iot_sys::CSysFileSync::initialize() { - if(!kbd_net::initMsgBus(CN_ProcName_fileSync.c_str(),m_strUniqueName.c_str())) + if(!iot_net::initMsgBus(CN_ProcName_fileSync.c_str(),m_strUniqueName.c_str())) { LOGERROR("初始化消息总线失败"); return false; @@ -204,7 +204,7 @@ bool kbd_sys::CSysFileSync::initialize() return true; } -bool kbd_sys::CSysFileSync::clean() +bool iot_sys::CSysFileSync::clean() { if(NULL != m_ptrFileSyncThread) { @@ -212,7 +212,7 @@ bool kbd_sys::CSysFileSync::clean() m_ptrFileSyncThread.reset(); } - if(!kbd_net::releaseMsgBus()) + if(!iot_net::releaseMsgBus()) { LOGERROR("销毁消息总线资源失败"); return false; diff --git a/product/src/sys/sys_svn_file_sync/CSysFileSync.h b/product/src/sys/sys_svn_file_sync/CSysFileSync.h index 9530aa00..7e6e1ea8 100644 --- a/product/src/sys/sys_svn_file_sync/CSysFileSync.h +++ b/product/src/sys/sys_svn_file_sync/CSysFileSync.h @@ -14,11 +14,11 @@ #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -namespace kbd_sys { +namespace iot_sys { - class CSysFileSync:public kbd_public::CBaseService,kbd_sys::CProcessQuitInterface + class CSysFileSync:public iot_public::CBaseService,iot_sys::CProcessQuitInterface { public: CSysFileSync(); @@ -74,13 +74,13 @@ namespace kbd_sys { std::string m_strAppName; //<- 应用名 std::string m_strStartArgs; //<- 本进程启动时相关参数 std::string m_strUniqueName; //<- 唯一的实例名 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //<- 系统信息访问库智能指针 - kbd_public::SNodeInfo m_stLocalNodeInfo; //<- 本节点信息 - kbd_public::SRunAppInfo m_stRunAppInfo; //<- 本应用运行常用信息 - kbd_public::SLocationInfo m_stLocationInfo; //<- 本车站的信息 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //<- 系统信息访问库智能指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //<- 本节点信息 + iot_public::SRunAppInfo m_stRunAppInfo; //<- 本应用运行常用信息 + iot_public::SLocationInfo m_stLocationInfo; //<- 本车站的信息 - kbd_sys::CProcMngInterfacePtr m_ptrProMng; //<-进程访问库智能指针 - kbd_sys::CFileSyncThreadPtr m_ptrFileSyncThread; // 完成文件同步线程智能指针 + iot_sys::CProcMngInterfacePtr m_ptrProMng; //<-进程访问库智能指针 + iot_sys::CFileSyncThreadPtr m_ptrFileSyncThread; // 完成文件同步线程智能指针 }; @@ -88,6 +88,6 @@ namespace kbd_sys { -} //end namespace kbd_sys +} //end namespace iot_sys #endif // CSYSFILESYNC_H diff --git a/product/src/sys/sys_svn_file_sync/FileSyncCommon.h b/product/src/sys/sys_svn_file_sync/FileSyncCommon.h index f507e41f..7f1e628c 100644 --- a/product/src/sys/sys_svn_file_sync/FileSyncCommon.h +++ b/product/src/sys/sys_svn_file_sync/FileSyncCommon.h @@ -15,7 +15,7 @@ #include #include "DataType.h" -namespace kbd_sys +namespace iot_sys { const std::string CN_ProcName_fileSync = "sys_file_sync"; const std::string CN_XML_CONFIG_FILE_NAME = "file_sync_by_svn_config.xml"; //文件名 @@ -57,7 +57,7 @@ namespace kbd_sys const uint32 CN_CENTRAL_DOMAIN_ID = 1; const int64 CN_REPEAT_ALARM_SEC = 1*24*60*60; //一天的秒数,当同一文件冲突超过一天未解决，再次报警 -} // end namespace kbd_sys +} // end namespace iot_sys diff --git a/product/src/sys/sys_svn_file_sync/main.cpp b/product/src/sys/sys_svn_file_sync/main.cpp index 1ab9d592..be15d9e2 100644 --- a/product/src/sys/sys_svn_file_sync/main.cpp +++ b/product/src/sys/sys_svn_file_sync/main.cpp @@ -2,6 +2,6 @@ int main(int argc,char *argv[]) { - kbd_sys::CSysFileSync objApp; + iot_sys::CSysFileSync objApp; return objApp.main(argc,argv); } diff --git a/product/src/sys/sys_svn_file_sync_api/CSysFileSyncApi.cpp b/product/src/sys/sys_svn_file_sync_api/CSysFileSyncApi.cpp index 6f745482..6aae7967 100644 --- a/product/src/sys/sys_svn_file_sync_api/CSysFileSyncApi.cpp +++ b/product/src/sys/sys_svn_file_sync_api/CSysFileSyncApi.cpp @@ -7,19 +7,19 @@ #include #include "pub_logger_api/logger.h" -using namespace kbd_public; -kbd_sys::CSysFileSyncApi::CSysFileSyncApi() +using namespace iot_public; +iot_sys::CSysFileSyncApi::CSysFileSyncApi() { codec = QTextCodec::codecForName("GBK"); } -kbd_sys::CSysFileSyncApi::~CSysFileSyncApi() +iot_sys::CSysFileSyncApi::~CSysFileSyncApi() { } -int kbd_sys::CSysFileSyncApi::exeStatus(QStringList &_qstrFilePathList, - QVector &_vecFileStatus, +int iot_sys::CSysFileSyncApi::exeStatus(QStringList &_qstrFilePathList, + QVector &_vecFileStatus, QString &_qStrError, QString _qStrUserName, QString _qStrPassword) @@ -87,7 +87,7 @@ int kbd_sys::CSysFileSyncApi::exeStatus(QStringList &_qstrFilePathList, cSixColumn = fileStatus.at(i).toStdString().at(5); cSevColumn = fileStatus.at(i).toStdString().at(6); - kbd_sys::stFileStatus stFileStatus; + iot_sys::stFileStatus stFileStatus; setFirstColumns(cFirColumn,stFileStatus); setSecondColumns(cSecColumn,stFileStatus); @@ -113,7 +113,7 @@ int kbd_sys::CSysFileSyncApi::exeStatus(QStringList &_qstrFilePathList, return 0; } -int kbd_sys::CSysFileSyncApi::exeRevert(QStringList &_qStrListFilePathList, +int iot_sys::CSysFileSyncApi::exeRevert(QStringList &_qStrListFilePathList, QString &_qStrOutput, QString &_qStrError, QString _qStrUserName, @@ -168,7 +168,7 @@ int kbd_sys::CSysFileSyncApi::exeRevert(QStringList &_qStrListFilePathList, return 0; } -int kbd_sys::CSysFileSyncApi::exeAdd(QStringList &_qStrListFilePath, +int iot_sys::CSysFileSyncApi::exeAdd(QStringList &_qStrListFilePath, QString &_qStrOutput, QString &_qStrError, QString _qStrUserName, @@ -221,7 +221,7 @@ int kbd_sys::CSysFileSyncApi::exeAdd(QStringList &_qStrListFilePath, return 0; } -int kbd_sys::CSysFileSyncApi::exeDelete(QStringList &_qStrListFilePath, +int iot_sys::CSysFileSyncApi::exeDelete(QStringList &_qStrListFilePath, QString &_qStrOutput, QString &_qStrError, QString _qStrUserName, @@ -274,7 +274,7 @@ int kbd_sys::CSysFileSyncApi::exeDelete(QStringList &_qStrListFilePath, return 0; } -int kbd_sys::CSysFileSyncApi::exeCommit(QStringList &_qStrListFilePath, +int iot_sys::CSysFileSyncApi::exeCommit(QStringList &_qStrListFilePath, QString &_qStrOutput, QString &_qStrError, QString _qStrUserName, @@ -329,7 +329,7 @@ int kbd_sys::CSysFileSyncApi::exeCommit(QStringList &_qStrListFilePath, return 0; } -int kbd_sys::CSysFileSyncApi::exeUpdate(QStringList &_qStrListFilePath, +int iot_sys::CSysFileSyncApi::exeUpdate(QStringList &_qStrListFilePath, QString &_qStrOutput, QString &_qStrError, QString _qStrUserName, @@ -391,7 +391,7 @@ int kbd_sys::CSysFileSyncApi::exeUpdate(QStringList &_qStrListFilePath, return 0; } -int kbd_sys::CSysFileSyncApi::getCurrentLocalVersion(QString &_qStrLocalPath, +int iot_sys::CSysFileSyncApi::getCurrentLocalVersion(QString &_qStrLocalPath, int &_nCurrentVersion, QString &_qStrError, QString _qStrUserName, @@ -450,7 +450,7 @@ int kbd_sys::CSysFileSyncApi::getCurrentLocalVersion(QString &_qStrLocalPath, return 0; } -int kbd_sys::CSysFileSyncApi::exeCheckout(QString &_qStrLocalPath, +int iot_sys::CSysFileSyncApi::exeCheckout(QString &_qStrLocalPath, QString &_qStrUrl, QString &_qStrOutput, QString &_qStrError, @@ -502,7 +502,7 @@ int kbd_sys::CSysFileSyncApi::exeCheckout(QString &_qStrLocalPath, return 0; } -int kbd_sys::CSysFileSyncApi::exeCleanup(QStringList &_qStrListFilePath, QString &_qStrOutput, QString &_qStrError, QString _qStrUserName, QString _qStrPassword) +int iot_sys::CSysFileSyncApi::exeCleanup(QStringList &_qStrListFilePath, QString &_qStrOutput, QString &_qStrError, QString _qStrUserName, QString _qStrPassword) { if(_qStrListFilePath.empty()) { @@ -551,7 +551,7 @@ int kbd_sys::CSysFileSyncApi::exeCleanup(QStringList &_qStrListFilePath, QString return 0; } -int kbd_sys::CSysFileSyncApi::outPutLog(QStringList &list) +int iot_sys::CSysFileSyncApi::outPutLog(QStringList &list) { QString text = SVN_CMD; foreach (QString st, list) { @@ -590,7 +590,7 @@ int kbd_sys::CSysFileSyncApi::outPutLog(QStringList &list) -void kbd_sys::CSysFileSyncApi::setFirstColumns(char _status, kbd_sys::stFileStatus &_stFileStatus) +void iot_sys::CSysFileSyncApi::setFirstColumns(char _status, iot_sys::stFileStatus &_stFileStatus) { switch (_status) { case ' ': @@ -632,7 +632,7 @@ void kbd_sys::CSysFileSyncApi::setFirstColumns(char _status, kbd_sys::stFileStat } } -void kbd_sys::CSysFileSyncApi::setSecondColumns(char _status, kbd_sys::stFileStatus &_stFileStatus) +void iot_sys::CSysFileSyncApi::setSecondColumns(char _status, iot_sys::stFileStatus &_stFileStatus) { switch (_status) { case ' ': @@ -650,7 +650,7 @@ void kbd_sys::CSysFileSyncApi::setSecondColumns(char _status, kbd_sys::stFileSta } } -void kbd_sys::CSysFileSyncApi::setThirdColumns(char _status, kbd_sys::stFileStatus &_stFileStatus) +void iot_sys::CSysFileSyncApi::setThirdColumns(char _status, iot_sys::stFileStatus &_stFileStatus) { switch (_status) { case ' ': @@ -665,7 +665,7 @@ void kbd_sys::CSysFileSyncApi::setThirdColumns(char _status, kbd_sys::stFileStat } } -void kbd_sys::CSysFileSyncApi::setFourthColumns(char _status, kbd_sys::stFileStatus &_stFileStatus) +void iot_sys::CSysFileSyncApi::setFourthColumns(char _status, iot_sys::stFileStatus &_stFileStatus) { switch (_status) { case ' ': @@ -680,7 +680,7 @@ void kbd_sys::CSysFileSyncApi::setFourthColumns(char _status, kbd_sys::stFileSta } } -void kbd_sys::CSysFileSyncApi::setFifthColumns(char _status, kbd_sys::stFileStatus &_stFileStatus) +void iot_sys::CSysFileSyncApi::setFifthColumns(char _status, iot_sys::stFileStatus &_stFileStatus) { switch (_status) { case ' ': @@ -698,7 +698,7 @@ void kbd_sys::CSysFileSyncApi::setFifthColumns(char _status, kbd_sys::stFileStat } } -void kbd_sys::CSysFileSyncApi::setSixthColumns(char _status, kbd_sys::stFileStatus &_stFileStatus) +void iot_sys::CSysFileSyncApi::setSixthColumns(char _status, iot_sys::stFileStatus &_stFileStatus) { switch (_status) { case ' ': @@ -713,7 +713,7 @@ void kbd_sys::CSysFileSyncApi::setSixthColumns(char _status, kbd_sys::stFileStat } } -void kbd_sys::CSysFileSyncApi::setSeventhColumns(char _status, kbd_sys::stFileStatus &_stFileStatus) +void iot_sys::CSysFileSyncApi::setSeventhColumns(char _status, iot_sys::stFileStatus &_stFileStatus) { switch (_status) { case ' ': diff --git a/product/src/tools/DataImput_cfd_tool/CSvnThread.h b/product/src/tools/DataImput_cfd_tool/CSvnThread.h index 0bd78b29..e088c20f 100644 --- a/product/src/tools/DataImput_cfd_tool/CSvnThread.h +++ b/product/src/tools/DataImput_cfd_tool/CSvnThread.h @@ -25,10 +25,10 @@ public slots: private: void noticeOtherNode(QStringList stList); private: - kbd_net::CMbCommunicator m_objComm; + iot_net::CMbCommunicator m_objComm; QString m_hostName; QString m_currentPath; - kbd_sys::CSysFileSyncApi m_objFileSyncApi; // <- 文件同步接口对象 + iot_sys::CSysFileSyncApi m_objFileSyncApi; // <- 文件同步接口对象 }; #endif // CSVNTHREAD_H diff --git a/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp b/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp index c76f1432..32ab9c29 100644 --- a/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp +++ b/product/src/tools/DataImput_cfd_tool/Client_DataProThread.cpp @@ -17,7 +17,7 @@ clienDataprothread::clienDataprothread(QVector devgroupVec,QString sy // :CTimerThreadBase("Client_cfd_DataProThread", clientszdtThreadtime, 0, true),haveValue(false),m_noFirst(0) { LOGFATAL( "线程1 !" ); - if (!kbd_dbms::initTsdbApi()) + if (!iot_dbms::initTsdbApi()) { LOGERROR("initTsdbApi() failed !"); //return 1; @@ -37,7 +37,7 @@ clienDataprothread::clienDataprothread(QVector devgroupVec,QString sy clienDataprothread::~clienDataprothread() { - if (!kbd_dbms::releaseTsdbApi()) + if (!iot_dbms::releaseTsdbApi()) { LOGERROR("releaseTsdbApi() failed !"); @@ -166,7 +166,7 @@ bool clienDataprothread::InsertHisPointDB(DEVPOINT point, QDateTime beginTime, Q } //< 获得连接并测试 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); if(conn == NULL) { LOGERROR("influxdb连接异常"); @@ -179,7 +179,7 @@ bool clienDataprothread::InsertHisPointDB(DEVPOINT point, QDateTime beginTime, Q } QSqlQuery query( m_oracleConnection ); - kbd_dbms::CTsdbConn &objConn = *conn.get(); + iot_dbms::CTsdbConn &objConn = *conn.get(); QString strdatetTime=beginTime.toString("yyyy-MM-dd 00:00:00"); QDateTime qdt=endTime; @@ -192,34 +192,34 @@ bool clienDataprothread::InsertHisPointDB(DEVPOINT point, QDateTime beginTime, Q boost::int64_t nTimeEnd= endTime.toMSecsSinceEpoch() ; int count=1; - std::vector curveKey(count); - // std::vector *> vecResult; - // vecResult.push_back(new std::vector); + std::vector curveKey(count); + // std::vector *> vecResult; + // vecResult.push_back(new std::vector); curveKey[0].m_pszTagName = point.tag_name.c_str(); if(point.table_name =="analog") { - curveKey[0].m_enType = kbd_dbms::MPT_AI; + curveKey[0].m_enType = iot_dbms::MPT_AI; } else if(point.table_name == "accuml") { - curveKey[0].m_enType = kbd_dbms::MPT_ACC; + curveKey[0].m_enType = iot_dbms::MPT_ACC; } else if(point.table_name == "digital") { - curveKey[0].m_enType = kbd_dbms::MPT_DI; + curveKey[0].m_enType = iot_dbms::MPT_DI; } - std::vector *> vecResult; - vecResult.push_back(new std::vector); + std::vector *> vecResult; + vecResult.push_back(new std::vector); - // if(kbd_dbms::getHisValue(objConn, -1, curveKey, -1, nTimeEnd, - // NULL, NULL, NULL,NULL,NULL,kbd_dbms::CM_LAST, -1,kbd_dbms::FM_NONE, vecResult)== false) + // if(iot_dbms::getHisValue(objConn, -1, curveKey, -1, nTimeEnd, + // NULL, NULL, NULL,NULL,NULL,iot_dbms::CM_LAST, -1,iot_dbms::FM_NONE, vecResult)== false) - if(kbd_dbms::getHisValue(objConn, -1, curveKey, nTimeBegin, nTimeEnd, - NULL, NULL, NULL,NULL,NULL,kbd_dbms::CM_NULL, -1,kbd_dbms::FM_NONE, vecResult)== false) + if(iot_dbms::getHisValue(objConn, -1, curveKey, nTimeBegin, nTimeEnd, + NULL, NULL, NULL,NULL,NULL,iot_dbms::CM_NULL, -1,iot_dbms::FM_NONE, vecResult)== false) { QString errorInfo = QString("查询数据库错误:code:%1 table:%2 begin:%3 timeEnd:%4 size:%5 ").arg(curveKey[0].m_pszTagName) .arg(curveKey[0].m_enType).arg(nTimeBegin).arg(nTimeEnd).arg(vecResult.size()); @@ -340,8 +340,8 @@ struct memory int clienDataprothread::readConfigForGenerate() { - kbd_public::CCommonConfigParse objCfgParse; - if(kbdSuccess != objCfgParse.load(kbd_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) + iot_public::CCommonConfigParse objCfgParse; + if(kbdSuccess != objCfgParse.load(iot_public::CFileUtil::getPathOfCfgFile("DataImput_cfd.xml"))) { LOGERROR("加载转发配置文件失败"); return kbdFailed; diff --git a/product/src/tools/DataImput_cfd_tool/Client_DataProThread.h b/product/src/tools/DataImput_cfd_tool/Client_DataProThread.h index b0e0e7a7..155bb281 100644 --- a/product/src/tools/DataImput_cfd_tool/Client_DataProThread.h +++ b/product/src/tools/DataImput_cfd_tool/Client_DataProThread.h @@ -17,7 +17,7 @@ #include "qdatetime.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; typedef struct aa { string tag_name; //本地代码 diff --git a/product/src/tools/DataImput_cfd_tool/MainWidget.cpp b/product/src/tools/DataImput_cfd_tool/MainWidget.cpp index c8c551f6..92d0cee2 100644 --- a/product/src/tools/DataImput_cfd_tool/MainWidget.cpp +++ b/product/src/tools/DataImput_cfd_tool/MainWidget.cpp @@ -161,8 +161,8 @@ MainWidget::~MainWidget() - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); delete ui; } @@ -171,13 +171,13 @@ MainWidget::~MainWidget() int MainWidget::initLog() { - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(),"DataImput_cfd_tool"); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(),"DataImput_cfd_tool"); return kbdSuccess; } int MainWidget::initMsg() { - if(!kbd_net::initMsgBus("DataImput_cfd_tool","DataImput_cfd_tool")) + if(!iot_net::initMsgBus("DataImput_cfd_tool","DataImput_cfd_tool")) { LOGERROR("初始化消息总线失败"); return kbdFailed; @@ -238,7 +238,7 @@ void MainWidget::initClient() bool MainWidget::initDevroup() { - kbd_dbms::CDbApi *m_pObjDbInterface = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi *m_pObjDbInterface = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pObjDbInterface->open()) { LOGERROR("数据库接口打开失败"); diff --git a/product/src/tools/DataImput_cfd_tool/main.cpp b/product/src/tools/DataImput_cfd_tool/main.cpp index b91f4a46..724e67a7 100644 --- a/product/src/tools/DataImput_cfd_tool/main.cpp +++ b/product/src/tools/DataImput_cfd_tool/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) // std::string strRootPath =""; // std::string strLanguage; // QDir dir; -// if(true == kbd_public::initI18N(strRootPath,strLanguage)) +// if(true == iot_public::initI18N(strRootPath,strLanguage)) // { // dir.setPath(QString::fromStdString(strRootPath)); // dir.cd(QString::fromStdString(strLanguage)); diff --git a/product/src/tools/DevGroupLockWidget/CDevGroupLockWidget.cpp b/product/src/tools/DevGroupLockWidget/CDevGroupLockWidget.cpp index c03b2f34..e4561cd3 100644 --- a/product/src/tools/DevGroupLockWidget/CDevGroupLockWidget.cpp +++ b/product/src/tools/DevGroupLockWidget/CDevGroupLockWidget.cpp @@ -21,7 +21,7 @@ CDevGroupLockWidget::CDevGroupLockWidget(QWidget *parent) : ui->setupUi(this); qRegisterMetaType("LockInfoPtr"); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -164,7 +164,7 @@ void CDevGroupLockWidget::initView() QList CDevGroupLockWidget::loadJson() { QList list; - QFile loadFile(QString("%1../../data/model/DevGroupLock.json").arg(kbd_public::CFileUtil::getCurModuleDir().c_str())); + QFile loadFile(QString("%1../../data/model/DevGroupLock.json").arg(iot_public::CFileUtil::getCurModuleDir().c_str())); if(!loadFile.exists() || !loadFile.open(QIODevice::ReadOnly | QIODevice::Text)) { return list; @@ -224,7 +224,7 @@ void CDevGroupLockWidget::initConnect() void CDevGroupLockWidget::saveJson(const QList &list) { - QFile saveFile(QString("%1../../data/model/DevGroupLock.json").arg(kbd_public::CFileUtil::getCurModuleDir().c_str())); + QFile saveFile(QString("%1../../data/model/DevGroupLock.json").arg(iot_public::CFileUtil::getCurModuleDir().c_str())); if(!saveFile.open(QIODevice::ReadWrite)) { showMess(tr("保存失败!"),tr("提示")); diff --git a/product/src/tools/ReportEdit/main.cpp b/product/src/tools/ReportEdit/main.cpp index 5617470f..65f2db97 100644 --- a/product/src/tools/ReportEdit/main.cpp +++ b/product/src/tools/ReportEdit/main.cpp @@ -8,7 +8,7 @@ #include "pub_sysinfo_api/SysInfoApi.h" #include "pub_sysinfo_api/SysInfoBase.h" -using namespace kbd_public; +using namespace iot_public; std::string m_ServerNode[2]; std::string m_ServerAddr[2]; diff --git a/product/src/tools/calc_lua_api/CCalcLua.cpp b/product/src/tools/calc_lua_api/CCalcLua.cpp index 774b4ea3..6c7e67d1 100644 --- a/product/src/tools/calc_lua_api/CCalcLua.cpp +++ b/product/src/tools/calc_lua_api/CCalcLua.cpp @@ -154,7 +154,7 @@ luabridge::LuaRef CCalcLua::getDataByIndex(int index, lua_State *LuaState) luabridge::LuaRef result = luabridge::newTable(LuaState); //加载配置文件 CCommonConfigParse parse; - parse.load(kbd_public::CFileUtil::getPathOfCfgFile("model_calc_lua.xml")); + parse.load(iot_public::CFileUtil::getPathOfCfgFile("model_calc_lua.xml")); SConfig config; if(0 != parse.getDataByIndex(index,config)) { @@ -177,7 +177,7 @@ luabridge::LuaRef CCalcLua::getInParamNum(lua_State *LuaState) luabridge::LuaRef result = luabridge::newTable(LuaState); //加载配置文件 CCommonConfigParse parse; - parse.load(kbd_public::CFileUtil::getPathOfCfgFile("model_calc_lua.xml")); + parse.load(iot_public::CFileUtil::getPathOfCfgFile("model_calc_lua.xml")); int size; if(parse.getSize(size)) { diff --git a/product/src/tools/camera_statistics/ccameraorientation.cpp b/product/src/tools/camera_statistics/ccameraorientation.cpp index b23f5667..37065f06 100644 --- a/product/src/tools/camera_statistics/ccameraorientation.cpp +++ b/product/src/tools/camera_statistics/ccameraorientation.cpp @@ -4,8 +4,8 @@ #define CAMERA_PTZ_CHANNEL 1 -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; using namespace QtAV; diff --git a/product/src/tools/camera_statistics/ccameraorientation.h b/product/src/tools/camera_statistics/ccameraorientation.h index 61afa1df..a379d29e 100644 --- a/product/src/tools/camera_statistics/ccameraorientation.h +++ b/product/src/tools/camera_statistics/ccameraorientation.h @@ -106,8 +106,8 @@ private: void modifyTableImport(int row,int column); //< 修改系统预置点表 - kbd_dbms::CDbApi* m_pDbReadApi; // 数据库接口 - kbd_dbms::CDbApi* m_pDbWriteApi; // 数据库接口 + iot_dbms::CDbApi* m_pDbReadApi; // 数据库接口 + iot_dbms::CDbApi* m_pDbWriteApi; // 数据库接口 QMap m_mapSCamera; //key是device的code QMap m_mapSOrientation; // tag_name->sOrientation diff --git a/product/src/tools/camera_statistics/main.cpp b/product/src/tools/camera_statistics/main.cpp index fc929343..bf798742 100644 --- a/product/src/tools/camera_statistics/main.cpp +++ b/product/src/tools/camera_statistics/main.cpp @@ -14,12 +14,12 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); a.setWindowIcon(QIcon(":/resource/preset_config.ico")); - kbd_public::StartLogSystem("PSCADA","camera_statistics"); + iot_public::StartLogSystem("PSCADA","camera_statistics"); CCameraOrientation w( 0 ); w.show(); int nRet = a.exec(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return nRet; } diff --git a/product/src/tools/debug_tool/CDataMng.cpp b/product/src/tools/debug_tool/CDataMng.cpp index a5bb468a..ab183459 100644 --- a/product/src/tools/debug_tool/CDataMng.cpp +++ b/product/src/tools/debug_tool/CDataMng.cpp @@ -1318,6 +1318,6 @@ CDataMng::CDataMng():QObject(), m_doMaxMinHaveLoad(false), m_moMaxMinHaveLoad(false) { - m_pReadApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadApi = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); m_pReadApi->open(); } diff --git a/product/src/tools/debug_tool/CDataMng.h b/product/src/tools/debug_tool/CDataMng.h index 7d5d7122..a9ef359c 100644 --- a/product/src/tools/debug_tool/CDataMng.h +++ b/product/src/tools/debug_tool/CDataMng.h @@ -218,7 +218,7 @@ private: private: static CDataMng *m_pInstance; - kbd_dbms::CDbApi *m_pReadApi; + iot_dbms::CDbApi *m_pReadApi; bool m_chanHaveLoad; bool m_devHaveLoad; bool m_aiHaveLoad; diff --git a/product/src/tools/debug_tool/CDebugTool.cpp b/product/src/tools/debug_tool/CDebugTool.cpp index fcec15df..cc3940ab 100644 --- a/product/src/tools/debug_tool/CDebugTool.cpp +++ b/product/src/tools/debug_tool/CDebugTool.cpp @@ -152,14 +152,14 @@ void CDebugTool::addFessim() void CDebugTool::initLogSystem() { // QString app = QString::fromStdString(CN_AppName_BASE); -// kbd_public::StartLogSystem(app.toStdString().c_str(),CN_ProcName_debug_tool.c_str()); +// iot_public::StartLogSystem(app.toStdString().c_str(),CN_ProcName_debug_tool.c_str()); // LOGINFO("initLogSystem()成功!"); } void CDebugTool::initMsgBus() { //< 初始化消息总线库 - if (!(kbd_net::initMsgBus("debugToolAppName", "debugToolProcessName"))) + if (!(iot_net::initMsgBus("debugToolAppName", "debugToolProcessName"))) { qDebug() << "Initialize message bus failed, exit !" << endl; LOGERROR("Initialize message bus failed, exit !"); @@ -171,19 +171,19 @@ void CDebugTool::initMsgBus() LOGINFO("Initialize message bus successed !"); } - kbd_service::CDpcdaForApp::initGlobalThread(); + iot_service::CDpcdaForApp::initGlobalThread(); return; } void CDebugTool::releaseResouce() { - kbd_service::CDpcdaForApp::releaseGlobalThread(); + iot_service::CDpcdaForApp::releaseGlobalThread(); //< 释放消息总线库 - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); //< 停止日志系统 - //kbd_public::StopLogSystem(); + //iot_public::StopLogSystem(); } diff --git a/product/src/tools/debug_tool/CEventDataCollect.cpp b/product/src/tools/debug_tool/CEventDataCollect.cpp index 06503ef5..6617d5a3 100644 --- a/product/src/tools/debug_tool/CEventDataCollect.cpp +++ b/product/src/tools/debug_tool/CEventDataCollect.cpp @@ -17,8 +17,8 @@ #include "dbms/db_api_ex/CDbApi.h" using namespace std; -using namespace kbd_public; -using namespace kbd_dbms; +using namespace iot_public; +using namespace iot_dbms; CEventDataCollect * CEventDataCollect::m_pInstance = NULL; CSystemResources *m_pSystemResources=NULL; @@ -42,9 +42,9 @@ CEventDataCollect::CEventDataCollect() : m_pTimer(NULL) { msgMutex = new QMutex(); - //m_rtdbPriorityOrderAccess = new kbd_dbms::CRdbAccess(); + //m_rtdbPriorityOrderAccess = new iot_dbms::CRdbAccess(); //m_rtdbPriorityOrderAccess->open("base", "alarm_level_define"); - //m_rtdbAccess = new kbd_dbms::CRdbAccess(); + //m_rtdbAccess = new iot_dbms::CRdbAccess(); m_pTimer = new QTimer(); m_pTimer->setInterval(1000); connect(m_pTimer, &QTimer::timeout, this, &CEventDataCollect::slotUpdateEvent); @@ -59,8 +59,8 @@ int CEventDataCollect::queryPriorityOrder(int &id) nRet = m_priorityOrderMap[id]; return nRet; -// kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); -// kbd_dbms::CVarType value; +// iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); +// iot_dbms::CVarType value; // m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); // return value.toInt(); } @@ -74,12 +74,12 @@ bool CEventDataCollect::initialize() { m_pTimer->start(); initVariable();; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; spSysInfo->getLocalNodeInfo(stNodeInfo); - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(stNodeInfo.nLocationId, stLocationInfo); m_nLocationID = stNodeInfo.nLocationId; } @@ -266,7 +266,7 @@ void CEventDataCollect::loadPermInfo() m_listPermRegionId.append(regionId); } } -// kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); +// iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); // if(permMngPtr != NULL) // { // permMngPtr->PermDllInit(); @@ -322,8 +322,8 @@ void CEventDataCollect::loadPriorityDescription() // m_priorityDescriptionMap.clear(); // if(m_rtdbAccess->open("base", "alarm_level_define")) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back("priority_id"); // columns.push_back("priority_name"); @@ -331,8 +331,8 @@ void CEventDataCollect::loadPriorityDescription() // { // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); // m_priorityDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -377,8 +377,8 @@ void CEventDataCollect::loadLocationDescription() // { // m_locationDescriptionMap.clear(); // m_locationOrderList.clear(); -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back("location_id"); // columns.push_back("tag_name"); @@ -391,11 +391,11 @@ void CEventDataCollect::loadLocationDescription() // { // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType area_id; -// kbd_dbms::CVarType tag_name; -// kbd_dbms::CVarType description; -// kbd_dbms::CVarType area_type; -// kbd_dbms::CVarType parea_id; +// iot_dbms::CVarType area_id; +// iot_dbms::CVarType tag_name; +// iot_dbms::CVarType description; +// iot_dbms::CVarType area_type; +// iot_dbms::CVarType parea_id; // result.getColumnValue(nIndex, 0, area_id); // result.getColumnValue(nIndex, 1, tag_name); // result.getColumnValue(nIndex, 2, description); @@ -479,8 +479,8 @@ void CEventDataCollect::loadRegionInfoDescription() // m_regionInfoDescriptionMap.clear(); // if(m_rtdbAccess->open("base", "region_info")) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back("region_id"); // columns.push_back("description"); @@ -488,8 +488,8 @@ void CEventDataCollect::loadRegionInfoDescription() // { // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); // if(m_listPermRegionId.contains(key.toInt())) @@ -518,8 +518,8 @@ void CEventDataCollect::loadAlarmTypeDescription() // m_alarmTypeDescriptionMap.clear(); // if(m_rtdbAccess->open("base", "alarm_type_define")) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back("type_id"); // columns.push_back("type_name"); @@ -527,8 +527,8 @@ void CEventDataCollect::loadAlarmTypeDescription() // { // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); // m_alarmTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -554,8 +554,8 @@ void CEventDataCollect::loadDeviceTypeDescription() // m_deviceTypeDescriptionMap.clear(); // if(m_rtdbAccess->open("base", "dev_type_def")) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back("dev_type_id"); // columns.push_back("description"); @@ -563,8 +563,8 @@ void CEventDataCollect::loadDeviceTypeDescription() // { // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); // m_deviceTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -590,8 +590,8 @@ void CEventDataCollect::loadAlarmStatusDescription() // m_alarmStatusMap.clear(); // if(m_rtdbAccess->open("base", "alarm_status_define")) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back("status_value"); // columns.push_back("display_name"); @@ -600,8 +600,8 @@ void CEventDataCollect::loadAlarmStatusDescription() // { // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); // m_alarmStatusMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -627,8 +627,8 @@ void CEventDataCollect::loadUserName() // m_userNameMap.clear(); // if(m_rtdbAccess->open("base", "rm_user_def")) // { -// kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); -// kbd_dbms::CRdbQueryResult result; +// iot_dbms::CTableLockGuard locker(*m_rtdbAccess); +// iot_dbms::CRdbQueryResult result; // std::vector columns; // columns.push_back("perm_id"); // columns.push_back("perm_name"); @@ -636,8 +636,8 @@ void CEventDataCollect::loadUserName() // { // for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) // { -// kbd_dbms::CVarType key; -// kbd_dbms::CVarType value; +// iot_dbms::CVarType key; +// iot_dbms::CVarType value; // result.getColumnValue(nIndex, 0, key); // result.getColumnValue(nIndex, 1, value); // m_userNameMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -648,7 +648,7 @@ void CEventDataCollect::loadUserName() void CEventDataCollect::loadEventShowStatusDescription() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -684,7 +684,7 @@ void CEventDataCollect::loadEventShowStatusDescription() void CEventDataCollect::loadEventOtherStatusDescription() { m_eventOtherStatusMap.clear(); - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -769,7 +769,7 @@ void CEventDataCollect::slotUpdateEvent() } } -void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt) +void CEventDataCollect::handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt) { QMutexLocker locker(msgMutex); LOGINFO("-------------------------handleAllEvtMsg-------------------------"); @@ -777,7 +777,7 @@ void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEv removeCache(nDomainID); for(int nAddMsgIndex(0); nAddMsgIndex < objAllEvt.evt_info_size(); nAddMsgIndex++) { - kbd_idlfile::SEvtInfoToEvtClt msg = objAllEvt.evt_info(nAddMsgIndex); + iot_idl::SEvtInfoToEvtClt msg = objAllEvt.evt_info(nAddMsgIndex); EventMsgPtr event(new CEventMsgInfo()); event->initialize(msg); event->priorityOrder = queryPriorityOrder(event->priority); @@ -795,13 +795,13 @@ void CEventDataCollect::handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEv emit sigEventStateChanged(); } -void CEventDataCollect::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) +void CEventDataCollect::handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt) { QMutexLocker locker(msgMutex); LOGINFO("-------------------------handleAddEvtMsg-------------------------"); for(int nAddMsgIndex(0); nAddMsgIndex < objAddEvt.evt_info_size(); nAddMsgIndex++) { - kbd_idlfile::SEvtInfoToEvtClt msg = objAddEvt.evt_info(nAddMsgIndex); + iot_idl::SEvtInfoToEvtClt msg = objAddEvt.evt_info(nAddMsgIndex); EventMsgPtr event(new CEventMsgInfo()); event->initialize(msg); event->priorityOrder = queryPriorityOrder(event->priority); @@ -815,7 +815,7 @@ void CEventDataCollect::handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt) emit sigEventStateChanged(); } -void CEventDataCollect::handleLinkWave2EvtMsg(kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Evt) +void CEventDataCollect::handleLinkWave2EvtMsg(iot_idl::SAlmCltLinkWave2Alm &objWave2Evt) { QMutexLocker locker(msgMutex); QList uuidList; diff --git a/product/src/tools/debug_tool/CEventDataCollect.h b/product/src/tools/debug_tool/CEventDataCollect.h index 6470203b..cf31ff55 100644 --- a/product/src/tools/debug_tool/CEventDataCollect.h +++ b/product/src/tools/debug_tool/CEventDataCollect.h @@ -15,7 +15,7 @@ #define FUNC_SPE_EVENT_VIEW ("FUNC_SPE_EVENT_VIEW") const int OTHERSTATUS = 9999; -class CEventDataCollect : public QObject, public kbd_service::CAlmApiForEvtClt +class CEventDataCollect : public QObject, public iot_service::CAlmApiForEvtClt { Q_OBJECT public: @@ -67,11 +67,11 @@ public: QMap eventShowStatusDescriptionMap(); QMap eventOtherStatusDescriptionMap(); - virtual void handleAllEvtMsg(int nDomainID, kbd_idlfile::SEvtCltAddEvt &objAllEvt); + virtual void handleAllEvtMsg(int nDomainID, iot_idl::SEvtCltAddEvt &objAllEvt); - virtual void handleAddEvtMsg(kbd_idlfile::SEvtCltAddEvt &objAddEvt); + virtual void handleAddEvtMsg(iot_idl::SEvtCltAddEvt &objAddEvt); - virtual void handleLinkWave2EvtMsg( kbd_idlfile::SAlmCltLinkWave2Alm &objWave2Evt); + virtual void handleLinkWave2EvtMsg( iot_idl::SAlmCltLinkWave2Alm &objWave2Evt); void handleClearRTEvent(); void destory(); @@ -120,9 +120,9 @@ private: QTimer * m_pTimer; int m_nLocationID; QList m_listEventCache; - //kbd_dbms::CRdbAccess * m_rtdbAccess; - //kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; - kbd_dbms::CDbApi *m_pObjDbInterface; + //iot_dbms::CRdbAccess * m_rtdbAccess; + //iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CDbApi *m_pObjDbInterface; QList m_listPermLocationId; QList m_listPermRegionId; diff --git a/product/src/tools/debug_tool/CEventDelegate.cpp b/product/src/tools/debug_tool/CEventDelegate.cpp index 4950af55..0c35620a 100644 --- a/product/src/tools/debug_tool/CEventDelegate.cpp +++ b/product/src/tools/debug_tool/CEventDelegate.cpp @@ -104,8 +104,8 @@ void CEventDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option button.rect = option.rect; button.rect.adjust(option.rect.width() - 40-40-40, option.rect.height()/2-10, -12-40-40, -(option.rect.height()/2-10)); - std::string style = kbd_public::CFileStyle::getCurStyle(); - QString file = kbd_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); + std::string style = iot_public::CFileStyle::getCurStyle(); + QString file = iot_public::CFileUtil::getPathOfResFile("gui/icon/alarm/wave_"+style+".png").c_str(); button.iconSize = QSize(button.rect.width()+2,button.rect.height()+2); button.icon = QIcon(file); button.features = QStyleOptionButton::Flat; @@ -146,8 +146,8 @@ bool CEventDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const wave = QString("%1%2%3").arg("\"").arg(wave).arg("\""); LOGINFO("录波文件为:%s",wave.toStdString().c_str()); - const std::string strProc = std::move(kbd_public::CFileUtil::getPathOfBinFile( - std::string("WaveAnalyze") + kbd_public::CFileUtil::getProcSuffix())); + const std::string strProc = std::move(iot_public::CFileUtil::getPathOfBinFile( + std::string("WaveAnalyze") + iot_public::CFileUtil::getProcSuffix())); if(strProc.empty()) LOGERROR("未找到可执行文件WaveAnalyze"); else @@ -160,7 +160,7 @@ bool CEventDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const } void CEventDelegate::loadColorConfig() { - QString filePath = QString::fromStdString(kbd_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); + QString filePath = QString::fromStdString(iot_public::CFileUtil::getCurModuleDir()) + QString("../../data/model/alarm_color_define.xml"); QDomDocument document; QFile file(filePath); if (!file.open(QIODevice::ReadOnly)) diff --git a/product/src/tools/debug_tool/CEventMsgInfo.cpp b/product/src/tools/debug_tool/CEventMsgInfo.cpp index ffabc069..9be7e361 100644 --- a/product/src/tools/debug_tool/CEventMsgInfo.cpp +++ b/product/src/tools/debug_tool/CEventMsgInfo.cpp @@ -42,7 +42,7 @@ CEventMsgInfo::CEventMsgInfo(const CEventMsgInfo &other) wave_file = other.wave_file; } -void CEventMsgInfo::initialize(const kbd_idlfile::SEvtInfoToEvtClt &eventInfo) +void CEventMsgInfo::initialize(const iot_idl::SEvtInfoToEvtClt &eventInfo) { alm_type = eventInfo.alm_type(); E_ALARM_LOGICSTATE logic = (E_ALARM_LOGICSTATE)eventInfo.logic_state(); diff --git a/product/src/tools/debug_tool/CEventMsgInfo.h b/product/src/tools/debug_tool/CEventMsgInfo.h index e19d2a75..133c6eb8 100644 --- a/product/src/tools/debug_tool/CEventMsgInfo.h +++ b/product/src/tools/debug_tool/CEventMsgInfo.h @@ -134,7 +134,7 @@ class CEventMsgInfo public: CEventMsgInfo(); CEventMsgInfo(const CEventMsgInfo &other); - void initialize(const kbd_idlfile::SEvtInfoToEvtClt &eventInfo); + void initialize(const iot_idl::SEvtInfoToEvtClt &eventInfo); bool lessThan(EventMsgPtr info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); bool moreThan(EventMsgPtr info, E_ALARM_SORTKEY sortkey = E_SORT_PRIORITY); bool operator==(const EventMsgPtr &target); diff --git a/product/src/tools/debug_tool/CRdbWorker.cpp b/product/src/tools/debug_tool/CRdbWorker.cpp index b925aade..eb9fd1db 100644 --- a/product/src/tools/debug_tool/CRdbWorker.cpp +++ b/product/src/tools/debug_tool/CRdbWorker.cpp @@ -3,7 +3,7 @@ #include CRdbWorker::CRdbWorker() { - m_pNetRdbApi = new kbd_dbms::CRdbNetApi(); + m_pNetRdbApi = new iot_dbms::CRdbNetApi(); } CRdbWorker::~CRdbWorker() @@ -16,9 +16,9 @@ CRdbWorker::~CRdbWorker() m_pNetRdbApi = NULL; } -void CRdbWorker::search(int domainId, int appid, kbd_idlfile::RdbQuery msgQuery, QString tableName, int searchWays) +void CRdbWorker::search(int domainId, int appid, iot_idl::RdbQuery msgQuery, QString tableName, int searchWays) { - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; bool isSuccess = false; if(m_pNetRdbApi) { diff --git a/product/src/tools/debug_tool/CRdbWorker.h b/product/src/tools/debug_tool/CRdbWorker.h index ad05fd25..9959ec9c 100644 --- a/product/src/tools/debug_tool/CRdbWorker.h +++ b/product/src/tools/debug_tool/CRdbWorker.h @@ -11,12 +11,12 @@ public: CRdbWorker(); ~CRdbWorker(); signals: - void sigAutoSearch(bool isSuccess,kbd_idlfile::RdbRet rdbRet,QString tableName); - void sigNotAutoSearch(bool isSuccess,kbd_idlfile::RdbRet rdbRet,QString tableName); + void sigAutoSearch(bool isSuccess,iot_idl::RdbRet rdbRet,QString tableName); + void sigNotAutoSearch(bool isSuccess,iot_idl::RdbRet rdbRet,QString tableName); public slots: - void search(int domainId, int appid, kbd_idlfile::RdbQuery msgQuery,QString tableName,int searchWays); + void search(int domainId, int appid, iot_idl::RdbQuery msgQuery,QString tableName,int searchWays); private: - kbd_dbms::CRdbNetApi *m_pNetRdbApi; //网络实时数据库接口指针 + iot_dbms::CRdbNetApi *m_pNetRdbApi; //网络实时数据库接口指针 }; #endif // CRDBWORKER_H diff --git a/product/src/tools/debug_tool/CRealDataControl.cpp b/product/src/tools/debug_tool/CRealDataControl.cpp index 7dc10a62..b7342b11 100644 --- a/product/src/tools/debug_tool/CRealDataControl.cpp +++ b/product/src/tools/debug_tool/CRealDataControl.cpp @@ -72,10 +72,10 @@ void CRealDataControl::initVariable(int locationId,int subSystemId,QString point m_nPermUserId = m_pSystemResources->getPermUserId(); m_nPermUserGroupId = m_pSystemResources->getPermUserGroupId(); - m_pSendComm = new kbd_net::CMbCommunicator((m_strPointName+"_Sender").toStdString().c_str()); + m_pSendComm = new iot_net::CMbCommunicator((m_strPointName+"_Sender").toStdString().c_str()); m_pSendComm->addSub(0,CH_HMI_TO_OPT_OPTCMD_DOWN); - m_pReceiveComm = new kbd_net::CMbCommunicator((m_strPointName+"_Receiver").toStdString().c_str()); + m_pReceiveComm = new iot_net::CMbCommunicator((m_strPointName+"_Receiver").toStdString().c_str()); m_pReceiveComm->addSub(0,CH_OPT_TO_HMI_OPTCMD_UP); @@ -226,8 +226,8 @@ void CRealDataControl::getHead(SOptReqHead &head) head.strCommName = m_pSendComm->getName(); head.nUserID = m_nPermUserId; head.nUserGroupID = m_nPermUserGroupId; - head.nOptTime = kbd_public::getUTCTimeMsec(); - //qDebug()<comboBox_cmdType->currentData().toInt(); - kbd_net::CMbMessage msg = kbd_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); + iot_net::CMbMessage msg = iot_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); if(!m_pSendComm->sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send SetAiLimit Failed!" <comboBox_cmdType->currentData().toInt(); std::string jsonObj = objOptTagSet.generate(optTagSet); - kbd_net::CMbMessage msg = kbd_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); + iot_net::CMbMessage msg = iot_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); if(!m_pSendComm->sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send InhibitRef Failed!" <comboBox_cmdType->currentData().toInt(); std::string jsonObj = objOptTagSet.generate(optTagSet); - kbd_net::CMbMessage msg = kbd_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); + iot_net::CMbMessage msg = iot_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); if(!m_pSendComm->sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send InhibitAlarm Failed!" <comboBox_cmdType->currentData().toInt(); std::string jsonObj = objOptTagSet.generate(optTagSet); - kbd_net::CMbMessage msg = kbd_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); + iot_net::CMbMessage msg = iot_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); if(!m_pSendComm->sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send InhibitCtrl Failed!" <comboBox_cmdType->currentData().toInt(); std::string jsonObj = objOptTagSet.generate(optTagSet); - kbd_net::CMbMessage msg = kbd_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); + iot_net::CMbMessage msg = iot_net::CMbMessage(jsonObj,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); if(!m_pSendComm->sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send SetValue Failed!" <sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send SetValue Failed!" <sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send SetValue Failed!" <sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send SetValue Failed!" <comboBox_cmdType->currentData().toInt(); COptCtrlRequest objOptCtrlRequest; std::string objJson = objOptCtrlRequest.generate(optCtrlRequest); - kbd_net::CMbMessage msg = kbd_net::CMbMessage(objJson,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); + iot_net::CMbMessage msg = iot_net::CMbMessage(objJson,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); if(!m_pSendComm->sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send SetValue Failed!" <comboBox_cmdType->currentData().toInt(); COptCtrlRequest objOptCtrlRequest; std::string objJson = objOptCtrlRequest.generate(optCtrlRequest); - kbd_net::CMbMessage msg = kbd_net::CMbMessage(objJson,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); + iot_net::CMbMessage msg = iot_net::CMbMessage(objJson,m_stAppInfo.nId,CH_HMI_TO_OPT_OPTCMD_DOWN,msgType); if(!m_pSendComm->sendMsgToDomain(msg,m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId))) { qDebug() << "send SetValue Failed!" <getDomainIdByLocationId(m_nDestLocationId); int nDestSubSystemId = m_nDestSubSystemId; objRdbNetApi.connect(nDestDomainId,nDestSubSystemId); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("analog_limit_info"); std::string *pColName = msgQuery.add_strselectcolnamearr(); @@ -661,15 +661,15 @@ void CRealDataControl::aiLimitQuery() pColName = msgQuery.add_strselectcolnamearr(); *pColName = "limit_low3"; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); - pCondtion->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); - pCondtion->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + pCondtion->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); + pCondtion->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("tag_name"); - kbd_idlfile::SVariable * pCondValue = pCondtion->mutable_msgvalue(); - pCondValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable * pCondValue = pCondtion->mutable_msgvalue(); + pCondValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); pCondValue->set_strvalue(m_strPointTagName.toStdString().c_str()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; QString strStatus; if(!objRdbNetApi.query(msgQuery,retMsg)) { @@ -707,11 +707,11 @@ void CRealDataControl::aiLimitQuery() /*禁止刷新，禁止报警，禁止控制，人工置数的状态查询，远程查询实时数据库opt_tag_info*/ void CRealDataControl::OptPointQuery() { - kbd_dbms::CRdbNetApi objRdbNetApi; + iot_dbms::CRdbNetApi objRdbNetApi; int nDestDomainId = m_pSystemResources->getDomainIdByLocationId(m_nDestLocationId); int nDestSubSystemId = m_nDestSubSystemId; objRdbNetApi.connect(nDestDomainId,nDestSubSystemId); - kbd_idlfile::RdbQuery msgQuery; + iot_idl::RdbQuery msgQuery; msgQuery.set_strtablename("opt_tag_info"); std::string *pColName = msgQuery.add_strselectcolnamearr(); @@ -719,17 +719,17 @@ void CRealDataControl::OptPointQuery() pColName = msgQuery.add_strselectcolnamearr(); *pColName = "set_value"; - kbd_idlfile::RdbCondition *pCondtion = msgQuery.add_msgcondition(); - pCondtion->set_enlogic(kbd_idlfile::ENConditionLogic::enumCondAnd); - pCondtion->set_enrelation(kbd_idlfile::ENConditionRelation::enumCondEqual); + iot_idl::RdbCondition *pCondtion = msgQuery.add_msgcondition(); + pCondtion->set_enlogic(iot_idl::ENConditionLogic::enumCondAnd); + pCondtion->set_enrelation(iot_idl::ENConditionRelation::enumCondEqual); pCondtion->set_strcolumnname("key_id_tag"); - kbd_idlfile::SVariable * pCondValue = pCondtion->mutable_msgvalue(); - pCondValue->set_edatatype(kbd_idlfile::DataType::CN_DATATYPE_STRING); + iot_idl::SVariable * pCondValue = pCondtion->mutable_msgvalue(); + pCondValue->set_edatatype(iot_idl::DataType::CN_DATATYPE_STRING); QString keyIdTag = m_strTableName.toLower() + "." + m_strPointTagName + "." + "status"; qDebug() << "keyIdTag:" << keyIdTag <set_strvalue(keyIdTag.toStdString().c_str()); - kbd_idlfile::RdbRet retMsg; + iot_idl::RdbRet retMsg; QString strStatus; if(!objRdbNetApi.query(msgQuery,retMsg)) { @@ -964,7 +964,7 @@ void CRealDataControl::slot_timeOutReciceMsg() m_pTimer->stop(); m_timeOutTimes = 0; } - kbd_net::CMbMessage msgRcv; + iot_net::CMbMessage msgRcv; if(m_pReceiveComm->recvMsg(msgRcv)) { if(msgRcv.getChannelID() == CH_OPT_TO_HMI_OPTCMD_UP) diff --git a/product/src/tools/debug_tool/CRealDataControl.h b/product/src/tools/debug_tool/CRealDataControl.h index a78e1da9..8b7ec7af 100644 --- a/product/src/tools/debug_tool/CRealDataControl.h +++ b/product/src/tools/debug_tool/CRealDataControl.h @@ -45,14 +45,14 @@ private: Ui::CRealDataControl * ui; - kbd_net::CMbCommunicator * m_pSendComm; - kbd_net::CMbCommunicator * m_pReceiveComm; + iot_net::CMbCommunicator * m_pSendComm; + iot_net::CMbCommunicator * m_pReceiveComm; CSystemResources * m_pSystemResources; - kbd_dbms::CDbApi * m_pDbInterface; + iot_dbms::CDbApi * m_pDbInterface; - kbd_public::SAppInfo m_stAppInfo; + iot_public::SAppInfo m_stAppInfo; int m_nDestSubSystemId; int m_nDestLocationId; QString m_strPointName; diff --git a/product/src/tools/debug_tool/CRealDataSelect.h b/product/src/tools/debug_tool/CRealDataSelect.h index 1be51cdf..a94c9c64 100644 --- a/product/src/tools/debug_tool/CRealDataSelect.h +++ b/product/src/tools/debug_tool/CRealDataSelect.h @@ -48,7 +48,7 @@ private slots: private: Ui::CRealDataSelect *ui; - kbd_dbms::CDbApi *m_pObjDbInterface; + iot_dbms::CDbApi *m_pObjDbInterface; CSystemResources *m_pSystemResources; // bool m_isFristQuery; diff --git a/product/src/tools/debug_tool/CRealDataWatch.cpp b/product/src/tools/debug_tool/CRealDataWatch.cpp index c75d8b57..de45d9e4 100644 --- a/product/src/tools/debug_tool/CRealDataWatch.cpp +++ b/product/src/tools/debug_tool/CRealDataWatch.cpp @@ -126,7 +126,7 @@ void CRealDataWatch::initWatch() void CRealDataWatch::initVariable() { m_pObjDbInterface = m_pSystemResources->getDbInterface(); - m_pDpcdaForApp = new kbd_service::CDpcdaForApp; + m_pDpcdaForApp = new iot_service::CDpcdaForApp; m_searchDialog = new CStatusDialog(m_pSystemResources,this); } diff --git a/product/src/tools/debug_tool/CRealDataWatch.h b/product/src/tools/debug_tool/CRealDataWatch.h index a29c1dd2..a0a9825b 100644 --- a/product/src/tools/debug_tool/CRealDataWatch.h +++ b/product/src/tools/debug_tool/CRealDataWatch.h @@ -51,9 +51,9 @@ protected: bool eventFilter(QObject *watched, QEvent *event); private: Ui::CRealDataWatch *ui; - kbd_dbms::CDbApi *m_pObjDbInterface; + iot_dbms::CDbApi *m_pObjDbInterface; CSystemResources *m_pSystemResources; - kbd_service::CDpcdaForApp *m_pDpcdaForApp; + iot_service::CDpcdaForApp *m_pDpcdaForApp; bool m_bIsLgoin; QPushButton *m_pSearchButton; diff --git a/product/src/tools/debug_tool/CRealDatabaseItemInfo.cpp b/product/src/tools/debug_tool/CRealDatabaseItemInfo.cpp index f3042ef2..da01f57e 100644 --- a/product/src/tools/debug_tool/CRealDatabaseItemInfo.cpp +++ b/product/src/tools/debug_tool/CRealDatabaseItemInfo.cpp @@ -4,42 +4,42 @@ CRealDatabaseItemInfo::CRealDatabaseItemInfo() { } -void CRealDatabaseItemInfo::initialize(const kbd_idlfile::RdbRecord &msgRecord) +void CRealDatabaseItemInfo::initialize(const iot_idl::RdbRecord &msgRecord) { init(msgRecord); } -void CRealDatabaseItemInfo::init(const kbd_idlfile::RdbRecord &msgRecord) +void CRealDatabaseItemInfo::init(const iot_idl::RdbRecord &msgRecord) { m_data.clear(); for(int index(0);index m_mapAppIdToAppTag; //<- 应用ID和应用名 QMap m_mapAppTagToAppDesc; //<- 应用名和应用描述 diff --git a/product/src/tools/debug_tool/CRealDatabaseShow.cpp b/product/src/tools/debug_tool/CRealDatabaseShow.cpp index 83e0cb1b..dba43056 100644 --- a/product/src/tools/debug_tool/CRealDatabaseShow.cpp +++ b/product/src/tools/debug_tool/CRealDatabaseShow.cpp @@ -6,8 +6,8 @@ #include "rdb_api/RdbDefine.h" #include "CRealDatabaseItemModel.h" -using namespace kbd_public; -using namespace kbd_idlfile; +using namespace iot_public; +using namespace iot_idl; CRealDatabaseShow::CRealDatabaseShow(QWidget *parent) : QWidget(parent), @@ -27,8 +27,8 @@ CRealDatabaseShow::CRealDatabaseShow(QWidget *parent) : { ui->setupUi(this); qRegisterMetaType< QList >("ListRealDatabasePtr"); - qRegisterMetaType("kbd_idlfile::RdbQuery"); - qRegisterMetaType("kbd_idlfile::RdbRet"); + qRegisterMetaType("iot_idl::RdbQuery"); + qRegisterMetaType("iot_idl::RdbRet"); m_nsubId = -2; m_nDomainId = -2; m_nlocationId = -2; @@ -434,36 +434,36 @@ void CRealDatabaseShow::slotTimerShot(const bool start) } //对表格的第row行第column列进行填写 -void CRealDatabaseShow::setItemData(int &row, int &column, const kbd_idlfile::SVariable &sVariable) +void CRealDatabaseShow::setItemData(int &row, int &column, const iot_idl::SVariable &sVariable) { QTableWidgetItem *item = new QTableWidgetItem; switch (sVariable.edatatype()) { - case kbd_idlfile::DataType::CN_DATATYPE_BOOL: + case iot_idl::DataType::CN_DATATYPE_BOOL: item->setText(QString::number(sVariable.bvalue())); break; - case kbd_idlfile::DataType::CN_DATATYPE_FLOAT: + case iot_idl::DataType::CN_DATATYPE_FLOAT: item->setText(QString::number(sVariable.fvalue())); break; - case kbd_idlfile::DataType::CN_DATATYPE_INT32: + case iot_idl::DataType::CN_DATATYPE_INT32: item->setText(QString::number(sVariable.nvalue())); break; - case kbd_idlfile::DataType::CN_DATATYPE_STRING: + case iot_idl::DataType::CN_DATATYPE_STRING: { item->setText(QString::fromStdString(sVariable.strvalue())); QString name = QString::fromStdString(sVariable.strvalue()); break; } - case kbd_idlfile::DataType::CN_DATATYPE_UINT32: + case iot_idl::DataType::CN_DATATYPE_UINT32: item->setText(QString::number(sVariable.uvalue())); break; - case kbd_idlfile::DataType::CN_DATATYPE_INT64: + case iot_idl::DataType::CN_DATATYPE_INT64: item->setText(QString::number(sVariable.lvalue())); break; - case kbd_idlfile::DataType::CN_DATATYPE_UINT64: + case iot_idl::DataType::CN_DATATYPE_UINT64: item->setText(QString::number(sVariable.ulvalue())); break; - case kbd_idlfile::DataType::CN_DATATYPE_DOUBLE: + case iot_idl::DataType::CN_DATATYPE_DOUBLE: item->setText(QString::number(sVariable.dvalue())); break; default: @@ -838,32 +838,32 @@ void CRealDatabaseShow::setTableHead() ui->tableWidget_showTable->setEditTriggers(QAbstractItemView::NoEditTriggers); } -QString CRealDatabaseShow::dataTypeToQString(const kbd_idlfile::SVariable &sVariable) +QString CRealDatabaseShow::dataTypeToQString(const iot_idl::SVariable &sVariable) { switch (sVariable.edatatype()) { - case kbd_idlfile::DataType::CN_DATATYPE_BOOL: + case iot_idl::DataType::CN_DATATYPE_BOOL: return QString::number(sVariable.bvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_FLOAT: + case iot_idl::DataType::CN_DATATYPE_FLOAT: return QString::number(sVariable.fvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_INT32: + case iot_idl::DataType::CN_DATATYPE_INT32: return QString::number(sVariable.nvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_STRING: + case iot_idl::DataType::CN_DATATYPE_STRING: return QString::fromStdString(sVariable.strvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_UINT32: + case iot_idl::DataType::CN_DATATYPE_UINT32: return QString::number(sVariable.uvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_INT64: + case iot_idl::DataType::CN_DATATYPE_INT64: return QString::number(sVariable.lvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_UINT64: + case iot_idl::DataType::CN_DATATYPE_UINT64: return QString::number(sVariable.ulvalue()); break; - case kbd_idlfile::DataType::CN_DATATYPE_DOUBLE: + case iot_idl::DataType::CN_DATATYPE_DOUBLE: return QString::number(sVariable.dvalue()); break; default: diff --git a/product/src/tools/debug_tool/CRealDatabaseShow.h b/product/src/tools/debug_tool/CRealDatabaseShow.h index a50bca58..84d9510c 100644 --- a/product/src/tools/debug_tool/CRealDatabaseShow.h +++ b/product/src/tools/debug_tool/CRealDatabaseShow.h @@ -51,7 +51,7 @@ private: signals: void sigTimerShot(const bool bStop); void sigDataRefresh(QList); - void sigSearch(int domainId,int appid,kbd_idlfile::RdbQuery rdbQuery,QString tableName,int searchWays); + void sigSearch(int domainId,int appid,iot_idl::RdbQuery rdbQuery,QString tableName,int searchWays); void signal_selectTextEdit(QString allQString); public slots: @@ -68,18 +68,18 @@ public slots: void auto_brush(); void not_auto_brush(); - void slotAutoResult(const bool & isSuccess,const kbd_idlfile::RdbRet & retMsg,const QString& tableName); - void slotNotAutoResult(const bool &isSuccess, const kbd_idlfile::RdbRet &retMsg, const QString &tableName); + void slotAutoResult(const bool & isSuccess,const iot_idl::RdbRet & retMsg,const QString& tableName); + void slotNotAutoResult(const bool &isSuccess, const iot_idl::RdbRet &retMsg, const QString &tableName); void statusSearch(); void showStatus(const QModelIndex &index); private: - bool makeData(const kbd_idlfile::RdbRet &retMsg); - void setItemData(int &row,int &column,const kbd_idlfile::SVariable &); + bool makeData(const iot_idl::RdbRet &retMsg); + void setItemData(int &row,int &column,const iot_idl::SVariable &); QStringList getTableHead(); void setTableHead(); - QString dataTypeToQString(const kbd_idlfile::SVariable &sVariable); + QString dataTypeToQString(const iot_idl::SVariable &sVariable); void hideDevGroup(); void showDevGroup(); @@ -91,9 +91,9 @@ private: void showFesDev(); void search(); - bool makeQuery(kbd_idlfile::RdbQuery &msgQuery); - bool makeUpdateQuery(kbd_idlfile::RdbQuery &msgQuery); - bool makeCondition(kbd_idlfile::RdbQuery &msgQuery); + bool makeQuery(iot_idl::RdbQuery &msgQuery); + bool makeUpdateQuery(iot_idl::RdbQuery &msgQuery); + bool makeCondition(iot_idl::RdbQuery &msgQuery); private: Ui::CRealDatabaseShow *ui; @@ -101,7 +101,7 @@ private: QMap m_showdata; //< 模型数据 CSystemResources *m_pSystemResources; //< 系统资源类指针 QVector * m_pVecTableInfo; //< 表的列名数组指针 - kbd_dbms::CDbApi *m_pObjDbInterface; //< mysql数据库的接口指针 + iot_dbms::CDbApi *m_pObjDbInterface; //< mysql数据库的接口指针 int m_nsubId; //< 专业ID int m_nDomainId; //< 域ID diff --git a/product/src/tools/debug_tool/CStatusDialog.h b/product/src/tools/debug_tool/CStatusDialog.h index 6d1376fb..12a23642 100644 --- a/product/src/tools/debug_tool/CStatusDialog.h +++ b/product/src/tools/debug_tool/CStatusDialog.h @@ -32,7 +32,7 @@ signals: void signal_selectTextEdit(QString allStatus,QString m_allName,int m_value); private: Ui::CStatusDialog *ui; - kbd_dbms::CDbApi *m_pObjDbInterface; + iot_dbms::CDbApi *m_pObjDbInterface; CSystemResources *m_pSystemResources; QMap > m_dict_menu; QList m_listItem; diff --git a/product/src/tools/debug_tool/CSystemResources.cpp b/product/src/tools/debug_tool/CSystemResources.cpp index a08a30a7..9e3e61c4 100644 --- a/product/src/tools/debug_tool/CSystemResources.cpp +++ b/product/src/tools/debug_tool/CSystemResources.cpp @@ -50,7 +50,7 @@ int CSystemResources::initSystemResources() return 0; } //得到数据库的接口 -kbd_dbms::CDbApi *CSystemResources::getDbInterface() +iot_dbms::CDbApi *CSystemResources::getDbInterface() { return m_pObjDbInterface; } @@ -60,7 +60,7 @@ int CSystemResources::getDomainIdByLocationId(int locationId) return m_mapLocationId2DomainId[locationId]; } //通过子系统得到应用信息 -int CSystemResources::getAppInfoBySubSystemId(int SubSystemId, kbd_public::SAppInfo &appInfo) +int CSystemResources::getAppInfoBySubSystemId(int SubSystemId, iot_public::SAppInfo &appInfo) { m_pSysInfoInterfacePtr->getAppInfoBySubsystemId(SubSystemId,appInfo); return 0; @@ -111,19 +111,19 @@ int CSystemResources::getPermUserGroupId() void CSystemResources::initLogSystem() { - //kbd_public::StartLogSystem("PUBLIC", "debugTool"); + //iot_public::StartLogSystem("PUBLIC", "debugTool"); } bool CSystemResources::initMsgBus() { //< 初始化消息总线库 - if (!(kbd_net::initMsgBus("debugToolAppName", "debugToolProcessName"))) + if (!(iot_net::initMsgBus("debugToolAppName", "debugToolProcessName"))) { qDebug() << "初始化消息总线失败" <open()) { qDebug() << "数据库接口打开失败" < m_mapLocationId2DomainId; QString m_strSrcTag ; //源标签（即发送端进程名） int m_nSrcDomainID ; //消息发送源域名 @@ -69,7 +69,7 @@ private: QString m_strCommName ; int m_nPermUserID ; //发送端用户ID int m_nPermUserGroupID ; //发送端用户组ID - kbd_public::CSysInfoInterfacePtr m_pSysInfoInterfacePtr; + iot_public::CSysInfoInterfacePtr m_pSysInfoInterfacePtr; }; diff --git a/product/src/tools/debug_tool/CUpdateThread.cpp b/product/src/tools/debug_tool/CUpdateThread.cpp index 25b62e2c..bc3e24ba 100644 --- a/product/src/tools/debug_tool/CUpdateThread.cpp +++ b/product/src/tools/debug_tool/CUpdateThread.cpp @@ -3,7 +3,7 @@ CUpdateThread::CUpdateThread(QObject *parent) : QThread(parent) { bIsRun = true; - m_pMbComm = new kbd_net::CMbCommunicator("updatePoint"); + m_pMbComm = new iot_net::CMbCommunicator("updatePoint"); //< 获取通讯器名称（可选） qDebug() << "My communicator name is " << m_pMbComm->getName().c_str() << endl; @@ -39,7 +39,7 @@ void CUpdateThread::run() { case CH_SCADA_TO_HMI_DATA_CHANGE: msgType = objMsg.getMsgType(); - if(kbd_idlfile::MT_DP_CHANGE_DATA == msgType) + if(iot_idl::MT_DP_CHANGE_DATA == msgType) { parserMsg(objMsg); } @@ -60,9 +60,9 @@ void CUpdateThread::stopThread() bIsRun = false; } -int CUpdateThread::parserMsg(const kbd_net::CMbMessage &msg) +int CUpdateThread::parserMsg(const iot_net::CMbMessage &msg) { - ::kbd_idlfile::SRealTimeDataPkg changeDataPackage; + ::iot_idl::SRealTimeDataPkg changeDataPackage; try { changeDataPackage.ParseFromArray(msg.getDataPtr(),(int)msg.getDataSize()); @@ -71,7 +71,7 @@ int CUpdateThread::parserMsg(const kbd_net::CMbMessage &msg) if(aiSize > 0) { // qDebug() << aiSize < 0) { - ::kbd_idlfile::SDiRealTimeData diStu; + ::iot_idl::SDiRealTimeData diStu; QString tagName; int value; uint status; @@ -105,7 +105,7 @@ int CUpdateThread::parserMsg(const kbd_net::CMbMessage &msg) int piSize = changeDataPackage.stpirtd_size(); if(piSize > 0) { - ::kbd_idlfile::SPiRealTimeData piStu; + ::iot_idl::SPiRealTimeData piStu; QString tagName; double value; uint status; @@ -122,7 +122,7 @@ int CUpdateThread::parserMsg(const kbd_net::CMbMessage &msg) int miSize = changeDataPackage.stmirtd_size(); if(miSize > 0) { - ::kbd_idlfile::SMiRealTimeData miStu; + ::iot_idl::SMiRealTimeData miStu; QString tagName; int value; uint status; diff --git a/product/src/tools/debug_tool/CUpdateThread.h b/product/src/tools/debug_tool/CUpdateThread.h index c9fb56a5..64b17d7d 100644 --- a/product/src/tools/debug_tool/CUpdateThread.h +++ b/product/src/tools/debug_tool/CUpdateThread.h @@ -26,12 +26,12 @@ signals: void signal_updateMi(QString,int,uint); private: - kbd_net::CMbCommunicator *m_pMbComm; - kbd_net::CMbMessage objMsg; + iot_net::CMbCommunicator *m_pMbComm; + iot_net::CMbMessage objMsg; bool bIsRun; private: - int parserMsg(const kbd_net::CMbMessage &); + int parserMsg(const iot_net::CMbMessage &); }; #endif // CUPDATETHREAD_H diff --git a/product/src/tools/debug_tool/CommonSheet.cpp b/product/src/tools/debug_tool/CommonSheet.cpp index 85c7ee0a..bc7c6596 100644 --- a/product/src/tools/debug_tool/CommonSheet.cpp +++ b/product/src/tools/debug_tool/CommonSheet.cpp @@ -4,7 +4,7 @@ CommonSheet::CommonSheet() { - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("debug_tool.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("debug_tool.qss") ; QFile qssfile(QString::fromStdString(strFullPath)); qssfile.open(QFile::ReadOnly); if (qssfile.isOpen()) diff --git a/product/src/tools/debug_tool/FesDef.h b/product/src/tools/debug_tool/FesDef.h index fe63da93..2aaa0df5 100644 --- a/product/src/tools/debug_tool/FesDef.h +++ b/product/src/tools/debug_tool/FesDef.h @@ -32,7 +32,7 @@ #pragma warning(disable: 4251)//需要有dll接口由class"xxxx"的客户端使用 #pragma warning(disable: 4267)// “=”: 从“size_t”转换到“int”，可能丢失数据 #pragma warning(disable: 4305)// “初始化”: 从“double”到“float”截断 -#pragma warning(disable: 4275)// 非 dll 接口 class“google::protobuf::Message”用作 dll 接口 class“kbd_idlfile:: +#pragma warning(disable: 4275)// 非 dll 接口 class“google::protobuf::Message”用作 dll 接口 class“iot_idl:: #pragma warning(disable: 4819)//该文件包含不能在当前代码页(0)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 #pragma warning(disable: 4474)// sprintf: 格式字符串中传递的参数太多 #pragma warning(disable: 4313)//“sprintf”: 格式字符串中的“%d”与“char *”类型的参数 5 冲突 diff --git a/product/src/tools/debug_tool/chanmondlg.cpp b/product/src/tools/debug_tool/chanmondlg.cpp index d864bffe..abeead83 100644 --- a/product/src/tools/debug_tool/chanmondlg.cpp +++ b/product/src/tools/debug_tool/chanmondlg.cpp @@ -62,7 +62,7 @@ ChanMonDlg::ChanMonDlg(int windowId, QWidget *parent) : //<< 获取通道信息 //============================================================================== ui->ChanNo->clear(); - m_pdbApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pdbApi = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(m_pdbApi->open()) { QSqlQuery ret; diff --git a/product/src/tools/debug_tool/chanmondlg.h b/product/src/tools/debug_tool/chanmondlg.h index da7282e8..ea9d94a3 100644 --- a/product/src/tools/debug_tool/chanmondlg.h +++ b/product/src/tools/debug_tool/chanmondlg.h @@ -62,7 +62,7 @@ signals: private: Ui::ChanMonDlg *ui; // QTimer *m_RefreshTimer; - kbd_dbms::CDbApi *m_pdbApi; + iot_dbms::CDbApi *m_pdbApi; int m_ConnectFlag; //连接成功标志 int m_RefreshFlag; //刷新标志 1：正再刷新 0：停止刷新 bool m_DispRecv; diff --git a/product/src/tools/debug_tool/main.cpp b/product/src/tools/debug_tool/main.cpp index 39289468..1c05ab9b 100644 --- a/product/src/tools/debug_tool/main.cpp +++ b/product/src/tools/debug_tool/main.cpp @@ -22,13 +22,13 @@ int main(int argc, char *argv[]) //QApplication a(argc, argv); SingleApplication a(argc, argv); a.setWindowIcon(QIcon(":/debug_tool.ico")); - kbd_public::StartLogSystem("BASE", "debug_tool"); + iot_public::StartLogSystem("BASE", "debug_tool"); //暂时取消国际化 // std::string strRootPath =""; // std::string strLanguage; // QDir dir; -// if(true == kbd_public::initI18N(strRootPath,strLanguage)) +// if(true == iot_public::initI18N(strRootPath,strLanguage)) // { // dir.setPath(QString::fromStdString(strRootPath)); // dir.cd(QString::fromStdString(strLanguage)); @@ -70,6 +70,6 @@ int main(int argc, char *argv[]) w.show(); ret = a.exec(); } - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return ret; } diff --git a/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/alarmpushdlg.cpp b/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/alarmpushdlg.cpp index 7f1f542a..653286ce 100644 --- a/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/alarmpushdlg.cpp +++ b/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/alarmpushdlg.cpp @@ -580,7 +580,7 @@ void AlarmPushDlg::brushTemp() void AlarmPushDlg::loadTemp() { - QString tempFile = kbd_public::CFileUtil::getPathOfResFile("fbd_editor/temp/evtpushstyletemp.json").c_str(); + QString tempFile = iot_public::CFileUtil::getPathOfResFile("fbd_editor/temp/evtpushstyletemp.json").c_str(); QFile loadFile(tempFile); if(!loadFile.open(QIODevice::ReadOnly)) { @@ -630,7 +630,7 @@ void AlarmPushDlg::init() { m_userMap.clear(); QVector vec; - kbd_dbms::CDbApi *readApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi *readApi = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(readApi->open()) { QString sql = QString ("select perm_id ,perm_name from rm_userg_def"); diff --git a/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/pushtypedlg.cpp b/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/pushtypedlg.cpp index ec241e63..7c4a5975 100644 --- a/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/pushtypedlg.cpp +++ b/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/pushtypedlg.cpp @@ -379,7 +379,7 @@ void PushTypeDlg::brushTemp() void PushTypeDlg::loadTemp() { - QString tempFile = kbd_public::CFileUtil::getPathOfResFile("fbd_editor/temp/evtpushstyletemp.json").c_str(); + QString tempFile = iot_public::CFileUtil::getPathOfResFile("fbd_editor/temp/evtpushstyletemp.json").c_str(); QFile loadFile(tempFile); if(!loadFile.open(QIODevice::ReadOnly)) { diff --git a/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/userchoosedlg.cpp b/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/userchoosedlg.cpp index 3c2db091..d3c30a7c 100644 --- a/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/userchoosedlg.cpp +++ b/product/src/tools/fbd_designer/fbd_plugins/alarmpushplugin/userchoosedlg.cpp @@ -128,7 +128,7 @@ void UserChooseDlg::init() { m_userMap.clear(); QVector vec; - kbd_dbms::CDbApi *readApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi *readApi = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(readApi->open()) { QString sql = QString ("select perm_id ,perm_name from rm_userg_def"); diff --git a/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CPointPropertySet.cpp b/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CPointPropertySet.cpp index 4ad8889a..2c1b07db 100644 --- a/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CPointPropertySet.cpp +++ b/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CPointPropertySet.cpp @@ -5,7 +5,7 @@ #include "db_api_ex/CDbApi.h" #include "BlockDefine.h" -using namespace kbd_dbms; +using namespace iot_dbms; enum EItemType { diff --git a/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CSinglePropertySet.cpp b/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CSinglePropertySet.cpp index 9d57e5ca..ac699ecc 100644 --- a/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CSinglePropertySet.cpp +++ b/product/src/tools/fbd_designer/fbd_plugins/alarmsubscribeplugin/CSinglePropertySet.cpp @@ -4,7 +4,7 @@ #include "db_api_ex/CDbApi.h" #include "BlockDefine.h" -using namespace kbd_dbms; +using namespace iot_dbms; CSinglePropertySet::CSinglePropertySet(QWidget *parent) : QDialog(parent), diff --git a/product/src/tools/fbd_designer/fbd_plugins/multimapplugin/mapcfgdlg.cpp b/product/src/tools/fbd_designer/fbd_plugins/multimapplugin/mapcfgdlg.cpp index 95a79a55..7ae4b31b 100644 --- a/product/src/tools/fbd_designer/fbd_plugins/multimapplugin/mapcfgdlg.cpp +++ b/product/src/tools/fbd_designer/fbd_plugins/multimapplugin/mapcfgdlg.cpp @@ -231,7 +231,7 @@ void MapCfgDlg::rapidParse(const char *json) int m_nRows = objDocRoot["multirows"].GetInt(); for(int index(0);index #include "boost/shared_ptr.hpp" -using namespace kbd_idlfile; +using namespace iot_idl; typedef boost::shared_ptr FileNodeRespMsgPtr; typedef boost::shared_ptr BroadcastResultMsgPtr; -class Msgtrans : public kbd_sys::FilesyncApiForTool +class Msgtrans : public iot_sys::FilesyncApiForTool { public: Msgtrans(); diff --git a/product/src/tools/file_sync_tool/treeupdatefun.h b/product/src/tools/file_sync_tool/treeupdatefun.h index c81d3968..0db18e2e 100644 --- a/product/src/tools/file_sync_tool/treeupdatefun.h +++ b/product/src/tools/file_sync_tool/treeupdatefun.h @@ -4,7 +4,7 @@ #include "msgtrans.h" -using namespace kbd_public; +using namespace iot_public; class TreeUpdateFun { public: diff --git a/product/src/tools/his_event_del/CCheckUser.cpp b/product/src/tools/his_event_del/CCheckUser.cpp index 9b44f1db..f5f18022 100644 --- a/product/src/tools/his_event_del/CCheckUser.cpp +++ b/product/src/tools/his_event_del/CCheckUser.cpp @@ -41,7 +41,7 @@ void CCheckUser::initVariable() { if(m_pReadDb == NULL) { - m_pReadDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_READ); + m_pReadDb = new iot_dbms::CDbApi(DB_CONN_MODEL_READ); if(!m_pReadDb->open()) { qDebug() << "数据库接口打开失败" < m_vecUsergInfo; - kbd_dbms::CDbApi* m_pReadDb; + iot_dbms::CDbApi* m_pReadDb; Ui::CCheckUser *ui; static QString m_userName; }; diff --git a/product/src/tools/his_event_del/CDbOpt.cpp b/product/src/tools/his_event_del/CDbOpt.cpp index 1265c19e..0803fcc8 100644 --- a/product/src/tools/his_event_del/CDbOpt.cpp +++ b/product/src/tools/his_event_del/CDbOpt.cpp @@ -13,7 +13,7 @@ #include "pub_utility_api/CharUtil.h" using namespace std; -using namespace kbd_public; +using namespace iot_public; CDbOpt * CDbOpt::m_pInstance = NULL; CDbOpt * CDbOpt::instance() @@ -30,12 +30,12 @@ CDbOpt::CDbOpt() { msgMutex = new QMutex(); - m_pWriteDb = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_pWriteDb = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_pWriteDb->open(); - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); - m_rtdbPriorityOrderAccess = new kbd_dbms::CRdbAccess(); + m_rtdbPriorityOrderAccess = new iot_dbms::CRdbAccess(); m_rtdbPriorityOrderAccess->open("base", "alarm_level_define"); m_pTimer = new QTimer(); @@ -74,12 +74,12 @@ CDbOpt::~CDbOpt() bool CDbOpt::initialize() { m_pTimer->start(); - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - kbd_public::SNodeInfo stNodeInfo; + iot_public::SNodeInfo stNodeInfo; spSysInfo->getLocalNodeInfo(stNodeInfo); - kbd_public::SLocationInfo stLocationInfo; + iot_public::SLocationInfo stLocationInfo; spSysInfo->getLocationInfoById(stNodeInfo.nLocationId, stLocationInfo); m_nLocationID = stNodeInfo.nLocationId; } @@ -213,7 +213,7 @@ QList CDbOpt::alarmOtherList() void CDbOpt::loadPermInfo() { - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { @@ -245,8 +245,8 @@ QMap CDbOpt::priorityDescriptionMap() m_priorityDescriptionMap.clear(); if(m_rtdbAccess->open("base", "alarm_level_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("priority_id"); columns.push_back("priority_name"); @@ -255,8 +255,8 @@ QMap CDbOpt::priorityDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_priorityDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -271,8 +271,8 @@ QMap CDbOpt::locationDescriptionMap() m_locationDescriptionMap.clear(); if(m_rtdbAccess->open("base", "sys_model_location_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("location_id"); columns.push_back("description"); @@ -281,8 +281,8 @@ QMap CDbOpt::locationDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermLocationId.contains(key.toInt())) @@ -300,8 +300,8 @@ QMap CDbOpt::regionInfoDescriptionMap() m_regionInfoDescriptionMap.clear(); if(m_rtdbAccess->open("base", "region_info")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("region_id"); columns.push_back("description"); @@ -310,8 +310,8 @@ QMap CDbOpt::regionInfoDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); if(m_listPermRegionId.contains(key.toInt())) @@ -329,8 +329,8 @@ QMap CDbOpt::alarmTypeDescriptionMap() m_alarmTypeDescriptionMap.clear(); if(m_rtdbAccess->open("base", "alarm_type_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("type_id"); columns.push_back("type_name"); @@ -339,8 +339,8 @@ QMap CDbOpt::alarmTypeDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -356,8 +356,8 @@ QMap CDbOpt::deviceTypeDescriptionMap() m_deviceTypeDescriptionMap.clear(); if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("dev_type_id"); columns.push_back("description"); @@ -366,8 +366,8 @@ QMap CDbOpt::deviceTypeDescriptionMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_deviceTypeDescriptionMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -382,8 +382,8 @@ QMap CDbOpt::alarmStatusMap() m_alarmStatusMap.clear(); if(m_rtdbAccess->open("base", "alarm_status_define")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("status_value"); columns.push_back("display_name"); @@ -392,8 +392,8 @@ QMap CDbOpt::alarmStatusMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_alarmStatusMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -408,8 +408,8 @@ QMap CDbOpt::userNameMap() m_userNameMap.clear(); if(m_rtdbAccess->open("base", "rm_user_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CRdbQueryResult result; std::vector columns; columns.push_back("perm_id"); columns.push_back("perm_name"); @@ -418,8 +418,8 @@ QMap CDbOpt::userNameMap() { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType key; - kbd_dbms::CVarType value; + iot_dbms::CVarType key; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, key); result.getColumnValue(nIndex, 1, value); m_userNameMap[key.toInt()] = QString::fromStdString(value.toStdString()); @@ -431,7 +431,7 @@ QMap CDbOpt::userNameMap() QMap CDbOpt::eventShowStatusDescriptionMap() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmStatus.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -461,7 +461,7 @@ QMap CDbOpt::eventShowStatusDescriptionMap() QMap CDbOpt::eventOtherStatusDescriptionMap() { - const std::string strConfFullPath = kbd_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); + const std::string strConfFullPath = iot_public::CFileUtil::getPathOfCfgFile("alarmOther.xml"); boost::property_tree::ptree pt; namespace xml = boost::property_tree::xml_parser; try @@ -625,8 +625,8 @@ void CDbOpt::slotUpdateEvent() int CDbOpt::queryPriorityOrder(int &id) { - kbd_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); - kbd_dbms::CVarType value; + iot_dbms::CTableLockGuard locker(*m_rtdbPriorityOrderAccess); + iot_dbms::CVarType value; m_rtdbPriorityOrderAccess->getColumnValueByKey((void*)&id, "priority_order", value); return value.toInt(); } diff --git a/product/src/tools/his_event_del/CDbOpt.h b/product/src/tools/his_event_del/CDbOpt.h index 9bf57bf8..5b2a49fb 100644 --- a/product/src/tools/his_event_del/CDbOpt.h +++ b/product/src/tools/his_event_del/CDbOpt.h @@ -80,9 +80,9 @@ private: QTimer * m_pTimer; int m_nLocationID; QList m_listEventCache; - kbd_dbms::CRdbAccess * m_rtdbAccess; - kbd_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; - kbd_dbms::CDbApi * m_pWriteDb; + iot_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbPriorityOrderAccess; + iot_dbms::CDbApi * m_pWriteDb; QList m_listPermLocationId; QList m_listPermRegionId; QMap m_priorityOrderMap; diff --git a/product/src/tools/his_event_del/CEventFilterDialog.cpp b/product/src/tools/his_event_del/CEventFilterDialog.cpp index e1755e32..f003d190 100644 --- a/product/src/tools/his_event_del/CEventFilterDialog.cpp +++ b/product/src/tools/his_event_del/CEventFilterDialog.cpp @@ -27,7 +27,7 @@ CEventFilterDialog::~CEventFilterDialog() void CEventFilterDialog::initialize() { - m_rtdbAccess = new kbd_dbms::CRdbAccess(); + m_rtdbAccess = new iot_dbms::CRdbAccess(); ui->level->setSelectionMode(QAbstractItemView::MultiSelection); ui->location->setSelectionMode(QAbstractItemView::MultiSelection); ui->region->setSelectionMode(QAbstractItemView::MultiSelection); @@ -57,12 +57,12 @@ void CEventFilterDialog::initialize() ui->type->addItem(CDbOpt::instance()->eventShowStatusDescription(alarmStatus)); } - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(info.nId <= CN_AppId_COMAPP) { @@ -482,12 +482,12 @@ void CEventFilterDialog::slot_updateCheckTypeState() void CEventFilterDialog::slot_updateDevice(const QString &subSystem) { int nSubSystemId = -1; - kbd_public::CSysInfoInterfacePtr spSysInfo; - if (kbd_public::createSysInfoInstance(spSysInfo)) + iot_public::CSysInfoInterfacePtr spSysInfo; + if (iot_public::createSysInfoInstance(spSysInfo)) { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; spSysInfo->getAllSubsystemInfo(vecSubsystemInfo); - foreach (kbd_public::SSubsystemInfo info, vecSubsystemInfo) + foreach (iot_public::SSubsystemInfo info, vecSubsystemInfo) { if(subSystem.toStdString() == info.strDesc) { @@ -497,34 +497,34 @@ void CEventFilterDialog::slot_updateDevice(const QString &subSystem) } ui->deviceType->clear(); - QList values; + QList values; if(nSubSystemId != -1) { - kbd_dbms::CVarType subSystemId = nSubSystemId; + iot_dbms::CVarType subSystemId = nSubSystemId; if(m_rtdbAccess->open("base", "dev_type_def")) { - kbd_dbms::CTableLockGuard locker(*m_rtdbAccess); - kbd_dbms::CONDINFO condition; + iot_dbms::CTableLockGuard locker(*m_rtdbAccess); + iot_dbms::CONDINFO condition; condition.relationop = ATTRCOND_EQU; memcpy(condition.name, "sub_system", strlen("sub_system")); condition.conditionval = subSystemId; std::vector columns; columns.push_back("description"); - kbd_dbms::CRdbQueryResult result; + iot_dbms::CRdbQueryResult result; if(m_rtdbAccess->select(condition, result, columns)) { for(int nIndex(0); nIndex < result.getRecordCount(); nIndex++) { - kbd_dbms::CVarType value; + iot_dbms::CVarType value; result.getColumnValue(nIndex, 0, value); values.append(value); } } } } - foreach (kbd_dbms::CVarType value, values) + foreach (iot_dbms::CVarType value, values) { ui->deviceType->addItem(value.c_str()); } diff --git a/product/src/tools/his_event_del/CEventFilterDialog.h b/product/src/tools/his_event_del/CEventFilterDialog.h index dcaa2902..453b6ab2 100644 --- a/product/src/tools/his_event_del/CEventFilterDialog.h +++ b/product/src/tools/his_event_del/CEventFilterDialog.h @@ -70,7 +70,7 @@ private slots: private: Ui::CEventFilterDialog *ui; - kbd_dbms::CRdbAccess * m_rtdbAccess; + iot_dbms::CRdbAccess * m_rtdbAccess; }; #endif // CEVENTFILTERDIALOG_H diff --git a/product/src/tools/his_event_del/CEventForm.cpp b/product/src/tools/his_event_del/CEventForm.cpp index a207089b..2f0bb7b8 100644 --- a/product/src/tools/his_event_del/CEventForm.cpp +++ b/product/src/tools/his_event_del/CEventForm.cpp @@ -19,7 +19,7 @@ #include "pub_utility_api/TimeUtil.h" #include -using namespace kbd_public; +using namespace iot_public; CEventForm::CEventForm(QWidget *parent) : QWidget(parent), m_pHistoryModel(NULL), @@ -30,7 +30,7 @@ CEventForm::CEventForm(QWidget *parent) : qRegisterMetaType("uint64"); ui->setupUi(this); QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf8")); - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -717,7 +717,7 @@ void CEventForm::deleteOneEvent(QModelIndex index) qDebug()<<"开始删除influx"; emit delInfluxdbOneEvent(time,type,tag); } - int fileName = kbd_public::getUTCTimeMsec()/(1000*60*60*24); + int fileName = iot_public::getUTCTimeMsec()/(1000*60*60*24); QDir dir(QCoreApplication::applicationDirPath()); QString stPath = "../../data/hisevent"; if(!dir.exists(stPath)) @@ -727,7 +727,7 @@ void CEventForm::deleteOneEvent(QModelIndex index) dir.cd(QString(stPath)); QFile file(QString("%1/%2.txt").arg(dir.path()).arg(fileName)); - QString strDelTime = QDateTime::fromMSecsSinceEpoch(kbd_public::getUTCTimeMsec()).toString("yyyy-MM-dd hh:mm:ss.zzz"); + QString strDelTime = QDateTime::fromMSecsSinceEpoch(iot_public::getUTCTimeMsec()).toString("yyyy-MM-dd hh:mm:ss.zzz"); QString strAlarmTime = QDateTime::fromMSecsSinceEpoch(time).toString("yyyy-MM-dd hh:mm:ss.zzz"); QString text = QString("用户:%1 时间:%2 删除历史事件:[表名:%3 时间:%4 类型:%5 位置:%6 标签:%7 内容:%8]") .arg(m_userName) diff --git a/product/src/tools/his_event_del/CEventHistoryModel.cpp b/product/src/tools/his_event_del/CEventHistoryModel.cpp index d61b583c..10a3d734 100644 --- a/product/src/tools/his_event_del/CEventHistoryModel.cpp +++ b/product/src/tools/his_event_del/CEventHistoryModel.cpp @@ -48,7 +48,7 @@ void CEventHistoryModel::initFilter() void CEventHistoryModel::loadEventHistoryData() { //< 权限判断 - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -188,7 +188,7 @@ QString CEventHistoryModel::bulidConditionPartStatus() QString CEventHistoryModel::bulidConditionPartLocation() { QList locationFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); @@ -240,7 +240,7 @@ QString CEventHistoryModel::bulidConditionPartLocation() QString CEventHistoryModel::bulidConditionPartRegion() { QList regionFilter; - kbd_service::CPermMngApiPtr permMngPtr = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base"); if(permMngPtr != NULL) { permMngPtr->PermDllInit(); diff --git a/product/src/tools/his_event_del/CInfluxdbOpt.cpp b/product/src/tools/his_event_del/CInfluxdbOpt.cpp index 9edacbdf..0bf8d610 100644 --- a/product/src/tools/his_event_del/CInfluxdbOpt.cpp +++ b/product/src/tools/his_event_del/CInfluxdbOpt.cpp @@ -7,14 +7,14 @@ CInfluxdbOpt::CInfluxdbOpt(QObject *parent) : QObject(parent) void CInfluxdbOpt::initialize() { - kbd_dbms::initTsdbApi(); + iot_dbms::initTsdbApi(); } void CInfluxdbOpt::delInfluxdbOneEvent(uint64 nTime, int nType, QString strTag) { //获取连接 - kbd_dbms::CTsdbConnPtr conn = kbd_dbms::getOneUseableConn(true); + iot_dbms::CTsdbConnPtr conn = iot_dbms::getOneUseableConn(true); QString sql = QString("delete from his_event_point where time = %1 and alm_type = %2 and key_id_tag ='%3'").arg(nTime*1000000).arg(QString::number(nType)).arg(strTag); conn->doQuery(sql.toStdString().c_str(),NULL,20); qDebug()<currentItem()->data(Qt::UserRole).toString(); bool isPq = false; - if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_KINGBASE - || KbdTableDataMgr::getInstance()->getDbPara().getDbType() == kbd_dbms::DB_OPENGAUSS) + if(KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_KINGBASE + || KbdTableDataMgr::getInstance()->getDbPara().getDbType() == iot_dbms::DB_OPENGAUSS) { isPq = true; }else diff --git a/product/src/tools/model_plugin/model_plan_curve/CDbInterface.cpp b/product/src/tools/model_plugin/model_plan_curve/CDbInterface.cpp index e9787a5b..5f1c64e3 100644 --- a/product/src/tools/model_plugin/model_plan_curve/CDbInterface.cpp +++ b/product/src/tools/model_plugin/model_plan_curve/CDbInterface.cpp @@ -3,7 +3,7 @@ #include "pub_logger_api/logger.h" #include -using namespace kbd_dbms; +using namespace iot_dbms; CDbInterface::CDbInterface(QObject *parent) : QObject(parent) { diff --git a/product/src/tools/model_plugin/model_plan_curve/CDbInterface.h b/product/src/tools/model_plugin/model_plan_curve/CDbInterface.h index a5c545d7..94b8b34f 100644 --- a/product/src/tools/model_plugin/model_plan_curve/CDbInterface.h +++ b/product/src/tools/model_plugin/model_plan_curve/CDbInterface.h @@ -81,7 +81,7 @@ private: void readUnit(); private: - kbd_dbms::CDbApi *m_dbInterface; + iot_dbms::CDbApi *m_dbInterface; QMap m_mapUnit; }; diff --git a/product/src/tools/model_plugin/model_plan_curve/CPlanCurvesConfigure.cpp b/product/src/tools/model_plugin/model_plan_curve/CPlanCurvesConfigure.cpp index 41b71431..d2935a08 100644 --- a/product/src/tools/model_plugin/model_plan_curve/CPlanCurvesConfigure.cpp +++ b/product/src/tools/model_plugin/model_plan_curve/CPlanCurvesConfigure.cpp @@ -21,7 +21,7 @@ CPlanCurvesConfigure::CPlanCurvesConfigure(QWidget *parent, bool hideNavBar, boo ui->planConfigType->setMaximumWidth(0); QString qss = QString(); - std::string strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("public.qss") ; + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; QFile qssfile1(QString::fromStdString(strFullPath)); qssfile1.open(QFile::ReadOnly); if (qssfile1.isOpen()) @@ -30,7 +30,7 @@ CPlanCurvesConfigure::CPlanCurvesConfigure(QWidget *parent, bool hideNavBar, boo qssfile1.close(); } - strFullPath = kbd_public::CFileStyle::getPathOfStyleFile("planCurvesConfigure.qss") ; + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("planCurvesConfigure.qss") ; QFile qssfile2(QString::fromStdString(strFullPath)); qssfile2.open(QFile::ReadOnly); if (qssfile2.isOpen()) diff --git a/product/src/tools/model_plugin/model_plan_curve/main.cpp b/product/src/tools/model_plugin/model_plan_curve/main.cpp index cc67ff1a..ab5251f5 100644 --- a/product/src/tools/model_plugin/model_plan_curve/main.cpp +++ b/product/src/tools/model_plugin/model_plan_curve/main.cpp @@ -7,12 +7,12 @@ int main(int argc, char *argv[]) { - kbd_public::StartLogSystem("", "hmi"); - if (!(kbd_net::initMsgBus("HMI", "HMI"))) + iot_public::StartLogSystem("", "hmi"); + if (!(iot_net::initMsgBus("HMI", "HMI"))) { return -1; } - kbd_service::CPermMngApiPtr perm = kbd_service::getPermMngInstance("base"); + iot_service::CPermMngApiPtr perm = iot_service::getPermMngInstance("base"); if(!perm || PERM_NORMAL != perm->PermDllInit()) { return -1; @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) return -1; } -// kbd_service::CDpcdaForApp::initGlobalThread(); +// iot_service::CDpcdaForApp::initGlobalThread(); { QApplication app(argc, argv); @@ -34,10 +34,10 @@ int main(int argc, char *argv[]) app.exec(); } -// kbd_service::CDpcdaForApp::releaseGlobalThread(); +// iot_service::CDpcdaForApp::releaseGlobalThread(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return 0; } diff --git a/product/src/tools/opc_tool/MainWindow.cpp b/product/src/tools/opc_tool/MainWindow.cpp index 3b43ba06..7944d677 100644 --- a/product/src/tools/opc_tool/MainWindow.cpp +++ b/product/src/tools/opc_tool/MainWindow.cpp @@ -60,14 +60,14 @@ MainWindow::~MainWindow() } m_pTimer = Q_NULLPTR; - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); delete ui; } bool MainWindow::getSystemInfo() { - if(!kbd_public::createSysInfoInstance(m_ptrSysInfo)) + if(!iot_public::createSysInfoInstance(m_ptrSysInfo)) { LOGERROR("创建系统信息访问库失败"); return false; @@ -111,13 +111,13 @@ void MainWindow::init() int MainWindow::initLog() { - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(),"opc_tool"); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(),"opc_tool"); return kbdSuccess; } int MainWindow::initMsg() { - if(!kbd_net::initMsgBus("opc_tool","opc_tool")) + if(!iot_net::initMsgBus("opc_tool","opc_tool")) { LOGERROR("初始化消息总线失败"); return kbdFailed; @@ -127,7 +127,7 @@ int MainWindow::initMsg() void MainWindow::initDb() { - m_pWriteApi = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + m_pWriteApi = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); m_pWriteApi->open(); } @@ -149,14 +149,14 @@ void MainWindow::initLoc() ui->comBoxLoc->clear(); m_locToDomainMap.clear(); - std::vector vecLocationInfo; + std::vector vecLocationInfo; if(kbdSuccess != m_ptrSysInfo->getAllLocationInfo(vecLocationInfo)) { LOGERROR("获取车站信息失败"); return ; } - std::vector::iterator it = vecLocationInfo.begin(); + std::vector::iterator it = vecLocationInfo.begin(); while (it != vecLocationInfo.end()) { m_locToDomainMap.insert(it->nLocationNo,it->nDomainId); ui->comBoxLoc->addItem(QString::fromStdString(it->strDesc),it->nLocationNo); @@ -166,7 +166,7 @@ void MainWindow::initLoc() void MainWindow::initSub() { - std::vector vecSubsystemInfo; + std::vector vecSubsystemInfo; ui->comBoxSub->clear(); if(kbdSuccess != m_ptrSysInfo->getAllSubsystemInfo(vecSubsystemInfo)) { @@ -174,7 +174,7 @@ void MainWindow::initSub() return ; } m_subAppMap.clear(); - std::vector::iterator it= vecSubsystemInfo.begin(); + std::vector::iterator it= vecSubsystemInfo.begin(); while (it != vecSubsystemInfo.end()) { if(it->nId > 3) { @@ -1125,9 +1125,9 @@ void MainWindow::deleteTag(QList listTag,bool isTip) m_pWriteApi->transaction(); for(int index(0);indexdeleteRow(ST_OPC_CONFIG_DEFINE,condition); diff --git a/product/src/tools/opc_tool/MainWindow.h b/product/src/tools/opc_tool/MainWindow.h index bde71022..33614936 100644 --- a/product/src/tools/opc_tool/MainWindow.h +++ b/product/src/tools/opc_tool/MainWindow.h @@ -151,7 +151,7 @@ protected: private: Ui::MainWindow *ui; - kbd_dbms::CDbApi *m_pWriteApi; + iot_dbms::CDbApi *m_pWriteApi; BackTableModel *m_backAiModel; BackTableModel *m_backDiModel; @@ -182,7 +182,7 @@ private: QString m_curDevGTag; QString m_curTabName; - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; QTimer *m_pTimer; }; diff --git a/product/src/tools/opc_tool/OpcWorkThread.cpp b/product/src/tools/opc_tool/OpcWorkThread.cpp index fd16ebb3..df6afa0b 100644 --- a/product/src/tools/opc_tool/OpcWorkThread.cpp +++ b/product/src/tools/opc_tool/OpcWorkThread.cpp @@ -22,7 +22,7 @@ void OpcWorkThread::slotSub(int appId) void OpcWorkThread::slotUnsub() { m_com.delSub(0,CH_OPC_TO_OPCTOOLS_REPLY); - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while(m_com.recvMsg(objMsg,0)) { @@ -32,20 +32,20 @@ void OpcWorkThread::slotUnsub() void OpcWorkThread::slotRequest(int domainId, int appId, QString devGTag) { - ::kbd_idlfile::RequestPointInfo reqPointInfo; + ::iot_idl::RequestPointInfo reqPointInfo; reqPointInfo.set_strgrouptag(devGTag.toStdString().c_str()); reqPointInfo.set_strhostname(m_hostName.toStdString().c_str()); reqPointInfo.set_ndomainid(domainId); reqPointInfo.set_nsubsystemid(appId); - //uint64 time = kbd_public::getUTCTimeMsec(); + //uint64 time = iot_public::getUTCTimeMsec(); //reqPointInfo.set_ntime(time); std::string strSendBuff; reqPointInfo.SerializeToString(&strSendBuff); - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; - objMsg.setMsgType(kbd_idlfile::MT_TOOLS_REQUEST_POINT_DATA); //指定消息类型 + objMsg.setMsgType(iot_idl::MT_TOOLS_REQUEST_POINT_DATA); //指定消息类型 objMsg.setSubject(appId,CH_OPCTOOLS_TO_OPC_REQUEST); //下发通道 objMsg.setPara1(domainId); objMsg.setData(strSendBuff); //设置需要发送数据 TO Protobuff @@ -55,7 +55,7 @@ void OpcWorkThread::slotRequest(int domainId, int appId, QString devGTag) void OpcWorkThread::onTimeRecvMess() { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; while(m_com.recvMsg(objMsg,0)) { switch (objMsg.getChannelID()) { @@ -70,7 +70,7 @@ void OpcWorkThread::onTimeRecvMess() void OpcWorkThread::slotCheckBadData() { - kbd_dbms::CDbApi *pModelWrite = new kbd_dbms::CDbApi(DB_CONN_MODEL_WRITE); + iot_dbms::CDbApi *pModelWrite = new iot_dbms::CDbApi(DB_CONN_MODEL_WRITE); pModelWrite->open(); QMultiHash aiBackPoint; QMultiHash diBackPoint; @@ -164,20 +164,20 @@ void OpcWorkThread::slotCheckBadData() emit sigDealBadData(badPoint.size()); } -void OpcWorkThread::dealReply(const kbd_net::CMbMessage &objMsg) +void OpcWorkThread::dealReply(const iot_net::CMbMessage &objMsg) { int nMessageType=objMsg.getMsgType(); switch (nMessageType) { - case kbd_idlfile::MT_SERVER_REPLY_POINT_DATA: + case iot_idl::MT_SERVER_REPLY_POINT_DATA: parsePointDataMsg(objMsg); default: break; } } -void OpcWorkThread::parsePointDataMsg(const kbd_net::CMbMessage &objMsg) +void OpcWorkThread::parsePointDataMsg(const iot_net::CMbMessage &objMsg) { - ::kbd_idlfile::ReplyPointInfo replyPointInfo; + ::iot_idl::ReplyPointInfo replyPointInfo; if(replyPointInfo.ParseFromArray(objMsg.getDataPtr(),(int)objMsg.getDataSize()) == true) { QString devGTag = QString::fromStdString(replyPointInfo.strgrouptag()); @@ -189,7 +189,7 @@ void OpcWorkThread::parsePointDataMsg(const kbd_net::CMbMessage &objMsg) for(int index(0);indexm_tagname = QString::fromStdString(info.strpointtag()); opcinfo->m_dValue = info.dvalue(); @@ -205,7 +205,7 @@ void OpcWorkThread::parsePointDataMsg(const kbd_net::CMbMessage &objMsg) int diSize = replyPointInfo.diinfo_size(); for(int index(0);indexm_tagname = QString::fromStdString(info.strpointtag()); opcinfo->m_nValue = info.nvalue(); @@ -221,7 +221,7 @@ void OpcWorkThread::parsePointDataMsg(const kbd_net::CMbMessage &objMsg) int piSize = replyPointInfo.piinfo_size(); for(int index(0);indexm_tagname = QString::fromStdString(info.strpointtag()); opcinfo->m_dValue = info.dvalue(); @@ -237,7 +237,7 @@ void OpcWorkThread::parsePointDataMsg(const kbd_net::CMbMessage &objMsg) int miSize = replyPointInfo.miinfo_size(); for(int index(0);indexm_tagname = QString::fromStdString(info.strpointtag()); opcinfo->m_nValue = info.nvalue(); diff --git a/product/src/tools/opc_tool/OpcWorkThread.h b/product/src/tools/opc_tool/OpcWorkThread.h index 6a493770..563ba144 100644 --- a/product/src/tools/opc_tool/OpcWorkThread.h +++ b/product/src/tools/opc_tool/OpcWorkThread.h @@ -35,14 +35,14 @@ public slots: void slotCheckBadData(); private: - void dealReply(const kbd_net::CMbMessage &objMsg); + void dealReply(const iot_net::CMbMessage &objMsg); - void parsePointDataMsg(const kbd_net::CMbMessage &objMsg); + void parsePointDataMsg(const iot_net::CMbMessage &objMsg); QString getDelSql(QList &badList); private: - kbd_net::CMbCommunicator m_com; + iot_net::CMbCommunicator m_com; QString m_hostName; }; diff --git a/product/src/tools/playerCfgParser/CPlayerCfgParser.cpp b/product/src/tools/playerCfgParser/CPlayerCfgParser.cpp index 7a88d19f..bda77352 100644 --- a/product/src/tools/playerCfgParser/CPlayerCfgParser.cpp +++ b/product/src/tools/playerCfgParser/CPlayerCfgParser.cpp @@ -17,10 +17,10 @@ CPlayerCfgParser::CPlayerCfgParser(const QString &configPath): if(xmlPath == "") { #ifdef OS_WINDOWS - xmlPath = kbd_public::CFileUtil::getPathOfCfgFile("playerConfig_qsv.xml").c_str(); + xmlPath = iot_public::CFileUtil::getPathOfCfgFile("playerConfig_qsv.xml").c_str(); #endif #ifdef OS_LINUX - xmlPath = kbd_public::CFileUtil::getPathOfCfgFile("playerConfig_ffmpeg.xml").c_str(); + xmlPath = iot_public::CFileUtil::getPathOfCfgFile("playerConfig_ffmpeg.xml").c_str(); #endif } diff --git a/product/src/tools/setup/setup_installer/SetupFunc.h b/product/src/tools/setup/setup_installer/SetupFunc.h index 8009f2bd..3aa5fb03 100644 --- a/product/src/tools/setup/setup_installer/SetupFunc.h +++ b/product/src/tools/setup/setup_installer/SetupFunc.h @@ -12,7 +12,7 @@ #include #include -namespace kbd_sys +namespace iot_sys { //< 注册系统服务，并设置自启动 @@ -56,5 +56,5 @@ bool setSysctl(); #endif -} //< kbd_sys +} //< iot_sys diff --git a/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp b/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp index 4d71a839..172559f6 100644 --- a/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp +++ b/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp @@ -16,7 +16,7 @@ #include #include -namespace kbd_sys +namespace iot_sys { QString getDesktopPath() @@ -368,7 +368,7 @@ bool setSysctl() } -} //< kbd_sys +} //< iot_sys #endif //< #ifdef OS_LINUX diff --git a/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp b/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp index 961fe525..aa26d783 100644 --- a/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp +++ b/product/src/tools/setup/setup_installer/SetupFuncWindows.cpp @@ -18,7 +18,7 @@ #include "SetupFunc.h" #include "setupCommon.h" -namespace kbd_sys +namespace iot_sys { static const TCHAR *pszServiceName = _T("iscs6000_launcher"); @@ -366,7 +366,7 @@ bool regUninstallReg(const QString &iconPath,const QString &version,const QStrin } -} //< kbd_sys +} //< iot_sys diff --git a/product/src/tools/setup/setup_installer/SetupWidget.cpp b/product/src/tools/setup/setup_installer/SetupWidget.cpp index 3fdfbc08..cf6a57c9 100644 --- a/product/src/tools/setup/setup_installer/SetupWidget.cpp +++ b/product/src/tools/setup/setup_installer/SetupWidget.cpp @@ -17,7 +17,7 @@ #include "CInstallWorker.h" -using namespace kbd_sys; +using namespace iot_sys; bool isKylin() { @@ -1252,12 +1252,12 @@ void SetupWidget::on_FinishButton_clicked() #ifdef OS_WINDOWS if(ui->checkBox51->checkState()==Qt::Checked) { - kbd_sys::creatShortcut(strErr,destPath); + iot_sys::creatShortcut(strErr,destPath); } if(ui->checkBox52->checkState()==Qt::Checked) { - kbd_sys::regSysService(strErr,destPath); + iot_sys::regSysService(strErr,destPath); } if(ui->checkBox53->checkState()==Qt::Checked) { @@ -1266,11 +1266,11 @@ void SetupWidget::on_FinishButton_clicked() QMessageBox::information(this,tr("提醒"),tr("勾选HMI自启动之前请先勾选系统服务自启动！")); return; } - kbd_sys::setSysStartupAutoStartByVbs(strErr,destPath); + iot_sys::setSysStartupAutoStartByVbs(strErr,destPath); } regDbConfig(); - kbd_sys::createStartProgram(strErr,destPath); + iot_sys::createStartProgram(strErr,destPath); MainProgramPath.replace("/","\\"); QString iconPath = MainProgramPath + QDir::separator() + "product" + QDir::separator() + "common" +QDir::separator() + "resource" +QDir::separator()+ "zh" +QDir::separator()+ "setup" +QDir::separator()+ "setup.ico"; QString uninstallPath = MainProgramPath+ QDir::separator() + "product" +QDir::separator() + g_platform_dir_name +QDir::separator()+ UNINSTALL_EXEC_NAME; @@ -1283,11 +1283,11 @@ void SetupWidget::on_FinishButton_clicked() if(ui->checkBox51->checkState()==Qt::Checked) { - kbd_sys::creatShortcut(strErr,MainProgramPath); + iot_sys::creatShortcut(strErr,MainProgramPath); } if(ui->checkBox52->checkState()==Qt::Checked) { - kbd_sys::regSysService(strErr,destPath); + iot_sys::regSysService(strErr,destPath); } if(ui->checkBox53->checkState()==Qt::Checked) { @@ -1296,10 +1296,10 @@ void SetupWidget::on_FinishButton_clicked() QMessageBox::information(this,tr("提醒"),tr("勾选HMI自启动之前请先勾选系统服务自启动！")); return; } - kbd_sys::setHmiAutoStart(strErr,destPath); + iot_sys::setHmiAutoStart(strErr,destPath); } - kbd_sys::createStartProgram(strErr,destPath); - kbd_sys::setSysctl(); + iot_sys::createStartProgram(strErr,destPath); + iot_sys::setSysctl(); QString chmodStr = QString("chmod 777 -R ") + MainProgramPath + "/log"; system(chmodStr.toStdString().c_str()); #endif diff --git a/product/src/tools/setup/setup_installer/SingleProcInstance.cpp b/product/src/tools/setup/setup_installer/SingleProcInstance.cpp index 4c70a3b7..2f30d534 100644 --- a/product/src/tools/setup/setup_installer/SingleProcInstance.cpp +++ b/product/src/tools/setup/setup_installer/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/product/src/tools/setup/setup_installer/SingleProcInstance.h b/product/src/tools/setup/setup_installer/SingleProcInstance.h index 7bbdebb6..21437006 100644 --- a/product/src/tools/setup/setup_installer/SingleProcInstance.h +++ b/product/src/tools/setup/setup_installer/SingleProcInstance.h @@ -10,7 +10,7 @@ #include #include -namespace kbd_public +namespace iot_public { class CSingleProcInstance { @@ -25,6 +25,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/product/src/tools/setup/setup_installer/main.cpp b/product/src/tools/setup/setup_installer/main.cpp index 7cc5f42b..36714599 100644 --- a/product/src/tools/setup/setup_installer/main.cpp +++ b/product/src/tools/setup/setup_installer/main.cpp @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) kbd_common::doQtAppGlobalSet(); // 单例模式 - if(kbd_public::CSingleProcInstance::hasInstanceRunning(INSTALLER_UNIQUE_NAME)) + if(iot_public::CSingleProcInstance::hasInstanceRunning(INSTALLER_UNIQUE_NAME)) return 1; diff --git a/product/src/tools/setup/setup_uninstall/SetupFunc.h b/product/src/tools/setup/setup_uninstall/SetupFunc.h index 9447eecd..ad8b17ee 100644 --- a/product/src/tools/setup/setup_uninstall/SetupFunc.h +++ b/product/src/tools/setup/setup_uninstall/SetupFunc.h @@ -12,7 +12,7 @@ #include #include -namespace kbd_sys +namespace iot_sys { @@ -44,5 +44,5 @@ bool removeShortcut(QString &strErr); //< 删除文件夹 bool DelDir(QString &path); -} //< kbd_sys +} //< iot_sys diff --git a/product/src/tools/setup/setup_uninstall/SetupFuncLinux.cpp b/product/src/tools/setup/setup_uninstall/SetupFuncLinux.cpp index 27c2a745..275c7f97 100644 --- a/product/src/tools/setup/setup_uninstall/SetupFuncLinux.cpp +++ b/product/src/tools/setup/setup_uninstall/SetupFuncLinux.cpp @@ -14,7 +14,7 @@ #include "SetupFunc.h" -namespace kbd_sys +namespace iot_sys { const static char* g_iscs6000_os = ISCS6000_OS; @@ -155,6 +155,6 @@ bool unregHisDataSrvService(QString &strErr) } -} //< kbd_sys +} //< iot_sys #endif //< #ifdef OS_LINUX diff --git a/product/src/tools/setup/setup_uninstall/SetupFuncWindows.cpp b/product/src/tools/setup/setup_uninstall/SetupFuncWindows.cpp index 40ec1bad..32f2f779 100644 --- a/product/src/tools/setup/setup_uninstall/SetupFuncWindows.cpp +++ b/product/src/tools/setup/setup_uninstall/SetupFuncWindows.cpp @@ -17,7 +17,7 @@ #include "SetupFunc.h" -namespace kbd_sys +namespace iot_sys { static const TCHAR *pszServiceName = _T("iscs6000_launcher"); @@ -322,6 +322,6 @@ bool unregHisDataSrvService(QString &strErr) } -} //< kbd_sys +} //< iot_sys #endif //< #ifdef OS_WINDOWS diff --git a/product/src/tools/setup/setup_uninstall/SetupWidget.cpp b/product/src/tools/setup/setup_uninstall/SetupWidget.cpp index 0f5bd5b9..e6ab23d2 100644 --- a/product/src/tools/setup/setup_uninstall/SetupWidget.cpp +++ b/product/src/tools/setup/setup_uninstall/SetupWidget.cpp @@ -53,7 +53,7 @@ const static int pos_max_y=400; #define SYS_CONFIG_PATH "/etc/powerscada3000" #endif -using namespace kbd_sys; +using namespace iot_sys; SetupWidget::SetupWidget(QWidget *parent) : QWidget(parent), @@ -354,14 +354,14 @@ void SetupWidget::startUninstall() QString strErr; #ifdef OS_WINDOWS - kbd_sys::unsetSysStartupAutoStartByVbs(strErr); + iot_sys::unsetSysStartupAutoStartByVbs(strErr); #endif #ifdef OS_LINUX - kbd_sys::unsetHmiAutoStart(strErr); + iot_sys::unsetHmiAutoStart(strErr); #endif unregHisDataSrvService(strErr); - kbd_sys::removeShortcut(strErr); - kbd_sys::unregSysService(strErr); + iot_sys::removeShortcut(strErr); + iot_sys::unregSysService(strErr); addMsg(QObject::tr("删除主程序完成,如有部分文件被占用导致未删除的情况可手动删除")); addMsg(QObject::tr("卸载完成")); diff --git a/product/src/tools/setup_install_helper/SetupWidget.cpp b/product/src/tools/setup_install_helper/SetupWidget.cpp index d12992fd..c66f8991 100644 --- a/product/src/tools/setup_install_helper/SetupWidget.cpp +++ b/product/src/tools/setup_install_helper/SetupWidget.cpp @@ -577,8 +577,8 @@ bool SetupWidget::installProject() info.password = this->m_db_password; info.db_type = this->m_db_type; - kbd_dbms::db_manager_api db_api; - connect(&db_api,&kbd_dbms::db_manager_api::sig_showMsg,this,&SetupWidget::handleMsg); + iot_dbms::db_manager_api db_api; + connect(&db_api,&iot_dbms::db_manager_api::sig_showMsg,this,&SetupWidget::handleMsg); statusInstall(tr("开始初始化完整工程")); db_api.setCompleteProjectPara(info,m_productName,m_projectName); diff --git a/product/src/tools/svn_file_sync_tool/CSvnThread.cpp b/product/src/tools/svn_file_sync_tool/CSvnThread.cpp index b1eb3120..5fd6f36b 100644 --- a/product/src/tools/svn_file_sync_tool/CSvnThread.cpp +++ b/product/src/tools/svn_file_sync_tool/CSvnThread.cpp @@ -204,7 +204,7 @@ void CSvnThread::slot_cleanupFile(QStringList stList) void CSvnThread::noticeOtherNode(QStringList stList) { - kbd_idlfile::fileSyncNotice objSyncNotice; + iot_idl::fileSyncNotice objSyncNotice; std::string *pStr = NULL; for(int i = 0 ; i < stList.size() ; ++i) { @@ -221,10 +221,10 @@ void CSvnThread::noticeOtherNode(QStringList stList) objSyncNotice.set_domainid(-1); objSyncNotice.set_locationid(-1); objSyncNotice.set_appid(CN_AppId_BASE); - kbd_net::CMbMessage objMsg(objSyncNotice.SerializeAsString(), + iot_net::CMbMessage objMsg(objSyncNotice.SerializeAsString(), CN_AppId_BASE, CH_FILE_COMMIT_NOTICE, - kbd_idlfile::enFileSyncMsgType::SVN_COMMIT_SUCCESS); + iot_idl::enFileSyncMsgType::SVN_COMMIT_SUCCESS); m_objComm.sendMsgToDomain(objMsg); } diff --git a/product/src/tools/svn_file_sync_tool/CSvnThread.h b/product/src/tools/svn_file_sync_tool/CSvnThread.h index 76579315..5d64c723 100644 --- a/product/src/tools/svn_file_sync_tool/CSvnThread.h +++ b/product/src/tools/svn_file_sync_tool/CSvnThread.h @@ -33,10 +33,10 @@ public slots: private: void noticeOtherNode(QStringList stList); private: - kbd_net::CMbCommunicator m_objComm; + iot_net::CMbCommunicator m_objComm; QString m_hostName; QString m_currentPath; - kbd_sys::CSysFileSyncApi m_objFileSyncApi; // <- 文件同步接口对象 + iot_sys::CSysFileSyncApi m_objFileSyncApi; // <- 文件同步接口对象 }; #endif // CSVNTHREAD_H diff --git a/product/src/tools/svn_file_sync_tool/MainWidget.cpp b/product/src/tools/svn_file_sync_tool/MainWidget.cpp index 6b531cdd..12f080a9 100644 --- a/product/src/tools/svn_file_sync_tool/MainWidget.cpp +++ b/product/src/tools/svn_file_sync_tool/MainWidget.cpp @@ -49,10 +49,10 @@ MainWidget::~MainWidget() m_thread->quit(); m_thread->wait(); } - kbd_net::releaseMsgBus(); + iot_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); delete ui; } @@ -198,13 +198,13 @@ int MainWidget::initUi() int MainWidget::initLog() { - kbd_public::StartLogSystem(CN_AppName_BASE.c_str(),"file_sync_tool"); + iot_public::StartLogSystem(CN_AppName_BASE.c_str(),"file_sync_tool"); return kbdSuccess; } int MainWidget::initMsg() { - if(!kbd_net::initMsgBus("file_sync_tool","file_sync_tool")) + if(!iot_net::initMsgBus("file_sync_tool","file_sync_tool")) { LOGERROR("初始化消息总线失败"); return kbdFailed; diff --git a/product/src/tools/svn_file_sync_tool/main.cpp b/product/src/tools/svn_file_sync_tool/main.cpp index b91f4a46..724e67a7 100644 --- a/product/src/tools/svn_file_sync_tool/main.cpp +++ b/product/src/tools/svn_file_sync_tool/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) // std::string strRootPath =""; // std::string strLanguage; // QDir dir; -// if(true == kbd_public::initI18N(strRootPath,strLanguage)) +// if(true == iot_public::initI18N(strRootPath,strLanguage)) // { // dir.setPath(QString::fromStdString(strRootPath)); // dir.cd(QString::fromStdString(strLanguage)); diff --git a/product/src/tools/upgrade_install_helper/upgrade_db.cpp b/product/src/tools/upgrade_install_helper/upgrade_db.cpp index aeb4f28a..01e91640 100644 --- a/product/src/tools/upgrade_install_helper/upgrade_db.cpp +++ b/product/src/tools/upgrade_install_helper/upgrade_db.cpp @@ -73,7 +73,7 @@ void upgrade_db::setUp(const QString& up) bool upgrade_db::initDbOpt() { - kbd_dbms::CDbApi readApi(DB_CONN_MODEL_READ); + iot_dbms::CDbApi readApi(DB_CONN_MODEL_READ); if(!readApi.open()) { @@ -81,17 +81,17 @@ bool upgrade_db::initDbOpt() return false; } - kbd_dbms::CDbPara para =readApi.getCurrentDbPara(); + iot_dbms::CDbPara para =readApi.getCurrentDbPara(); readApi.close(); int type =(int)para.getDbType(); switch (type) { - case kbd_dbms::DB_ORACLE: + case iot_dbms::DB_ORACLE: m_pdbOpt = new db_opt_oracle(); break; - case kbd_dbms::DB_MYSQL: + case iot_dbms::DB_MYSQL: m_pdbOpt = new db_opt_mysql(); break; - case kbd_dbms::DB_OPENGAUSS: + case iot_dbms::DB_OPENGAUSS: m_pdbOpt = new db_opt_opengauss(); break; default: @@ -126,8 +126,8 @@ bool upgrade_db::execUp() return true; } - kbd_dbms::db_manager_api db_api; - connect(&db_api,&kbd_dbms::db_manager_api::sig_showMsg,this,&upgrade_db::handleMsg); + iot_dbms::db_manager_api db_api; + connect(&db_api,&iot_dbms::db_manager_api::sig_showMsg,this,&upgrade_db::handleMsg); bool res = db_api.updateDatabase(m_pdbOpt,m_databaseName); if(!res) { diff --git a/product/src/z_discard/db_api/DbBase.cpp b/product/src/z_discard/db_api/DbBase.cpp index 7dbd6844..80ec0da2 100644 --- a/product/src/z_discard/db_api/DbBase.cpp +++ b/product/src/z_discard/db_api/DbBase.cpp @@ -5,7 +5,7 @@ #include #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; QMutex CDbBase::m_mutex; diff --git a/product/src/z_discard/db_api/DbBase.h b/product/src/z_discard/db_api/DbBase.h index 794be879..d6bc6e32 100644 --- a/product/src/z_discard/db_api/DbBase.h +++ b/product/src/z_discard/db_api/DbBase.h @@ -7,7 +7,7 @@ #include "DataType.h" #include "db_api/QDbInterface.h" -namespace kbd_dbms +namespace iot_dbms { class CDbBase diff --git a/product/src/z_discard/db_api/DbMaster.cpp b/product/src/z_discard/db_api/DbMaster.cpp index a0317cea..73a46a29 100644 --- a/product/src/z_discard/db_api/DbMaster.cpp +++ b/product/src/z_discard/db_api/DbMaster.cpp @@ -5,7 +5,7 @@ #include "DbSQLite.h" #include "DbODBC.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbMaster::CDbMaster() { diff --git a/product/src/z_discard/db_api/DbMaster.h b/product/src/z_discard/db_api/DbMaster.h index 769695c0..ddc460e0 100644 --- a/product/src/z_discard/db_api/DbMaster.h +++ b/product/src/z_discard/db_api/DbMaster.h @@ -3,7 +3,7 @@ #include "db_api/QDbInterface.h" -namespace kbd_dbms +namespace iot_dbms { class CDbBase; @@ -11,12 +11,12 @@ class CDbMaster { public: CDbMaster(); - CDbMaster( const kbd_dbms::CDbPara* pDbPara ); + CDbMaster( const iot_dbms::CDbPara* pDbPara ); virtual ~CDbMaster(); CDbPara getDbPara() const; - void setDbPara( const kbd_dbms::CDbPara* pDbPara ); + void setDbPara( const iot_dbms::CDbPara* pDbPara ); bool initDatabase(); @@ -24,7 +24,7 @@ public: protected: CDbBase* m_pDatabase; - const kbd_dbms::CDbPara* m_pDbPara; //只在CQDbInterface中存一份，其他地方都用指针，保证数据一致性，且减少内存消耗 + const iot_dbms::CDbPara* m_pDbPara; //只在CQDbInterface中存一份，其他地方都用指针，保证数据一致性，且减少内存消耗 }; } #endif diff --git a/product/src/z_discard/db_api/DbMySQL.cpp b/product/src/z_discard/db_api/DbMySQL.cpp index 44411007..ef5b393a 100644 --- a/product/src/z_discard/db_api/DbMySQL.cpp +++ b/product/src/z_discard/db_api/DbMySQL.cpp @@ -2,7 +2,7 @@ #include "DbMySQL.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbMySQL::CDbMySQL() : CDbBase() diff --git a/product/src/z_discard/db_api/DbMySQL.h b/product/src/z_discard/db_api/DbMySQL.h index c6ad2243..1f8e8242 100644 --- a/product/src/z_discard/db_api/DbMySQL.h +++ b/product/src/z_discard/db_api/DbMySQL.h @@ -3,7 +3,7 @@ #include "DbBase.h" -namespace kbd_dbms +namespace iot_dbms { class CDbMySQL : public CDbBase diff --git a/product/src/z_discard/db_api/DbODBC.cpp b/product/src/z_discard/db_api/DbODBC.cpp index e86677a9..f9d2acc4 100644 --- a/product/src/z_discard/db_api/DbODBC.cpp +++ b/product/src/z_discard/db_api/DbODBC.cpp @@ -3,7 +3,7 @@ //注意，尚未用到ODBC接口，此文件内容可能不正确 -using namespace kbd_dbms; +using namespace iot_dbms; CDbODBC::CDbODBC() : CDbBase() diff --git a/product/src/z_discard/db_api/DbODBC.h b/product/src/z_discard/db_api/DbODBC.h index 357675e8..a3435f9f 100644 --- a/product/src/z_discard/db_api/DbODBC.h +++ b/product/src/z_discard/db_api/DbODBC.h @@ -2,7 +2,7 @@ #define LIBDBINTERFACE_DBODBC_H_ #include "DbBase.h" -namespace kbd_dbms +namespace iot_dbms { class CDbODBC : public CDbBase diff --git a/product/src/z_discard/db_api/DbOci.cpp b/product/src/z_discard/db_api/DbOci.cpp index c8ef3b79..beb671cd 100644 --- a/product/src/z_discard/db_api/DbOci.cpp +++ b/product/src/z_discard/db_api/DbOci.cpp @@ -1,7 +1,7 @@ #include #include "DbOci.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbOci::CDbOci() : CDbBase() diff --git a/product/src/z_discard/db_api/DbOci.h b/product/src/z_discard/db_api/DbOci.h index 910064d2..6d03e74f 100644 --- a/product/src/z_discard/db_api/DbOci.h +++ b/product/src/z_discard/db_api/DbOci.h @@ -3,7 +3,7 @@ #include "DbBase.h" -namespace kbd_dbms +namespace iot_dbms { class CDbOci : public CDbBase diff --git a/product/src/z_discard/db_api/DbSQLite.cpp b/product/src/z_discard/db_api/DbSQLite.cpp index 7a0a1c41..50d7db21 100644 --- a/product/src/z_discard/db_api/DbSQLite.cpp +++ b/product/src/z_discard/db_api/DbSQLite.cpp @@ -1,7 +1,7 @@ #include #include "DbSQLite.h" -using namespace kbd_dbms; +using namespace iot_dbms; CDbSQLite::CDbSQLite() : CDbBase() diff --git a/product/src/z_discard/db_api/DbSQLite.h b/product/src/z_discard/db_api/DbSQLite.h index 262d1771..b0074890 100644 --- a/product/src/z_discard/db_api/DbSQLite.h +++ b/product/src/z_discard/db_api/DbSQLite.h @@ -2,7 +2,7 @@ #define LIBDBINTERFACE_DBSQLITE_H_ #include "DbBase.h" -namespace kbd_dbms +namespace iot_dbms { class CDbSQLite : public CDbBase diff --git a/product/src/z_discard/db_api/QDbInterface.cpp b/product/src/z_discard/db_api/QDbInterface.cpp index df05ce63..a82da877 100644 --- a/product/src/z_discard/db_api/QDbInterface.cpp +++ b/product/src/z_discard/db_api/QDbInterface.cpp @@ -2,10 +2,10 @@ #include "DbBase.h" #include "DbMaster.h" -using namespace kbd_dbms; +using namespace iot_dbms; //根据宏定义返回默认的数据库类型 -ENUM_DB_TYPE kbd_dbms::GetDefaultDbType() +ENUM_DB_TYPE iot_dbms::GetDefaultDbType() { #if defined( DB_ORACLE ) return DB_TYPE_ORACLE; @@ -23,7 +23,7 @@ ENUM_DB_TYPE kbd_dbms::GetDefaultDbType() } //根据宏定义返回默认数据库类型的默认端口号 -int kbd_dbms::GetDefaultDbPort() +int iot_dbms::GetDefaultDbPort() { #if defined( DB_ORACLE ) return 1521; @@ -39,7 +39,7 @@ int kbd_dbms::GetDefaultDbPort() } //将表名、列名等字符串添加该数据库所用的引用字符，防止特殊表名、列名引起错误 -QString kbd_dbms::addQuoteMarks( const QString& str, ENUM_DB_TYPE DbType ) +QString iot_dbms::addQuoteMarks( const QString& str, ENUM_DB_TYPE DbType ) { QString strDest( str.trimmed() ); switch ( DbType ) @@ -99,7 +99,7 @@ QString kbd_dbms::addQuoteMarks( const QString& str, ENUM_DB_TYPE DbType ) } //将QDateTime转为该数据所使用的时间SQL语句，若不正确，请修改 -QString kbd_dbms::converDtToSqlString( const QDateTime& dt, ENUM_DB_TYPE DbType ) +QString iot_dbms::converDtToSqlString( const QDateTime& dt, ENUM_DB_TYPE DbType ) { switch ( DbType ) { diff --git a/product/src/z_discard/db_model_api/CDbModelApiImpl.cpp b/product/src/z_discard/db_model_api/CDbModelApiImpl.cpp index 97d30ef8..c26cbe23 100644 --- a/product/src/z_discard/db_model_api/CDbModelApiImpl.cpp +++ b/product/src/z_discard/db_model_api/CDbModelApiImpl.cpp @@ -12,20 +12,20 @@ #define RETRYTIMES 3 using namespace std; -using namespace kbd_dbms; -using namespace kbd_idlfile; -using namespace kbd_net; -using namespace kbd_public; +using namespace iot_dbms; +using namespace iot_idl; +using namespace iot_net; +using namespace iot_public; using namespace boost::uuids; -CDbModelApiPtr kbd_dbms::getDbModelApiInstance() +CDbModelApiPtr iot_dbms::getDbModelApiInstance() { CDbModelApiPtr ptrRet = boost::make_shared(); return ptrRet; } CDbModelApiImpl::CDbModelApiImpl() - : kbd_public::CTimerThreadBase( "db_model_server_lib CDbModelApiImpl 内存库模型更新实现线程", + : iot_public::CTimerThreadBase( "db_model_server_lib CDbModelApiImpl 内存库模型更新实现线程", 0, CN_DeadlockTimeoutMsec, true ) { m_nAppId = CN_AppId_PUBLIC; @@ -44,7 +44,7 @@ CDbModelApiImpl::CDbModelApiImpl() resume(); } -kbd_dbms::CDbModelApiImpl::~CDbModelApiImpl() +iot_dbms::CDbModelApiImpl::~CDbModelApiImpl() { quit(); diff --git a/product/src/z_discard/db_model_api/CDbModelApiImpl.h b/product/src/z_discard/db_model_api/CDbModelApiImpl.h index 3c34e8a8..0c5a6d2a 100644 --- a/product/src/z_discard/db_model_api/CDbModelApiImpl.h +++ b/product/src/z_discard/db_model_api/CDbModelApiImpl.h @@ -7,10 +7,10 @@ #include "MessageChannel.h" #include "pub_utility_api/TimerThreadBase.h" -namespace kbd_dbms +namespace iot_dbms { -class CDbModelApiImpl : public CDbModelApi, public kbd_public::CTimerThreadBase +class CDbModelApiImpl : public CDbModelApi, public iot_public::CTimerThreadBase { public: CDbModelApiImpl(); @@ -46,7 +46,7 @@ public: void reSetLastInfo( std::string sUuid ); private: - kbd_net::CMbCommunicator m_com; + iot_net::CMbCommunicator m_com; int m_nAppId; int m_nChannelID; std::string m_strSessionId; diff --git a/product/src/z_discard/db_model_server/CDbModelRedundant.cpp b/product/src/z_discard/db_model_server/CDbModelRedundant.cpp index fbb5da07..b1f48d0b 100644 --- a/product/src/z_discard/db_model_server/CDbModelRedundant.cpp +++ b/product/src/z_discard/db_model_server/CDbModelRedundant.cpp @@ -30,7 +30,7 @@ void CDbModelRedundant::setBSlave( bool bSlave ) m_bSlave.store( bSlave ); } -void CDbModelRedundant::bindProcMng( kbd_sys::CProcMngInterfacePtr ptrProcMng ) +void CDbModelRedundant::bindProcMng( iot_sys::CProcMngInterfacePtr ptrProcMng ) { m_ptrProcMng = ptrProcMng; } diff --git a/product/src/z_discard/db_model_server/CDbModelRedundant.h b/product/src/z_discard/db_model_server/CDbModelRedundant.h index 4cc708fe..27de3bdb 100644 --- a/product/src/z_discard/db_model_server/CDbModelRedundant.h +++ b/product/src/z_discard/db_model_server/CDbModelRedundant.h @@ -4,7 +4,7 @@ #include "sys_node_mng_api/NodeMngInterface.h" #include "boost/atomic.hpp" -class CDbModelRedundant : public kbd_sys::CRedundantSwitchInterface +class CDbModelRedundant : public iot_sys::CRedundantSwitchInterface { public: CDbModelRedundant() {} @@ -15,12 +15,12 @@ public: bool bSlave() const; void setBSlave( bool bSlave ); - void bindProcMng( kbd_sys::CProcMngInterfacePtr ptrProcMng ); + void bindProcMng( iot_sys::CProcMngInterfacePtr ptrProcMng ); private: static boost::atomic_bool m_bMaster; static boost::atomic_bool m_bSlave; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; }; typedef boost::shared_ptr CDbModelRedundantPtr; diff --git a/product/src/z_discard/db_model_server/CDbModelService.cpp b/product/src/z_discard/db_model_server/CDbModelService.cpp index 3cc04c6f..0c7b9e54 100644 --- a/product/src/z_discard/db_model_server/CDbModelService.cpp +++ b/product/src/z_discard/db_model_server/CDbModelService.cpp @@ -33,24 +33,24 @@ bool CDbModelService::start( int argc, char* argv[], int& nStatus ) return false; } - kbd_public::StartLogSystem( m_stRunAppInfo.strAppName.c_str(), DB_MODEL_SERVER_PROCESSNAME ); + iot_public::StartLogSystem( m_stRunAppInfo.strAppName.c_str(), DB_MODEL_SERVER_PROCESSNAME ); if ( isAlreadyRunning() ) { return false; } - using namespace kbd_dbms; + using namespace iot_dbms; - bool bRet = kbd_net::initMsgBus( DB_MODEL_SERVER_PROCESSNAME, getInstanceName().c_str() ); + bool bRet = iot_net::initMsgBus( DB_MODEL_SERVER_PROCESSNAME, getInstanceName().c_str() ); if ( false == bRet ) { LOGERROR( "InitMsgBus:error" ); return false; } - using namespace kbd_public; - using namespace kbd_sys; + using namespace iot_public; + using namespace iot_sys; using namespace boost; CProcMngInterfacePtr ptrProcMng; SProcessInfoKey processInfo; @@ -62,7 +62,7 @@ bool CDbModelService::start( int argc, char* argv[], int& nStatus ) { //get processInfo - using namespace kbd_sys; + using namespace iot_sys; ptrProcMng = getProcMngInstance( processInfo ); if ( NULL == ptrProcMng ) { @@ -106,14 +106,14 @@ bool CDbModelService::stop() } m_ptrRedundantMng.reset(); - kbd_net::releaseMsgBus(); - kbd_public::StopLogSystem(); + iot_net::releaseMsgBus(); + iot_public::StopLogSystem(); return true; } bool CDbModelService::isAlreadyRunning() { - return kbd_public::CSingleProcInstance::hasInstanceRunning( getInstanceName() ); + return iot_public::CSingleProcInstance::hasInstanceRunning( getInstanceName() ); } int CDbModelService::toQuit() @@ -168,8 +168,8 @@ bool CDbModelService::parseCommandLine( int argc, char* argv[] ) std::cout << desc << std::endl; return false; } - kbd_public::CSysInfoInterfacePtr sysInfoPtr; - if ( kbd_public::createSysInfoInstance( sysInfoPtr ) == false ) + iot_public::CSysInfoInterfacePtr sysInfoPtr; + if ( iot_public::createSysInfoInstance( sysInfoPtr ) == false ) { return false; } diff --git a/product/src/z_discard/db_model_server/CDbModelService.h b/product/src/z_discard/db_model_server/CDbModelService.h index 1d1caef9..667555fa 100644 --- a/product/src/z_discard/db_model_server/CDbModelService.h +++ b/product/src/z_discard/db_model_server/CDbModelService.h @@ -6,7 +6,7 @@ #include "PredefineForDbModelServer.h" #include "pub_sysinfo_api/SysInfoApi.h" -class CDbModelService : public kbd_public::CBaseService, public kbd_sys::CProcessQuitInterface +class CDbModelService : public iot_public::CBaseService, public iot_sys::CProcessQuitInterface { public: CDbModelService(); @@ -21,8 +21,8 @@ public: private: std::string m_strStartArgs; - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; + iot_public::SRunAppInfo m_stRunAppInfo; + iot_sys::CRedundantMngInterfacePtr m_ptrRedundantMng; CDbModelServiceThreadPtr m_ptrServiceThread; }; diff --git a/product/src/z_discard/db_model_server/CDbModelServiceThread.cpp b/product/src/z_discard/db_model_server/CDbModelServiceThread.cpp index fbfc95d7..e92c5bf1 100644 --- a/product/src/z_discard/db_model_server/CDbModelServiceThread.cpp +++ b/product/src/z_discard/db_model_server/CDbModelServiceThread.cpp @@ -8,9 +8,9 @@ #define CN_HEARTBEAT_TIMEOUT 5000 // 心跳超时时间 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; CDbModelServiceThread::CDbModelServiceThread() : CTimerThreadBase( "db_model_server CDbModelServiceThread 数据模型服务线程", 0 ) @@ -180,10 +180,10 @@ void CDbModelServiceThread::afterResume() return; } -void CDbModelServiceThread::dealNoticeUp( const kbd_net::CMbMessage& msgRequest ) +void CDbModelServiceThread::dealNoticeUp( const iot_net::CMbMessage& msgRequest ) { - kbd_net::CMbMessage msgResponse; - using namespace kbd_idlfile; + iot_net::CMbMessage msgResponse; + using namespace iot_idl; msgResponse.setData( (const void*)msgRequest.getDataPtr(), msgRequest.getDataSize() ); msgResponse.setMsgType( MT_MODEL_MDY_NOTICE_DOWN ); msgResponse.setSubject( CN_AppId_PUBLIC, CH_MODEL_TO_PUB_NOTICE_DOWN ); diff --git a/product/src/z_discard/db_model_server/CDbModelServiceThread.h b/product/src/z_discard/db_model_server/CDbModelServiceThread.h index b99a0819..22fc08b5 100644 --- a/product/src/z_discard/db_model_server/CDbModelServiceThread.h +++ b/product/src/z_discard/db_model_server/CDbModelServiceThread.h @@ -14,7 +14,7 @@ /** * @brief The CRdbServiceThread class */ -class CDbModelServiceThread : public kbd_public::CTimerThreadBase, public CDbModelRedundant +class CDbModelServiceThread : public iot_public::CTimerThreadBase, public CDbModelRedundant { public: CDbModelServiceThread(); @@ -25,12 +25,12 @@ public: void beforeQuit(); // void afterQuit(); void afterResume(); - void dealNoticeUp( const kbd_net::CMbMessage& msgRequest ); + void dealNoticeUp( const iot_net::CMbMessage& msgRequest ); int redundantSwitch( bool bMaster, bool bSlave ); void checkSessionTimeOut(); private: - kbd_net::CMbCommunicator m_objMbComm; + iot_net::CMbCommunicator m_objMbComm; std::map m_mapSessionId2WorkThread; std::map m_mapSessionId2LastHeartBeat;// 每个会话对应的最后一次心跳时间 }; diff --git a/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.cpp b/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.cpp index 21db41fb..7760822c 100644 --- a/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.cpp +++ b/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.cpp @@ -6,9 +6,9 @@ #include "db_sysinfo_api/CDbSysInfo.h" #include "pub_logger_api/logger.h" -using namespace kbd_dbms; -using namespace kbd_idlfile; -using namespace kbd_net; +using namespace iot_dbms; +using namespace iot_idl; +using namespace iot_net; using namespace std; CDbModelServiceWorkThread::CDbModelServiceWorkThread() diff --git a/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.h b/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.h index 80db8913..05ae6c9e 100644 --- a/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.h +++ b/product/src/z_discard/db_model_server/CDbModelServiceWorkThread.h @@ -14,7 +14,7 @@ class CDbModelServiceHeartBeatThread; /** * @brief The CRdbServiceThread class */ -class CDbModelServiceWorkThread : public kbd_public::CTimerThreadBase +class CDbModelServiceWorkThread : public iot_public::CTimerThreadBase { public: CDbModelServiceWorkThread(); @@ -25,21 +25,21 @@ public: void beforeQuit(); // void afterQuit(); void afterResume(); - void setRunAppInfo( const kbd_public::SRunAppInfo& objRunInfo ); - void pushBackMsg( kbd_net::CMbMessage& msg ); + void setRunAppInfo( const iot_public::SRunAppInfo& objRunInfo ); + void pushBackMsg( iot_net::CMbMessage& msg ); void initDatabase(); private: - void dealRequest( const kbd_net::CMbMessage& netMsg ); - void dealTransaction( const kbd_net::CMbMessage& netMsg ); - void dealCommit( const kbd_net::CMbMessage& netMsg ); - void dealRollback( const kbd_net::CMbMessage& netMsg ); - bool popFrontMsg( kbd_net::CMbMessage& msg ); + void dealRequest( const iot_net::CMbMessage& netMsg ); + void dealTransaction( const iot_net::CMbMessage& netMsg ); + void dealCommit( const iot_net::CMbMessage& netMsg ); + void dealRollback( const iot_net::CMbMessage& netMsg ); + bool popFrontMsg( iot_net::CMbMessage& msg ); private: - kbd_net::CMbCommunicator m_objMbComm; - kbd_dbms::CDbApi m_objDb; - std::list m_listMsg; + iot_net::CMbCommunicator m_objMbComm; + iot_dbms::CDbApi m_objDb; + std::list m_listMsg; boost::mutex m_listMutex; bool m_bTransaction; //open transaction by interfaces CDbModelServiceHeartBeatThread *m_pHeartBeatThread; @@ -49,7 +49,7 @@ typedef boost::shared_ptr CDbModelServiceWorkThreadPt // 执行语句（尤其是耗时语句）时server向client发送心跳，告诉client不要超时 -class CDbModelServiceHeartBeatThread : public kbd_public::CTimerThreadBase +class CDbModelServiceHeartBeatThread : public iot_public::CTimerThreadBase { public: CDbModelServiceHeartBeatThread(); @@ -57,11 +57,11 @@ public: public: void execute(); - void setSrcMsg( const kbd_net::CMbMessage& srcMsg ); + void setSrcMsg( const iot_net::CMbMessage& srcMsg ); private: - kbd_net::CMbCommunicator m_objHeartBeatComm; - kbd_net::CMbMessage m_srcMsg; + iot_net::CMbCommunicator m_objHeartBeatComm; + iot_net::CMbMessage m_srcMsg; }; diff --git a/product/src/z_discard/fbd_plugins/alarmplugin/alarmplugin.cpp b/product/src/z_discard/fbd_plugins/alarmplugin/alarmplugin.cpp index faedf238..1621b1fb 100644 --- a/product/src/z_discard/fbd_plugins/alarmplugin/alarmplugin.cpp +++ b/product/src/z_discard/fbd_plugins/alarmplugin/alarmplugin.cpp @@ -8,7 +8,7 @@ #include using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; #define DBG(str) // cerr << __PRETTY_FUNCTION__ << " - " << str << endl diff --git a/product/src/z_discard/fbd_plugins/dlgs/DAOContrl.cpp b/product/src/z_discard/fbd_plugins/dlgs/DAOContrl.cpp index 287348d0..18e719f1 100644 --- a/product/src/z_discard/fbd_plugins/dlgs/DAOContrl.cpp +++ b/product/src/z_discard/fbd_plugins/dlgs/DAOContrl.cpp @@ -6,7 +6,7 @@ #include #include -using namespace kbd_dbms; +using namespace iot_dbms; using namespace boost::property_tree; DAOContrl::DAOContrl(QWidget *parent) diff --git a/product/src/z_discard/fbd_plugins/dlgs/alarm.cpp b/product/src/z_discard/fbd_plugins/dlgs/alarm.cpp index 0253471f..3b6fc1f7 100644 --- a/product/src/z_discard/fbd_plugins/dlgs/alarm.cpp +++ b/product/src/z_discard/fbd_plugins/dlgs/alarm.cpp @@ -6,7 +6,7 @@ #include using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; using namespace boost::property_tree; alarmDlg::alarmDlg(QWidget *parent) diff --git a/product/src/z_discard/fbd_plugins/reffplugin/reffplugin.cpp b/product/src/z_discard/fbd_plugins/reffplugin/reffplugin.cpp index 5d922f2b..70b8e358 100644 --- a/product/src/z_discard/fbd_plugins/reffplugin/reffplugin.cpp +++ b/product/src/z_discard/fbd_plugins/reffplugin/reffplugin.cpp @@ -6,7 +6,7 @@ #include using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; #define DBG(str) // cerr << __PRETTY_FUNCTION__ << " - " << str << endl diff --git a/product/src/z_discard/fbd_plugins/refplugin/refplugin.cpp b/product/src/z_discard/fbd_plugins/refplugin/refplugin.cpp index 6db72fdd..9e174605 100644 --- a/product/src/z_discard/fbd_plugins/refplugin/refplugin.cpp +++ b/product/src/z_discard/fbd_plugins/refplugin/refplugin.cpp @@ -12,7 +12,7 @@ /*END USER CODE*/ using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; #define DBG(str) // cerr << __PRETTY_FUNCTION__ << " - " << str << endl diff --git a/product/src/z_discard/fbd_plugins/setAOplugin/setAOplugin.cpp b/product/src/z_discard/fbd_plugins/setAOplugin/setAOplugin.cpp index c8fdb2fc..035e981b 100644 --- a/product/src/z_discard/fbd_plugins/setAOplugin/setAOplugin.cpp +++ b/product/src/z_discard/fbd_plugins/setAOplugin/setAOplugin.cpp @@ -13,7 +13,7 @@ /*END USER CODE*/ using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; //#define DBG(str) // cerr << __PRETTY_FUNCTION__ << " - " << str << endl diff --git a/product/src/z_discard/fbd_plugins/setDOplugin/setDOplugin.cpp b/product/src/z_discard/fbd_plugins/setDOplugin/setDOplugin.cpp index dcd8ca0c..6e40e2f9 100644 --- a/product/src/z_discard/fbd_plugins/setDOplugin/setDOplugin.cpp +++ b/product/src/z_discard/fbd_plugins/setDOplugin/setDOplugin.cpp @@ -11,7 +11,7 @@ /*END USER CODE*/ using namespace std; -using namespace kbd_dbms; +using namespace iot_dbms; //#define DBG(str) // cerr << __PRETTY_FUNCTION__ << " - " << str << endl diff --git a/product/src/z_discard/idl_files/ModelServerMessage.pb.cc b/product/src/z_discard/idl_files/ModelServerMessage.pb.cc index bcddae51..99226cf2 100644 --- a/product/src/z_discard/idl_files/ModelServerMessage.pb.cc +++ b/product/src/z_discard/idl_files/ModelServerMessage.pb.cc @@ -16,7 +16,7 @@ #include // @@protoc_insertion_point(includes) -namespace kbd_idlfile { +namespace iot_idl { namespace { @@ -222,7 +222,7 @@ void protobuf_AddDesc_ModelServerMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\030ModelServerMessage.proto\022\013kbd_idlfile\"" + "\n\030ModelServerMessage.proto\022\013iot_idl\"" "f\n\025MsgModelServerRequest\022\021\n\tsessionID\030\001 " "\002(\t\022\014\n\004UUID\030\002 \002(\t\022\023\n\013strSqlArray\030\003 \003(\t\022\027" "\n\nnTimeoutMs\030\004 \001(\005:\003300\"]\n\021MsgModelServe" @@ -302,7 +302,7 @@ const int MsgModelServerRequest::kNTimeoutMsFieldNumber; MsgModelServerRequest::MsgModelServerRequest() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(constructor:iot_idl.MsgModelServerRequest) } void MsgModelServerRequest::InitAsDefaultInstance() { @@ -312,7 +312,7 @@ MsgModelServerRequest::MsgModelServerRequest(const MsgModelServerRequest& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(copy_constructor:iot_idl.MsgModelServerRequest) } void MsgModelServerRequest::SharedCtor() { @@ -325,7 +325,7 @@ void MsgModelServerRequest::SharedCtor() { } MsgModelServerRequest::~MsgModelServerRequest() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(destructor:iot_idl.MsgModelServerRequest) SharedDtor(); } @@ -384,7 +384,7 @@ bool MsgModelServerRequest::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(parse_start:iot_idl.MsgModelServerRequest) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -471,17 +471,17 @@ bool MsgModelServerRequest::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(parse_success:iot_idl.MsgModelServerRequest) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(parse_failure:iot_idl.MsgModelServerRequest) return false; #undef DO_ } void MsgModelServerRequest::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(serialize_start:iot_idl.MsgModelServerRequest) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -521,12 +521,12 @@ void MsgModelServerRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(serialize_end:iot_idl.MsgModelServerRequest) } ::google::protobuf::uint8* MsgModelServerRequest::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MsgModelServerRequest) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -568,7 +568,7 @@ void MsgModelServerRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MsgModelServerRequest) return target; } @@ -696,7 +696,7 @@ const int MsgModelServerRet::kStrErrorMsgFieldNumber; MsgModelServerRet::MsgModelServerRet() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(constructor:iot_idl.MsgModelServerRet) } void MsgModelServerRet::InitAsDefaultInstance() { @@ -706,7 +706,7 @@ MsgModelServerRet::MsgModelServerRet(const MsgModelServerRet& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(copy_constructor:iot_idl.MsgModelServerRet) } void MsgModelServerRet::SharedCtor() { @@ -720,7 +720,7 @@ void MsgModelServerRet::SharedCtor() { } MsgModelServerRet::~MsgModelServerRet() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(destructor:iot_idl.MsgModelServerRet) SharedDtor(); } @@ -786,7 +786,7 @@ bool MsgModelServerRet::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(parse_start:iot_idl.MsgModelServerRet) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -871,17 +871,17 @@ bool MsgModelServerRet::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(parse_success:iot_idl.MsgModelServerRet) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(parse_failure:iot_idl.MsgModelServerRet) return false; #undef DO_ } void MsgModelServerRet::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(serialize_start:iot_idl.MsgModelServerRet) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -921,12 +921,12 @@ void MsgModelServerRet::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(serialize_end:iot_idl.MsgModelServerRet) } ::google::protobuf::uint8* MsgModelServerRet::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MsgModelServerRet) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -969,7 +969,7 @@ void MsgModelServerRet::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MsgModelServerRet) return target; } @@ -1094,7 +1094,7 @@ const int MsgNotifySyn::kBSynFieldNumber; MsgNotifySyn::MsgNotifySyn() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(constructor:iot_idl.MsgNotifySyn) } void MsgNotifySyn::InitAsDefaultInstance() { @@ -1104,7 +1104,7 @@ MsgNotifySyn::MsgNotifySyn(const MsgNotifySyn& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(copy_constructor:iot_idl.MsgNotifySyn) } void MsgNotifySyn::SharedCtor() { @@ -1114,7 +1114,7 @@ void MsgNotifySyn::SharedCtor() { } MsgNotifySyn::~MsgNotifySyn() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(destructor:iot_idl.MsgNotifySyn) SharedDtor(); } @@ -1154,7 +1154,7 @@ bool MsgNotifySyn::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(parse_start:iot_idl.MsgNotifySyn) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1188,17 +1188,17 @@ bool MsgNotifySyn::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(parse_success:iot_idl.MsgNotifySyn) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(parse_failure:iot_idl.MsgNotifySyn) return false; #undef DO_ } void MsgNotifySyn::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(serialize_start:iot_idl.MsgNotifySyn) // required bool bSyn = 2 [default = true]; if (has_bsyn()) { ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->bsyn(), output); @@ -1208,12 +1208,12 @@ void MsgNotifySyn::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(serialize_end:iot_idl.MsgNotifySyn) } ::google::protobuf::uint8* MsgNotifySyn::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MsgNotifySyn) // required bool bSyn = 2 [default = true]; if (has_bsyn()) { target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->bsyn(), target); @@ -1223,7 +1223,7 @@ void MsgNotifySyn::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MsgNotifySyn) return target; } @@ -1316,7 +1316,7 @@ const int MsgStartTransaction::kUUIDFieldNumber; MsgStartTransaction::MsgStartTransaction() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(constructor:iot_idl.MsgStartTransaction) } void MsgStartTransaction::InitAsDefaultInstance() { @@ -1326,7 +1326,7 @@ MsgStartTransaction::MsgStartTransaction(const MsgStartTransaction& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(copy_constructor:iot_idl.MsgStartTransaction) } void MsgStartTransaction::SharedCtor() { @@ -1338,7 +1338,7 @@ void MsgStartTransaction::SharedCtor() { } MsgStartTransaction::~MsgStartTransaction() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(destructor:iot_idl.MsgStartTransaction) SharedDtor(); } @@ -1395,7 +1395,7 @@ bool MsgStartTransaction::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(parse_start:iot_idl.MsgStartTransaction) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1448,17 +1448,17 @@ bool MsgStartTransaction::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(parse_success:iot_idl.MsgStartTransaction) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(parse_failure:iot_idl.MsgStartTransaction) return false; #undef DO_ } void MsgStartTransaction::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(serialize_start:iot_idl.MsgStartTransaction) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1483,12 +1483,12 @@ void MsgStartTransaction::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(serialize_end:iot_idl.MsgStartTransaction) } ::google::protobuf::uint8* MsgStartTransaction::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MsgStartTransaction) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1515,7 +1515,7 @@ void MsgStartTransaction::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MsgStartTransaction) return target; } @@ -1622,7 +1622,7 @@ const int MsgCommit::kNTimeoutMsFieldNumber; MsgCommit::MsgCommit() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(constructor:iot_idl.MsgCommit) } void MsgCommit::InitAsDefaultInstance() { @@ -1632,7 +1632,7 @@ MsgCommit::MsgCommit(const MsgCommit& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(copy_constructor:iot_idl.MsgCommit) } void MsgCommit::SharedCtor() { @@ -1645,7 +1645,7 @@ void MsgCommit::SharedCtor() { } MsgCommit::~MsgCommit() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(destructor:iot_idl.MsgCommit) SharedDtor(); } @@ -1703,7 +1703,7 @@ bool MsgCommit::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(parse_start:iot_idl.MsgCommit) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -1771,17 +1771,17 @@ bool MsgCommit::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(parse_success:iot_idl.MsgCommit) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(parse_failure:iot_idl.MsgCommit) return false; #undef DO_ } void MsgCommit::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(serialize_start:iot_idl.MsgCommit) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1811,12 +1811,12 @@ void MsgCommit::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(serialize_end:iot_idl.MsgCommit) } ::google::protobuf::uint8* MsgCommit::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MsgCommit) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1848,7 +1848,7 @@ void MsgCommit::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MsgCommit) return target; } @@ -1965,7 +1965,7 @@ const int MsgRollback::kUUIDFieldNumber; MsgRollback::MsgRollback() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(constructor:iot_idl.MsgRollback) } void MsgRollback::InitAsDefaultInstance() { @@ -1975,7 +1975,7 @@ MsgRollback::MsgRollback(const MsgRollback& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(copy_constructor:iot_idl.MsgRollback) } void MsgRollback::SharedCtor() { @@ -1987,7 +1987,7 @@ void MsgRollback::SharedCtor() { } MsgRollback::~MsgRollback() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(destructor:iot_idl.MsgRollback) SharedDtor(); } @@ -2044,7 +2044,7 @@ bool MsgRollback::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(parse_start:iot_idl.MsgRollback) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2097,17 +2097,17 @@ bool MsgRollback::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(parse_success:iot_idl.MsgRollback) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(parse_failure:iot_idl.MsgRollback) return false; #undef DO_ } void MsgRollback::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(serialize_start:iot_idl.MsgRollback) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2132,12 +2132,12 @@ void MsgRollback::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(serialize_end:iot_idl.MsgRollback) } ::google::protobuf::uint8* MsgRollback::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MsgRollback) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2164,7 +2164,7 @@ void MsgRollback::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MsgRollback) return target; } @@ -2269,7 +2269,7 @@ const int MsgCloseSession::kSessionIDFieldNumber; MsgCloseSession::MsgCloseSession() : ::google::protobuf::Message() { SharedCtor(); - // @@protoc_insertion_point(constructor:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(constructor:iot_idl.MsgCloseSession) } void MsgCloseSession::InitAsDefaultInstance() { @@ -2279,7 +2279,7 @@ MsgCloseSession::MsgCloseSession(const MsgCloseSession& from) : ::google::protobuf::Message() { SharedCtor(); MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(copy_constructor:iot_idl.MsgCloseSession) } void MsgCloseSession::SharedCtor() { @@ -2290,7 +2290,7 @@ void MsgCloseSession::SharedCtor() { } MsgCloseSession::~MsgCloseSession() { - // @@protoc_insertion_point(destructor:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(destructor:iot_idl.MsgCloseSession) SharedDtor(); } @@ -2337,7 +2337,7 @@ bool MsgCloseSession::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(parse_start:iot_idl.MsgCloseSession) for (;;) { ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); tag = p.first; @@ -2373,17 +2373,17 @@ bool MsgCloseSession::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(parse_success:iot_idl.MsgCloseSession) return true; failure: - // @@protoc_insertion_point(parse_failure:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(parse_failure:iot_idl.MsgCloseSession) return false; #undef DO_ } void MsgCloseSession::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(serialize_start:iot_idl.MsgCloseSession) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2398,12 +2398,12 @@ void MsgCloseSession::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(serialize_end:iot_idl.MsgCloseSession) } ::google::protobuf::uint8* MsgCloseSession::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.MsgCloseSession) // required string sessionID = 1; if (has_sessionid()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -2419,7 +2419,7 @@ void MsgCloseSession::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.MsgCloseSession) return target; } @@ -2506,6 +2506,6 @@ void MsgCloseSession::Swap(MsgCloseSession* other) { // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl // @@protoc_insertion_point(global_scope) diff --git a/product/src/z_discard/idl_files/ModelServerMessage.pb.h b/product/src/z_discard/idl_files/ModelServerMessage.pb.h index 05b11614..4e9efc09 100644 --- a/product/src/z_discard/idl_files/ModelServerMessage.pb.h +++ b/product/src/z_discard/idl_files/ModelServerMessage.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_ModelServerMessage_2eproto(); @@ -171,7 +171,7 @@ class IDL_FILES_EXPORT MsgModelServerRequest : public ::google::protobuf::Messag inline ::google::protobuf::int32 ntimeoutms() const; inline void set_ntimeoutms(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MsgModelServerRequest) + // @@protoc_insertion_point(class_scope:iot_idl.MsgModelServerRequest) private: inline void set_has_sessionid(); inline void clear_has_sessionid(); @@ -293,7 +293,7 @@ class IDL_FILES_EXPORT MsgModelServerRet : public ::google::protobuf::Message { inline ::std::string* release_strerrormsg(); inline void set_allocated_strerrormsg(::std::string* strerrormsg); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MsgModelServerRet) + // @@protoc_insertion_point(class_scope:iot_idl.MsgModelServerRet) private: inline void set_has_sessionid(); inline void clear_has_sessionid(); @@ -381,7 +381,7 @@ class IDL_FILES_EXPORT MsgNotifySyn : public ::google::protobuf::Message { inline bool bsyn() const; inline void set_bsyn(bool value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MsgNotifySyn) + // @@protoc_insertion_point(class_scope:iot_idl.MsgNotifySyn) private: inline void set_has_bsyn(); inline void clear_has_bsyn(); @@ -477,7 +477,7 @@ class IDL_FILES_EXPORT MsgStartTransaction : public ::google::protobuf::Message inline ::std::string* release_uuid(); inline void set_allocated_uuid(::std::string* uuid); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MsgStartTransaction) + // @@protoc_insertion_point(class_scope:iot_idl.MsgStartTransaction) private: inline void set_has_sessionid(); inline void clear_has_sessionid(); @@ -583,7 +583,7 @@ class IDL_FILES_EXPORT MsgCommit : public ::google::protobuf::Message { inline ::google::protobuf::int32 ntimeoutms() const; inline void set_ntimeoutms(::google::protobuf::int32 value); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MsgCommit) + // @@protoc_insertion_point(class_scope:iot_idl.MsgCommit) private: inline void set_has_sessionid(); inline void clear_has_sessionid(); @@ -685,7 +685,7 @@ class IDL_FILES_EXPORT MsgRollback : public ::google::protobuf::Message { inline ::std::string* release_uuid(); inline void set_allocated_uuid(::std::string* uuid); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MsgRollback) + // @@protoc_insertion_point(class_scope:iot_idl.MsgRollback) private: inline void set_has_sessionid(); inline void clear_has_sessionid(); @@ -772,7 +772,7 @@ class IDL_FILES_EXPORT MsgCloseSession : public ::google::protobuf::Message { inline ::std::string* release_sessionid(); inline void set_allocated_sessionid(::std::string* sessionid); - // @@protoc_insertion_point(class_scope:kbd_idlfile.MsgCloseSession) + // @@protoc_insertion_point(class_scope:iot_idl.MsgCloseSession) private: inline void set_has_sessionid(); inline void clear_has_sessionid(); @@ -813,7 +813,7 @@ inline void MsgModelServerRequest::clear_sessionid() { clear_has_sessionid(); } inline const ::std::string& MsgModelServerRequest::sessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRequest.sessionID) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRequest.sessionID) return *sessionid_; } inline void MsgModelServerRequest::set_sessionid(const ::std::string& value) { @@ -822,7 +822,7 @@ inline void MsgModelServerRequest::set_sessionid(const ::std::string& value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRequest.sessionID) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRequest.sessionID) } inline void MsgModelServerRequest::set_sessionid(const char* value) { set_has_sessionid(); @@ -830,7 +830,7 @@ inline void MsgModelServerRequest::set_sessionid(const char* value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgModelServerRequest.sessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgModelServerRequest.sessionID) } inline void MsgModelServerRequest::set_sessionid(const char* value, size_t size) { set_has_sessionid(); @@ -838,14 +838,14 @@ inline void MsgModelServerRequest::set_sessionid(const char* value, size_t size) sessionid_ = new ::std::string; } sessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgModelServerRequest.sessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgModelServerRequest.sessionID) } inline ::std::string* MsgModelServerRequest::mutable_sessionid() { set_has_sessionid(); if (sessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgModelServerRequest.sessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgModelServerRequest.sessionID) return sessionid_; } inline ::std::string* MsgModelServerRequest::release_sessionid() { @@ -869,7 +869,7 @@ inline void MsgModelServerRequest::set_allocated_sessionid(::std::string* sessio clear_has_sessionid(); sessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgModelServerRequest.sessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgModelServerRequest.sessionID) } // required string UUID = 2; @@ -889,7 +889,7 @@ inline void MsgModelServerRequest::clear_uuid() { clear_has_uuid(); } inline const ::std::string& MsgModelServerRequest::uuid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRequest.UUID) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRequest.UUID) return *uuid_; } inline void MsgModelServerRequest::set_uuid(const ::std::string& value) { @@ -898,7 +898,7 @@ inline void MsgModelServerRequest::set_uuid(const ::std::string& value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRequest.UUID) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRequest.UUID) } inline void MsgModelServerRequest::set_uuid(const char* value) { set_has_uuid(); @@ -906,7 +906,7 @@ inline void MsgModelServerRequest::set_uuid(const char* value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgModelServerRequest.UUID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgModelServerRequest.UUID) } inline void MsgModelServerRequest::set_uuid(const char* value, size_t size) { set_has_uuid(); @@ -914,14 +914,14 @@ inline void MsgModelServerRequest::set_uuid(const char* value, size_t size) { uuid_ = new ::std::string; } uuid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgModelServerRequest.UUID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgModelServerRequest.UUID) } inline ::std::string* MsgModelServerRequest::mutable_uuid() { set_has_uuid(); if (uuid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgModelServerRequest.UUID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgModelServerRequest.UUID) return uuid_; } inline ::std::string* MsgModelServerRequest::release_uuid() { @@ -945,7 +945,7 @@ inline void MsgModelServerRequest::set_allocated_uuid(::std::string* uuid) { clear_has_uuid(); uuid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgModelServerRequest.UUID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgModelServerRequest.UUID) } // repeated string strSqlArray = 3; @@ -956,49 +956,49 @@ inline void MsgModelServerRequest::clear_strsqlarray() { strsqlarray_.Clear(); } inline const ::std::string& MsgModelServerRequest::strsqlarray(int index) const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRequest.strSqlArray) return strsqlarray_.Get(index); } inline ::std::string* MsgModelServerRequest::mutable_strsqlarray(int index) { - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgModelServerRequest.strSqlArray) return strsqlarray_.Mutable(index); } inline void MsgModelServerRequest::set_strsqlarray(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRequest.strSqlArray) strsqlarray_.Mutable(index)->assign(value); } inline void MsgModelServerRequest::set_strsqlarray(int index, const char* value) { strsqlarray_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgModelServerRequest.strSqlArray) } inline void MsgModelServerRequest::set_strsqlarray(int index, const char* value, size_t size) { strsqlarray_.Mutable(index)->assign( reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgModelServerRequest.strSqlArray) } inline ::std::string* MsgModelServerRequest::add_strsqlarray() { return strsqlarray_.Add(); } inline void MsgModelServerRequest::add_strsqlarray(const ::std::string& value) { strsqlarray_.Add()->assign(value); - // @@protoc_insertion_point(field_add:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_add:iot_idl.MsgModelServerRequest.strSqlArray) } inline void MsgModelServerRequest::add_strsqlarray(const char* value) { strsqlarray_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_add_char:iot_idl.MsgModelServerRequest.strSqlArray) } inline void MsgModelServerRequest::add_strsqlarray(const char* value, size_t size) { strsqlarray_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_add_pointer:iot_idl.MsgModelServerRequest.strSqlArray) } inline const ::google::protobuf::RepeatedPtrField< ::std::string>& MsgModelServerRequest::strsqlarray() const { - // @@protoc_insertion_point(field_list:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_list:iot_idl.MsgModelServerRequest.strSqlArray) return strsqlarray_; } inline ::google::protobuf::RepeatedPtrField< ::std::string>* MsgModelServerRequest::mutable_strsqlarray() { - // @@protoc_insertion_point(field_mutable_list:kbd_idlfile.MsgModelServerRequest.strSqlArray) + // @@protoc_insertion_point(field_mutable_list:iot_idl.MsgModelServerRequest.strSqlArray) return &strsqlarray_; } @@ -1017,13 +1017,13 @@ inline void MsgModelServerRequest::clear_ntimeoutms() { clear_has_ntimeoutms(); } inline ::google::protobuf::int32 MsgModelServerRequest::ntimeoutms() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRequest.nTimeoutMs) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRequest.nTimeoutMs) return ntimeoutms_; } inline void MsgModelServerRequest::set_ntimeoutms(::google::protobuf::int32 value) { set_has_ntimeoutms(); ntimeoutms_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRequest.nTimeoutMs) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRequest.nTimeoutMs) } // ------------------------------------------------------------------- @@ -1047,7 +1047,7 @@ inline void MsgModelServerRet::clear_sessionid() { clear_has_sessionid(); } inline const ::std::string& MsgModelServerRet::sessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRet.sessionID) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRet.sessionID) return *sessionid_; } inline void MsgModelServerRet::set_sessionid(const ::std::string& value) { @@ -1056,7 +1056,7 @@ inline void MsgModelServerRet::set_sessionid(const ::std::string& value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRet.sessionID) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRet.sessionID) } inline void MsgModelServerRet::set_sessionid(const char* value) { set_has_sessionid(); @@ -1064,7 +1064,7 @@ inline void MsgModelServerRet::set_sessionid(const char* value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgModelServerRet.sessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgModelServerRet.sessionID) } inline void MsgModelServerRet::set_sessionid(const char* value, size_t size) { set_has_sessionid(); @@ -1072,14 +1072,14 @@ inline void MsgModelServerRet::set_sessionid(const char* value, size_t size) { sessionid_ = new ::std::string; } sessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgModelServerRet.sessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgModelServerRet.sessionID) } inline ::std::string* MsgModelServerRet::mutable_sessionid() { set_has_sessionid(); if (sessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgModelServerRet.sessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgModelServerRet.sessionID) return sessionid_; } inline ::std::string* MsgModelServerRet::release_sessionid() { @@ -1103,7 +1103,7 @@ inline void MsgModelServerRet::set_allocated_sessionid(::std::string* sessionid) clear_has_sessionid(); sessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgModelServerRet.sessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgModelServerRet.sessionID) } // required string UUID = 2; @@ -1123,7 +1123,7 @@ inline void MsgModelServerRet::clear_uuid() { clear_has_uuid(); } inline const ::std::string& MsgModelServerRet::uuid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRet.UUID) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRet.UUID) return *uuid_; } inline void MsgModelServerRet::set_uuid(const ::std::string& value) { @@ -1132,7 +1132,7 @@ inline void MsgModelServerRet::set_uuid(const ::std::string& value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRet.UUID) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRet.UUID) } inline void MsgModelServerRet::set_uuid(const char* value) { set_has_uuid(); @@ -1140,7 +1140,7 @@ inline void MsgModelServerRet::set_uuid(const char* value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgModelServerRet.UUID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgModelServerRet.UUID) } inline void MsgModelServerRet::set_uuid(const char* value, size_t size) { set_has_uuid(); @@ -1148,14 +1148,14 @@ inline void MsgModelServerRet::set_uuid(const char* value, size_t size) { uuid_ = new ::std::string; } uuid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgModelServerRet.UUID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgModelServerRet.UUID) } inline ::std::string* MsgModelServerRet::mutable_uuid() { set_has_uuid(); if (uuid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgModelServerRet.UUID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgModelServerRet.UUID) return uuid_; } inline ::std::string* MsgModelServerRet::release_uuid() { @@ -1179,7 +1179,7 @@ inline void MsgModelServerRet::set_allocated_uuid(::std::string* uuid) { clear_has_uuid(); uuid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgModelServerRet.UUID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgModelServerRet.UUID) } // required bool bRet = 3 [default = true]; @@ -1197,13 +1197,13 @@ inline void MsgModelServerRet::clear_bret() { clear_has_bret(); } inline bool MsgModelServerRet::bret() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRet.bRet) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRet.bRet) return bret_; } inline void MsgModelServerRet::set_bret(bool value) { set_has_bret(); bret_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRet.bRet) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRet.bRet) } // optional string strErrorMsg = 4; @@ -1223,7 +1223,7 @@ inline void MsgModelServerRet::clear_strerrormsg() { clear_has_strerrormsg(); } inline const ::std::string& MsgModelServerRet::strerrormsg() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgModelServerRet.strErrorMsg) + // @@protoc_insertion_point(field_get:iot_idl.MsgModelServerRet.strErrorMsg) return *strerrormsg_; } inline void MsgModelServerRet::set_strerrormsg(const ::std::string& value) { @@ -1232,7 +1232,7 @@ inline void MsgModelServerRet::set_strerrormsg(const ::std::string& value) { strerrormsg_ = new ::std::string; } strerrormsg_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgModelServerRet.strErrorMsg) + // @@protoc_insertion_point(field_set:iot_idl.MsgModelServerRet.strErrorMsg) } inline void MsgModelServerRet::set_strerrormsg(const char* value) { set_has_strerrormsg(); @@ -1240,7 +1240,7 @@ inline void MsgModelServerRet::set_strerrormsg(const char* value) { strerrormsg_ = new ::std::string; } strerrormsg_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgModelServerRet.strErrorMsg) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgModelServerRet.strErrorMsg) } inline void MsgModelServerRet::set_strerrormsg(const char* value, size_t size) { set_has_strerrormsg(); @@ -1248,14 +1248,14 @@ inline void MsgModelServerRet::set_strerrormsg(const char* value, size_t size) { strerrormsg_ = new ::std::string; } strerrormsg_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgModelServerRet.strErrorMsg) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgModelServerRet.strErrorMsg) } inline ::std::string* MsgModelServerRet::mutable_strerrormsg() { set_has_strerrormsg(); if (strerrormsg_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strerrormsg_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgModelServerRet.strErrorMsg) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgModelServerRet.strErrorMsg) return strerrormsg_; } inline ::std::string* MsgModelServerRet::release_strerrormsg() { @@ -1279,7 +1279,7 @@ inline void MsgModelServerRet::set_allocated_strerrormsg(::std::string* strerror clear_has_strerrormsg(); strerrormsg_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgModelServerRet.strErrorMsg) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgModelServerRet.strErrorMsg) } // ------------------------------------------------------------------- @@ -1301,13 +1301,13 @@ inline void MsgNotifySyn::clear_bsyn() { clear_has_bsyn(); } inline bool MsgNotifySyn::bsyn() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgNotifySyn.bSyn) + // @@protoc_insertion_point(field_get:iot_idl.MsgNotifySyn.bSyn) return bsyn_; } inline void MsgNotifySyn::set_bsyn(bool value) { set_has_bsyn(); bsyn_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgNotifySyn.bSyn) + // @@protoc_insertion_point(field_set:iot_idl.MsgNotifySyn.bSyn) } // ------------------------------------------------------------------- @@ -1331,7 +1331,7 @@ inline void MsgStartTransaction::clear_sessionid() { clear_has_sessionid(); } inline const ::std::string& MsgStartTransaction::sessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgStartTransaction.sessionID) + // @@protoc_insertion_point(field_get:iot_idl.MsgStartTransaction.sessionID) return *sessionid_; } inline void MsgStartTransaction::set_sessionid(const ::std::string& value) { @@ -1340,7 +1340,7 @@ inline void MsgStartTransaction::set_sessionid(const ::std::string& value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgStartTransaction.sessionID) + // @@protoc_insertion_point(field_set:iot_idl.MsgStartTransaction.sessionID) } inline void MsgStartTransaction::set_sessionid(const char* value) { set_has_sessionid(); @@ -1348,7 +1348,7 @@ inline void MsgStartTransaction::set_sessionid(const char* value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgStartTransaction.sessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgStartTransaction.sessionID) } inline void MsgStartTransaction::set_sessionid(const char* value, size_t size) { set_has_sessionid(); @@ -1356,14 +1356,14 @@ inline void MsgStartTransaction::set_sessionid(const char* value, size_t size) { sessionid_ = new ::std::string; } sessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgStartTransaction.sessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgStartTransaction.sessionID) } inline ::std::string* MsgStartTransaction::mutable_sessionid() { set_has_sessionid(); if (sessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgStartTransaction.sessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgStartTransaction.sessionID) return sessionid_; } inline ::std::string* MsgStartTransaction::release_sessionid() { @@ -1387,7 +1387,7 @@ inline void MsgStartTransaction::set_allocated_sessionid(::std::string* sessioni clear_has_sessionid(); sessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgStartTransaction.sessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgStartTransaction.sessionID) } // required string UUID = 2; @@ -1407,7 +1407,7 @@ inline void MsgStartTransaction::clear_uuid() { clear_has_uuid(); } inline const ::std::string& MsgStartTransaction::uuid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgStartTransaction.UUID) + // @@protoc_insertion_point(field_get:iot_idl.MsgStartTransaction.UUID) return *uuid_; } inline void MsgStartTransaction::set_uuid(const ::std::string& value) { @@ -1416,7 +1416,7 @@ inline void MsgStartTransaction::set_uuid(const ::std::string& value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgStartTransaction.UUID) + // @@protoc_insertion_point(field_set:iot_idl.MsgStartTransaction.UUID) } inline void MsgStartTransaction::set_uuid(const char* value) { set_has_uuid(); @@ -1424,7 +1424,7 @@ inline void MsgStartTransaction::set_uuid(const char* value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgStartTransaction.UUID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgStartTransaction.UUID) } inline void MsgStartTransaction::set_uuid(const char* value, size_t size) { set_has_uuid(); @@ -1432,14 +1432,14 @@ inline void MsgStartTransaction::set_uuid(const char* value, size_t size) { uuid_ = new ::std::string; } uuid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgStartTransaction.UUID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgStartTransaction.UUID) } inline ::std::string* MsgStartTransaction::mutable_uuid() { set_has_uuid(); if (uuid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgStartTransaction.UUID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgStartTransaction.UUID) return uuid_; } inline ::std::string* MsgStartTransaction::release_uuid() { @@ -1463,7 +1463,7 @@ inline void MsgStartTransaction::set_allocated_uuid(::std::string* uuid) { clear_has_uuid(); uuid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgStartTransaction.UUID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgStartTransaction.UUID) } // ------------------------------------------------------------------- @@ -1487,7 +1487,7 @@ inline void MsgCommit::clear_sessionid() { clear_has_sessionid(); } inline const ::std::string& MsgCommit::sessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgCommit.sessionID) + // @@protoc_insertion_point(field_get:iot_idl.MsgCommit.sessionID) return *sessionid_; } inline void MsgCommit::set_sessionid(const ::std::string& value) { @@ -1496,7 +1496,7 @@ inline void MsgCommit::set_sessionid(const ::std::string& value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgCommit.sessionID) + // @@protoc_insertion_point(field_set:iot_idl.MsgCommit.sessionID) } inline void MsgCommit::set_sessionid(const char* value) { set_has_sessionid(); @@ -1504,7 +1504,7 @@ inline void MsgCommit::set_sessionid(const char* value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgCommit.sessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgCommit.sessionID) } inline void MsgCommit::set_sessionid(const char* value, size_t size) { set_has_sessionid(); @@ -1512,14 +1512,14 @@ inline void MsgCommit::set_sessionid(const char* value, size_t size) { sessionid_ = new ::std::string; } sessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgCommit.sessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgCommit.sessionID) } inline ::std::string* MsgCommit::mutable_sessionid() { set_has_sessionid(); if (sessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgCommit.sessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgCommit.sessionID) return sessionid_; } inline ::std::string* MsgCommit::release_sessionid() { @@ -1543,7 +1543,7 @@ inline void MsgCommit::set_allocated_sessionid(::std::string* sessionid) { clear_has_sessionid(); sessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgCommit.sessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgCommit.sessionID) } // required string UUID = 2; @@ -1563,7 +1563,7 @@ inline void MsgCommit::clear_uuid() { clear_has_uuid(); } inline const ::std::string& MsgCommit::uuid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgCommit.UUID) + // @@protoc_insertion_point(field_get:iot_idl.MsgCommit.UUID) return *uuid_; } inline void MsgCommit::set_uuid(const ::std::string& value) { @@ -1572,7 +1572,7 @@ inline void MsgCommit::set_uuid(const ::std::string& value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgCommit.UUID) + // @@protoc_insertion_point(field_set:iot_idl.MsgCommit.UUID) } inline void MsgCommit::set_uuid(const char* value) { set_has_uuid(); @@ -1580,7 +1580,7 @@ inline void MsgCommit::set_uuid(const char* value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgCommit.UUID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgCommit.UUID) } inline void MsgCommit::set_uuid(const char* value, size_t size) { set_has_uuid(); @@ -1588,14 +1588,14 @@ inline void MsgCommit::set_uuid(const char* value, size_t size) { uuid_ = new ::std::string; } uuid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgCommit.UUID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgCommit.UUID) } inline ::std::string* MsgCommit::mutable_uuid() { set_has_uuid(); if (uuid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgCommit.UUID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgCommit.UUID) return uuid_; } inline ::std::string* MsgCommit::release_uuid() { @@ -1619,7 +1619,7 @@ inline void MsgCommit::set_allocated_uuid(::std::string* uuid) { clear_has_uuid(); uuid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgCommit.UUID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgCommit.UUID) } // optional int32 nTimeoutMs = 3 [default = 300]; @@ -1637,13 +1637,13 @@ inline void MsgCommit::clear_ntimeoutms() { clear_has_ntimeoutms(); } inline ::google::protobuf::int32 MsgCommit::ntimeoutms() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgCommit.nTimeoutMs) + // @@protoc_insertion_point(field_get:iot_idl.MsgCommit.nTimeoutMs) return ntimeoutms_; } inline void MsgCommit::set_ntimeoutms(::google::protobuf::int32 value) { set_has_ntimeoutms(); ntimeoutms_ = value; - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgCommit.nTimeoutMs) + // @@protoc_insertion_point(field_set:iot_idl.MsgCommit.nTimeoutMs) } // ------------------------------------------------------------------- @@ -1667,7 +1667,7 @@ inline void MsgRollback::clear_sessionid() { clear_has_sessionid(); } inline const ::std::string& MsgRollback::sessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgRollback.sessionID) + // @@protoc_insertion_point(field_get:iot_idl.MsgRollback.sessionID) return *sessionid_; } inline void MsgRollback::set_sessionid(const ::std::string& value) { @@ -1676,7 +1676,7 @@ inline void MsgRollback::set_sessionid(const ::std::string& value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgRollback.sessionID) + // @@protoc_insertion_point(field_set:iot_idl.MsgRollback.sessionID) } inline void MsgRollback::set_sessionid(const char* value) { set_has_sessionid(); @@ -1684,7 +1684,7 @@ inline void MsgRollback::set_sessionid(const char* value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgRollback.sessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgRollback.sessionID) } inline void MsgRollback::set_sessionid(const char* value, size_t size) { set_has_sessionid(); @@ -1692,14 +1692,14 @@ inline void MsgRollback::set_sessionid(const char* value, size_t size) { sessionid_ = new ::std::string; } sessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgRollback.sessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgRollback.sessionID) } inline ::std::string* MsgRollback::mutable_sessionid() { set_has_sessionid(); if (sessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgRollback.sessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgRollback.sessionID) return sessionid_; } inline ::std::string* MsgRollback::release_sessionid() { @@ -1723,7 +1723,7 @@ inline void MsgRollback::set_allocated_sessionid(::std::string* sessionid) { clear_has_sessionid(); sessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgRollback.sessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgRollback.sessionID) } // required string UUID = 2; @@ -1743,7 +1743,7 @@ inline void MsgRollback::clear_uuid() { clear_has_uuid(); } inline const ::std::string& MsgRollback::uuid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgRollback.UUID) + // @@protoc_insertion_point(field_get:iot_idl.MsgRollback.UUID) return *uuid_; } inline void MsgRollback::set_uuid(const ::std::string& value) { @@ -1752,7 +1752,7 @@ inline void MsgRollback::set_uuid(const ::std::string& value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgRollback.UUID) + // @@protoc_insertion_point(field_set:iot_idl.MsgRollback.UUID) } inline void MsgRollback::set_uuid(const char* value) { set_has_uuid(); @@ -1760,7 +1760,7 @@ inline void MsgRollback::set_uuid(const char* value) { uuid_ = new ::std::string; } uuid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgRollback.UUID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgRollback.UUID) } inline void MsgRollback::set_uuid(const char* value, size_t size) { set_has_uuid(); @@ -1768,14 +1768,14 @@ inline void MsgRollback::set_uuid(const char* value, size_t size) { uuid_ = new ::std::string; } uuid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgRollback.UUID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgRollback.UUID) } inline ::std::string* MsgRollback::mutable_uuid() { set_has_uuid(); if (uuid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { uuid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgRollback.UUID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgRollback.UUID) return uuid_; } inline ::std::string* MsgRollback::release_uuid() { @@ -1799,7 +1799,7 @@ inline void MsgRollback::set_allocated_uuid(::std::string* uuid) { clear_has_uuid(); uuid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgRollback.UUID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgRollback.UUID) } // ------------------------------------------------------------------- @@ -1823,7 +1823,7 @@ inline void MsgCloseSession::clear_sessionid() { clear_has_sessionid(); } inline const ::std::string& MsgCloseSession::sessionid() const { - // @@protoc_insertion_point(field_get:kbd_idlfile.MsgCloseSession.sessionID) + // @@protoc_insertion_point(field_get:iot_idl.MsgCloseSession.sessionID) return *sessionid_; } inline void MsgCloseSession::set_sessionid(const ::std::string& value) { @@ -1832,7 +1832,7 @@ inline void MsgCloseSession::set_sessionid(const ::std::string& value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set:kbd_idlfile.MsgCloseSession.sessionID) + // @@protoc_insertion_point(field_set:iot_idl.MsgCloseSession.sessionID) } inline void MsgCloseSession::set_sessionid(const char* value) { set_has_sessionid(); @@ -1840,7 +1840,7 @@ inline void MsgCloseSession::set_sessionid(const char* value) { sessionid_ = new ::std::string; } sessionid_->assign(value); - // @@protoc_insertion_point(field_set_char:kbd_idlfile.MsgCloseSession.sessionID) + // @@protoc_insertion_point(field_set_char:iot_idl.MsgCloseSession.sessionID) } inline void MsgCloseSession::set_sessionid(const char* value, size_t size) { set_has_sessionid(); @@ -1848,14 +1848,14 @@ inline void MsgCloseSession::set_sessionid(const char* value, size_t size) { sessionid_ = new ::std::string; } sessionid_->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:kbd_idlfile.MsgCloseSession.sessionID) + // @@protoc_insertion_point(field_set_pointer:iot_idl.MsgCloseSession.sessionID) } inline ::std::string* MsgCloseSession::mutable_sessionid() { set_has_sessionid(); if (sessionid_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { sessionid_ = new ::std::string; } - // @@protoc_insertion_point(field_mutable:kbd_idlfile.MsgCloseSession.sessionID) + // @@protoc_insertion_point(field_mutable:iot_idl.MsgCloseSession.sessionID) return sessionid_; } inline ::std::string* MsgCloseSession::release_sessionid() { @@ -1879,22 +1879,22 @@ inline void MsgCloseSession::set_allocated_sessionid(::std::string* sessionid) { clear_has_sessionid(); sessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - // @@protoc_insertion_point(field_set_allocated:kbd_idlfile.MsgCloseSession.sessionID) + // @@protoc_insertion_point(field_set_allocated:iot_idl.MsgCloseSession.sessionID) } // @@protoc_insertion_point(namespace_scope) -} // namespace kbd_idlfile +} // namespace iot_idl #ifndef SWIG namespace google { namespace protobuf { -template <> struct is_proto_enum< ::kbd_idlfile::enModelServerMessage> : ::google::protobuf::internal::true_type {}; +template <> struct is_proto_enum< ::iot_idl::enModelServerMessage> : ::google::protobuf::internal::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor< ::kbd_idlfile::enModelServerMessage>() { - return ::kbd_idlfile::enModelServerMessage_descriptor(); +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enModelServerMessage>() { + return ::iot_idl::enModelServerMessage_descriptor(); } } // namespace google diff --git a/product/src/z_discard/idl_files/ModelServerMessage.proto b/product/src/z_discard/idl_files/ModelServerMessage.proto index 79077ef8..456649b8 100644 --- a/product/src/z_discard/idl_files/ModelServerMessage.proto +++ b/product/src/z_discard/idl_files/ModelServerMessage.proto @@ -3,7 +3,7 @@ // @author xuyang syntax="proto2"; -package kbd_idlfile; +package iot_idl; //======================================================================================== // 消息类型枚举 diff --git a/product/src/z_discard/include/db_api/QDbInterface.h b/product/src/z_discard/include/db_api/QDbInterface.h index d702db53..e5fe1dfa 100644 --- a/product/src/z_discard/include/db_api/QDbInterface.h +++ b/product/src/z_discard/include/db_api/QDbInterface.h @@ -21,7 +21,7 @@ #include #include -namespace kbd_dbms +namespace iot_dbms { // 数据库类型枚举 diff --git a/product/src/z_discard/include/db_model_api/CDbModelApi.h b/product/src/z_discard/include/db_model_api/CDbModelApi.h index 2e794ebc..272c4c51 100644 --- a/product/src/z_discard/include/db_model_api/CDbModelApi.h +++ b/product/src/z_discard/include/db_model_api/CDbModelApi.h @@ -20,7 +20,7 @@ //#pragma warning( disable: 4251 ) -namespace kbd_dbms +namespace iot_dbms { // 异步数据库请求类 diff --git a/product/src/z_discard/sys_ftp_sync/CDownloadFile.cpp b/product/src/z_discard/sys_ftp_sync/CDownloadFile.cpp index f0934c9f..beab00d1 100644 --- a/product/src/z_discard/sys_ftp_sync/CDownloadFile.cpp +++ b/product/src/z_discard/sys_ftp_sync/CDownloadFile.cpp @@ -30,14 +30,14 @@ size_t writeFunc(void *ptr, size_t size, size_t nmemb, void *stream) return fwrite(ptr, size, nmemb, (FILE*)stream); } -kbd_sys::CDownloadFile::CDownloadFile(const kbd_public::SRunAppInfo &stRunAppInfo): - kbd_public::CTimerThreadBase("CDownRecordFileThread",1000), +iot_sys::CDownloadFile::CDownloadFile(const iot_public::SRunAppInfo &stRunAppInfo): + iot_public::CTimerThreadBase("CDownRecordFileThread",1000), m_stRunAppInfo(stRunAppInfo) { } -kbd_sys::CDownloadFile::~CDownloadFile() +iot_sys::CDownloadFile::~CDownloadFile() { if(!m_objComm.delSub(m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE)) { @@ -45,15 +45,15 @@ kbd_sys::CDownloadFile::~CDownloadFile() } } -void kbd_sys::CDownloadFile::execute() +void iot_sys::CDownloadFile::execute() { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; if(m_objComm.recvMsg(objMsg)) { if(CH_FILE_SYNCH_NOTICE == objMsg.getChannelID()) { int msgType = objMsg.getMsgType(); - if(kbd_sys::FILE_SYNC_DOWN_NOTICE == msgType) + if(iot_sys::FILE_SYNC_DOWN_NOTICE == msgType) { if(isLocalHost(objMsg)) //如果是本机同步，直接忽略。 @@ -98,7 +98,7 @@ void kbd_sys::CDownloadFile::execute() } } -int kbd_sys::CDownloadFile::initialize() +int iot_sys::CDownloadFile::initialize() { if(!loadConfig()) { @@ -152,7 +152,7 @@ int kbd_sys::CDownloadFile::initialize() return kbdSuccess; } -bool kbd_sys::CDownloadFile::getCurrentFilesMap(std::string srcPath, std::map &objMap,std::string basePath) +bool iot_sys::CDownloadFile::getCurrentFilesMap(std::string srcPath, std::map &objMap,std::string basePath) { boost::filesystem::path fsPath = srcPath; boost::system::error_code ec; @@ -181,7 +181,7 @@ bool kbd_sys::CDownloadFile::getCurrentFilesMap(std::string srcPath, std::map &objMap, std::string basePath) +void iot_sys::CDownloadFile::recursionGetMap(boost::filesystem::path &fsPath, std::map &objMap, std::string basePath) { stFileInfo objFileInfo; std::string strTempPath = fsPath.string(); @@ -211,9 +211,9 @@ void kbd_sys::CDownloadFile::recursionGetMap(boost::filesystem::path &fsPath, st } } -void kbd_sys::CDownloadFile::parserMsg(kbd_net::CMbMessage &objMsg) +void iot_sys::CDownloadFile::parserMsg(iot_net::CMbMessage &objMsg) { - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -244,7 +244,7 @@ void kbd_sys::CDownloadFile::parserMsg(kbd_net::CMbMessage &objMsg) } int fileNum = syncInfoPackage.files_size(); std::string fileName = ""; - std::map::iterator it; + std::map::iterator it; bool isDir; for(int i = 0 ; i < fileNum ; ++i) { @@ -276,9 +276,9 @@ void kbd_sys::CDownloadFile::parserMsg(kbd_net::CMbMessage &objMsg) } } -bool kbd_sys::CDownloadFile::isLocalHost(kbd_net::CMbMessage &objMsg) +bool iot_sys::CDownloadFile::isLocalHost(iot_net::CMbMessage &objMsg) { - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -307,9 +307,9 @@ bool kbd_sys::CDownloadFile::isLocalHost(kbd_net::CMbMessage &objMsg) -bool kbd_sys::CDownloadFile::getRelaDir(kbd_net::CMbMessage &objMsg, std::string &strRelaDir) +bool iot_sys::CDownloadFile::getRelaDir(iot_net::CMbMessage &objMsg, std::string &strRelaDir) { - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -332,7 +332,7 @@ bool kbd_sys::CDownloadFile::getRelaDir(kbd_net::CMbMessage &objMsg, std::string return false; } -bool kbd_sys::CDownloadFile::judgtRelaDirExist(std::string &strDescDir, std::vector vecRelaDir) +bool iot_sys::CDownloadFile::judgtRelaDirExist(std::string &strDescDir, std::vector vecRelaDir) { std::vector::iterator it; it = std::find(vecRelaDir.begin(),vecRelaDir.end(),strDescDir); @@ -346,10 +346,10 @@ bool kbd_sys::CDownloadFile::judgtRelaDirExist(std::string &strDescDir, std::vec } } -bool kbd_sys::CDownloadFile::getRemotePath(kbd_net::CMbMessage &objMsg, std::vector &vecRemotePath) +bool iot_sys::CDownloadFile::getRemotePath(iot_net::CMbMessage &objMsg, std::vector &vecRemotePath) { vecRemotePath.clear(); - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -380,10 +380,10 @@ bool kbd_sys::CDownloadFile::getRemotePath(kbd_net::CMbMessage &objMsg, std::vec return false; } -bool kbd_sys::CDownloadFile::getDownloadFile(kbd_net::CMbMessage &objMsg, std::map &localFileMap, std::map &downloadFileMap) +bool iot_sys::CDownloadFile::getDownloadFile(iot_net::CMbMessage &objMsg, std::map &localFileMap, std::map &downloadFileMap) { downloadFileMap.clear(); - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -393,7 +393,7 @@ bool kbd_sys::CDownloadFile::getDownloadFile(kbd_net::CMbMessage &objMsg, std::m } int fileNum = syncInfoPackage.files_size(); std::string fileName = ""; - std::map::iterator it; + std::map::iterator it; bool isDir; for(int i = 0 ; i < fileNum ; ++i) { @@ -420,7 +420,7 @@ bool kbd_sys::CDownloadFile::getDownloadFile(kbd_net::CMbMessage &objMsg, std::m -void kbd_sys::CDownloadFile::deletePathFile(std::map &deleteMap, const std::string &basePath) +void iot_sys::CDownloadFile::deletePathFile(std::map &deleteMap, const std::string &basePath) { if(deleteMap.empty()) { @@ -447,7 +447,7 @@ void kbd_sys::CDownloadFile::deletePathFile(std::map &deleteM } } -void kbd_sys::CDownloadFile::getFileFromFtp(std::map &downloadMap,std::string basePath , std::string userName, std::string passwd,int port) +void iot_sys::CDownloadFile::getFileFromFtp(std::map &downloadMap,std::string basePath , std::string userName, std::string passwd,int port) { if(downloadMap.empty()) { @@ -505,7 +505,7 @@ void kbd_sys::CDownloadFile::getFileFromFtp(std::map &downloa curl_global_cleanup(); } -int kbd_sys::CDownloadFile::download(CURL *curlhandle, const char *remotepath, const char *localpath, const char *userName, const char *passwd,CURLcode &ret, int port, long timeout) +int iot_sys::CDownloadFile::download(CURL *curlhandle, const char *remotepath, const char *localpath, const char *userName, const char *passwd,CURLcode &ret, int port, long timeout) { FILE *f; curl_off_t local_file_len = -1 ; @@ -555,7 +555,7 @@ int kbd_sys::CDownloadFile::download(CURL *curlhandle, const char *remotepath, c } } -bool kbd_sys::CDownloadFile::stringEndWith(std::string longStr, std::string tailStr) +bool iot_sys::CDownloadFile::stringEndWith(std::string longStr, std::string tailStr) { int longStrSize = longStr.size(); int tailStrSize = tailStr.size(); @@ -573,7 +573,7 @@ bool kbd_sys::CDownloadFile::stringEndWith(std::string longStr, std::string tail } } -bool kbd_sys::CDownloadFile::isSyncType(std::string &filePath, std::vector &typeVec) +bool iot_sys::CDownloadFile::isSyncType(std::string &filePath, std::vector &typeVec) { std::vector::iterator it; for(it = typeVec.begin(); it != typeVec.end() ; ++it) @@ -586,9 +586,9 @@ bool kbd_sys::CDownloadFile::isSyncType(std::string &filePath, std::vector &map) +void iot_sys::CDownloadFile::printMap(std::map &map) { - std::map::iterator it; + std::map::iterator it; for(it = map.begin(); it != map.end();++it) { LOGINFO("fileName:%s,isDir:%d",it->first.c_str(),it->second.isDir); } } -void kbd_sys::CDownloadFile::printMap(std::map &map) +void iot_sys::CDownloadFile::printMap(std::map &map) { std::map::iterator it; for(it = map.begin(); it != map.end() ; ++it) @@ -626,7 +626,7 @@ void kbd_sys::CDownloadFile::printMap(std::map &map) -void kbd_sys::CDownloadFile::printSynchInfo(kbd_idlfile::SynchInfo &synchInfo) +void iot_sys::CDownloadFile::printSynchInfo(iot_idl::SynchInfo &synchInfo) { } diff --git a/product/src/z_discard/sys_ftp_sync/CDownloadFile.h b/product/src/z_discard/sys_ftp_sync/CDownloadFile.h index f75ba98d..92ec0199 100644 --- a/product/src/z_discard/sys_ftp_sync/CDownloadFile.h +++ b/product/src/z_discard/sys_ftp_sync/CDownloadFile.h @@ -15,11 +15,11 @@ size_t getContentLengthFunc(void *ptr, size_t size, size_t nmemb, void *stream); size_t writeFunc(void *ptr, size_t size, size_t nmemb, void *stream); -namespace kbd_sys { - class CDownloadFile : public kbd_public::CTimerThreadBase +namespace iot_sys { + class CDownloadFile : public iot_public::CTimerThreadBase { public: - CDownloadFile(const kbd_public::SRunAppInfo &stRunAppInfo); + CDownloadFile(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CDownloadFile(); /* @@ -39,29 +39,29 @@ namespace kbd_sys { @param srcPath 根目录 @param objMap 存文件的map */ - bool getCurrentFilesMap(std::string srcPath,std::map&objMap,std::string basePath); + bool getCurrentFilesMap(std::string srcPath,std::map&objMap,std::string basePath); /* @breif 第归调用得到含有相对路径的map @param fsPath 根目录 @objMap 存放目录的map */ - void recursionGetMap(boost::filesystem::path &fsPath,std::map &objMap,std::string basePath); + void recursionGetMap(boost::filesystem::path &fsPath,std::map &objMap,std::string basePath); /* @breif 解析消息 @param objMsg收到的消息 @ */ - void parserMsg(kbd_net::CMbMessage &objMsg); + void parserMsg(iot_net::CMbMessage &objMsg); /* *@brief 根据主机名，判断是否是主机本机 */ - bool isLocalHost(kbd_net::CMbMessage &objMsg); + bool isLocalHost(iot_net::CMbMessage &objMsg); /* *@brief 得到FTP根目录下的相对路径 */ - bool getRelaDir(kbd_net::CMbMessage &objMsg,std::string &strRelaDir); + bool getRelaDir(iot_net::CMbMessage &objMsg,std::string &strRelaDir); /* *@brief 判断相对文件夹是否存在本地 */ @@ -70,12 +70,12 @@ namespace kbd_sys { /* *@brief 得到远程路径 */ - bool getRemotePath(kbd_net::CMbMessage &objMsg,std::vector &vecRemotePath); + bool getRemotePath(iot_net::CMbMessage &objMsg,std::vector &vecRemotePath); /* *@brief 得到需要下载文件的文件 */ - bool getDownloadFile(kbd_net::CMbMessage &objMsg,std::map &localFileMap,std::map &downloadFileMap); + bool getDownloadFile(iot_net::CMbMessage &objMsg,std::map &localFileMap,std::map &downloadFileMap); /* @@ -115,13 +115,13 @@ namespace kbd_sys { bool loadConfig(); /* 测试打印*/ - void printMap(std::map &map); + void printMap(std::map &map); void printMap(std::map &map); - void printSynchInfo(kbd_idlfile::SynchInfo &synchInfo); + void printSynchInfo(iot_idl::SynchInfo &synchInfo); private: bool m_bIsDelete; //<- 是否做删除功能 - kbd_public::SRunAppInfo m_stRunAppInfo; //<- 运行常用相关参数 - kbd_net::CMbCommunicator m_objComm; //<- 接收消息的通讯器 + iot_public::SRunAppInfo m_stRunAppInfo; //<- 运行常用相关参数 + iot_net::CMbCommunicator m_objComm; //<- 接收消息的通讯器 std::string m_strFtpUser; //<- FTP用户名 std::string m_strFtpPasswd; //<- FTP密码 std::vector m_vecSrcPath; //<- 发送端的多个网卡的IP地址对应的路径 @@ -129,7 +129,7 @@ namespace kbd_sys { std::vector m_vecRelaPath; //<- 相对 同步根目录的 的目录 std::vector m_vecFileType; //<- 需要同步的文件类型 - std::map m_mapLocalRelFile; //<- 当前本地的文件（相对路径） + std::map m_mapLocalRelFile; //<- 当前本地的文件（相对路径） std::map m_mapDeleteFile; //<- 待删除的文件 std::map m_mapDownloadFile; //<- 待下载的文件 }; diff --git a/product/src/z_discard/sys_ftp_sync/CFileSync.cpp b/product/src/z_discard/sys_ftp_sync/CFileSync.cpp index edf3d18e..c29a477a 100644 --- a/product/src/z_discard/sys_ftp_sync/CFileSync.cpp +++ b/product/src/z_discard/sys_ftp_sync/CFileSync.cpp @@ -5,7 +5,7 @@ #include "net_msg_bus_api/MsgBusApi.h" -kbd_sys::CFileSync::CFileSync(): +iot_sys::CFileSync::CFileSync(): m_ptrSysInfo(NULL), m_ptrProMng(NULL), m_ptrRedundancyMng(NULL), @@ -13,12 +13,12 @@ kbd_sys::CFileSync::CFileSync(): { } -kbd_sys::CFileSync::~CFileSync() +iot_sys::CFileSync::~CFileSync() { stop(); } -bool kbd_sys::CFileSync::start(int argc,char *argv[],int &nStatus) +bool iot_sys::CFileSync::start(int argc,char *argv[],int &nStatus) { //1.解析启动参数 if(!parseCmdLine(argc,argv)) @@ -53,7 +53,7 @@ bool kbd_sys::CFileSync::start(int argc,char *argv[],int &nStatus) //6.创建冗余管理 if(CN_AppName_BASE != m_strAppName) { - 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(NULL == m_ptrRedundancyMng ) { LOGERROR("创建冗余管理失败"); @@ -93,7 +93,7 @@ bool kbd_sys::CFileSync::start(int argc,char *argv[],int &nStatus) return true; } -bool kbd_sys::CFileSync::stop() +bool iot_sys::CFileSync::stop() { //9.更新当前进程冗余状态 if(m_ptrProMng != NULL) @@ -119,17 +119,17 @@ bool kbd_sys::CFileSync::stop() m_ptrProMng.reset(); } //2.销毁日志系统 - kbd_public::StopLogSystem(); + iot_public::StopLogSystem(); return true; } -int kbd_sys::CFileSync::toQuit() +int iot_sys::CFileSync::toQuit() { shutdown(); return kbdSuccess; } -bool kbd_sys::CFileSync::parseCmdLine(int argc, char *argv[]) +bool iot_sys::CFileSync::parseCmdLine(int argc, char *argv[]) { for(int i = 1 ; i < argc ; ++i ) { @@ -182,26 +182,26 @@ bool kbd_sys::CFileSync::parseCmdLine(int argc, char *argv[]) } -void kbd_sys::CFileSync::showHelp(const boost::program_options::options_description &objDesc) +void iot_sys::CFileSync::showHelp(const boost::program_options::options_description &objDesc) { std::cout << CN_ProcName_FileSync << " [-h] | [-a app]" << std::endl; std::cout << objDesc << std::endl; } -bool kbd_sys::CFileSync::isAlreadyRunning() +bool iot_sys::CFileSync::isAlreadyRunning() { - std::string strUniqueName = kbd_sys::CN_ProcName_FileSync; + std::string strUniqueName = iot_sys::CN_ProcName_FileSync; strUniqueName += m_strStartArgs; - return kbd_public::CSingleProcInstance::hasInstanceRunning(strUniqueName); + return iot_public::CSingleProcInstance::hasInstanceRunning(strUniqueName); } -bool kbd_sys::CFileSync::initLog() +bool iot_sys::CFileSync::initLog() { - kbd_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_FileSync.c_str()); + iot_public::StartLogSystem(m_strAppName.c_str(),CN_ProcName_FileSync.c_str()); return true; } -bool kbd_sys::CFileSync::getSystemInfo() +bool iot_sys::CFileSync::getSystemInfo() { if(!createSysInfoInstance(m_ptrSysInfo)) { @@ -216,16 +216,16 @@ bool kbd_sys::CFileSync::getSystemInfo() return true; } -bool kbd_sys::CFileSync::registToProcMng() +bool iot_sys::CFileSync::registToProcMng() { - kbd_sys::SProcessInfoKey stProcKey; + iot_sys::SProcessInfoKey stProcKey; stProcKey.nDomainId = m_stRunAppInfo.nDomainId; stProcKey.nAppId = m_stRunAppInfo.nAppId; stProcKey.strNodeName = m_stRunAppInfo.strLocalNodeName; stProcKey.strProcName = CN_ProcName_FileSync; stProcKey.strProcParam = m_strStartArgs; - m_ptrProMng = kbd_sys::getProcMngInstance(stProcKey); + m_ptrProMng = iot_sys::getProcMngInstance(stProcKey); if(m_ptrProMng == NULL) { LOGERROR("创建进程管理访问库失败"); @@ -240,9 +240,9 @@ bool kbd_sys::CFileSync::registToProcMng() return true; } -bool kbd_sys::CFileSync::initialize() +bool iot_sys::CFileSync::initialize() { - if(!kbd_net::initMsgBus(CN_ProcName_FileSync.c_str(),"")) + if(!iot_net::initMsgBus(CN_ProcName_FileSync.c_str(),"")) { LOGERROR("初始化消息总线失败"); return kbdFailed; @@ -264,9 +264,9 @@ bool kbd_sys::CFileSync::initialize() return true; } -bool kbd_sys::CFileSync::clean() +bool iot_sys::CFileSync::clean() { - if(!kbd_net::releaseMsgBus()) + if(!iot_net::releaseMsgBus()) { LOGERROR("销毁消息总线失败"); return false; diff --git a/product/src/z_discard/sys_ftp_sync/CFileSync.h b/product/src/z_discard/sys_ftp_sync/CFileSync.h index aa65bccd..02bc75b4 100644 --- a/product/src/z_discard/sys_ftp_sync/CFileSync.h +++ b/product/src/z_discard/sys_ftp_sync/CFileSync.h @@ -11,11 +11,11 @@ #define OPT_DESC_APP "app" #define OPT_DESC_HELP "help" -namespace kbd_sys +namespace iot_sys { - class CFileSync : public kbd_public::CBaseService , kbd_sys::CProcessQuitInterface + class CFileSync : public iot_public::CBaseService , iot_sys::CProcessQuitInterface { public: CFileSync(); @@ -81,12 +81,12 @@ namespace kbd_sys private: std::string m_strAppName; //<- 进程名 std::string m_strStartArgs; //<- 本进程相关运行参数 - kbd_public::CSysInfoInterfacePtr m_ptrSysInfo; //<- 系统信息访问库智能指针 - kbd_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //<- 冗余管理类智能指针 - kbd_public::SRunAppInfo m_stRunAppInfo; //<- 本应用运行常用信息 - kbd_sys::CProcMngInterfacePtr m_ptrProMng; //<- 进程访问库智能指针 - kbd_public::SNodeInfo m_stLocalNodeInfo; //<- 本机节点 - kbd_sys::CFileSyncMngPtr m_ptrFileSyncMng; //<- 进程管理 + iot_public::CSysInfoInterfacePtr m_ptrSysInfo; //<- 系统信息访问库智能指针 + iot_sys::CRedundantMngInterfacePtr m_ptrRedundancyMng; //<- 冗余管理类智能指针 + iot_public::SRunAppInfo m_stRunAppInfo; //<- 本应用运行常用信息 + iot_sys::CProcMngInterfacePtr m_ptrProMng; //<- 进程访问库智能指针 + iot_public::SNodeInfo m_stLocalNodeInfo; //<- 本机节点 + iot_sys::CFileSyncMngPtr m_ptrFileSyncMng; //<- 进程管理 diff --git a/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp b/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp index 4de1d578..eead555f 100644 --- a/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp +++ b/product/src/z_discard/sys_ftp_sync/CFileSyncMng.cpp @@ -2,7 +2,7 @@ #include "pub_logger_api/logger.h" -kbd_sys::CFileSyncMng::CFileSyncMng(const kbd_public::SRunAppInfo &stRunAppInfo, const kbd_sys::CProcMngInterfacePtr &ptrProMng) +iot_sys::CFileSyncMng::CFileSyncMng(const iot_public::SRunAppInfo &stRunAppInfo, const iot_sys::CProcMngInterfacePtr &ptrProMng) :m_stRunAppInfo(stRunAppInfo), m_ptrProcMng(ptrProMng), m_ptrSnedFileInfo(NULL), @@ -11,7 +11,7 @@ kbd_sys::CFileSyncMng::CFileSyncMng(const kbd_public::SRunAppInfo &stRunAppInfo, } -kbd_sys::CFileSyncMng::~CFileSyncMng() +iot_sys::CFileSyncMng::~CFileSyncMng() { if(m_ptrSnedFileInfo != NULL) { @@ -27,7 +27,7 @@ kbd_sys::CFileSyncMng::~CFileSyncMng() m_ptrProcMng.reset(); } -int kbd_sys::CFileSyncMng::redundantSwitch(bool bMaster, bool bSlave) +int iot_sys::CFileSyncMng::redundantSwitch(bool bMaster, bool bSlave) { LOGWARN("接受到冗余切换指令：Master=[%d],Slave=[%d]",bMaster,bSlave); if(NULL != m_ptrSnedFileInfo) @@ -70,12 +70,12 @@ int kbd_sys::CFileSyncMng::redundantSwitch(bool bMaster, bool bSlave) return kbdSuccess; } -int kbd_sys::CFileSyncMng::initialize() +int iot_sys::CFileSyncMng::initialize() { //文件信息发送，发送上传和下载信息，所有的实时服务器上有 - if(kbd_public::ENodeType_ApplicationServer == m_stRunAppInfo.eNodeType) //<- 只有在实时服务器上，才需要发送文件信息 + if(iot_public::ENodeType_ApplicationServer == m_stRunAppInfo.eNodeType) //<- 只有在实时服务器上，才需要发送文件信息 { - m_ptrSnedFileInfo = boost::make_shared(m_stRunAppInfo); + m_ptrSnedFileInfo = boost::make_shared(m_stRunAppInfo); if(NULL == m_ptrSnedFileInfo) { LOGERROR("创建发送文件信息线程失败"); @@ -90,7 +90,7 @@ int kbd_sys::CFileSyncMng::initialize() //上传至FTP服务器线程，所有的实时服务器上有 // if(ENodeType_ApplicationServer == m_stRunAppInfo.eNodeType) // { -// m_ptrUploadFile = boost::make_shared(m_stRunAppInfo); +// m_ptrUploadFile = boost::make_shared(m_stRunAppInfo); // if(NULL == m_ptrUploadFile) // { // LOGERROR("创建上传文件线程失败"); @@ -104,7 +104,7 @@ int kbd_sys::CFileSyncMng::initialize() // } //下载至本地目录线程，工作站和实时服务器 - m_ptrDownliadFile = boost::make_shared(m_stRunAppInfo); + m_ptrDownliadFile = boost::make_shared(m_stRunAppInfo); if(NULL == m_ptrDownliadFile) { LOGERROR("创建下载文件线程失败"); diff --git a/product/src/z_discard/sys_ftp_sync/CFileSyncMng.h b/product/src/z_discard/sys_ftp_sync/CFileSyncMng.h index 9a5b6c57..93a1c0c9 100644 --- a/product/src/z_discard/sys_ftp_sync/CFileSyncMng.h +++ b/product/src/z_discard/sys_ftp_sync/CFileSyncMng.h @@ -8,12 +8,12 @@ #include "CDownloadFile.h" -namespace kbd_sys { +namespace iot_sys { - class CFileSyncMng : public kbd_sys::CRedundantSwitchInterface + class CFileSyncMng : public iot_sys::CRedundantSwitchInterface { public: - CFileSyncMng(const kbd_public::SRunAppInfo &stRunAppInfo,const kbd_sys::CProcMngInterfacePtr &ptrProMng); + CFileSyncMng(const iot_public::SRunAppInfo &stRunAppInfo,const iot_sys::CProcMngInterfacePtr &ptrProMng); virtual ~CFileSyncMng(); virtual int redundantSwitch(bool bMaster,bool bSlave); @@ -21,12 +21,12 @@ namespace kbd_sys { int initialize(); private: - kbd_public::SRunAppInfo m_stRunAppInfo; - kbd_sys::CProcMngInterfacePtr m_ptrProcMng; + iot_public::SRunAppInfo m_stRunAppInfo; + iot_sys::CProcMngInterfacePtr m_ptrProcMng; - kbd_sys::CSendFileInfoPtr m_ptrSnedFileInfo; - kbd_sys::CUploadFilePtr m_ptrUploadFile; - kbd_sys::CDownloadFilePtr m_ptrDownliadFile; + iot_sys::CSendFileInfoPtr m_ptrSnedFileInfo; + iot_sys::CUploadFilePtr m_ptrUploadFile; + iot_sys::CDownloadFilePtr m_ptrDownliadFile; }; typedef boost::shared_ptr CFileSyncMngPtr; diff --git a/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp b/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp index 1ac724e5..58e4ea90 100644 --- a/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp +++ b/product/src/z_discard/sys_ftp_sync/CSendFileInfo.cpp @@ -7,27 +7,27 @@ -kbd_sys::CSendFileInfo::CSendFileInfo(const kbd_public::SRunAppInfo &stRunAppInfo) - :kbd_public::CTimerThreadBase("CSendFileInfoThread",2000), +iot_sys::CSendFileInfo::CSendFileInfo(const iot_public::SRunAppInfo &stRunAppInfo) + :iot_public::CTimerThreadBase("CSendFileInfoThread",2000), m_stRunAppInfo(stRunAppInfo) { } -kbd_sys::CSendFileInfo::~CSendFileInfo() +iot_sys::CSendFileInfo::~CSendFileInfo() { } -void kbd_sys::CSendFileInfo::execute() +void iot_sys::CSendFileInfo::execute() { if(m_nLastSyncMse >= m_nTimingCycleMse) { m_nLastSyncMse = 0; std::vector::iterator dirIt; - std::map currentfileMap; + std::map currentfileMap; std::string srcDir; - kbd_idlfile::SynchInfo objSynchInfo; + iot_idl::SynchInfo objSynchInfo; for(dirIt = m_vecRelaPath.begin(); dirIt != m_vecRelaPath.end();++dirIt) { @@ -41,7 +41,7 @@ void kbd_sys::CSendFileInfo::execute() // printSynchInfo(objSynchInfo); //打印测试 if(bIsMaster && !bIsSlave) //只有为主的时候才发送下载通知，备不发送下载通知 { - kbd_net::CMbMessage msgDown(objSynchInfo.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE,FILE_SYNC_DOWN_NOTICE); + iot_net::CMbMessage msgDown(objSynchInfo.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE,FILE_SYNC_DOWN_NOTICE); if(m_objComm.sendMsgToDomain(msgDown)) //发送至本域 { // LOGINFO("发送至本域下载文件信息成功,文件夹：%s",srcDir.c_str()); @@ -53,7 +53,7 @@ void kbd_sys::CSendFileInfo::execute() if(!m_stRunAppInfo.bIsCenterDomain) //如果本域不是中心域，发送下载消息至中心域 { - kbd_net::CMbMessage msgCenterDown(objSynchInfo.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE,FILE_SYNC_DOWN_NOTICE); + iot_net::CMbMessage msgCenterDown(objSynchInfo.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE,FILE_SYNC_DOWN_NOTICE); if(m_objComm.sendMsgToDomain(msgCenterDown,CN_DOMAIN_ID)) { // LOGINFO("发送至中心域下载文件信息成功，文件夹：%s",srcDir.c_str()); @@ -67,7 +67,7 @@ void kbd_sys::CSendFileInfo::execute() } // if((bIsMaster && !bIsSlave) || (!bIsMaster && bIsSlave)) //<- 主、备都发送上传通知 // { -// kbd_net::CMbMessage msgUpload(objSynchInfo.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE,FILE_SYNC_UP_NOTICE); +// iot_net::CMbMessage msgUpload(objSynchInfo.SerializeAsString(),m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE,FILE_SYNC_UP_NOTICE); // if(m_objComm.sendMsgToHost(msgUpload)) // { // LOGINFO("发送至本域上传文件信息成功，文件夹：%s",srcDir.c_str()); @@ -90,7 +90,7 @@ void kbd_sys::CSendFileInfo::execute() } } -int kbd_sys::CSendFileInfo::initialize() +int iot_sys::CSendFileInfo::initialize() { if(!loadConfig()) { @@ -133,13 +133,13 @@ int kbd_sys::CSendFileInfo::initialize() } } //得到本机配置的IP地址 - kbd_public::CSysInfoInterfacePtr sysInfoInterfacePtr; - if((!kbd_public::createSysInfoInstance(sysInfoInterfacePtr)) || (NULL == sysInfoInterfacePtr)) + iot_public::CSysInfoInterfacePtr sysInfoInterfacePtr; + if((!iot_public::createSysInfoInstance(sysInfoInterfacePtr)) || (NULL == sysInfoInterfacePtr)) { LOGERROR("创建系统信息智能智能指针失败"); return kbdFailed; } - kbd_public::SNodeInfo nodeInfo; + iot_public::SNodeInfo nodeInfo; sysInfoInterfacePtr->getLocalNodeInfo(nodeInfo); if(0 != nodeInfo.strNic1Addr.compare("")) { @@ -156,14 +156,14 @@ int kbd_sys::CSendFileInfo::initialize() } -void kbd_sys::CSendFileInfo::redundantSwitch(bool bMaster, bool bSlave) +void iot_sys::CSendFileInfo::redundantSwitch(bool bMaster, bool bSlave) { bIsMaster = bMaster; bIsSlave = bSlave; } -bool kbd_sys::CSendFileInfo::getCurrentFilesMap(std::string srcPath, std::map &fileMap,std::string basePath) +bool iot_sys::CSendFileInfo::getCurrentFilesMap(std::string srcPath, std::map &fileMap,std::string basePath) { std::string tempBasePath = basePath; if(stringEndWith(tempBasePath,std::string("/"))) @@ -187,14 +187,14 @@ bool kbd_sys::CSendFileInfo::getCurrentFilesMap(std::string srcPath, std::map &objMap1, std::map &objMap2) +bool iot_sys::CSendFileInfo::compareFilesMap(std::map &objMap1, std::map &objMap2) { if(objMap1.size() != objMap2.size()) { return false; } - std::map::iterator it1; - std::map::iterator it2; + std::map::iterator it1; + std::map::iterator it2; for(it1 = objMap1.begin(),it2 = objMap2.begin(); it1 != objMap1.end() && it2 != objMap2.end() ;it1++,it2++) { if((it1->first != it2->first) || @@ -211,7 +211,7 @@ bool kbd_sys::CSendFileInfo::compareFilesMap(std::map &objMap,std::string basePath) +void iot_sys::CSendFileInfo::recursionGetMap(boost::filesystem::path fsPath, std::map &objMap,std::string basePath) { stFileInfo objFileInfo; std::string strTempPath = fsPath.string(); @@ -243,7 +243,7 @@ void kbd_sys::CSendFileInfo::recursionGetMap(boost::filesystem::path fsPath, std } } -void kbd_sys::CSendFileInfo::fliesMapToSynchInfo(std::map &fileMap, kbd_idlfile::SynchInfo &objSynchInfo,std::string relaPath) +void iot_sys::CSendFileInfo::fliesMapToSynchInfo(std::map &fileMap, iot_idl::SynchInfo &objSynchInfo,std::string relaPath) { std::vector::iterator vecIt; for(vecIt = m_vecNicAddr.begin(); vecIt != m_vecNicAddr.end() ; ++vecIt) @@ -258,10 +258,10 @@ void kbd_sys::CSendFileInfo::fliesMapToSynchInfo(std::map::iterator mapIt; + std::map::iterator mapIt; for(mapIt = fileMap.begin(); mapIt != fileMap.end() ; ++mapIt) { - kbd_idlfile::FileInfo *pFileInfo = objSynchInfo.add_files(); + iot_idl::FileInfo *pFileInfo = objSynchInfo.add_files(); pFileInfo->set_pathfile(mapIt->first); pFileInfo->set_isdir(mapIt->second.isDir); for(int i = 0 ; i < 5; ++i) @@ -273,7 +273,7 @@ void kbd_sys::CSendFileInfo::fliesMapToSynchInfo(std::map &typeVec) +bool iot_sys::CSendFileInfo::isSyncType(std::string &filePath, std::vector &typeVec) { std::vector::iterator it; for(it = typeVec.begin(); it != typeVec.end() ; ++it) @@ -318,9 +318,9 @@ bool kbd_sys::CSendFileInfo::isSyncType(std::string &filePath, std::vector&objMap1,std::map&objMap2); + bool compareFilesMap(std::map&objMap1,std::map&objMap2); /* @breif 第归调用得到含有绝对路径的map @param fsPath 根目录 @@ -49,7 +49,7 @@ namespace kbd_sys { @param fileMap:存有相对FTP路径的map @param objSynchInfo文件同步的信息 */ - void fliesMapToSynchInfo(std::map &fileMap, kbd_idlfile::SynchInfo &objSynchInfo,std::string relaPath); + void fliesMapToSynchInfo(std::map &fileMap, iot_idl::SynchInfo &objSynchInfo,std::string relaPath); /* *判断longStr是否以tailStr结尾 @@ -74,13 +74,13 @@ namespace kbd_sys { /* 测试打印*/ - void printSynchInfo(kbd_idlfile::SynchInfo &synchInfo); + void printSynchInfo(iot_idl::SynchInfo &synchInfo); private: bool bIsMaster; //<- 现实在是否为主 bool bIsSlave; //<- 现在是否为备 - kbd_public::SRunAppInfo m_stRunAppInfo; //<- 进程运行常用信息 - kbd_net::CMbCommunicator m_objComm; //<- 通讯器对象 + iot_public::SRunAppInfo m_stRunAppInfo; //<- 进程运行常用信息 + iot_net::CMbCommunicator m_objComm; //<- 通讯器对象 std::vector m_vecNicAddr; //<- 此主机的多个IP地址192.168.xxx.xxx std::string m_strHostName; //<- 主机名 std::string m_ftpRootDir; //<- 文件存放的目录，ftp的根目录，绝对路径 diff --git a/product/src/z_discard/sys_ftp_sync/CUploadFile.cpp b/product/src/z_discard/sys_ftp_sync/CUploadFile.cpp index cdaa6a51..2970824f 100644 --- a/product/src/z_discard/sys_ftp_sync/CUploadFile.cpp +++ b/product/src/z_discard/sys_ftp_sync/CUploadFile.cpp @@ -10,14 +10,14 @@ #include "pub_utility_api/CommonConfigParse.h" -kbd_sys::CUploadFile::CUploadFile(const kbd_public::SRunAppInfo &stRunAppInfo): - kbd_public::CTimerThreadBase("CUploadRecordFileThread",1000), +iot_sys::CUploadFile::CUploadFile(const iot_public::SRunAppInfo &stRunAppInfo): + iot_public::CTimerThreadBase("CUploadRecordFileThread",1000), m_stRunAppInfo(stRunAppInfo) { } -kbd_sys::CUploadFile::~CUploadFile() +iot_sys::CUploadFile::~CUploadFile() { if(!m_objComm.delSub(m_stRunAppInfo.nAppId,CH_FILE_SYNCH_NOTICE)) { @@ -25,16 +25,16 @@ kbd_sys::CUploadFile::~CUploadFile() } } -void kbd_sys::CUploadFile::execute() +void iot_sys::CUploadFile::execute() { - kbd_net::CMbMessage objMsg; + iot_net::CMbMessage objMsg; if(m_objComm.recvMsg(objMsg)) { if(CH_FILE_SYNCH_NOTICE == objMsg.getChannelID()) { int msgType = objMsg.getMsgType(); - if(kbd_sys::FILE_SYNC_UP_NOTICE == msgType) + if(iot_sys::FILE_SYNC_UP_NOTICE == msgType) { std::string relaPath; if(!getDescDir(objMsg,relaPath)) //<- 得到相对路径 @@ -70,7 +70,7 @@ void kbd_sys::CUploadFile::execute() } } -int kbd_sys::CUploadFile::initialize() +int iot_sys::CUploadFile::initialize() { m_mapLocalRelFile.clear(); m_mapUploadFile.clear(); @@ -110,7 +110,7 @@ int kbd_sys::CUploadFile::initialize() return kbdSuccess; } // 得到当前srcPath目录下，相对路径basePath的文件信息 -bool kbd_sys::CUploadFile::getCurrentFilesMap(std::string srcPath, std::map &fileMap, std::string basePath) +bool iot_sys::CUploadFile::getCurrentFilesMap(std::string srcPath, std::map &fileMap, std::string basePath) { std::string tempBasePath = basePath; if(stringEndWith(tempBasePath,std::string("/"))) @@ -134,7 +134,7 @@ bool kbd_sys::CUploadFile::getCurrentFilesMap(std::string srcPath, std::map &objMap, std::string basePath) +void iot_sys::CUploadFile::recursionGetMap(boost::filesystem::path &fsPath, std::map &objMap, std::string basePath) { stFileInfo objFileInfo; std::string strTempPath = fsPath.string(); @@ -166,9 +166,9 @@ void kbd_sys::CUploadFile::recursionGetMap(boost::filesystem::path &fsPath, std: } } -//int kbd_sys::CUploadFile::parserMsg(kbd_net::CMbMessage &objMsg) +//int iot_sys::CUploadFile::parserMsg(iot_net::CMbMessage &objMsg) //{ -// kbd_idlfile::SynchInfo syncInfoPackage; +// iot_idl::SynchInfo syncInfoPackage; // try // { // if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -206,7 +206,7 @@ void kbd_sys::CUploadFile::recursionGetMap(boost::filesystem::path &fsPath, std: // } // int fileNum = syncInfoPackage.files_size(); // std::string fileName = ""; -// std::map::iterator it; +// std::map::iterator it; // bool isDir; // for(int i = 0 ; i < fileNum ; ++i) // { @@ -235,9 +235,9 @@ void kbd_sys::CUploadFile::recursionGetMap(boost::filesystem::path &fsPath, std: // } //} -bool kbd_sys::CUploadFile::getDescDir(kbd_net::CMbMessage &objMsg, std::string &strDescDir) +bool iot_sys::CUploadFile::getDescDir(iot_net::CMbMessage &objMsg, std::string &strDescDir) { - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -260,9 +260,9 @@ bool kbd_sys::CUploadFile::getDescDir(kbd_net::CMbMessage &objMsg, std::string & return false; } //得到远程的上传目录 -bool kbd_sys::CUploadFile::getRemotePath(kbd_net::CMbMessage &objMsg, std::vector &vecRemotePath) +bool iot_sys::CUploadFile::getRemotePath(iot_net::CMbMessage &objMsg, std::vector &vecRemotePath) { - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -294,7 +294,7 @@ bool kbd_sys::CUploadFile::getRemotePath(kbd_net::CMbMessage &objMsg, std::vecto return false; } //<- 判断strDescDir 是否存在于 vecRelaDir -bool kbd_sys::CUploadFile::judgtRelaDirExist(std::string &strDescDir, std::vector vecRelaDir) +bool iot_sys::CUploadFile::judgtRelaDirExist(std::string &strDescDir, std::vector vecRelaDir) { std::vector::iterator it; it = std::find(vecRelaDir.begin(),vecRelaDir.end(),strDescDir); @@ -309,10 +309,10 @@ bool kbd_sys::CUploadFile::judgtRelaDirExist(std::string &strDescDir, std::vecto } //得到需要上传的文件map -void kbd_sys::CUploadFile::getUploadMap(kbd_net::CMbMessage &objMsg, std::map &localFileMap, std::map &uploadFileMap) +void iot_sys::CUploadFile::getUploadMap(iot_net::CMbMessage &objMsg, std::map &localFileMap, std::map &uploadFileMap) { uploadFileMap.clear(); - kbd_idlfile::SynchInfo syncInfoPackage; + iot_idl::SynchInfo syncInfoPackage; try { if(!syncInfoPackage.ParseFromArray(objMsg.getDataPtr(),objMsg.getDataSize())) @@ -322,7 +322,7 @@ void kbd_sys::CUploadFile::getUploadMap(kbd_net::CMbMessage &objMsg, std::map::iterator it; + std::map::iterator it; bool isDir; // printMap(localFileMap); //测试打印 for(int i = 0 ; i < fileNum ; ++i) @@ -354,7 +354,7 @@ void kbd_sys::CUploadFile::getUploadMap(kbd_net::CMbMessage &objMsg, std::map &uploadMap,std::string basePath, std::string userName, std::string passwd, int port) +void iot_sys::CUploadFile::uploadToFtp(std::map &uploadMap,std::string basePath, std::string userName, std::string passwd, int port) { if(uploadMap.empty()) { @@ -397,7 +397,7 @@ void kbd_sys::CUploadFile::uploadToFtp(std::map &uploadMap,st curl_global_cleanup(); } -int kbd_sys::CUploadFile::upload(CURL *curlhandle, const char *remotepath, const char *localpath, const char *userName, const char *passwd, int port, int timeout,int tries) +int iot_sys::CUploadFile::upload(CURL *curlhandle, const char *remotepath, const char *localpath, const char *userName, const char *passwd, int port, int timeout,int tries) { FILE *f; long uploaded_len = 0; @@ -458,9 +458,9 @@ int kbd_sys::CUploadFile::upload(CURL *curlhandle, const char *remotepath, const } } -bool kbd_sys::CUploadFile::loadConfig() +bool iot_sys::CUploadFile::loadConfig() { - kbd_public::CCommonConfigParse objCfg; + iot_public::CCommonConfigParse objCfg; if(kbdSuccess != objCfg.load(CN_XML_CONFIG_FILE_PATH,CN_XML_CONFIG_FILE_NAME)) { LOGERROR("加载配置文件：%s失败",CN_XML_CONFIG_FILE_NAME.c_str()); @@ -478,7 +478,7 @@ bool kbd_sys::CUploadFile::loadConfig() return true; } -bool kbd_sys::CUploadFile::isSyncType(std::string &filePath, std::vector &typeVec) +bool iot_sys::CUploadFile::isSyncType(std::string &filePath, std::vector &typeVec) { std::vector::iterator it; for(it = typeVec.begin(); it != typeVec.end() ; ++it) @@ -491,7 +491,7 @@ bool kbd_sys::CUploadFile::isSyncType(std::string &filePath, std::vector &map) +void printMap(std::map &map) { - std::map::iterator it; + std::map::iterator it; for(it = map.begin(); it != map.end();++it) { LOGINFO("fileName:%s,isDir:%d",it->first.c_str(),it->second.isDir); diff --git a/product/src/z_discard/sys_ftp_sync/CUploadFile.h b/product/src/z_discard/sys_ftp_sync/CUploadFile.h index a50dbbb3..697b75df 100644 --- a/product/src/z_discard/sys_ftp_sync/CUploadFile.h +++ b/product/src/z_discard/sys_ftp_sync/CUploadFile.h @@ -14,14 +14,14 @@ size_t getcontentlengthfunc(void *ptr, size_t size, size_t nmemb, void *stream); size_t discardfunc(void *ptr, size_t size, size_t nmemb, void *stream); size_t readfunc(void *ptr, size_t size, size_t nmemb, void *stream); -void printMap(std::map &map); +void printMap(std::map &map); -namespace kbd_sys { +namespace iot_sys { - class CUploadFile : public kbd_public::CTimerThreadBase + class CUploadFile : public iot_public::CTimerThreadBase { public: - CUploadFile(const kbd_public::SRunAppInfo &stRunAppInfo); + CUploadFile(const iot_public::SRunAppInfo &stRunAppInfo); virtual ~CUploadFile(); virtual void execute(); @@ -41,23 +41,23 @@ namespace kbd_sys { @param fsPath 根目录 @objMap 存放目录的map */ - void recursionGetMap(boost::filesystem::path &fsPath,std::map &objMap,std::string basePath); + void recursionGetMap(boost::filesystem::path &fsPath,std::map &objMap,std::string basePath); /* @breif 解析消息 @param objMsg收到的消息 @ */ -// int parserMsg(kbd_net::CMbMessage &objMsg); +// int parserMsg(iot_net::CMbMessage &objMsg); /* *@brief 得到远程目标的文件夹 */ - bool getDescDir(kbd_net::CMbMessage &objMsg,std::string &strDescDir); + bool getDescDir(iot_net::CMbMessage &objMsg,std::string &strDescDir); /* *@brief 得到远程路径 */ - bool getRemotePath(kbd_net::CMbMessage &objMsg,std::vector &vecRemotePath); + bool getRemotePath(iot_net::CMbMessage &objMsg,std::vector &vecRemotePath); /* *@brief 判断相对文件夹是否存在本地 */ @@ -67,7 +67,7 @@ namespace kbd_sys { /* *@ 得到需要上传的文件信息map */ - void getUploadMap(kbd_net::CMbMessage &objMsg,std::map &localFileMap,std::map &uploadFileMap); + void getUploadMap(iot_net::CMbMessage &objMsg,std::map &localFileMap,std::map &uploadFileMap); /* @brief 从FTP服务器请求文件 @param pathFile 服务器根目录下的文件路径 @@ -102,8 +102,8 @@ namespace kbd_sys { private: - kbd_public::SRunAppInfo m_stRunAppInfo; //<- 运行常用相关参数 - kbd_net::CMbCommunicator m_objComm; //<- 接收消息的通讯器 + iot_public::SRunAppInfo m_stRunAppInfo; //<- 运行常用相关参数 + iot_net::CMbCommunicator m_objComm; //<- 接收消息的通讯器 std::vector m_vecRemotePath; //<- 发送端的多个网卡的IP地址对应的路径 std::string m_strFtpUser; //<- ftp服务的用户名 std::string m_strFtpPasswd; //<- 用户名对应的密码 @@ -111,7 +111,7 @@ namespace kbd_sys { std::vector m_vecRelaPath; //<- 存放录波文件的文件夹 std::vector m_vecFileType; //<- 需要被同步的文件类型：点+后缀名。如：".cpp" - std::map m_mapLocalRelFile; //<- 当前本地的文件（相对路径） + std::map m_mapLocalRelFile; //<- 当前本地的文件（相对路径） std::map m_mapUploadFile; }; typedef boost::shared_ptr CUploadFilePtr; diff --git a/product/src/z_discard/sys_ftp_sync/FileSyncCommon.h b/product/src/z_discard/sys_ftp_sync/FileSyncCommon.h index 6c7d0fde..be19d7c0 100644 --- a/product/src/z_discard/sys_ftp_sync/FileSyncCommon.h +++ b/product/src/z_discard/sys_ftp_sync/FileSyncCommon.h @@ -4,7 +4,7 @@ #include #include #include -namespace kbd_sys +namespace iot_sys { const std::string CN_ProcName_FileSync = "sys_ftp_sync"; //<- 当前进程名 diff --git a/product/src/z_discard/sys_ftp_sync/main.cpp b/product/src/z_discard/sys_ftp_sync/main.cpp index 1574f139..c6410590 100644 --- a/product/src/z_discard/sys_ftp_sync/main.cpp +++ b/product/src/z_discard/sys_ftp_sync/main.cpp @@ -4,6 +4,6 @@ using namespace std; int main(int argc, char *argv[]) { - kbd_sys::CFileSync objFileSync; + iot_sys::CFileSync objFileSync; return objFileSync.main(argc, argv); }