diff --git a/platform/src/idl_files/AlarmMessage.pb.cc b/platform/src/idl_files/AlarmMessage.pb.cc index 7c68a985..54a704ab 100644 --- a/platform/src/idl_files/AlarmMessage.pb.cc +++ b/platform/src/idl_files/AlarmMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: AlarmMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -421,80 +421,79 @@ void protobuf_AddDesc_AlarmMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\022AlarmMessage.proto\022\013iot_idl\"\200\001\n\nSA" - "lmManner\022\020\n\010priority\030\001 \002(\005\022\025\n\rif_ack_on_" - "rtn\030\002 \002(\005\022\026\n\016del_act_on_ack\030\003 \002(\005\022\033\n\023if_" - "never_alm_on_rtn\030\004 \002(\005\022\024\n\014if_water_alm\030\005" - " \002(\005\"(\n\013SAlmKeyword\022\n\n\002id\030\001 \002(\005\022\r\n\005value" - "\030\002 \002(\t\"\233\003\n\017SAlmInfoFromApp\022\020\n\010alm_type\030\001" - " \002(\005\022\016\n\006status\030\002 \002(\005\022\022\n\ntime_stamp\030\003 \002(\003" - "\022\023\n\013location_id\030\004 \002(\005\022*\n\talm_style\030\005 \002(\016" - "2\027.iot_idl.enAlmStyle\022-\n\013alm_keyword" - "\030\006 \003(\0132\030.iot_idl.SAlmKeyword\022\022\n\nsub_" - "system\030\007 \001(\005\022\020\n\010dev_type\030\010 \001(\005\022\021\n\tregion" - "_id\030\t \001(\005\022\025\n\rdev_group_tag\030\n \001(\t\022\022\n\nkey_" - "id_tag\030\013 \001(\t\022\022\n\ngraph_name\030\014 \001(\t\022\022\n\nsoun" - "d_file\030\r \003(\t\022+\n\nalm_manner\030\016 \001(\0132\027.kbd_i" - "dlfile.SAlmManner\022\022\n\ncamera_tag\030\017 \001(\t\022\025\n" - "\rcamera_preset\030\020 \001(\t\"_\n\nSAppAddAlm\022\021\n\tdo" - "main_id\030\001 \001(\005\022\016\n\006app_id\030\002 \001(\005\022.\n\010alm_inf" - "o\030\003 \003(\0132\034.iot_idl.SAlmInfoFromApp\"]\n" - "\013SAppAddWave\022\022\n\nstart_time\030\001 \002(\003\022\020\n\010end_" - "time\030\002 \002(\003\022\025\n\rdev_group_tag\030\003 \002(\t\022\021\n\twav" - "e_file\030\004 \002(\t\"\233\004\n\020SAlmInfoToAlmClt\022\020\n\010alm" - "_type\030\001 \002(\005\022\022\n\nalm_status\030\002 \002(\005\0221\n\013logic" - "_state\030\003 \002(\0162\034.iot_idl.enAlmLogicSta" - "te\022\022\n\ntime_stamp\030\004 \002(\003\022\021\n\tdomain_id\030\005 \002(" - "\005\022\023\n\013location_id\030\006 \002(\005\022\016\n\006app_id\030\007 \002(\005\022\020" - "\n\010priority\030\010 \002(\005\022\025\n\rif_ack_on_rtn\030\t \002(\005\022" - "\026\n\016del_act_on_ack\030\n \002(\005\022\033\n\023if_never_alm_" - "on_rtn\030\013 \002(\005\022\024\n\014if_water_alm\030\014 \002(\005\022\023\n\013uu" - "id_base64\030\r \002(\t\022\017\n\007content\030\016 \002(\t\022\022\n\nsoun" - "d_file\030\017 \003(\t\022\022\n\nsub_system\030\020 \001(\005\022\020\n\010dev_" - "type\030\021 \001(\005\022\021\n\tregion_id\030\022 \001(\005\022\025\n\rdev_gro" - "up_tag\030\023 \001(\t\022\022\n\nkey_id_tag\030\024 \001(\t\022\022\n\ngrap" - "h_name\030\025 \001(\t\022\021\n\twave_file\030\026 \001(\t\022\022\n\ncamer" - "a_tag\030\027 \001(\t\022\025\n\rcamera_preset\030\030 \001(\t\"@\n\rSA" - "lmCltAddAlm\022/\n\010alm_info\030\001 \003(\0132\035.kbd_idlf" - "ile.SAlmInfoToAlmClt\"\273\001\n\rSAlmCltCfmAlm\022\021" - "\n\tnode_name\030\001 \002(\t\022\017\n\007user_id\030\002 \002(\005\022\024\n\014co" - "nfirm_time\030\003 \002(\003\022\020\n\010alm_type\030\004 \002(\005\022\021\n\tdo" - "main_id\030\005 \002(\005\022\016\n\006app_id\030\006 \002(\005\022\022\n\ntime_st" - "amp\030\007 \003(\003\022\023\n\013uuid_base64\030\010 \003(\t\022\022\n\nkey_id" - "_tag\030\t \003(\t\"7\n\rSAlmCltDelAlm\022\021\n\tdomain_id" - "\030\001 \002(\005\022\023\n\013uuid_base64\030\002 \003(\t\"(\n\021SAlmCltRe" - "leaseAlm\022\023\n\013uuid_base64\030\001 \003(\t\"=\n\023SAlmClt" - "LinkWave2Alm\022\021\n\twave_file\030\001 \002(\t\022\023\n\013uuid_" - "base64\030\002 \003(\t\"\346\002\n\020SEvtInfoToEvtClt\022\020\n\010alm" - "_type\030\001 \002(\005\022\022\n\nalm_status\030\002 \002(\005\022\022\n\ntime_" - "stamp\030\003 \002(\003\022\021\n\tdomain_id\030\004 \002(\005\022\023\n\013locati" - "on_id\030\005 \002(\005\022\016\n\006app_id\030\006 \002(\005\022\020\n\010priority\030" - "\007 \002(\005\022\023\n\013uuid_base64\030\010 \002(\t\022\017\n\007content\030\t " - "\002(\t\022\022\n\nsub_system\030\n \001(\005\022\020\n\010dev_type\030\013 \001(" - "\005\022\021\n\tregion_id\030\014 \001(\005\0221\n\013logic_state\030\r \001(" - "\0162\034.iot_idl.enAlmLogicState\022\025\n\rdev_g" - "roup_tag\030\016 \001(\t\022\022\n\nkey_id_tag\030\017 \001(\t\022\021\n\twa" - "ve_file\030\020 \001(\t\"@\n\rSEvtCltAddEvt\022/\n\010evt_in" - "fo\030\001 \003(\0132\035.iot_idl.SEvtInfoToEvtClt*" - "\304\003\n\014enAlmMsgType\022\024\n\020MT_ALM_AP2AS_ADD\020\001\022\030" - "\n\024MT_ALM_AS2AP_ADD_ACK\020\002\022\025\n\021MT_ALM_AP2AS" - "_WAVE\020\003\022\031\n\025MT_ALM_AS2AP_WAVE_ACK\020\004\022\026\n\022MT" - "_ALM_AS2AC_SEQNO\020\013\022\032\n\026MT_ALM_AC2AS_SEQNO" - "_REQ\020\014\022\024\n\020MT_ALM_AS2AC_ALL\020\r\022\030\n\024MT_ALM_A" - "C2AS_ALL_REQ\020\016\022\027\n\023MT_ALM_AC2AS_RT_REQ\020\017\022" - "\024\n\020MT_ALM_AS2AC_ADD\020\020\022\024\n\020MT_ALM_AS2AC_CF" - "M\020\021\022\030\n\024MT_ALM_AC2AS_CFM_REQ\020\022\022\024\n\020MT_ALM_" - "AS2AC_DEL\020\023\022\030\n\024MT_ALM_AC2AS_DEL_REQ\020\024\022\030\n" - "\024MT_ALM_AS2AC_RELEASE\020\025\022\025\n\021MT_ALM_AS2AC_" - "WAVE\020\026\022\024\n\020MT_ALM_DP2AS_CFM\020Z\022\030\n\024MT_ALM_A" - "S2DP_CFM_REQ\020[*R\n\nenAlmStyle\022\014\n\010AS_ALARM" - "\020\000\022\020\n\014AS_ALARM_RTN\020\001\022\021\n\rAS_EVENT_ONLY\020\002\022" - "\021\n\rAS_DO_NOTHING\020\003*\277\001\n\017enAlmLogicState\022\r" - "\n\tALS_ALARM\020\000\022\021\n\rALS_ALARM_CFM\020\001\022\016\n\nALS_" - "RETURN\020\002\022\022\n\016ALS_RETURN_CFM\020\003\022\020\n\014ALS_EVT_" - "ONLY\020\004\022\021\n\rALS_ALARM_DEL\020\024\022\025\n\021ALS_ALARM_C" - "FM_DEL\020\025\022\022\n\016ALS_RETURN_DEL\020\026\022\026\n\022ALS_RETU" - "RN_CFM_DEL\020\027", 2932); + "\n\022AlarmMessage.proto\022\007iot_idl\"\200\001\n\nSAlmMa" + "nner\022\020\n\010priority\030\001 \002(\005\022\025\n\rif_ack_on_rtn\030" + "\002 \002(\005\022\026\n\016del_act_on_ack\030\003 \002(\005\022\033\n\023if_neve" + "r_alm_on_rtn\030\004 \002(\005\022\024\n\014if_water_alm\030\005 \002(\005" + "\"(\n\013SAlmKeyword\022\n\n\002id\030\001 \002(\005\022\r\n\005value\030\002 \002" + "(\t\"\217\003\n\017SAlmInfoFromApp\022\020\n\010alm_type\030\001 \002(\005" + "\022\016\n\006status\030\002 \002(\005\022\022\n\ntime_stamp\030\003 \002(\003\022\023\n\013" + "location_id\030\004 \002(\005\022&\n\talm_style\030\005 \002(\0162\023.i" + "ot_idl.enAlmStyle\022)\n\013alm_keyword\030\006 \003(\0132\024" + ".iot_idl.SAlmKeyword\022\022\n\nsub_system\030\007 \001(\005" + "\022\020\n\010dev_type\030\010 \001(\005\022\021\n\tregion_id\030\t \001(\005\022\025\n" + "\rdev_group_tag\030\n \001(\t\022\022\n\nkey_id_tag\030\013 \001(\t" + "\022\022\n\ngraph_name\030\014 \001(\t\022\022\n\nsound_file\030\r \003(\t" + "\022\'\n\nalm_manner\030\016 \001(\0132\023.iot_idl.SAlmManne" + "r\022\022\n\ncamera_tag\030\017 \001(\t\022\025\n\rcamera_preset\030\020" + " \001(\t\"[\n\nSAppAddAlm\022\021\n\tdomain_id\030\001 \001(\005\022\016\n" + "\006app_id\030\002 \001(\005\022*\n\010alm_info\030\003 \003(\0132\030.iot_id" + "l.SAlmInfoFromApp\"]\n\013SAppAddWave\022\022\n\nstar" + "t_time\030\001 \002(\003\022\020\n\010end_time\030\002 \002(\003\022\025\n\rdev_gr" + "oup_tag\030\003 \002(\t\022\021\n\twave_file\030\004 \002(\t\"\227\004\n\020SAl" + "mInfoToAlmClt\022\020\n\010alm_type\030\001 \002(\005\022\022\n\nalm_s" + "tatus\030\002 \002(\005\022-\n\013logic_state\030\003 \002(\0162\030.iot_i" + "dl.enAlmLogicState\022\022\n\ntime_stamp\030\004 \002(\003\022\021" + "\n\tdomain_id\030\005 \002(\005\022\023\n\013location_id\030\006 \002(\005\022\016" + "\n\006app_id\030\007 \002(\005\022\020\n\010priority\030\010 \002(\005\022\025\n\rif_a" + "ck_on_rtn\030\t \002(\005\022\026\n\016del_act_on_ack\030\n \002(\005\022" + "\033\n\023if_never_alm_on_rtn\030\013 \002(\005\022\024\n\014if_water" + "_alm\030\014 \002(\005\022\023\n\013uuid_base64\030\r \002(\t\022\017\n\007conte" + "nt\030\016 \002(\t\022\022\n\nsound_file\030\017 \003(\t\022\022\n\nsub_syst" + "em\030\020 \001(\005\022\020\n\010dev_type\030\021 \001(\005\022\021\n\tregion_id\030" + "\022 \001(\005\022\025\n\rdev_group_tag\030\023 \001(\t\022\022\n\nkey_id_t" + "ag\030\024 \001(\t\022\022\n\ngraph_name\030\025 \001(\t\022\021\n\twave_fil" + "e\030\026 \001(\t\022\022\n\ncamera_tag\030\027 \001(\t\022\025\n\rcamera_pr" + "eset\030\030 \001(\t\"<\n\rSAlmCltAddAlm\022+\n\010alm_info\030" + "\001 \003(\0132\031.iot_idl.SAlmInfoToAlmClt\"\273\001\n\rSAl" + "mCltCfmAlm\022\021\n\tnode_name\030\001 \002(\t\022\017\n\007user_id" + "\030\002 \002(\005\022\024\n\014confirm_time\030\003 \002(\003\022\020\n\010alm_type" + "\030\004 \002(\005\022\021\n\tdomain_id\030\005 \002(\005\022\016\n\006app_id\030\006 \002(" + "\005\022\022\n\ntime_stamp\030\007 \003(\003\022\023\n\013uuid_base64\030\010 \003" + "(\t\022\022\n\nkey_id_tag\030\t \003(\t\"7\n\rSAlmCltDelAlm\022" + "\021\n\tdomain_id\030\001 \002(\005\022\023\n\013uuid_base64\030\002 \003(\t\"" + "(\n\021SAlmCltReleaseAlm\022\023\n\013uuid_base64\030\001 \003(" + "\t\"=\n\023SAlmCltLinkWave2Alm\022\021\n\twave_file\030\001 " + "\002(\t\022\023\n\013uuid_base64\030\002 \003(\t\"\342\002\n\020SEvtInfoToE" + "vtClt\022\020\n\010alm_type\030\001 \002(\005\022\022\n\nalm_status\030\002 " + "\002(\005\022\022\n\ntime_stamp\030\003 \002(\003\022\021\n\tdomain_id\030\004 \002" + "(\005\022\023\n\013location_id\030\005 \002(\005\022\016\n\006app_id\030\006 \002(\005\022" + "\020\n\010priority\030\007 \002(\005\022\023\n\013uuid_base64\030\010 \002(\t\022\017" + "\n\007content\030\t \002(\t\022\022\n\nsub_system\030\n \001(\005\022\020\n\010d" + "ev_type\030\013 \001(\005\022\021\n\tregion_id\030\014 \001(\005\022-\n\013logi" + "c_state\030\r \001(\0162\030.iot_idl.enAlmLogicState\022" + "\025\n\rdev_group_tag\030\016 \001(\t\022\022\n\nkey_id_tag\030\017 \001" + "(\t\022\021\n\twave_file\030\020 \001(\t\"<\n\rSEvtCltAddEvt\022+" + "\n\010evt_info\030\001 \003(\0132\031.iot_idl.SEvtInfoToEvt" + "Clt*\304\003\n\014enAlmMsgType\022\024\n\020MT_ALM_AP2AS_ADD" + "\020\001\022\030\n\024MT_ALM_AS2AP_ADD_ACK\020\002\022\025\n\021MT_ALM_A" + "P2AS_WAVE\020\003\022\031\n\025MT_ALM_AS2AP_WAVE_ACK\020\004\022\026" + "\n\022MT_ALM_AS2AC_SEQNO\020\013\022\032\n\026MT_ALM_AC2AS_S" + "EQNO_REQ\020\014\022\024\n\020MT_ALM_AS2AC_ALL\020\r\022\030\n\024MT_A" + "LM_AC2AS_ALL_REQ\020\016\022\027\n\023MT_ALM_AC2AS_RT_RE" + "Q\020\017\022\024\n\020MT_ALM_AS2AC_ADD\020\020\022\024\n\020MT_ALM_AS2A" + "C_CFM\020\021\022\030\n\024MT_ALM_AC2AS_CFM_REQ\020\022\022\024\n\020MT_" + "ALM_AS2AC_DEL\020\023\022\030\n\024MT_ALM_AC2AS_DEL_REQ\020" + "\024\022\030\n\024MT_ALM_AS2AC_RELEASE\020\025\022\025\n\021MT_ALM_AS" + "2AC_WAVE\020\026\022\024\n\020MT_ALM_DP2AS_CFM\020Z\022\030\n\024MT_A" + "LM_AS2DP_CFM_REQ\020[*R\n\nenAlmStyle\022\014\n\010AS_A" + "LARM\020\000\022\020\n\014AS_ALARM_RTN\020\001\022\021\n\rAS_EVENT_ONL" + "Y\020\002\022\021\n\rAS_DO_NOTHING\020\003*\277\001\n\017enAlmLogicSta" + "te\022\r\n\tALS_ALARM\020\000\022\021\n\rALS_ALARM_CFM\020\001\022\016\n\n" + "ALS_RETURN\020\002\022\022\n\016ALS_RETURN_CFM\020\003\022\020\n\014ALS_" + "EVT_ONLY\020\004\022\021\n\rALS_ALARM_DEL\020\024\022\025\n\021ALS_ALA" + "RM_CFM_DEL\020\025\022\022\n\016ALS_RETURN_DEL\020\026\022\026\n\022ALS_" + "RETURN_CFM_DEL\020\027", 2896); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "AlarmMessage.proto", &protobuf_RegisterTypes); SAlmManner::default_instance_ = new SAlmManner(); diff --git a/platform/src/idl_files/AlarmMessage.pb.h b/platform/src/idl_files/AlarmMessage.pb.h index 08698867..9b126e82 100644 --- a/platform/src/idl_files/AlarmMessage.pb.h +++ b/platform/src/idl_files/AlarmMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: AlarmMessage.proto #ifndef PROTOBUF_AlarmMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/BioIdentifyMsg.pb.cc b/platform/src/idl_files/BioIdentifyMsg.pb.cc index 60eec64f..095be226 100644 --- a/platform/src/idl_files/BioIdentifyMsg.pb.cc +++ b/platform/src/idl_files/BioIdentifyMsg.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: BioIdentifyMsg.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -82,12 +82,12 @@ void protobuf_AddDesc_BioIdentifyMsg_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024BioIdentifyMsg.proto\022\013iot_idl\"F\n\014S" - "BisIdResult\022\017\n\007user_id\030\001 \002(\005\022\023\n\013acs_dev_" - "tag\030\002 \002(\t\022\020\n\010pic_data\030\003 \001(\014*l\n\014EnBisMsgT" - "ype\022\027\n\023MT_BIS_START_ID_REQ\020\001\022\027\n\023MT_BIS_S" - "TART_ID_REP\020\002\022\024\n\020MT_BIS_ID_RESULT\020\003\022\024\n\020M" - "T_BIS_CANCEL_ID\020\004", 217); + "\n\024BioIdentifyMsg.proto\022\007iot_idl\"F\n\014SBisI" + "dResult\022\017\n\007user_id\030\001 \002(\005\022\023\n\013acs_dev_tag\030" + "\002 \002(\t\022\020\n\010pic_data\030\003 \001(\014*l\n\014EnBisMsgType\022" + "\027\n\023MT_BIS_START_ID_REQ\020\001\022\027\n\023MT_BIS_START" + "_ID_REP\020\002\022\024\n\020MT_BIS_ID_RESULT\020\003\022\024\n\020MT_BI" + "S_CANCEL_ID\020\004", 213); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "BioIdentifyMsg.proto", &protobuf_RegisterTypes); SBisIdResult::default_instance_ = new SBisIdResult(); diff --git a/platform/src/idl_files/BioIdentifyMsg.pb.h b/platform/src/idl_files/BioIdentifyMsg.pb.h index 521769db..4534da5e 100644 --- a/platform/src/idl_files/BioIdentifyMsg.pb.h +++ b/platform/src/idl_files/BioIdentifyMsg.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: BioIdentifyMsg.proto #ifndef PROTOBUF_BioIdentifyMsg_2eproto__INCLUDED diff --git a/platform/src/idl_files/DataProcMessage.pb.cc b/platform/src/idl_files/DataProcMessage.pb.cc index d48bc2b6..cc82ae2c 100644 --- a/platform/src/idl_files/DataProcMessage.pb.cc +++ b/platform/src/idl_files/DataProcMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: DataProcMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -343,50 +343,49 @@ void protobuf_AddDesc_DataProcMessage_2eproto() { ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\025DataProcMessage.proto\022\013iot_idl\032\014Pu" - "blic.proto\"E\n\rSDpcdaSubInfo\022\020\n\010tab_name\030" - "\001 \002(\t\022\020\n\010tag_name\030\002 \002(\t\022\020\n\010col_name\030\003 \002(" - "\t\"h\n\014SDpcdaSubPkg\022+\n\007add_sub\030\001 \003(\0132\032.kbd" - "_idlfile.SDpcdaSubInfo\022+\n\007del_sub\030\002 \003(\0132" - "\032.iot_idl.SDpcdaSubInfo\"\\\n\tSPointMsg" - "\022\020\n\010nDominId\030\001 \002(\005\022\016\n\006nAppId\030\002 \002(\005\022\016\n\006sT" - "able\030\003 \002(\t\022\014\n\004sKey\030\004 \002(\t\022\017\n\007sColumn\030\005 \002(" - "\t\"<\n\020SPointMsgPackage\022(\n\010PointMsg\030\001 \003(\0132" - "\026.iot_idl.SPointMsg\"9\n\020SRealTimePkgH" - "ead\022\021\n\tstrSrcTag\030\001 \002(\t\022\022\n\nnTimeStamp\030\002 \002" - "(\003\"\232\001\n\017SAiRealTimeData\022\021\n\tnLocation\030\001 \002(" - "\005\022\022\n\nnSubSystem\030\002 \002(\005\022\024\n\014strTableName\030\003 " - "\002(\t\022\022\n\nstrTagName\030\004 \002(\t\022\025\n\rstrColumnName" - "\030\005 \002(\t\022\016\n\006fValue\030\006 \002(\002\022\017\n\007uStatus\030\007 \002(\r\"" - "\232\001\n\017SPiRealTimeData\022\021\n\tnLocation\030\001 \002(\005\022\022" - "\n\nnSubSystem\030\002 \002(\005\022\024\n\014strTableName\030\003 \002(\t" - "\022\022\n\nstrTagName\030\004 \002(\t\022\025\n\rstrColumnName\030\005 " - "\002(\t\022\016\n\006dValue\030\006 \002(\001\022\017\n\007uStatus\030\007 \002(\r\"\232\001\n" - "\017SDiRealTimeData\022\021\n\tnLocation\030\001 \002(\005\022\022\n\nn" - "SubSystem\030\002 \002(\005\022\024\n\014strTableName\030\003 \002(\t\022\022\n" - "\nstrTagName\030\004 \002(\t\022\025\n\rstrColumnName\030\005 \002(\t" - "\022\016\n\006nValue\030\006 \002(\005\022\017\n\007uStatus\030\007 \002(\r\"\232\001\n\017SM" - "iRealTimeData\022\021\n\tnLocation\030\001 \002(\005\022\022\n\nnSub" - "System\030\002 \002(\005\022\024\n\014strTableName\030\003 \002(\t\022\022\n\nst" - "rTagName\030\004 \002(\t\022\025\n\rstrColumnName\030\005 \002(\t\022\016\n" - "\006nValue\030\006 \002(\005\022\017\n\007uStatus\030\007 \002(\r\"\246\001\n\022STabl" - "eRealTimeData\022\024\n\014strTableName\030\001 \002(\t\022\022\n\ns" - "trTagName\030\002 \002(\t\022\025\n\rstrColumnName\030\003 \002(\t\022\021" - "\n\tnLocation\030\004 \001(\005\022\022\n\nnSubSystem\030\005 \001(\005\022(\n" - "\010varValue\030\006 \002(\0132\026.iot_idl.SVariable\"" - "\260\002\n\020SRealTimeDataPkg\022-\n\006stHead\030\001 \002(\0132\035.k" - "bd_idlfile.SRealTimePkgHead\022-\n\007stAiRtd\030\002" - " \003(\0132\034.iot_idl.SAiRealTimeData\022-\n\007st" - "PiRtd\030\003 \003(\0132\034.iot_idl.SPiRealTimeDat" - "a\022-\n\007stDiRtd\030\004 \003(\0132\034.iot_idl.SDiReal" - "TimeData\022-\n\007stMiRtd\030\005 \003(\0132\034.iot_idl." - "SMiRealTimeData\0221\n\010stTblRtd\030\006 \003(\0132\037.kbd_" - "idlfile.STableRealTimeData*\261\001\n\021enDataPro" - "cMessage\022\027\n\023MT_DPCDA_APP2DP_CHG\020\001\022\033\n\027MT_" - "DPCDA_APP2DP_CHG_CNT\020\002\022\027\n\023MT_DPCDA_APP2D" - "P_ALL\020\003\022\033\n\027MT_DPCDA_DP2APP_ALL_REQ\020\004\022\025\n\021" - "MT_DP_CHANGE_DATA\020\006\022\031\n\025MT_TOPO_QCOLOR_NO" - "TIFY\020\024", 1726); + "\n\025DataProcMessage.proto\022\007iot_idl\032\014Public" + ".proto\"E\n\rSDpcdaSubInfo\022\020\n\010tab_name\030\001 \002(" + "\t\022\020\n\010tag_name\030\002 \002(\t\022\020\n\010col_name\030\003 \002(\t\"`\n" + "\014SDpcdaSubPkg\022\'\n\007add_sub\030\001 \003(\0132\026.iot_idl" + ".SDpcdaSubInfo\022\'\n\007del_sub\030\002 \003(\0132\026.iot_id" + "l.SDpcdaSubInfo\"\\\n\tSPointMsg\022\020\n\010nDominId" + "\030\001 \002(\005\022\016\n\006nAppId\030\002 \002(\005\022\016\n\006sTable\030\003 \002(\t\022\014" + "\n\004sKey\030\004 \002(\t\022\017\n\007sColumn\030\005 \002(\t\"8\n\020SPointM" + "sgPackage\022$\n\010PointMsg\030\001 \003(\0132\022.iot_idl.SP" + "ointMsg\"9\n\020SRealTimePkgHead\022\021\n\tstrSrcTag" + "\030\001 \002(\t\022\022\n\nnTimeStamp\030\002 \002(\003\"\232\001\n\017SAiRealTi" + "meData\022\021\n\tnLocation\030\001 \002(\005\022\022\n\nnSubSystem\030" + "\002 \002(\005\022\024\n\014strTableName\030\003 \002(\t\022\022\n\nstrTagNam" + "e\030\004 \002(\t\022\025\n\rstrColumnName\030\005 \002(\t\022\016\n\006fValue" + "\030\006 \002(\002\022\017\n\007uStatus\030\007 \002(\r\"\232\001\n\017SPiRealTimeD" + "ata\022\021\n\tnLocation\030\001 \002(\005\022\022\n\nnSubSystem\030\002 \002" + "(\005\022\024\n\014strTableName\030\003 \002(\t\022\022\n\nstrTagName\030\004" + " \002(\t\022\025\n\rstrColumnName\030\005 \002(\t\022\016\n\006dValue\030\006 " + "\002(\001\022\017\n\007uStatus\030\007 \002(\r\"\232\001\n\017SDiRealTimeData" + "\022\021\n\tnLocation\030\001 \002(\005\022\022\n\nnSubSystem\030\002 \002(\005\022" + "\024\n\014strTableName\030\003 \002(\t\022\022\n\nstrTagName\030\004 \002(" + "\t\022\025\n\rstrColumnName\030\005 \002(\t\022\016\n\006nValue\030\006 \002(\005" + "\022\017\n\007uStatus\030\007 \002(\r\"\232\001\n\017SMiRealTimeData\022\021\n" + "\tnLocation\030\001 \002(\005\022\022\n\nnSubSystem\030\002 \002(\005\022\024\n\014" + "strTableName\030\003 \002(\t\022\022\n\nstrTagName\030\004 \002(\t\022\025" + "\n\rstrColumnName\030\005 \002(\t\022\016\n\006nValue\030\006 \002(\005\022\017\n" + "\007uStatus\030\007 \002(\r\"\242\001\n\022STableRealTimeData\022\024\n" + "\014strTableName\030\001 \002(\t\022\022\n\nstrTagName\030\002 \002(\t\022" + "\025\n\rstrColumnName\030\003 \002(\t\022\021\n\tnLocation\030\004 \001(" + "\005\022\022\n\nnSubSystem\030\005 \001(\005\022$\n\010varValue\030\006 \002(\0132" + "\022.iot_idl.SVariable\"\230\002\n\020SRealTimeDataPkg" + "\022)\n\006stHead\030\001 \002(\0132\031.iot_idl.SRealTimePkgH" + "ead\022)\n\007stAiRtd\030\002 \003(\0132\030.iot_idl.SAiRealTi" + "meData\022)\n\007stPiRtd\030\003 \003(\0132\030.iot_idl.SPiRea" + "lTimeData\022)\n\007stDiRtd\030\004 \003(\0132\030.iot_idl.SDi" + "RealTimeData\022)\n\007stMiRtd\030\005 \003(\0132\030.iot_idl." + "SMiRealTimeData\022-\n\010stTblRtd\030\006 \003(\0132\033.iot_" + "idl.STableRealTimeData*\261\001\n\021enDataProcMes" + "sage\022\027\n\023MT_DPCDA_APP2DP_CHG\020\001\022\033\n\027MT_DPCD" + "A_APP2DP_CHG_CNT\020\002\022\027\n\023MT_DPCDA_APP2DP_AL" + "L\020\003\022\033\n\027MT_DPCDA_DP2APP_ALL_REQ\020\004\022\025\n\021MT_D" + "P_CHANGE_DATA\020\006\022\031\n\025MT_TOPO_QCOLOR_NOTIFY" + "\020\024", 1682); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "DataProcMessage.proto", &protobuf_RegisterTypes); SDpcdaSubInfo::default_instance_ = new SDpcdaSubInfo(); diff --git a/platform/src/idl_files/DataProcMessage.pb.h b/platform/src/idl_files/DataProcMessage.pb.h index 4c34cca3..db524080 100644 --- a/platform/src/idl_files/DataProcMessage.pb.h +++ b/platform/src/idl_files/DataProcMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: DataProcMessage.proto #ifndef PROTOBUF_DataProcMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/DbSaveMessage.pb.cc b/platform/src/idl_files/DbSaveMessage.pb.cc index 189057d0..aceb2375 100644 --- a/platform/src/idl_files/DbSaveMessage.pb.cc +++ b/platform/src/idl_files/DbSaveMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: DbSaveMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -306,56 +306,54 @@ void protobuf_AddDesc_DbSaveMessage_2eproto() { ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\023DbSaveMessage.proto\022\013iot_idl\032\014Publ" - "ic.proto\"\264\001\n\013DbCondition\022.\n\007enLogic\030\001 \001(" - "\0162\035.iot_idl.ENConditionLogic\0224\n\nenRe" - "lation\030\002 \002(\0162 .iot_idl.ENConditionRe" - "lation\022\025\n\rstrColumnName\030\003 \002(\t\022(\n\010msgValu" - "e\030\004 \002(\0132\026.iot_idl.SVariable\"\216\001\n\017DbCo" - "nditionHead\022.\n\007enLogic\030\001 \001(\0162\035.kbd_idlfi" - "le.ENConditionLogic\0224\n\nenRelation\030\002 \002(\0162" - " .iot_idl.ENConditionRelation\022\025\n\rstr" - "ColumnName\030\003 \002(\t\"8\n\014DbValueArray\022(\n\010msgV" - "alue\030\001 \003(\0132\026.iot_idl.SVariable\"P\n\rDb" - "UpdateValue\022\025\n\rstrColumnName\030\001 \002(\t\022(\n\010ms" - "gValue\030\002 \002(\0132\026.iot_idl.SVariable\"\231\001\n" - "\010DbInsert\0222\n\014enSaveAction\030\001 \002(\0162\034.kbd_id" - "lfile.enDssSaveAction\022\024\n\014strTableName\030\002 " - "\002(\t\022\025\n\rstrColumnName\030\003 \003(\t\022,\n\tmsgRecord\030" - "\004 \003(\0132\031.iot_idl.DbValueArray\"\210\001\n\010DbR" - "emove\0222\n\014enSaveAction\030\001 \002(\0162\034.kbd_idlfil" - "e.enDssSaveAction\022\024\n\014strTableName\030\002 \002(\t\022" - "2\n\020msgCondtionArray\030\003 \003(\0132\030.iot_idl." - "DbCondition\"\307\001\n\rDbRemoveMulti\0222\n\014enSaveA" - "ction\030\001 \002(\0162\034.iot_idl.enDssSaveActio" - "n\022\024\n\014strTableName\030\002 \002(\t\0226\n\020msgConditionH" - "ead\030\003 \003(\0132\034.iot_idl.DbConditionHead\022" - "4\n\021msgConditionValue\030\004 \003(\0132\031.iot_idl" - ".DbValueArray\"\270\001\n\010DbUpdate\0222\n\014enSaveActi" - "on\030\001 \002(\0162\034.iot_idl.enDssSaveAction\022\024" - "\n\014strTableName\030\002 \002(\t\0222\n\016msgUpdateValue\030\003" - " \003(\0132\032.iot_idl.DbUpdateValue\022.\n\014msgC" - "ondition\030\004 \003(\0132\030.iot_idl.DbCondition" - "\"\373\001\n\rDbUpdateMulti\0222\n\014enSaveAction\030\001 \002(\016" - "2\034.iot_idl.enDssSaveAction\022\024\n\014strTab" - "leName\030\002 \002(\t\0222\n\016msgUpdateValue\030\003 \003(\0132\032.k" - "bd_idlfile.DbUpdateValue\0226\n\020msgCondition" - "Head\030\004 \003(\0132\034.iot_idl.DbConditionHead" - "\0224\n\021msgConditionValue\030\005 \003(\0132\031.kbd_idlfil" - "e.DbValueArray\"\361\001\n\tDbRequest\022(\n\tmsgInser" - "t\030\001 \001(\0132\025.iot_idl.DbInsert\022(\n\tmsgRem" - "ove\030\002 \001(\0132\025.iot_idl.DbRemove\0222\n\016msgR" - "emoveMulti\030\003 \001(\0132\032.iot_idl.DbRemoveM" - "ulti\022(\n\tmsgUpdate\030\004 \001(\0132\025.iot_idl.Db" - "Update\0222\n\016msgUpdateMulti\030\005 \001(\0132\032.kbd_idl" - "file.DbUpdateMulti*\267\001\n\014enDssMsgType\022\031\n\025M" - "T_DSS_APP2SRV_INSERT\020\n\022\031\n\025MT_DSS_APP2SRV" - "_REMOVE\020\024\022\036\n\032MT_DSS_APP2SRV_REMOVEMULTI\020" - "\025\022\031\n\025MT_DSS_APP2SRV_UPDATE\020\036\022\036\n\032MT_DSS_A" - "PP2SRV_UPDATEMULTI\020\037\022\026\n\022MT_DSS_SRV2APP_A" - "CK\020d*p\n\017enDssSaveAction\022\025\n\021SA_DSS_DO_NOT" - "HING\020\000\022\025\n\021SA_DSS_LOCAL_ONLY\020\001\022\026\n\022SA_DSS_" - "REMOTE_ONLY\020\002\022\027\n\023SA_DSS_LOCAL_REMOTE\020\003", 1998); + "\n\023DbSaveMessage.proto\022\007iot_idl\032\014Public.p" + "roto\"\250\001\n\013DbCondition\022*\n\007enLogic\030\001 \001(\0162\031." + "iot_idl.ENConditionLogic\0220\n\nenRelation\030\002" + " \002(\0162\034.iot_idl.ENConditionRelation\022\025\n\rst" + "rColumnName\030\003 \002(\t\022$\n\010msgValue\030\004 \002(\0132\022.io" + "t_idl.SVariable\"\206\001\n\017DbConditionHead\022*\n\007e" + "nLogic\030\001 \001(\0162\031.iot_idl.ENConditionLogic\022" + "0\n\nenRelation\030\002 \002(\0162\034.iot_idl.ENConditio" + "nRelation\022\025\n\rstrColumnName\030\003 \002(\t\"4\n\014DbVa" + "lueArray\022$\n\010msgValue\030\001 \003(\0132\022.iot_idl.SVa" + "riable\"L\n\rDbUpdateValue\022\025\n\rstrColumnName" + "\030\001 \002(\t\022$\n\010msgValue\030\002 \002(\0132\022.iot_idl.SVari" + "able\"\221\001\n\010DbInsert\022.\n\014enSaveAction\030\001 \002(\0162" + "\030.iot_idl.enDssSaveAction\022\024\n\014strTableNam" + "e\030\002 \002(\t\022\025\n\rstrColumnName\030\003 \003(\t\022(\n\tmsgRec" + "ord\030\004 \003(\0132\025.iot_idl.DbValueArray\"\200\001\n\010DbR" + "emove\022.\n\014enSaveAction\030\001 \002(\0162\030.iot_idl.en" + "DssSaveAction\022\024\n\014strTableName\030\002 \002(\t\022.\n\020m" + "sgCondtionArray\030\003 \003(\0132\024.iot_idl.DbCondit" + "ion\"\273\001\n\rDbRemoveMulti\022.\n\014enSaveAction\030\001 " + "\002(\0162\030.iot_idl.enDssSaveAction\022\024\n\014strTabl" + "eName\030\002 \002(\t\0222\n\020msgConditionHead\030\003 \003(\0132\030." + "iot_idl.DbConditionHead\0220\n\021msgConditionV" + "alue\030\004 \003(\0132\025.iot_idl.DbValueArray\"\254\001\n\010Db" + "Update\022.\n\014enSaveAction\030\001 \002(\0162\030.iot_idl.e" + "nDssSaveAction\022\024\n\014strTableName\030\002 \002(\t\022.\n\016" + "msgUpdateValue\030\003 \003(\0132\026.iot_idl.DbUpdateV" + "alue\022*\n\014msgCondition\030\004 \003(\0132\024.iot_idl.DbC" + "ondition\"\353\001\n\rDbUpdateMulti\022.\n\014enSaveActi" + "on\030\001 \002(\0162\030.iot_idl.enDssSaveAction\022\024\n\014st" + "rTableName\030\002 \002(\t\022.\n\016msgUpdateValue\030\003 \003(\013" + "2\026.iot_idl.DbUpdateValue\0222\n\020msgCondition" + "Head\030\004 \003(\0132\030.iot_idl.DbConditionHead\0220\n\021" + "msgConditionValue\030\005 \003(\0132\025.iot_idl.DbValu" + "eArray\"\335\001\n\tDbRequest\022$\n\tmsgInsert\030\001 \001(\0132" + "\021.iot_idl.DbInsert\022$\n\tmsgRemove\030\002 \001(\0132\021." + "iot_idl.DbRemove\022.\n\016msgRemoveMulti\030\003 \001(\013" + "2\026.iot_idl.DbRemoveMulti\022$\n\tmsgUpdate\030\004 " + "\001(\0132\021.iot_idl.DbUpdate\022.\n\016msgUpdateMulti" + "\030\005 \001(\0132\026.iot_idl.DbUpdateMulti*\267\001\n\014enDss" + "MsgType\022\031\n\025MT_DSS_APP2SRV_INSERT\020\n\022\031\n\025MT" + "_DSS_APP2SRV_REMOVE\020\024\022\036\n\032MT_DSS_APP2SRV_" + "REMOVEMULTI\020\025\022\031\n\025MT_DSS_APP2SRV_UPDATE\020\036" + "\022\036\n\032MT_DSS_APP2SRV_UPDATEMULTI\020\037\022\026\n\022MT_D" + "SS_SRV2APP_ACK\020d*p\n\017enDssSaveAction\022\025\n\021S" + "A_DSS_DO_NOTHING\020\000\022\025\n\021SA_DSS_LOCAL_ONLY\020" + "\001\022\026\n\022SA_DSS_REMOTE_ONLY\020\002\022\027\n\023SA_DSS_LOCA" + "L_REMOTE\020\003", 1890); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "DbSaveMessage.proto", &protobuf_RegisterTypes); DbCondition::default_instance_ = new DbCondition(); diff --git a/platform/src/idl_files/DbSaveMessage.pb.h b/platform/src/idl_files/DbSaveMessage.pb.h index 25e26043..ad86a4ec 100644 --- a/platform/src/idl_files/DbSaveMessage.pb.h +++ b/platform/src/idl_files/DbSaveMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: DbSaveMessage.proto #ifndef PROTOBUF_DbSaveMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/FBD.pb.cc b/platform/src/idl_files/FBD.pb.cc index a953a7ad..678564d6 100644 --- a/platform/src/idl_files/FBD.pb.cc +++ b/platform/src/idl_files/FBD.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: FBD.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -131,16 +131,16 @@ void protobuf_AddDesc_FBD_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\tFBD.proto\022\013iot_idl\"]\n\rSFBDDebugDat" - "a\022\025\n\rsInstanceName\030\001 \002(\t\022\025\n\rnOutPortInde" - "x\030\002 \002(\005\022\016\n\006sValue\030\003 \002(\t\022\016\n\006nValid\030\004 \002(\005\"" - ":\n\020SFBDDebugRequest\022\020\n\010nGroupId\030\001 \002(\005\022\024\n" - "\014sDiagramName\030\002 \002(\t\"\202\001\n\021SFBDDebugRespons" - "e\022\020\n\010nGroupId\030\001 \002(\005\022\024\n\014sDiagramName\030\002 \002(" - "\t\022\027\n\017nLastUpdateTime\030\003 \002(\003\022,\n\010vecBlock\030\004" - " \003(\0132\032.iot_idl.SFBDDebugData*>\n\014enFb" - "dMsgType\022\026\n\022MT_FBD_E2S_DBG_REQ\020\001\022\026\n\022MT_F" - "BD_S2E_DBG_REP\020\002", 376); + "\n\tFBD.proto\022\007iot_idl\"]\n\rSFBDDebugData\022\025\n" + "\rsInstanceName\030\001 \002(\t\022\025\n\rnOutPortIndex\030\002 " + "\002(\005\022\016\n\006sValue\030\003 \002(\t\022\016\n\006nValid\030\004 \002(\005\":\n\020S" + "FBDDebugRequest\022\020\n\010nGroupId\030\001 \002(\005\022\024\n\014sDi" + "agramName\030\002 \002(\t\"~\n\021SFBDDebugResponse\022\020\n\010" + "nGroupId\030\001 \002(\005\022\024\n\014sDiagramName\030\002 \002(\t\022\027\n\017" + "nLastUpdateTime\030\003 \002(\003\022(\n\010vecBlock\030\004 \003(\0132" + "\026.iot_idl.SFBDDebugData*>\n\014enFbdMsgType\022" + "\026\n\022MT_FBD_E2S_DBG_REQ\020\001\022\026\n\022MT_FBD_S2E_DB" + "G_REP\020\002", 367); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "FBD.proto", &protobuf_RegisterTypes); SFBDDebugData::default_instance_ = new SFBDDebugData(); diff --git a/platform/src/idl_files/FBD.pb.h b/platform/src/idl_files/FBD.pb.h index fa578514..d145f80f 100644 --- a/platform/src/idl_files/FBD.pb.h +++ b/platform/src/idl_files/FBD.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: FBD.proto #ifndef PROTOBUF_FBD_2eproto__INCLUDED diff --git a/platform/src/idl_files/FesMessage.pb.cc b/platform/src/idl_files/FesMessage.pb.cc index 7e0c6863..62b18a01 100644 --- a/platform/src/idl_files/FesMessage.pb.cc +++ b/platform/src/idl_files/FesMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: FesMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -80,6 +80,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* SFesMoRequestPkg_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* SFesMoRequestPkg_reflection_ = NULL; +const ::google::protobuf::Descriptor* SFesCtrlRequestSeq_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + SFesCtrlRequestSeq_reflection_ = NULL; const ::google::protobuf::Descriptor* SFesCtrlReplyPkg_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* SFesCtrlReplyPkg_reflection_ = NULL; @@ -165,6 +168,7 @@ const ::google::protobuf::Descriptor* SFesChangeVirtualDataPkg_descriptor_ = NUL const ::google::protobuf::internal::GeneratedMessageReflection* SFesChangeVirtualDataPkg_reflection_ = NULL; const ::google::protobuf::EnumDescriptor* enFesMsgType_descriptor_ = NULL; +const ::google::protobuf::EnumDescriptor* enFesCtrlReplyType_descriptor_ = NULL; } // namespace @@ -345,7 +349,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithTm, strappcolumnname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithTm, strapptagname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithTm, ustatus_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithTm, nvalue_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithTm, dvalue_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithTm, ultime_), }; SFesPiDataWithTm_reflection_ = @@ -365,7 +369,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithoutTm, strappcolumnname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithoutTm, strapptagname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithoutTm, ustatus_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithoutTm, nvalue_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiDataWithoutTm, dvalue_), }; SFesPiDataWithoutTm_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -484,7 +488,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesUpdateMiPkg)); SFesDoRequestPkg_descriptor_ = file->message_type(17); - static const int SFesDoRequestPkg_offsets_[12] = { + static const int SFesDoRequestPkg_offsets_[13] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDoRequestPkg, strsourcetag_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDoRequestPkg, strapptablename_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDoRequestPkg, strappcolumnname_), @@ -497,6 +501,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDoRequestPkg, lpara2_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDoRequestPkg, fpara_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDoRequestPkg, strpara_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDoRequestPkg, nctrltype_), }; SFesDoRequestPkg_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -563,7 +568,24 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesMoRequestPkg)); - SFesCtrlReplyPkg_descriptor_ = file->message_type(20); + SFesCtrlRequestSeq_descriptor_ = file->message_type(20); + static const int SFesCtrlRequestSeq_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCtrlRequestSeq, do_seq_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCtrlRequestSeq, ao_seq_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCtrlRequestSeq, mo_seq_), + }; + SFesCtrlRequestSeq_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + SFesCtrlRequestSeq_descriptor_, + SFesCtrlRequestSeq::default_instance_, + SFesCtrlRequestSeq_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCtrlRequestSeq, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCtrlRequestSeq, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(SFesCtrlRequestSeq)); + SFesCtrlReplyPkg_descriptor_ = file->message_type(21); static const int SFesCtrlReplyPkg_offsets_[9] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCtrlReplyPkg, strsourcetag_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCtrlReplyPkg, strapptablename_), @@ -586,7 +608,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesCtrlReplyPkg)); - SFesCustCmdQueue_descriptor_ = file->message_type(21); + SFesCustCmdQueue_descriptor_ = file->message_type(22); static const int SFesCustCmdQueue_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCustCmdQueue, strkeyname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCustCmdQueue, strkeyvalue_), @@ -602,7 +624,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesCustCmdQueue)); - SFesCustCmdRequestPkg_descriptor_ = file->message_type(22); + SFesCustCmdRequestPkg_descriptor_ = file->message_type(23); static const int SFesCustCmdRequestPkg_offsets_[8] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCustCmdRequestPkg, strsourcetag_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCustCmdRequestPkg, strapptablename_), @@ -624,7 +646,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesCustCmdRequestPkg)); - SFesCustCmdReplyPkg_descriptor_ = file->message_type(23); + SFesCustCmdReplyPkg_descriptor_ = file->message_type(24); static const int SFesCustCmdReplyPkg_offsets_[11] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCustCmdReplyPkg, strsourcetag_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesCustCmdReplyPkg, strapptablename_), @@ -649,7 +671,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesCustCmdReplyPkg)); - SConstSetQueue_descriptor_ = file->message_type(24); + SConstSetQueue_descriptor_ = file->message_type(25); static const int SConstSetQueue_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SConstSetQueue, strtagname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SConstSetQueue, nconstid_), @@ -666,7 +688,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SConstSetQueue)); - SFesConstSetRequestPkg_descriptor_ = file->message_type(25); + SFesConstSetRequestPkg_descriptor_ = file->message_type(26); static const int SFesConstSetRequestPkg_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesConstSetRequestPkg, nrtuno_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesConstSetRequestPkg, ndevid_), @@ -684,7 +706,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesConstSetRequestPkg)); - SFesConstReadReplyPkg_descriptor_ = file->message_type(26); + SFesConstReadReplyPkg_descriptor_ = file->message_type(27); static const int SFesConstReadReplyPkg_offsets_[5] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesConstReadReplyPkg, nrtuno_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesConstReadReplyPkg, ndevid_), @@ -703,7 +725,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesConstReadReplyPkg)); - SFesChanStatusInfo_descriptor_ = file->message_type(27); + SFesChanStatusInfo_descriptor_ = file->message_type(28); static const int SFesChanStatusInfo_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanStatusInfo, nchanno_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanStatusInfo, ustatus_), @@ -721,7 +743,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesChanStatusInfo)); - SFesChanStatusPkg_descriptor_ = file->message_type(28); + SFesChanStatusPkg_descriptor_ = file->message_type(29); static const int SFesChanStatusPkg_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanStatusPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanStatusPkg, stchanstatus_), @@ -737,7 +759,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesChanStatusPkg)); - SFesRTUStatusInfo_descriptor_ = file->message_type(29); + SFesRTUStatusInfo_descriptor_ = file->message_type(30); static const int SFesRTUStatusInfo_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUStatusInfo, nrtuno_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUStatusInfo, ustatus_), @@ -754,7 +776,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesRTUStatusInfo)); - SFesRTUStatusPkg_descriptor_ = file->message_type(30); + SFesRTUStatusPkg_descriptor_ = file->message_type(31); static const int SFesRTUStatusPkg_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUStatusPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUStatusPkg, strtustatus_), @@ -770,7 +792,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesRTUStatusPkg)); - SFesSoeEventInfo_descriptor_ = file->message_type(31); + SFesSoeEventInfo_descriptor_ = file->message_type(32); static const int SFesSoeEventInfo_offsets_[7] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesSoeEventInfo, strapptablename_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesSoeEventInfo, strappcolumnname_), @@ -791,7 +813,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesSoeEventInfo)); - SFesChanEventInfo_descriptor_ = file->message_type(32); + SFesChanEventInfo_descriptor_ = file->message_type(33); static const int SFesChanEventInfo_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanEventInfo, strchantag_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanEventInfo, ustatus_), @@ -809,7 +831,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesChanEventInfo)); - SFesRTUEventInfo_descriptor_ = file->message_type(33); + SFesRTUEventInfo_descriptor_ = file->message_type(34); static const int SFesRTUEventInfo_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUEventInfo, strrtutag_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUEventInfo, ustatus_), @@ -827,7 +849,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesRTUEventInfo)); - SFesSoeEventPkg_descriptor_ = file->message_type(34); + SFesSoeEventPkg_descriptor_ = file->message_type(35); static const int SFesSoeEventPkg_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesSoeEventPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesSoeEventPkg, stsoeevent_), @@ -843,7 +865,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesSoeEventPkg)); - SFesChanEventPkg_descriptor_ = file->message_type(35); + SFesChanEventPkg_descriptor_ = file->message_type(36); static const int SFesChanEventPkg_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanEventPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChanEventPkg, stchanevent_), @@ -859,7 +881,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesChanEventPkg)); - SFesRTUEventPkg_descriptor_ = file->message_type(36); + SFesRTUEventPkg_descriptor_ = file->message_type(37); static const int SFesRTUEventPkg_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUEventPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesRTUEventPkg, strtuevent_), @@ -875,7 +897,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesRTUEventPkg)); - SFesAiValue_descriptor_ = file->message_type(37); + SFesAiValue_descriptor_ = file->message_type(38); static const int SFesAiValue_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesAiValue, npointno_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesAiValue, fvalue_), @@ -893,7 +915,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesAiValue)); - SFesDiValue_descriptor_ = file->message_type(38); + SFesDiValue_descriptor_ = file->message_type(39); static const int SFesDiValue_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDiValue, npointno_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDiValue, nvalue_), @@ -911,10 +933,10 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesDiValue)); - SFesPiValue_descriptor_ = file->message_type(39); + SFesPiValue_descriptor_ = file->message_type(40); static const int SFesPiValue_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiValue, npointno_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiValue, nvalue_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiValue, dvalue_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiValue, ustatus_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiValue, ultime_), }; @@ -929,7 +951,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesPiValue)); - SFesMiValue_descriptor_ = file->message_type(40); + SFesMiValue_descriptor_ = file->message_type(41); static const int SFesMiValue_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesMiValue, npointno_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesMiValue, nvalue_), @@ -947,7 +969,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesMiValue)); - SFesValueReqPkg_descriptor_ = file->message_type(41); + SFesValueReqPkg_descriptor_ = file->message_type(42); static const int SFesValueReqPkg_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesValueReqPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesValueReqPkg, nrtuno_), @@ -963,7 +985,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesValueReqPkg)); - SFesAiValueRespPkg_descriptor_ = file->message_type(42); + SFesAiValueRespPkg_descriptor_ = file->message_type(43); static const int SFesAiValueRespPkg_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesAiValueRespPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesAiValueRespPkg, nrtuno_), @@ -980,7 +1002,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesAiValueRespPkg)); - SFesDiValueRespPkg_descriptor_ = file->message_type(43); + SFesDiValueRespPkg_descriptor_ = file->message_type(44); static const int SFesDiValueRespPkg_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDiValueRespPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesDiValueRespPkg, nrtuno_), @@ -997,7 +1019,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesDiValueRespPkg)); - SFesPiValueRespPkg_descriptor_ = file->message_type(44); + SFesPiValueRespPkg_descriptor_ = file->message_type(45); static const int SFesPiValueRespPkg_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiValueRespPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesPiValueRespPkg, nrtuno_), @@ -1014,7 +1036,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesPiValueRespPkg)); - SFesMiValueRespPkg_descriptor_ = file->message_type(45); + SFesMiValueRespPkg_descriptor_ = file->message_type(46); static const int SFesMiValueRespPkg_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesMiValueRespPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesMiValueRespPkg, nrtuno_), @@ -1031,7 +1053,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesMiValueRespPkg)); - SFesVirtualData_descriptor_ = file->message_type(46); + SFesVirtualData_descriptor_ = file->message_type(47); static const int SFesVirtualData_offsets_[6] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesVirtualData, strrtutag_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesVirtualData, strpointtag_), @@ -1051,7 +1073,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesVirtualData)); - SFesChangeVirtualDataPkg_descriptor_ = file->message_type(47); + SFesChangeVirtualDataPkg_descriptor_ = file->message_type(48); static const int SFesChangeVirtualDataPkg_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChangeVirtualDataPkg, sthead_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SFesChangeVirtualDataPkg, stdata_), @@ -1068,6 +1090,7 @@ void protobuf_AssignDesc_FesMessage_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(SFesChangeVirtualDataPkg)); enFesMsgType_descriptor_ = file->enum_type(0); + enFesCtrlReplyType_descriptor_ = file->enum_type(1); } namespace { @@ -1120,6 +1143,8 @@ void protobuf_RegisterTypes(const ::std::string&) { SFesAoRequestPkg_descriptor_, &SFesAoRequestPkg::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( SFesMoRequestPkg_descriptor_, &SFesMoRequestPkg::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + SFesCtrlRequestSeq_descriptor_, &SFesCtrlRequestSeq::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( SFesCtrlReplyPkg_descriptor_, &SFesCtrlReplyPkg::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( @@ -1221,6 +1246,8 @@ void protobuf_ShutdownFile_FesMessage_2eproto() { delete SFesAoRequestPkg_reflection_; delete SFesMoRequestPkg::default_instance_; delete SFesMoRequestPkg_reflection_; + delete SFesCtrlRequestSeq::default_instance_; + delete SFesCtrlRequestSeq_reflection_; delete SFesCtrlReplyPkg::default_instance_; delete SFesCtrlReplyPkg_reflection_; delete SFesCustCmdQueue::default_instance_; @@ -1286,203 +1313,207 @@ void protobuf_AddDesc_FesMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\020FesMessage.proto\022\013iot_idl\"\212\001\n\017SFes" - "RealPkgHead\022\024\n\014strFesSource\030\001 \002(\t\022\024\n\014nPa" - "ckageType\030\002 \002(\005\022\020\n\010nDataNum\030\003 \002(\005\022\023\n\013ulM" - "essageID\030\004 \002(\004\022\021\n\tnResPara1\030\005 \001(\005\022\021\n\tnRe" - "sPara2\030\006 \001(\005\"\215\001\n\020SFesAiDataWithTm\022\027\n\017str" - "AppTableName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002" - " \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004" - " \002(\r\022\016\n\006fValue\030\005 \002(\002\022\016\n\006ulTime\030\006 \002(\004\"\200\001\n" - "\023SFesAiDataWithoutTm\022\027\n\017strAppTableName\030" - "\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n\rstrAp" - "pTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n\006fValu" - "e\030\005 \002(\002\"p\n\017SFesChangeAiPkg\022,\n\006stHead\030\001 \002" - "(\0132\034.iot_idl.SFesRealPkgHead\022/\n\010stAi" - "Data\030\002 \003(\0132\035.iot_idl.SFesAiDataWithT" - "m\"\203\001\n\017SFesUpdateAiPkg\022,\n\006stHead\030\001 \002(\0132\034." - "iot_idl.SFesRealPkgHead\0222\n\010stAiData\030" - "\002 \003(\0132 .iot_idl.SFesAiDataWithoutTm\022" - "\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020SFesDiDataWithTm\022\027\n\017" - "strAppTableName\030\001 \002(\t\022\030\n\020strAppColumnNam" - "e\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatu" - "s\030\004 \002(\r\022\016\n\006nValue\030\005 \002(\005\022\016\n\006ulTime\030\006 \002(\004\"" - "\200\001\n\023SFesDiDataWithoutTm\022\027\n\017strAppTableNa" - "me\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n\rst" - "rAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n\006nV" - "alue\030\005 \002(\005\"p\n\017SFesChangeDiPkg\022,\n\006stHead\030" - "\001 \002(\0132\034.iot_idl.SFesRealPkgHead\022/\n\010s" - "tDiData\030\002 \003(\0132\035.iot_idl.SFesDiDataWi" - "thTm\"\203\001\n\017SFesUpdateDiPkg\022,\n\006stHead\030\001 \002(\013" - "2\034.iot_idl.SFesRealPkgHead\0222\n\010stDiDa" - "ta\030\002 \003(\0132 .iot_idl.SFesDiDataWithout" - "Tm\022\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020SFesPiDataWithTm\022" - "\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppColumn" - "Name\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uSt" - "atus\030\004 \002(\r\022\016\n\006nValue\030\005 \002(\003\022\016\n\006ulTime\030\006 \002" - "(\004\"\200\001\n\023SFesPiDataWithoutTm\022\027\n\017strAppTabl" - "eName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n" - "\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n" - "\006nValue\030\005 \002(\003\"p\n\017SFesChangePiPkg\022,\n\006stHe" - "ad\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\022/" - "\n\010stPiData\030\002 \003(\0132\035.iot_idl.SFesPiDat" - "aWithTm\"\203\001\n\017SFesUpdatePiPkg\022,\n\006stHead\030\001 " - "\002(\0132\034.iot_idl.SFesRealPkgHead\0222\n\010stP" - "iData\030\002 \003(\0132 .iot_idl.SFesPiDataWith" - "outTm\022\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020SFesMiDataWith" - "Tm\022\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppCol" - "umnName\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007" - "uStatus\030\004 \002(\r\022\016\n\006nValue\030\005 \002(\005\022\016\n\006ulTime\030" - "\006 \002(\004\"\200\001\n\023SFesMiDataWithoutTm\022\027\n\017strAppT" + "\n\020FesMessage.proto\022\007iot_idl\"\212\001\n\017SFesReal" + "PkgHead\022\024\n\014strFesSource\030\001 \002(\t\022\024\n\014nPackag" + "eType\030\002 \002(\005\022\020\n\010nDataNum\030\003 \002(\005\022\023\n\013ulMessa" + "geID\030\004 \002(\004\022\021\n\tnResPara1\030\005 \001(\005\022\021\n\tnResPar" + "a2\030\006 \001(\005\"\215\001\n\020SFesAiDataWithTm\022\027\n\017strAppT" "ableName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t" "\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r" - "\022\016\n\006nValue\030\005 \002(\005\"p\n\017SFesChangeMiPkg\022,\n\006s" - "tHead\030\001 \002(\0132\034.iot_idl.SFesRealPkgHea" - "d\022/\n\010stMiData\030\002 \003(\0132\035.iot_idl.SFesMi" - "DataWithTm\"\203\001\n\017SFesUpdateMiPkg\022,\n\006stHead" - "\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\0222\n\010" - "stMiData\030\002 \003(\0132 .iot_idl.SFesMiDataW" - "ithoutTm\022\016\n\006ulTime\030\003 \002(\004\"\375\001\n\020SFesDoReque" - "stPkg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n\017strAppTab" - "leName\030\002 \002(\t\022\030\n\020strAppColumnName\030\003 \002(\t\022\025" - "\n\rstrAppTagName\030\004 \002(\t\022\022\n\nstrRtuName\030\005 \002(" - "\t\022\016\n\006nOrder\030\006 \002(\005\022\017\n\007nAction\030\007 \002(\005\022\024\n\014nI" - "fTagtState\030\t \002(\005\022\016\n\006lPara1\030\n \001(\003\022\016\n\006lPar" - "a2\030\013 \001(\003\022\r\n\005fPara\030\014 \001(\002\022\017\n\007strPara\030\r \001(\t" - "\"\217\002\n\020SFesAoRequestPkg\022\024\n\014strSourceTag\030\001 " - "\002(\t\022\027\n\017strAppTableName\030\002 \002(\t\022\030\n\020strAppCo" - "lumnName\030\003 \002(\t\022\025\n\rstrAppTagName\030\004 \002(\t\022\022\n" - "\nstrRtuName\030\005 \002(\t\022\016\n\006nOrder\030\006 \002(\005\022\016\n\006fVa" - "lue\030\007 \002(\002\022\021\n\tnCtrlType\030\010 \002(\005\022\024\n\014nIfTagtS" - "tate\030\t \002(\005\022\016\n\006lPara1\030\n \001(\003\022\016\n\006lPara2\030\013 \001" - "(\003\022\r\n\005fPara\030\014 \001(\002\022\017\n\007strPara\030\r \001(\t\"\217\002\n\020S" - "FesMoRequestPkg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n" - "\017strAppTableName\030\002 \002(\t\022\030\n\020strAppColumnNa" - "me\030\003 \002(\t\022\025\n\rstrAppTagName\030\004 \002(\t\022\022\n\nstrRt" - "uName\030\005 \002(\t\022\016\n\006nOrder\030\006 \002(\005\022\016\n\006nValue\030\007 " - "\002(\005\022\021\n\tnCtrlType\030\010 \002(\005\022\024\n\014nIfTagtState\030\t" - " \002(\005\022\016\n\006lPara1\030\n \001(\003\022\016\n\006lPara2\030\013 \001(\003\022\r\n\005" - "fPara\030\014 \001(\002\022\017\n\007strPara\030\r \001(\t\"\303\001\n\020SFesCtr" - "lReplyPkg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n\017strAp" - "pTableName\030\002 \002(\t\022\030\n\020strAppColumnName\030\003 \002" - "(\t\022\025\n\rstrAppTagName\030\004 \002(\t\022\017\n\007nResult\030\005 \002" - "(\005\022\016\n\006lPara1\030\n \001(\003\022\016\n\006lPara2\030\013 \001(\003\022\r\n\005fP" - "ara\030\014 \001(\002\022\017\n\007strPara\030\r \001(\t\";\n\020SFesCustCm" - "dQueue\022\022\n\nstrKeyName\030\001 \002(\t\022\023\n\013strKeyValu" - "e\030\002 \002(\t\"\344\001\n\025SFesCustCmdRequestPkg\022\024\n\014str" - "SourceTag\030\001 \002(\t\022\027\n\017strAppTableName\030\002 \002(\t" - "\022\025\n\rstrAppTagName\030\003 \002(\t\022\030\n\020strAppColumnN" - "ame\030\004 \002(\t\022\022\n\nstrRtuName\030\005 \002(\t\022\016\n\006nDevId\030" - "\006 \001(\005\022\020\n\010nDataLen\030\007 \001(\005\0225\n\016seqCustCmdDat" - "a\030\010 \003(\0132\035.iot_idl.SFesCustCmdQueue\"\232" - "\002\n\023SFesCustCmdReplyPkg\022\024\n\014strSourceTag\030\001" - " \002(\t\022\027\n\017strAppTableName\030\002 \002(\t\022\025\n\rstrAppT" - "agName\030\004 \002(\t\022\030\n\020strAppColumnName\030\003 \002(\t\022\022" - "\n\nstrRtuName\030\005 \002(\t\022\016\n\006nDevId\030\006 \001(\005\022\017\n\007nS" - "tatus\030\007 \001(\005\022\020\n\010nDataLen\030\010 \001(\005\0225\n\016seqCust" - "CmdData\030\t \003(\0132\035.iot_idl.SFesCustCmdQ" - "ueue\022\017\n\007nResult\030\n \002(\005\022\024\n\014strRetResult\030\013 " - "\001(\t\"F\n\016SConstSetQueue\022\022\n\nstrTagName\030\001 \002(" - "\t\022\020\n\010nConstID\030\002 \002(\005\022\016\n\006nValue\030\003 \002(\005\"u\n\026S" - "FesConstSetRequestPkg\022\016\n\006nRtuNo\030\001 \002(\005\022\016\n" - "\006nDevId\030\002 \002(\005\022\014\n\004nNum\030\003 \002(\005\022-\n\010seqValue\030" - "\004 \003(\0132\033.iot_idl.SConstSetQueue\"\220\001\n\025S" - "FesConstReadReplyPkg\022\016\n\006nRtuNo\030\001 \002(\005\022\016\n\006" - "nDevId\030\002 \002(\005\022\022\n\nnRetStatus\030\003 \002(\005\022-\n\010seqV" - "alue\030\004 \003(\0132\033.iot_idl.SConstSetQueue\022" - "\024\n\014strRetResult\030\005 \001(\t\"X\n\022SFesChanStatusI" - "nfo\022\017\n\007nChanNo\030\001 \002(\005\022\017\n\007uStatus\030\002 \002(\r\022\020\n" - "\010fErrRate\030\003 \002(\002\022\016\n\006ulTime\030\004 \002(\004\"x\n\021SFesC" - "hanStatusPkg\022,\n\006stHead\030\001 \002(\0132\034.kbd_idlfi" - "le.SFesRealPkgHead\0225\n\014stChanStatus\030\002 \003(\013" - "2\037.iot_idl.SFesChanStatusInfo\"D\n\021SFe" - "sRTUStatusInfo\022\016\n\006nRtuNo\030\001 \002(\005\022\017\n\007uStatu" - "s\030\002 \002(\r\022\016\n\006ulTime\030\003 \002(\004\"u\n\020SFesRTUStatus" - "Pkg\022,\n\006stHead\030\001 \002(\0132\034.iot_idl.SFesRe" - "alPkgHead\0223\n\013stRtuStatus\030\002 \003(\0132\036.kbd_idl" - "file.SFesRTUStatusInfo\"\243\001\n\020SFesSoeEventI" - "nfo\022\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppCo" - "lumnName\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n" - "\007uStatus\030\004 \002(\r\022\016\n\006nValue\030\005 \002(\005\022\016\n\006ulTime" - "\030\006 \002(\004\022\024\n\014strFaultDesc\030\007 \001(\t\"Z\n\021SFesChan" - "EventInfo\022\022\n\nstrChanTag\030\001 \002(\t\022\017\n\007uStatus" - "\030\002 \002(\r\022\020\n\010fErrRate\030\003 \002(\002\022\016\n\006ulTime\030\004 \002(\004" - "\"Z\n\020SFesRTUEventInfo\022\021\n\tstrRtuTag\030\001 \002(\t\022" - "\017\n\007uStatus\030\002 \002(\r\022\022\n\nnCurChanNo\030\003 \002(\005\022\016\n\006" - "ulTime\030\004 \002(\004\"r\n\017SFesSoeEventPkg\022,\n\006stHea" - "d\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\0221\n" - "\nstSoeEvent\030\002 \003(\0132\035.iot_idl.SFesSoeE" - "ventInfo\"u\n\020SFesChanEventPkg\022,\n\006stHead\030\001" - " \002(\0132\034.iot_idl.SFesRealPkgHead\0223\n\013st" - "ChanEvent\030\002 \003(\0132\036.iot_idl.SFesChanEv" - "entInfo\"r\n\017SFesRTUEventPkg\022,\n\006stHead\030\001 \002" - "(\0132\034.iot_idl.SFesRealPkgHead\0221\n\nstRt" - "uEvent\030\002 \003(\0132\035.iot_idl.SFesRTUEventI" - "nfo\"P\n\013SFesAiValue\022\020\n\010nPointNo\030\001 \002(\005\022\016\n\006" - "fValue\030\002 \002(\002\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006ulTime\030" - "\004 \002(\004\"P\n\013SFesDiValue\022\020\n\010nPointNo\030\001 \002(\005\022\016" - "\n\006nValue\030\002 \002(\005\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006ulTim" - "e\030\004 \002(\004\"P\n\013SFesPiValue\022\020\n\010nPointNo\030\001 \002(\005" - "\022\016\n\006nValue\030\002 \002(\003\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006ulT" - "ime\030\004 \002(\004\"P\n\013SFesMiValue\022\020\n\010nPointNo\030\001 \002" - "(\005\022\016\n\006nValue\030\002 \002(\005\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006u" - "lTime\030\004 \002(\004\"O\n\017SFesValueReqPkg\022,\n\006stHead" - "\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead\022\016\n\006" - "nRtuNo\030\002 \002(\005\"\177\n\022SFesAiValueRespPkg\022,\n\006st" - "Head\030\001 \002(\0132\034.iot_idl.SFesRealPkgHead" - "\022\016\n\006nRtuNo\030\002 \002(\005\022+\n\tstAiValue\030\003 \003(\0132\030.kb" - "d_idlfile.SFesAiValue\"\177\n\022SFesDiValueResp" - "Pkg\022,\n\006stHead\030\001 \002(\0132\034.iot_idl.SFesRe" - "alPkgHead\022\016\n\006nRtuNo\030\002 \002(\005\022+\n\tstDiValue\030\003" - " \003(\0132\030.iot_idl.SFesDiValue\"\177\n\022SFesPi" - "ValueRespPkg\022,\n\006stHead\030\001 \002(\0132\034.kbd_idlfi" - "le.SFesRealPkgHead\022\016\n\006nRtuNo\030\002 \002(\005\022+\n\tst" - "PiValue\030\003 \003(\0132\030.iot_idl.SFesPiValue\"" - "\177\n\022SFesMiValueRespPkg\022,\n\006stHead\030\001 \002(\0132\034." - "iot_idl.SFesRealPkgHead\022\016\n\006nRtuNo\030\002 " - "\002(\005\022+\n\tstMiValue\030\003 \003(\0132\030.iot_idl.SFe" - "sMiValue\"}\n\017SFesVirtualData\022\021\n\tstrRtuTag" - "\030\001 \002(\t\022\023\n\013strPointTag\030\002 \002(\t\022\022\n\nnPointTyp" - "e\030\003 \002(\005\022\016\n\006nOrder\030\004 \002(\005\022\016\n\006fValue\030\005 \002(\002\022" - "\016\n\006ulTime\030\006 \002(\004\"v\n\030SFesChangeVirtualData" - "Pkg\022,\n\006stHead\030\001 \002(\0132\034.iot_idl.SFesRe" - "alPkgHead\022,\n\006stData\030\002 \003(\0132\034.iot_idl." - "SFesVirtualData*\350\n\n\014enFesMsgType\022\024\n\020MT_F" - "ES_DI_CHANGE\020\001\022\024\n\020MT_FES_DI_UPDATE\020\002\022\021\n\r" - "MT_FES_DI_SOE\020\003\022\024\n\020MT_FES_AI_CHANGE\020\004\022\024\n" - "\020MT_FES_AI_UPDATE\020\005\022\024\n\020MT_FES_MI_CHANGE\020" - "\006\022\024\n\020MT_FES_MI_UPDATE\020\007\022\024\n\020MT_FES_PI_CHA" - "NGE\020\010\022\024\n\020MT_FES_PI_UPDATE\020\t\022\027\n\023MT_FES_DA" - "TA_REQUEST\020\n\022\033\n\027MT_FES_RTU_DATA_REQUEST\020" - "\024\022\030\n\024MT_FES_RTU_DI_UPDATE\020\025\022\030\n\024MT_FES_RT" - "U_AI_UPDATE\020\026\022\030\n\024MT_FES_RTU_MI_UPDATE\020\027\022" - "\031\n\025MT_FES_RTU_ACC_UPDATE\020\030\022\032\n\026MT_FES_RTU" - "_WAVE_UPDATE\020\031\022\"\n\036MT_FES_RTU_WAVE_RESEND" - "_REQUEST\020\032\022\031\n\025MT_FES_RTU_DDI_UPDATE\020\033\022\024\n" - "\020MT_FES_DO_SELECT\020\036\022\025\n\021MT_FES_DO_EXECUTE" - "\020\037\022\024\n\020MT_FES_DO_CANCEL\020 \022\025\n\021MT_FES_DO_PR" - "EVENT\020!\022\032\n\026MT_FES_DO_SELECT_REPLY\020#\022\033\n\027M" - "T_FES_DO_EXECUTE_REPLY\020$\022\032\n\026MT_FES_DO_CA" - "NCEL_REPLY\020%\022\033\n\027MT_FES_DO_PREVENT_REPLY\020" - "&\022\027\n\023MT_FES_DO_DIRECTEXE\020\'\022\025\n\021MT_FES_DO_" - "AUTOEXE\020(\022\025\n\021MT_FES_AO_EXECUTE\020-\022\033\n\027MT_F" - "ES_AO_EXECUTE_REPLY\020.\022\024\n\020MT_FES_MO_SELEC" - "T\0202\022\025\n\021MT_FES_MO_EXECUTE\0203\022\024\n\020MT_FES_MO_" - "CANCEL\0204\022\025\n\021MT_FES_MO_PREVENT\0205\022\032\n\026MT_FE" - "S_MO_SELECT_REPLY\0207\022\033\n\027MT_FES_MO_EXECUTE" - "_REPLY\0208\022\032\n\026MT_FES_MO_CANCEL_REPLY\0209\022\033\n\027" - "MT_FES_MO_PREVENT_REPLY\020:\022\027\n\023MT_FES_SETT" - "ING_READ\020<\022\027\n\023MT_FES_SETTING_DOWN\020=\022\026\n\022M" - "T_FES_SETTING_ACK\020>\022\035\n\031MT_FES_SETTING_RE" - "AD_REPLY\020\?\022\035\n\031MT_FES_SETTING_DOWN_REPLY\020" - "@\022\034\n\030MT_FES_SETTING_ACK_REPLY\020A\022\025\n\021MT_FE" - "S_DEFINE_CMD\020B\022\034\n\030MT_FES_DEFINE_CMD_REPL" - "AY\020C\022\027\n\023MT_FES_VIRTUAL_CTRL\020D\022\026\n\022MT_FES_" - "CHAN_UPDATE\020F\022\025\n\021MT_FES_RTU_UPDATE\020G\022\024\n\020" - "MT_FES_SOE_EVENT\020H\022\024\n\020MT_FES_RTU_EVENT\020I" - "\022\025\n\021MT_FES_CHAN_EVENT\020J\022\030\n\024MT_FES_CONFIG" - "_UPDATE\020K\022\037\n\033MT_FES_CONFIG_UPDATE_REPLAY" - "\020L", 7842); + "\022\016\n\006fValue\030\005 \002(\002\022\016\n\006ulTime\030\006 \002(\004\"\200\001\n\023SFe" + "sAiDataWithoutTm\022\027\n\017strAppTableName\030\001 \002(" + "\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n\rstrAppTag" + "Name\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n\006fValue\030\005 " + "\002(\002\"h\n\017SFesChangeAiPkg\022(\n\006stHead\030\001 \002(\0132\030" + ".iot_idl.SFesRealPkgHead\022+\n\010stAiData\030\002 \003" + "(\0132\031.iot_idl.SFesAiDataWithTm\"{\n\017SFesUpd" + "ateAiPkg\022(\n\006stHead\030\001 \002(\0132\030.iot_idl.SFesR" + "ealPkgHead\022.\n\010stAiData\030\002 \003(\0132\034.iot_idl.S" + "FesAiDataWithoutTm\022\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020S" + "FesDiDataWithTm\022\027\n\017strAppTableName\030\001 \002(\t" + "\022\030\n\020strAppColumnName\030\002 \002(\t\022\025\n\rstrAppTagN" + "ame\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n\006nValue\030\005 \002" + "(\005\022\016\n\006ulTime\030\006 \002(\004\"\200\001\n\023SFesDiDataWithout" + "Tm\022\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppCol" + "umnName\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007" + "uStatus\030\004 \002(\r\022\016\n\006nValue\030\005 \002(\005\"h\n\017SFesCha" + "ngeDiPkg\022(\n\006stHead\030\001 \002(\0132\030.iot_idl.SFesR" + "ealPkgHead\022+\n\010stDiData\030\002 \003(\0132\031.iot_idl.S" + "FesDiDataWithTm\"{\n\017SFesUpdateDiPkg\022(\n\006st" + "Head\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022.\n\010" + "stDiData\030\002 \003(\0132\034.iot_idl.SFesDiDataWitho" + "utTm\022\016\n\006ulTime\030\003 \002(\004\"\215\001\n\020SFesPiDataWithT" + "m\022\027\n\017strAppTableName\030\001 \002(\t\022\030\n\020strAppColu" + "mnName\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007u" + "Status\030\004 \002(\r\022\016\n\006dValue\030\005 \002(\001\022\016\n\006ulTime\030\006" + " \002(\004\"\200\001\n\023SFesPiDataWithoutTm\022\027\n\017strAppTa" + "bleName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022" + "\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022" + "\016\n\006dValue\030\005 \002(\001\"h\n\017SFesChangePiPkg\022(\n\006st" + "Head\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022+\n\010" + "stPiData\030\002 \003(\0132\031.iot_idl.SFesPiDataWithT" + "m\"{\n\017SFesUpdatePiPkg\022(\n\006stHead\030\001 \002(\0132\030.i" + "ot_idl.SFesRealPkgHead\022.\n\010stPiData\030\002 \003(\013" + "2\034.iot_idl.SFesPiDataWithoutTm\022\016\n\006ulTime" + "\030\003 \002(\004\"\215\001\n\020SFesMiDataWithTm\022\027\n\017strAppTab" + "leName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(\t\022\025" + "\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016" + "\n\006nValue\030\005 \002(\005\022\016\n\006ulTime\030\006 \002(\004\"\200\001\n\023SFesM" + "iDataWithoutTm\022\027\n\017strAppTableName\030\001 \002(\t\022" + "\030\n\020strAppColumnName\030\002 \002(\t\022\025\n\rstrAppTagNa" + "me\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(\r\022\016\n\006nValue\030\005 \002(" + "\005\"h\n\017SFesChangeMiPkg\022(\n\006stHead\030\001 \002(\0132\030.i" + "ot_idl.SFesRealPkgHead\022+\n\010stMiData\030\002 \003(\013" + "2\031.iot_idl.SFesMiDataWithTm\"{\n\017SFesUpdat" + "eMiPkg\022(\n\006stHead\030\001 \002(\0132\030.iot_idl.SFesRea" + "lPkgHead\022.\n\010stMiData\030\002 \003(\0132\034.iot_idl.SFe" + "sMiDataWithoutTm\022\016\n\006ulTime\030\003 \002(\004\"\220\002\n\020SFe" + "sDoRequestPkg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n\017s" + "trAppTableName\030\002 \002(\t\022\030\n\020strAppColumnName" + "\030\003 \002(\t\022\025\n\rstrAppTagName\030\004 \002(\t\022\022\n\nstrRtuN" + "ame\030\005 \002(\t\022\016\n\006nOrder\030\006 \002(\005\022\017\n\007nAction\030\007 \002" + "(\005\022\024\n\014nIfTagtState\030\t \002(\005\022\016\n\006lPara1\030\n \001(\003" + "\022\016\n\006lPara2\030\013 \001(\003\022\r\n\005fPara\030\014 \001(\002\022\017\n\007strPa" + "ra\030\r \001(\t\022\021\n\tnCtrlType\030\016 \002(\005\"\217\002\n\020SFesAoRe" + "questPkg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n\017strApp" + "TableName\030\002 \002(\t\022\030\n\020strAppColumnName\030\003 \002(" + "\t\022\025\n\rstrAppTagName\030\004 \002(\t\022\022\n\nstrRtuName\030\005" + " \002(\t\022\016\n\006nOrder\030\006 \002(\005\022\016\n\006fValue\030\007 \002(\002\022\021\n\t" + "nCtrlType\030\010 \002(\005\022\024\n\014nIfTagtState\030\t \002(\005\022\016\n" + "\006lPara1\030\n \001(\003\022\016\n\006lPara2\030\013 \001(\003\022\r\n\005fPara\030\014" + " \001(\002\022\017\n\007strPara\030\r \001(\t\"\217\002\n\020SFesMoRequestP" + "kg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n\017strAppTableN" + "ame\030\002 \002(\t\022\030\n\020strAppColumnName\030\003 \002(\t\022\025\n\rs" + "trAppTagName\030\004 \002(\t\022\022\n\nstrRtuName\030\005 \002(\t\022\016" + "\n\006nOrder\030\006 \002(\005\022\016\n\006nValue\030\007 \002(\005\022\021\n\tnCtrlT" + "ype\030\010 \002(\005\022\024\n\014nIfTagtState\030\t \002(\005\022\016\n\006lPara" + "1\030\n \001(\003\022\016\n\006lPara2\030\013 \001(\003\022\r\n\005fPara\030\014 \001(\002\022\017" + "\n\007strPara\030\r \001(\t\"\225\001\n\022SFesCtrlRequestSeq\022)" + "\n\006do_seq\030\001 \003(\0132\031.iot_idl.SFesDoRequestPk" + "g\022)\n\006ao_seq\030\002 \003(\0132\031.iot_idl.SFesAoReques" + "tPkg\022)\n\006mo_seq\030\003 \003(\0132\031.iot_idl.SFesMoReq" + "uestPkg\"\303\001\n\020SFesCtrlReplyPkg\022\024\n\014strSourc" + "eTag\030\001 \002(\t\022\027\n\017strAppTableName\030\002 \002(\t\022\030\n\020s" + "trAppColumnName\030\003 \002(\t\022\025\n\rstrAppTagName\030\004" + " \002(\t\022\017\n\007nResult\030\005 \002(\005\022\016\n\006lPara1\030\n \001(\003\022\016\n" + "\006lPara2\030\013 \001(\003\022\r\n\005fPara\030\014 \001(\002\022\017\n\007strPara\030" + "\r \001(\t\";\n\020SFesCustCmdQueue\022\022\n\nstrKeyName\030" + "\001 \002(\t\022\023\n\013strKeyValue\030\002 \002(\t\"\340\001\n\025SFesCustC" + "mdRequestPkg\022\024\n\014strSourceTag\030\001 \002(\t\022\027\n\017st" + "rAppTableName\030\002 \002(\t\022\025\n\rstrAppTagName\030\003 \002" + "(\t\022\030\n\020strAppColumnName\030\004 \002(\t\022\022\n\nstrRtuNa" + "me\030\005 \002(\t\022\016\n\006nDevId\030\006 \001(\005\022\020\n\010nDataLen\030\007 \001" + "(\005\0221\n\016seqCustCmdData\030\010 \003(\0132\031.iot_idl.SFe" + "sCustCmdQueue\"\226\002\n\023SFesCustCmdReplyPkg\022\024\n" + "\014strSourceTag\030\001 \002(\t\022\027\n\017strAppTableName\030\002" + " \002(\t\022\025\n\rstrAppTagName\030\004 \002(\t\022\030\n\020strAppCol" + "umnName\030\003 \002(\t\022\022\n\nstrRtuName\030\005 \002(\t\022\016\n\006nDe" + "vId\030\006 \001(\005\022\017\n\007nStatus\030\007 \001(\005\022\020\n\010nDataLen\030\010" + " \001(\005\0221\n\016seqCustCmdData\030\t \003(\0132\031.iot_idl.S" + "FesCustCmdQueue\022\017\n\007nResult\030\n \002(\005\022\024\n\014strR" + "etResult\030\013 \001(\t\"F\n\016SConstSetQueue\022\022\n\nstrT" + "agName\030\001 \002(\t\022\020\n\010nConstID\030\002 \002(\005\022\016\n\006nValue" + "\030\003 \002(\005\"q\n\026SFesConstSetRequestPkg\022\016\n\006nRtu" + "No\030\001 \002(\005\022\016\n\006nDevId\030\002 \002(\005\022\014\n\004nNum\030\003 \002(\005\022)" + "\n\010seqValue\030\004 \003(\0132\027.iot_idl.SConstSetQueu" + "e\"\214\001\n\025SFesConstReadReplyPkg\022\016\n\006nRtuNo\030\001 " + "\002(\005\022\016\n\006nDevId\030\002 \002(\005\022\022\n\nnRetStatus\030\003 \002(\005\022" + ")\n\010seqValue\030\004 \003(\0132\027.iot_idl.SConstSetQue" + "ue\022\024\n\014strRetResult\030\005 \001(\t\"X\n\022SFesChanStat" + "usInfo\022\017\n\007nChanNo\030\001 \002(\005\022\017\n\007uStatus\030\002 \002(\r" + "\022\020\n\010fErrRate\030\003 \002(\002\022\016\n\006ulTime\030\004 \002(\004\"p\n\021SF" + "esChanStatusPkg\022(\n\006stHead\030\001 \002(\0132\030.iot_id" + "l.SFesRealPkgHead\0221\n\014stChanStatus\030\002 \003(\0132" + "\033.iot_idl.SFesChanStatusInfo\"D\n\021SFesRTUS" + "tatusInfo\022\016\n\006nRtuNo\030\001 \002(\005\022\017\n\007uStatus\030\002 \002" + "(\r\022\016\n\006ulTime\030\003 \002(\004\"m\n\020SFesRTUStatusPkg\022(" + "\n\006stHead\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead" + "\022/\n\013stRtuStatus\030\002 \003(\0132\032.iot_idl.SFesRTUS" + "tatusInfo\"\243\001\n\020SFesSoeEventInfo\022\027\n\017strApp" + "TableName\030\001 \002(\t\022\030\n\020strAppColumnName\030\002 \002(" + "\t\022\025\n\rstrAppTagName\030\003 \002(\t\022\017\n\007uStatus\030\004 \002(" + "\r\022\016\n\006nValue\030\005 \002(\005\022\016\n\006ulTime\030\006 \002(\004\022\024\n\014str" + "FaultDesc\030\007 \001(\t\"Z\n\021SFesChanEventInfo\022\022\n\n" + "strChanTag\030\001 \002(\t\022\017\n\007uStatus\030\002 \002(\r\022\020\n\010fEr" + "rRate\030\003 \002(\002\022\016\n\006ulTime\030\004 \002(\004\"Z\n\020SFesRTUEv" + "entInfo\022\021\n\tstrRtuTag\030\001 \002(\t\022\017\n\007uStatus\030\002 " + "\002(\r\022\022\n\nnCurChanNo\030\003 \002(\005\022\016\n\006ulTime\030\004 \002(\004\"" + "j\n\017SFesSoeEventPkg\022(\n\006stHead\030\001 \002(\0132\030.iot" + "_idl.SFesRealPkgHead\022-\n\nstSoeEvent\030\002 \003(\013" + "2\031.iot_idl.SFesSoeEventInfo\"m\n\020SFesChanE" + "ventPkg\022(\n\006stHead\030\001 \002(\0132\030.iot_idl.SFesRe" + "alPkgHead\022/\n\013stChanEvent\030\002 \003(\0132\032.iot_idl" + ".SFesChanEventInfo\"j\n\017SFesRTUEventPkg\022(\n" + "\006stHead\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022" + "-\n\nstRtuEvent\030\002 \003(\0132\031.iot_idl.SFesRTUEve" + "ntInfo\"P\n\013SFesAiValue\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\006ulTi" + "me\030\004 \002(\004\"P\n\013SFesDiValue\022\020\n\010nPointNo\030\001 \002(" + "\005\022\016\n\006nValue\030\002 \002(\005\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006ul" + "Time\030\004 \002(\004\"P\n\013SFesPiValue\022\020\n\010nPointNo\030\001 " + "\002(\005\022\016\n\006dValue\030\002 \002(\001\022\017\n\007uStatus\030\003 \002(\r\022\016\n\006" + "ulTime\030\004 \002(\004\"P\n\013SFesMiValue\022\020\n\010nPointNo\030" + "\001 \002(\005\022\016\n\006nValue\030\002 \002(\005\022\017\n\007uStatus\030\003 \002(\r\022\016" + "\n\006ulTime\030\004 \002(\004\"K\n\017SFesValueReqPkg\022(\n\006stH" + "ead\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022\016\n\006n" + "RtuNo\030\002 \002(\005\"w\n\022SFesAiValueRespPkg\022(\n\006stH" + "ead\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022\016\n\006n" + "RtuNo\030\002 \002(\005\022\'\n\tstAiValue\030\003 \003(\0132\024.iot_idl" + ".SFesAiValue\"w\n\022SFesDiValueRespPkg\022(\n\006st" + "Head\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022\016\n\006" + "nRtuNo\030\002 \002(\005\022\'\n\tstDiValue\030\003 \003(\0132\024.iot_id" + "l.SFesDiValue\"w\n\022SFesPiValueRespPkg\022(\n\006s" + "tHead\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022\016\n" + "\006nRtuNo\030\002 \002(\005\022\'\n\tstPiValue\030\003 \003(\0132\024.iot_i" + "dl.SFesPiValue\"w\n\022SFesMiValueRespPkg\022(\n\006" + "stHead\030\001 \002(\0132\030.iot_idl.SFesRealPkgHead\022\016" + "\n\006nRtuNo\030\002 \002(\005\022\'\n\tstMiValue\030\003 \003(\0132\024.iot_" + "idl.SFesMiValue\"}\n\017SFesVirtualData\022\021\n\tst" + "rRtuTag\030\001 \002(\t\022\023\n\013strPointTag\030\002 \002(\t\022\022\n\nnP" + "ointType\030\003 \002(\005\022\016\n\006nOrder\030\004 \002(\005\022\016\n\006fValue" + "\030\005 \002(\002\022\016\n\006ulTime\030\006 \002(\004\"n\n\030SFesChangeVirt" + "ualDataPkg\022(\n\006stHead\030\001 \002(\0132\030.iot_idl.SFe" + "sRealPkgHead\022(\n\006stData\030\002 \003(\0132\030.iot_idl.S" + "FesVirtualData*\277\013\n\014enFesMsgType\022\024\n\020MT_FE" + "S_DI_CHANGE\020\001\022\024\n\020MT_FES_DI_UPDATE\020\002\022\021\n\rM" + "T_FES_DI_SOE\020\003\022\024\n\020MT_FES_AI_CHANGE\020\004\022\024\n\020" + "MT_FES_AI_UPDATE\020\005\022\024\n\020MT_FES_MI_CHANGE\020\006" + "\022\024\n\020MT_FES_MI_UPDATE\020\007\022\024\n\020MT_FES_PI_CHAN" + "GE\020\010\022\024\n\020MT_FES_PI_UPDATE\020\t\022\027\n\023MT_FES_DAT" + "A_REQUEST\020\n\022\033\n\027MT_FES_RTU_DATA_REQUEST\020\024" + "\022\030\n\024MT_FES_RTU_DI_UPDATE\020\025\022\030\n\024MT_FES_RTU" + "_AI_UPDATE\020\026\022\030\n\024MT_FES_RTU_MI_UPDATE\020\027\022\031" + "\n\025MT_FES_RTU_ACC_UPDATE\020\030\022\032\n\026MT_FES_RTU_" + "WAVE_UPDATE\020\031\022\"\n\036MT_FES_RTU_WAVE_RESEND_" + "REQUEST\020\032\022\031\n\025MT_FES_RTU_DDI_UPDATE\020\033\022\024\n\020" + "MT_FES_DO_SELECT\020\036\022\025\n\021MT_FES_DO_EXECUTE\020" + "\037\022\024\n\020MT_FES_DO_CANCEL\020 \022\025\n\021MT_FES_DO_PRE" + "VENT\020!\022\032\n\026MT_FES_DO_SELECT_REPLY\020#\022\033\n\027MT" + "_FES_DO_EXECUTE_REPLY\020$\022\032\n\026MT_FES_DO_CAN" + "CEL_REPLY\020%\022\033\n\027MT_FES_DO_PREVENT_REPLY\020&" + "\022\027\n\023MT_FES_DO_DIRECTEXE\020\'\022\025\n\021MT_FES_DO_A" + "UTOEXE\020(\022\025\n\021MT_FES_AO_EXECUTE\020-\022\033\n\027MT_FE" + "S_AO_EXECUTE_REPLY\020.\022\024\n\020MT_FES_MO_SELECT" + "\0202\022\025\n\021MT_FES_MO_EXECUTE\0203\022\024\n\020MT_FES_MO_C" + "ANCEL\0204\022\025\n\021MT_FES_MO_PREVENT\0205\022\032\n\026MT_FES" + "_MO_SELECT_REPLY\0207\022\033\n\027MT_FES_MO_EXECUTE_" + "REPLY\0208\022\032\n\026MT_FES_MO_CANCEL_REPLY\0209\022\033\n\027M" + "T_FES_MO_PREVENT_REPLY\020:\022\027\n\023MT_FES_SETTI" + "NG_READ\020<\022\027\n\023MT_FES_SETTING_DOWN\020=\022\026\n\022MT" + "_FES_SETTING_ACK\020>\022\035\n\031MT_FES_SETTING_REA" + "D_REPLY\020\?\022\035\n\031MT_FES_SETTING_DOWN_REPLY\020@" + "\022\034\n\030MT_FES_SETTING_ACK_REPLY\020A\022\025\n\021MT_FES" + "_DEFINE_CMD\020B\022\034\n\030MT_FES_DEFINE_CMD_REPLA" + "Y\020C\022\027\n\023MT_FES_VIRTUAL_CTRL\020D\022\030\n\024MT_FES_B" + "ATCH_PNT_CMD\020E\022\026\n\022MT_FES_CHAN_UPDATE\020F\022\025" + "\n\021MT_FES_RTU_UPDATE\020G\022\024\n\020MT_FES_SOE_EVEN" + "T\020H\022\024\n\020MT_FES_RTU_EVENT\020I\022\025\n\021MT_FES_CHAN" + "_EVENT\020J\022\030\n\024MT_FES_CONFIG_UPDATE\020K\022\037\n\033MT" + "_FES_CONFIG_UPDATE_REPLAY\020L\022\033\n\027MT_FES_JS" + "ON_RTU_CMD_REQ\020P\022\036\n\032MT_FES_JSON_RTU_CMD_" + "REPLAY\020Q*^\n\022enFesCtrlReplyType\022\027\n\023CTRL_T" + "YPE_NWAIT_RTN\020\000\022\026\n\022CTRL_TYPE_WAIT_RTN\020\001\022" + "\027\n\023CTRL_TYPE_NWAIT_ACK\020\002", 8024); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "FesMessage.proto", &protobuf_RegisterTypes); SFesRealPkgHead::default_instance_ = new SFesRealPkgHead(); @@ -1505,6 +1536,7 @@ void protobuf_AddDesc_FesMessage_2eproto() { SFesDoRequestPkg::default_instance_ = new SFesDoRequestPkg(); SFesAoRequestPkg::default_instance_ = new SFesAoRequestPkg(); SFesMoRequestPkg::default_instance_ = new SFesMoRequestPkg(); + SFesCtrlRequestSeq::default_instance_ = new SFesCtrlRequestSeq(); SFesCtrlReplyPkg::default_instance_ = new SFesCtrlReplyPkg(); SFesCustCmdQueue::default_instance_ = new SFesCustCmdQueue(); SFesCustCmdRequestPkg::default_instance_ = new SFesCustCmdRequestPkg(); @@ -1553,6 +1585,7 @@ void protobuf_AddDesc_FesMessage_2eproto() { SFesDoRequestPkg::default_instance_->InitAsDefaultInstance(); SFesAoRequestPkg::default_instance_->InitAsDefaultInstance(); SFesMoRequestPkg::default_instance_->InitAsDefaultInstance(); + SFesCtrlRequestSeq::default_instance_->InitAsDefaultInstance(); SFesCtrlReplyPkg::default_instance_->InitAsDefaultInstance(); SFesCustCmdQueue::default_instance_->InitAsDefaultInstance(); SFesCustCmdRequestPkg::default_instance_->InitAsDefaultInstance(); @@ -1643,6 +1676,7 @@ bool enFesMsgType_IsValid(int value) { case 66: case 67: case 68: + case 69: case 70: case 71: case 72: @@ -1650,6 +1684,23 @@ bool enFesMsgType_IsValid(int value) { case 74: case 75: case 76: + case 80: + case 81: + return true; + default: + return false; + } +} + +const ::google::protobuf::EnumDescriptor* enFesCtrlReplyType_descriptor() { + protobuf_AssignDescriptorsOnce(); + return enFesCtrlReplyType_descriptor_; +} +bool enFesCtrlReplyType_IsValid(int value) { + switch(value) { + case 0: + case 1: + case 2: return true; default: return false; @@ -5173,7 +5224,7 @@ const int SFesPiDataWithTm::kStrAppTableNameFieldNumber; const int SFesPiDataWithTm::kStrAppColumnNameFieldNumber; const int SFesPiDataWithTm::kStrAppTagNameFieldNumber; const int SFesPiDataWithTm::kUStatusFieldNumber; -const int SFesPiDataWithTm::kNValueFieldNumber; +const int SFesPiDataWithTm::kDValueFieldNumber; const int SFesPiDataWithTm::kUlTimeFieldNumber; #endif // !_MSC_VER @@ -5200,7 +5251,7 @@ void SFesPiDataWithTm::SharedCtor() { strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); ustatus_ = 0u; - nvalue_ = GOOGLE_LONGLONG(0); + dvalue_ = 0; ultime_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -5257,7 +5308,7 @@ void SFesPiDataWithTm::Clear() { } while (0) if (_has_bits_[0 / 32] & 63) { - ZR_(nvalue_, ustatus_); + ZR_(dvalue_, ustatus_); if (has_strapptablename()) { if (strapptablename_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_->clear(); @@ -5353,18 +5404,18 @@ bool SFesPiDataWithTm::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_nValue; + if (input->ExpectTag(41)) goto parse_dValue; break; } - // required int64 nValue = 5; + // required double dValue = 5; case 5: { - if (tag == 40) { - parse_nValue: + if (tag == 41) { + parse_dValue: DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &nvalue_))); - set_has_nvalue(); + double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( + input, &dvalue_))); + set_has_dvalue(); } else { goto handle_unusual; } @@ -5447,9 +5498,9 @@ void SFesPiDataWithTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->ustatus(), output); } - // required int64 nValue = 5; - if (has_nvalue()) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->nvalue(), output); + // required double dValue = 5; + if (has_dvalue()) { + ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->dvalue(), output); } // required uint64 ulTime = 6; @@ -5505,9 +5556,9 @@ void SFesPiDataWithTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->ustatus(), target); } - // required int64 nValue = 5; - if (has_nvalue()) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->nvalue(), target); + // required double dValue = 5; + if (has_dvalue()) { + target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->dvalue(), target); } // required uint64 ulTime = 6; @@ -5555,11 +5606,9 @@ int SFesPiDataWithTm::ByteSize() const { this->ustatus()); } - // required int64 nValue = 5; - if (has_nvalue()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->nvalue()); + // required double dValue = 5; + if (has_dvalue()) { + total_size += 1 + 8; } // required uint64 ulTime = 6; @@ -5608,8 +5657,8 @@ void SFesPiDataWithTm::MergeFrom(const SFesPiDataWithTm& from) { if (from.has_ustatus()) { set_ustatus(from.ustatus()); } - if (from.has_nvalue()) { - set_nvalue(from.nvalue()); + if (from.has_dvalue()) { + set_dvalue(from.dvalue()); } if (from.has_ultime()) { set_ultime(from.ultime()); @@ -5642,7 +5691,7 @@ void SFesPiDataWithTm::Swap(SFesPiDataWithTm* other) { std::swap(strappcolumnname_, other->strappcolumnname_); std::swap(strapptagname_, other->strapptagname_); std::swap(ustatus_, other->ustatus_); - std::swap(nvalue_, other->nvalue_); + std::swap(dvalue_, other->dvalue_); std::swap(ultime_, other->ultime_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -5666,7 +5715,7 @@ const int SFesPiDataWithoutTm::kStrAppTableNameFieldNumber; const int SFesPiDataWithoutTm::kStrAppColumnNameFieldNumber; const int SFesPiDataWithoutTm::kStrAppTagNameFieldNumber; const int SFesPiDataWithoutTm::kUStatusFieldNumber; -const int SFesPiDataWithoutTm::kNValueFieldNumber; +const int SFesPiDataWithoutTm::kDValueFieldNumber; #endif // !_MSC_VER SFesPiDataWithoutTm::SFesPiDataWithoutTm() @@ -5692,7 +5741,7 @@ void SFesPiDataWithoutTm::SharedCtor() { strappcolumnname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); strapptagname_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); ustatus_ = 0u; - nvalue_ = GOOGLE_LONGLONG(0); + dvalue_ = 0; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -5748,7 +5797,7 @@ void SFesPiDataWithoutTm::Clear() { } while (0) if (_has_bits_[0 / 32] & 31) { - ZR_(nvalue_, ustatus_); + ZR_(dvalue_, ustatus_); if (has_strapptablename()) { if (strapptablename_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { strapptablename_->clear(); @@ -5844,18 +5893,18 @@ bool SFesPiDataWithoutTm::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_nValue; + if (input->ExpectTag(41)) goto parse_dValue; break; } - // required int64 nValue = 5; + // required double dValue = 5; case 5: { - if (tag == 40) { - parse_nValue: + if (tag == 41) { + parse_dValue: DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &nvalue_))); - set_has_nvalue(); + double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( + input, &dvalue_))); + set_has_dvalue(); } else { goto handle_unusual; } @@ -5923,9 +5972,9 @@ void SFesPiDataWithoutTm::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->ustatus(), output); } - // required int64 nValue = 5; - if (has_nvalue()) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->nvalue(), output); + // required double dValue = 5; + if (has_dvalue()) { + ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->dvalue(), output); } if (!unknown_fields().empty()) { @@ -5976,9 +6025,9 @@ void SFesPiDataWithoutTm::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->ustatus(), target); } - // required int64 nValue = 5; - if (has_nvalue()) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->nvalue(), target); + // required double dValue = 5; + if (has_dvalue()) { + target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->dvalue(), target); } if (!unknown_fields().empty()) { @@ -6021,11 +6070,9 @@ int SFesPiDataWithoutTm::ByteSize() const { this->ustatus()); } - // required int64 nValue = 5; - if (has_nvalue()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->nvalue()); + // required double dValue = 5; + if (has_dvalue()) { + total_size += 1 + 8; } } @@ -6067,8 +6114,8 @@ void SFesPiDataWithoutTm::MergeFrom(const SFesPiDataWithoutTm& from) { if (from.has_ustatus()) { set_ustatus(from.ustatus()); } - if (from.has_nvalue()) { - set_nvalue(from.nvalue()); + if (from.has_dvalue()) { + set_dvalue(from.dvalue()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -6098,7 +6145,7 @@ void SFesPiDataWithoutTm::Swap(SFesPiDataWithoutTm* other) { std::swap(strappcolumnname_, other->strappcolumnname_); std::swap(strapptagname_, other->strapptagname_); std::swap(ustatus_, other->ustatus_); - std::swap(nvalue_, other->nvalue_); + std::swap(dvalue_, other->dvalue_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -8243,6 +8290,7 @@ const int SFesDoRequestPkg::kLPara1FieldNumber; const int SFesDoRequestPkg::kLPara2FieldNumber; const int SFesDoRequestPkg::kFParaFieldNumber; const int SFesDoRequestPkg::kStrParaFieldNumber; +const int SFesDoRequestPkg::kNCtrlTypeFieldNumber; #endif // !_MSC_VER SFesDoRequestPkg::SFesDoRequestPkg() @@ -8276,6 +8324,7 @@ void SFesDoRequestPkg::SharedCtor() { lpara2_ = GOOGLE_LONGLONG(0); fpara_ = 0; strpara_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + nctrltype_ = 0; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -8368,7 +8417,7 @@ void SFesDoRequestPkg::Clear() { } niftagtstate_ = 0; } - if (_has_bits_[8 / 32] & 3840) { + if (_has_bits_[8 / 32] & 7936) { ZR_(fpara_, lpara2_); lpara1_ = GOOGLE_LONGLONG(0); if (has_strpara()) { @@ -8376,6 +8425,7 @@ void SFesDoRequestPkg::Clear() { strpara_->clear(); } } + nctrltype_ = 0; } #undef OFFSET_OF_FIELD_ @@ -8582,6 +8632,21 @@ bool SFesDoRequestPkg::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(112)) goto parse_nCtrlType; + break; + } + + // required int32 nCtrlType = 14; + case 14: { + if (tag == 112) { + parse_nCtrlType: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &nctrltype_))); + set_has_nctrltype(); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -8701,6 +8766,11 @@ void SFesDoRequestPkg::SerializeWithCachedSizes( 13, this->strpara(), output); } + // required int32 nCtrlType = 14; + if (has_nctrltype()) { + ::google::protobuf::internal::WireFormatLite::WriteInt32(14, this->nctrltype(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -8807,6 +8877,11 @@ void SFesDoRequestPkg::SerializeWithCachedSizes( 13, this->strpara(), target); } + // required int32 nCtrlType = 14; + if (has_nctrltype()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(14, this->nctrltype(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -8903,6 +8978,13 @@ int SFesDoRequestPkg::ByteSize() const { this->strpara()); } + // required int32 nCtrlType = 14; + if (has_nctrltype()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->nctrltype()); + } + } if (!unknown_fields().empty()) { total_size += @@ -8968,6 +9050,9 @@ void SFesDoRequestPkg::MergeFrom(const SFesDoRequestPkg& from) { if (from.has_strpara()) { set_strpara(from.strpara()); } + if (from.has_nctrltype()) { + set_nctrltype(from.nctrltype()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -8985,7 +9070,7 @@ void SFesDoRequestPkg::CopyFrom(const SFesDoRequestPkg& from) { } bool SFesDoRequestPkg::IsInitialized() const { - if ((_has_bits_[0] & 0x000000ff) != 0x000000ff) return false; + if ((_has_bits_[0] & 0x000010ff) != 0x000010ff) return false; return true; } @@ -9004,6 +9089,7 @@ void SFesDoRequestPkg::Swap(SFesDoRequestPkg* other) { std::swap(lpara2_, other->lpara2_); std::swap(fpara_, other->fpara_); std::swap(strpara_, other->strpara_); + std::swap(nctrltype_, other->nctrltype_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -10673,6 +10759,306 @@ void SFesMoRequestPkg::Swap(SFesMoRequestPkg* other) { } +// =================================================================== + +#ifndef _MSC_VER +const int SFesCtrlRequestSeq::kDoSeqFieldNumber; +const int SFesCtrlRequestSeq::kAoSeqFieldNumber; +const int SFesCtrlRequestSeq::kMoSeqFieldNumber; +#endif // !_MSC_VER + +SFesCtrlRequestSeq::SFesCtrlRequestSeq() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:iot_idl.SFesCtrlRequestSeq) +} + +void SFesCtrlRequestSeq::InitAsDefaultInstance() { +} + +SFesCtrlRequestSeq::SFesCtrlRequestSeq(const SFesCtrlRequestSeq& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:iot_idl.SFesCtrlRequestSeq) +} + +void SFesCtrlRequestSeq::SharedCtor() { + _cached_size_ = 0; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +SFesCtrlRequestSeq::~SFesCtrlRequestSeq() { + // @@protoc_insertion_point(destructor:iot_idl.SFesCtrlRequestSeq) + SharedDtor(); +} + +void SFesCtrlRequestSeq::SharedDtor() { + if (this != default_instance_) { + } +} + +void SFesCtrlRequestSeq::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* SFesCtrlRequestSeq::descriptor() { + protobuf_AssignDescriptorsOnce(); + return SFesCtrlRequestSeq_descriptor_; +} + +const SFesCtrlRequestSeq& SFesCtrlRequestSeq::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_FesMessage_2eproto(); + return *default_instance_; +} + +SFesCtrlRequestSeq* SFesCtrlRequestSeq::default_instance_ = NULL; + +SFesCtrlRequestSeq* SFesCtrlRequestSeq::New() const { + return new SFesCtrlRequestSeq; +} + +void SFesCtrlRequestSeq::Clear() { + do_seq_.Clear(); + ao_seq_.Clear(); + mo_seq_.Clear(); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool SFesCtrlRequestSeq::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:iot_idl.SFesCtrlRequestSeq) + 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 .iot_idl.SFesDoRequestPkg do_seq = 1; + case 1: { + if (tag == 10) { + parse_do_seq: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, add_do_seq())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(10)) goto parse_do_seq; + if (input->ExpectTag(18)) goto parse_ao_seq; + break; + } + + // repeated .iot_idl.SFesAoRequestPkg ao_seq = 2; + case 2: { + if (tag == 18) { + parse_ao_seq: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, add_ao_seq())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(18)) goto parse_ao_seq; + if (input->ExpectTag(26)) goto parse_mo_seq; + break; + } + + // repeated .iot_idl.SFesMoRequestPkg mo_seq = 3; + case 3: { + if (tag == 26) { + parse_mo_seq: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, add_mo_seq())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(26)) goto parse_mo_seq; + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:iot_idl.SFesCtrlRequestSeq) + return true; +failure: + // @@protoc_insertion_point(parse_failure:iot_idl.SFesCtrlRequestSeq) + return false; +#undef DO_ +} + +void SFesCtrlRequestSeq::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:iot_idl.SFesCtrlRequestSeq) + // repeated .iot_idl.SFesDoRequestPkg do_seq = 1; + for (int i = 0; i < this->do_seq_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->do_seq(i), output); + } + + // repeated .iot_idl.SFesAoRequestPkg ao_seq = 2; + for (int i = 0; i < this->ao_seq_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->ao_seq(i), output); + } + + // repeated .iot_idl.SFesMoRequestPkg mo_seq = 3; + for (int i = 0; i < this->mo_seq_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 3, this->mo_seq(i), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:iot_idl.SFesCtrlRequestSeq) +} + +::google::protobuf::uint8* SFesCtrlRequestSeq::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:iot_idl.SFesCtrlRequestSeq) + // repeated .iot_idl.SFesDoRequestPkg do_seq = 1; + for (int i = 0; i < this->do_seq_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->do_seq(i), target); + } + + // repeated .iot_idl.SFesAoRequestPkg ao_seq = 2; + for (int i = 0; i < this->ao_seq_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->ao_seq(i), target); + } + + // repeated .iot_idl.SFesMoRequestPkg mo_seq = 3; + for (int i = 0; i < this->mo_seq_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 3, this->mo_seq(i), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:iot_idl.SFesCtrlRequestSeq) + return target; +} + +int SFesCtrlRequestSeq::ByteSize() const { + int total_size = 0; + + // repeated .iot_idl.SFesDoRequestPkg do_seq = 1; + total_size += 1 * this->do_seq_size(); + for (int i = 0; i < this->do_seq_size(); i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->do_seq(i)); + } + + // repeated .iot_idl.SFesAoRequestPkg ao_seq = 2; + total_size += 1 * this->ao_seq_size(); + for (int i = 0; i < this->ao_seq_size(); i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->ao_seq(i)); + } + + // repeated .iot_idl.SFesMoRequestPkg mo_seq = 3; + total_size += 1 * this->mo_seq_size(); + for (int i = 0; i < this->mo_seq_size(); i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->mo_seq(i)); + } + + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void SFesCtrlRequestSeq::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const SFesCtrlRequestSeq* source = + ::google::protobuf::internal::dynamic_cast_if_available( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void SFesCtrlRequestSeq::MergeFrom(const SFesCtrlRequestSeq& from) { + GOOGLE_CHECK_NE(&from, this); + do_seq_.MergeFrom(from.do_seq_); + ao_seq_.MergeFrom(from.ao_seq_); + mo_seq_.MergeFrom(from.mo_seq_); + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void SFesCtrlRequestSeq::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void SFesCtrlRequestSeq::CopyFrom(const SFesCtrlRequestSeq& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool SFesCtrlRequestSeq::IsInitialized() const { + + if (!::google::protobuf::internal::AllAreInitialized(this->do_seq())) return false; + if (!::google::protobuf::internal::AllAreInitialized(this->ao_seq())) return false; + if (!::google::protobuf::internal::AllAreInitialized(this->mo_seq())) return false; + return true; +} + +void SFesCtrlRequestSeq::Swap(SFesCtrlRequestSeq* other) { + if (other != this) { + do_seq_.Swap(&other->do_seq_); + ao_seq_.Swap(&other->ao_seq_); + mo_seq_.Swap(&other->mo_seq_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata SFesCtrlRequestSeq::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = SFesCtrlRequestSeq_descriptor_; + metadata.reflection = SFesCtrlRequestSeq_reflection_; + return metadata; +} + + // =================================================================== #ifndef _MSC_VER @@ -18128,7 +18514,7 @@ void SFesDiValue::Swap(SFesDiValue* other) { #ifndef _MSC_VER const int SFesPiValue::kNPointNoFieldNumber; -const int SFesPiValue::kNValueFieldNumber; +const int SFesPiValue::kDValueFieldNumber; const int SFesPiValue::kUStatusFieldNumber; const int SFesPiValue::kUlTimeFieldNumber; #endif // !_MSC_VER @@ -18152,7 +18538,7 @@ SFesPiValue::SFesPiValue(const SFesPiValue& from) void SFesPiValue::SharedCtor() { _cached_size_ = 0; npointno_ = 0; - nvalue_ = GOOGLE_LONGLONG(0); + dvalue_ = 0; ustatus_ = 0u; ultime_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -18200,7 +18586,7 @@ void SFesPiValue::Clear() { ::memset(&first, 0, n); \ } while (0) - ZR_(nvalue_, ultime_); + ZR_(dvalue_, ultime_); #undef OFFSET_OF_FIELD_ #undef ZR_ @@ -18229,18 +18615,18 @@ bool SFesPiValue::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_nValue; + if (input->ExpectTag(17)) goto parse_dValue; break; } - // required int64 nValue = 2; + // required double dValue = 2; case 2: { - if (tag == 16) { - parse_nValue: + if (tag == 17) { + parse_dValue: DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &nvalue_))); - set_has_nvalue(); + double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( + input, &dvalue_))); + set_has_dvalue(); } else { goto handle_unusual; } @@ -18308,9 +18694,9 @@ void SFesPiValue::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->npointno(), output); } - // required int64 nValue = 2; - if (has_nvalue()) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(2, this->nvalue(), output); + // required double dValue = 2; + if (has_dvalue()) { + ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->dvalue(), output); } // required uint32 uStatus = 3; @@ -18338,9 +18724,9 @@ void SFesPiValue::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->npointno(), target); } - // required int64 nValue = 2; - if (has_nvalue()) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(2, this->nvalue(), target); + // required double dValue = 2; + if (has_dvalue()) { + target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->dvalue(), target); } // required uint32 uStatus = 3; @@ -18372,11 +18758,9 @@ int SFesPiValue::ByteSize() const { this->npointno()); } - // required int64 nValue = 2; - if (has_nvalue()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->nvalue()); + // required double dValue = 2; + if (has_dvalue()) { + total_size += 1 + 8; } // required uint32 uStatus = 3; @@ -18423,8 +18807,8 @@ void SFesPiValue::MergeFrom(const SFesPiValue& from) { if (from.has_npointno()) { set_npointno(from.npointno()); } - if (from.has_nvalue()) { - set_nvalue(from.nvalue()); + if (from.has_dvalue()) { + set_dvalue(from.dvalue()); } if (from.has_ustatus()) { set_ustatus(from.ustatus()); @@ -18457,7 +18841,7 @@ bool SFesPiValue::IsInitialized() const { void SFesPiValue::Swap(SFesPiValue* other) { if (other != this) { std::swap(npointno_, other->npointno_); - std::swap(nvalue_, other->nvalue_); + std::swap(dvalue_, other->dvalue_); std::swap(ustatus_, other->ustatus_); std::swap(ultime_, other->ultime_); std::swap(_has_bits_[0], other->_has_bits_[0]); diff --git a/platform/src/idl_files/FesMessage.pb.h b/platform/src/idl_files/FesMessage.pb.h index 6f4cfa52..ffe889b9 100644 --- a/platform/src/idl_files/FesMessage.pb.h +++ b/platform/src/idl_files/FesMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: FesMessage.proto #ifndef PROTOBUF_FesMessage_2eproto__INCLUDED @@ -54,6 +54,7 @@ class SFesUpdateMiPkg; class SFesDoRequestPkg; class SFesAoRequestPkg; class SFesMoRequestPkg; +class SFesCtrlRequestSeq; class SFesCtrlReplyPkg; class SFesCustCmdQueue; class SFesCustCmdRequestPkg; @@ -131,17 +132,20 @@ enum enFesMsgType { MT_FES_DEFINE_CMD = 66, MT_FES_DEFINE_CMD_REPLAY = 67, MT_FES_VIRTUAL_CTRL = 68, + MT_FES_BATCH_PNT_CMD = 69, MT_FES_CHAN_UPDATE = 70, MT_FES_RTU_UPDATE = 71, MT_FES_SOE_EVENT = 72, MT_FES_RTU_EVENT = 73, MT_FES_CHAN_EVENT = 74, MT_FES_CONFIG_UPDATE = 75, - MT_FES_CONFIG_UPDATE_REPLAY = 76 + MT_FES_CONFIG_UPDATE_REPLAY = 76, + MT_FES_JSON_RTU_CMD_REQ = 80, + MT_FES_JSON_RTU_CMD_REPLAY = 81 }; IDL_FILES_EXPORT bool enFesMsgType_IsValid(int value); const enFesMsgType enFesMsgType_MIN = MT_FES_DI_CHANGE; -const enFesMsgType enFesMsgType_MAX = MT_FES_CONFIG_UPDATE_REPLAY; +const enFesMsgType enFesMsgType_MAX = MT_FES_JSON_RTU_CMD_REPLAY; const int enFesMsgType_ARRAYSIZE = enFesMsgType_MAX + 1; IDL_FILES_EXPORT const ::google::protobuf::EnumDescriptor* enFesMsgType_descriptor(); @@ -154,6 +158,26 @@ inline bool enFesMsgType_Parse( return ::google::protobuf::internal::ParseNamedEnum( enFesMsgType_descriptor(), name, value); } +enum enFesCtrlReplyType { + CTRL_TYPE_NWAIT_RTN = 0, + CTRL_TYPE_WAIT_RTN = 1, + CTRL_TYPE_NWAIT_ACK = 2 +}; +IDL_FILES_EXPORT bool enFesCtrlReplyType_IsValid(int value); +const enFesCtrlReplyType enFesCtrlReplyType_MIN = CTRL_TYPE_NWAIT_RTN; +const enFesCtrlReplyType enFesCtrlReplyType_MAX = CTRL_TYPE_NWAIT_ACK; +const int enFesCtrlReplyType_ARRAYSIZE = enFesCtrlReplyType_MAX + 1; + +IDL_FILES_EXPORT const ::google::protobuf::EnumDescriptor* enFesCtrlReplyType_descriptor(); +inline const ::std::string& enFesCtrlReplyType_Name(enFesCtrlReplyType value) { + return ::google::protobuf::internal::NameOfEnum( + enFesCtrlReplyType_descriptor(), value); +} +inline bool enFesCtrlReplyType_Parse( + const ::std::string& name, enFesCtrlReplyType* value) { + return ::google::protobuf::internal::ParseNamedEnum( + enFesCtrlReplyType_descriptor(), name, value); +} // =================================================================== class IDL_FILES_EXPORT SFesRealPkgHead : public ::google::protobuf::Message { @@ -1338,12 +1362,12 @@ class IDL_FILES_EXPORT SFesPiDataWithTm : public ::google::protobuf::Message { inline ::google::protobuf::uint32 ustatus() const; inline void set_ustatus(::google::protobuf::uint32 value); - // required int64 nValue = 5; - inline bool has_nvalue() const; - inline void clear_nvalue(); - static const int kNValueFieldNumber = 5; - inline ::google::protobuf::int64 nvalue() const; - inline void set_nvalue(::google::protobuf::int64 value); + // required double dValue = 5; + inline bool has_dvalue() const; + inline void clear_dvalue(); + static const int kDValueFieldNumber = 5; + inline double dvalue() const; + inline void set_dvalue(double value); // required uint64 ulTime = 6; inline bool has_ultime() const; @@ -1362,8 +1386,8 @@ class IDL_FILES_EXPORT SFesPiDataWithTm : public ::google::protobuf::Message { inline void clear_has_strapptagname(); inline void set_has_ustatus(); inline void clear_has_ustatus(); - inline void set_has_nvalue(); - inline void clear_has_nvalue(); + inline void set_has_dvalue(); + inline void clear_has_dvalue(); inline void set_has_ultime(); inline void clear_has_ultime(); @@ -1374,7 +1398,7 @@ class IDL_FILES_EXPORT SFesPiDataWithTm : public ::google::protobuf::Message { ::std::string* strapptablename_; ::std::string* strappcolumnname_; ::std::string* strapptagname_; - ::google::protobuf::int64 nvalue_; + double dvalue_; ::google::protobuf::uint64 ultime_; ::google::protobuf::uint32 ustatus_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); @@ -1482,12 +1506,12 @@ class IDL_FILES_EXPORT SFesPiDataWithoutTm : public ::google::protobuf::Message inline ::google::protobuf::uint32 ustatus() const; inline void set_ustatus(::google::protobuf::uint32 value); - // required int64 nValue = 5; - inline bool has_nvalue() const; - inline void clear_nvalue(); - static const int kNValueFieldNumber = 5; - inline ::google::protobuf::int64 nvalue() const; - inline void set_nvalue(::google::protobuf::int64 value); + // required double dValue = 5; + inline bool has_dvalue() const; + inline void clear_dvalue(); + static const int kDValueFieldNumber = 5; + inline double dvalue() const; + inline void set_dvalue(double value); // @@protoc_insertion_point(class_scope:iot_idl.SFesPiDataWithoutTm) private: @@ -1499,8 +1523,8 @@ class IDL_FILES_EXPORT SFesPiDataWithoutTm : public ::google::protobuf::Message inline void clear_has_strapptagname(); inline void set_has_ustatus(); inline void clear_has_ustatus(); - inline void set_has_nvalue(); - inline void clear_has_nvalue(); + inline void set_has_dvalue(); + inline void clear_has_dvalue(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -1509,7 +1533,7 @@ class IDL_FILES_EXPORT SFesPiDataWithoutTm : public ::google::protobuf::Message ::std::string* strapptablename_; ::std::string* strappcolumnname_; ::std::string* strapptagname_; - ::google::protobuf::int64 nvalue_; + double dvalue_; ::google::protobuf::uint32 ustatus_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); @@ -2361,6 +2385,13 @@ class IDL_FILES_EXPORT SFesDoRequestPkg : public ::google::protobuf::Message { inline ::std::string* release_strpara(); inline void set_allocated_strpara(::std::string* strpara); + // required int32 nCtrlType = 14; + inline bool has_nctrltype() const; + inline void clear_nctrltype(); + static const int kNCtrlTypeFieldNumber = 14; + inline ::google::protobuf::int32 nctrltype() const; + inline void set_nctrltype(::google::protobuf::int32 value); + // @@protoc_insertion_point(class_scope:iot_idl.SFesDoRequestPkg) private: inline void set_has_strsourcetag(); @@ -2387,6 +2418,8 @@ class IDL_FILES_EXPORT SFesDoRequestPkg : public ::google::protobuf::Message { inline void clear_has_fpara(); inline void set_has_strpara(); inline void clear_has_strpara(); + inline void set_has_nctrltype(); + inline void clear_has_nctrltype(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -2404,6 +2437,7 @@ class IDL_FILES_EXPORT SFesDoRequestPkg : public ::google::protobuf::Message { float fpara_; ::google::protobuf::int64 lpara2_; ::std::string* strpara_; + ::google::protobuf::int32 nctrltype_; friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); friend void protobuf_AssignDesc_FesMessage_2eproto(); friend void protobuf_ShutdownFile_FesMessage_2eproto(); @@ -2871,6 +2905,114 @@ class IDL_FILES_EXPORT SFesMoRequestPkg : public ::google::protobuf::Message { }; // ------------------------------------------------------------------- +class IDL_FILES_EXPORT SFesCtrlRequestSeq : public ::google::protobuf::Message { + public: + SFesCtrlRequestSeq(); + virtual ~SFesCtrlRequestSeq(); + + SFesCtrlRequestSeq(const SFesCtrlRequestSeq& from); + + inline SFesCtrlRequestSeq& operator=(const SFesCtrlRequestSeq& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const SFesCtrlRequestSeq& default_instance(); + + void Swap(SFesCtrlRequestSeq* other); + + // implements Message ---------------------------------------------- + + SFesCtrlRequestSeq* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const SFesCtrlRequestSeq& from); + void MergeFrom(const SFesCtrlRequestSeq& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .iot_idl.SFesDoRequestPkg do_seq = 1; + inline int do_seq_size() const; + inline void clear_do_seq(); + static const int kDoSeqFieldNumber = 1; + inline const ::iot_idl::SFesDoRequestPkg& do_seq(int index) const; + inline ::iot_idl::SFesDoRequestPkg* mutable_do_seq(int index); + inline ::iot_idl::SFesDoRequestPkg* add_do_seq(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDoRequestPkg >& + do_seq() const; + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDoRequestPkg >* + mutable_do_seq(); + + // repeated .iot_idl.SFesAoRequestPkg ao_seq = 2; + inline int ao_seq_size() const; + inline void clear_ao_seq(); + static const int kAoSeqFieldNumber = 2; + inline const ::iot_idl::SFesAoRequestPkg& ao_seq(int index) const; + inline ::iot_idl::SFesAoRequestPkg* mutable_ao_seq(int index); + inline ::iot_idl::SFesAoRequestPkg* add_ao_seq(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAoRequestPkg >& + ao_seq() const; + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAoRequestPkg >* + mutable_ao_seq(); + + // repeated .iot_idl.SFesMoRequestPkg mo_seq = 3; + inline int mo_seq_size() const; + inline void clear_mo_seq(); + static const int kMoSeqFieldNumber = 3; + inline const ::iot_idl::SFesMoRequestPkg& mo_seq(int index) const; + inline ::iot_idl::SFesMoRequestPkg* mutable_mo_seq(int index); + inline ::iot_idl::SFesMoRequestPkg* add_mo_seq(); + inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMoRequestPkg >& + mo_seq() const; + inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMoRequestPkg >* + mutable_mo_seq(); + + // @@protoc_insertion_point(class_scope:iot_idl.SFesCtrlRequestSeq) + private: + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDoRequestPkg > do_seq_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAoRequestPkg > ao_seq_; + ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMoRequestPkg > mo_seq_; + friend void IDL_FILES_EXPORT protobuf_AddDesc_FesMessage_2eproto(); + friend void protobuf_AssignDesc_FesMessage_2eproto(); + friend void protobuf_ShutdownFile_FesMessage_2eproto(); + + void InitAsDefaultInstance(); + static SFesCtrlRequestSeq* default_instance_; +}; +// ------------------------------------------------------------------- + class IDL_FILES_EXPORT SFesCtrlReplyPkg : public ::google::protobuf::Message { public: SFesCtrlReplyPkg(); @@ -5229,12 +5371,12 @@ class IDL_FILES_EXPORT SFesPiValue : public ::google::protobuf::Message { inline ::google::protobuf::int32 npointno() const; inline void set_npointno(::google::protobuf::int32 value); - // required int64 nValue = 2; - inline bool has_nvalue() const; - inline void clear_nvalue(); - static const int kNValueFieldNumber = 2; - inline ::google::protobuf::int64 nvalue() const; - inline void set_nvalue(::google::protobuf::int64 value); + // required double dValue = 2; + inline bool has_dvalue() const; + inline void clear_dvalue(); + static const int kDValueFieldNumber = 2; + inline double dvalue() const; + inline void set_dvalue(double value); // required uint32 uStatus = 3; inline bool has_ustatus() const; @@ -5254,8 +5396,8 @@ class IDL_FILES_EXPORT SFesPiValue : public ::google::protobuf::Message { private: inline void set_has_npointno(); inline void clear_has_npointno(); - inline void set_has_nvalue(); - inline void clear_has_nvalue(); + inline void set_has_dvalue(); + inline void clear_has_dvalue(); inline void set_has_ustatus(); inline void clear_has_ustatus(); inline void set_has_ultime(); @@ -5265,7 +5407,7 @@ class IDL_FILES_EXPORT SFesPiValue : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::int64 nvalue_; + double dvalue_; ::google::protobuf::int32 npointno_; ::google::protobuf::uint32 ustatus_; ::google::protobuf::uint64 ultime_; @@ -8100,28 +8242,28 @@ inline void SFesPiDataWithTm::set_ustatus(::google::protobuf::uint32 value) { // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.uStatus) } -// required int64 nValue = 5; -inline bool SFesPiDataWithTm::has_nvalue() const { +// required double dValue = 5; +inline bool SFesPiDataWithTm::has_dvalue() const { return (_has_bits_[0] & 0x00000010u) != 0; } -inline void SFesPiDataWithTm::set_has_nvalue() { +inline void SFesPiDataWithTm::set_has_dvalue() { _has_bits_[0] |= 0x00000010u; } -inline void SFesPiDataWithTm::clear_has_nvalue() { +inline void SFesPiDataWithTm::clear_has_dvalue() { _has_bits_[0] &= ~0x00000010u; } -inline void SFesPiDataWithTm::clear_nvalue() { - nvalue_ = GOOGLE_LONGLONG(0); - clear_has_nvalue(); +inline void SFesPiDataWithTm::clear_dvalue() { + dvalue_ = 0; + clear_has_dvalue(); } -inline ::google::protobuf::int64 SFesPiDataWithTm::nvalue() const { - // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.nValue) - return nvalue_; +inline double SFesPiDataWithTm::dvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithTm.dValue) + return dvalue_; } -inline void SFesPiDataWithTm::set_nvalue(::google::protobuf::int64 value) { - set_has_nvalue(); - nvalue_ = value; - // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.nValue) +inline void SFesPiDataWithTm::set_dvalue(double value) { + set_has_dvalue(); + dvalue_ = value; + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithTm.dValue) } // required uint64 ulTime = 6; @@ -8404,28 +8546,28 @@ inline void SFesPiDataWithoutTm::set_ustatus(::google::protobuf::uint32 value) { // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.uStatus) } -// required int64 nValue = 5; -inline bool SFesPiDataWithoutTm::has_nvalue() const { +// required double dValue = 5; +inline bool SFesPiDataWithoutTm::has_dvalue() const { return (_has_bits_[0] & 0x00000010u) != 0; } -inline void SFesPiDataWithoutTm::set_has_nvalue() { +inline void SFesPiDataWithoutTm::set_has_dvalue() { _has_bits_[0] |= 0x00000010u; } -inline void SFesPiDataWithoutTm::clear_has_nvalue() { +inline void SFesPiDataWithoutTm::clear_has_dvalue() { _has_bits_[0] &= ~0x00000010u; } -inline void SFesPiDataWithoutTm::clear_nvalue() { - nvalue_ = GOOGLE_LONGLONG(0); - clear_has_nvalue(); +inline void SFesPiDataWithoutTm::clear_dvalue() { + dvalue_ = 0; + clear_has_dvalue(); } -inline ::google::protobuf::int64 SFesPiDataWithoutTm::nvalue() const { - // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithoutTm.nValue) - return nvalue_; +inline double SFesPiDataWithoutTm::dvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesPiDataWithoutTm.dValue) + return dvalue_; } -inline void SFesPiDataWithoutTm::set_nvalue(::google::protobuf::int64 value) { - set_has_nvalue(); - nvalue_ = value; - // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.nValue) +inline void SFesPiDataWithoutTm::set_dvalue(double value) { + set_has_dvalue(); + dvalue_ = value; + // @@protoc_insertion_point(field_set:iot_idl.SFesPiDataWithoutTm.dValue) } // ------------------------------------------------------------------- @@ -9964,6 +10106,30 @@ inline void SFesDoRequestPkg::set_allocated_strpara(::std::string* strpara) { // @@protoc_insertion_point(field_set_allocated:iot_idl.SFesDoRequestPkg.strPara) } +// required int32 nCtrlType = 14; +inline bool SFesDoRequestPkg::has_nctrltype() const { + return (_has_bits_[0] & 0x00001000u) != 0; +} +inline void SFesDoRequestPkg::set_has_nctrltype() { + _has_bits_[0] |= 0x00001000u; +} +inline void SFesDoRequestPkg::clear_has_nctrltype() { + _has_bits_[0] &= ~0x00001000u; +} +inline void SFesDoRequestPkg::clear_nctrltype() { + nctrltype_ = 0; + clear_has_nctrltype(); +} +inline ::google::protobuf::int32 SFesDoRequestPkg::nctrltype() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesDoRequestPkg.nCtrlType) + return nctrltype_; +} +inline void SFesDoRequestPkg::set_nctrltype(::google::protobuf::int32 value) { + set_has_nctrltype(); + nctrltype_ = value; + // @@protoc_insertion_point(field_set:iot_idl.SFesDoRequestPkg.nCtrlType) +} + // ------------------------------------------------------------------- // SFesAoRequestPkg @@ -11222,6 +11388,100 @@ inline void SFesMoRequestPkg::set_allocated_strpara(::std::string* strpara) { // ------------------------------------------------------------------- +// SFesCtrlRequestSeq + +// repeated .iot_idl.SFesDoRequestPkg do_seq = 1; +inline int SFesCtrlRequestSeq::do_seq_size() const { + return do_seq_.size(); +} +inline void SFesCtrlRequestSeq::clear_do_seq() { + do_seq_.Clear(); +} +inline const ::iot_idl::SFesDoRequestPkg& SFesCtrlRequestSeq::do_seq(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlRequestSeq.do_seq) + return do_seq_.Get(index); +} +inline ::iot_idl::SFesDoRequestPkg* SFesCtrlRequestSeq::mutable_do_seq(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlRequestSeq.do_seq) + return do_seq_.Mutable(index); +} +inline ::iot_idl::SFesDoRequestPkg* SFesCtrlRequestSeq::add_do_seq() { + // @@protoc_insertion_point(field_add:iot_idl.SFesCtrlRequestSeq.do_seq) + return do_seq_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDoRequestPkg >& +SFesCtrlRequestSeq::do_seq() const { + // @@protoc_insertion_point(field_list:iot_idl.SFesCtrlRequestSeq.do_seq) + return do_seq_; +} +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesDoRequestPkg >* +SFesCtrlRequestSeq::mutable_do_seq() { + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesCtrlRequestSeq.do_seq) + return &do_seq_; +} + +// repeated .iot_idl.SFesAoRequestPkg ao_seq = 2; +inline int SFesCtrlRequestSeq::ao_seq_size() const { + return ao_seq_.size(); +} +inline void SFesCtrlRequestSeq::clear_ao_seq() { + ao_seq_.Clear(); +} +inline const ::iot_idl::SFesAoRequestPkg& SFesCtrlRequestSeq::ao_seq(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlRequestSeq.ao_seq) + return ao_seq_.Get(index); +} +inline ::iot_idl::SFesAoRequestPkg* SFesCtrlRequestSeq::mutable_ao_seq(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlRequestSeq.ao_seq) + return ao_seq_.Mutable(index); +} +inline ::iot_idl::SFesAoRequestPkg* SFesCtrlRequestSeq::add_ao_seq() { + // @@protoc_insertion_point(field_add:iot_idl.SFesCtrlRequestSeq.ao_seq) + return ao_seq_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAoRequestPkg >& +SFesCtrlRequestSeq::ao_seq() const { + // @@protoc_insertion_point(field_list:iot_idl.SFesCtrlRequestSeq.ao_seq) + return ao_seq_; +} +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesAoRequestPkg >* +SFesCtrlRequestSeq::mutable_ao_seq() { + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesCtrlRequestSeq.ao_seq) + return &ao_seq_; +} + +// repeated .iot_idl.SFesMoRequestPkg mo_seq = 3; +inline int SFesCtrlRequestSeq::mo_seq_size() const { + return mo_seq_.size(); +} +inline void SFesCtrlRequestSeq::clear_mo_seq() { + mo_seq_.Clear(); +} +inline const ::iot_idl::SFesMoRequestPkg& SFesCtrlRequestSeq::mo_seq(int index) const { + // @@protoc_insertion_point(field_get:iot_idl.SFesCtrlRequestSeq.mo_seq) + return mo_seq_.Get(index); +} +inline ::iot_idl::SFesMoRequestPkg* SFesCtrlRequestSeq::mutable_mo_seq(int index) { + // @@protoc_insertion_point(field_mutable:iot_idl.SFesCtrlRequestSeq.mo_seq) + return mo_seq_.Mutable(index); +} +inline ::iot_idl::SFesMoRequestPkg* SFesCtrlRequestSeq::add_mo_seq() { + // @@protoc_insertion_point(field_add:iot_idl.SFesCtrlRequestSeq.mo_seq) + return mo_seq_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMoRequestPkg >& +SFesCtrlRequestSeq::mo_seq() const { + // @@protoc_insertion_point(field_list:iot_idl.SFesCtrlRequestSeq.mo_seq) + return mo_seq_; +} +inline ::google::protobuf::RepeatedPtrField< ::iot_idl::SFesMoRequestPkg >* +SFesCtrlRequestSeq::mutable_mo_seq() { + // @@protoc_insertion_point(field_mutable_list:iot_idl.SFesCtrlRequestSeq.mo_seq) + return &mo_seq_; +} + +// ------------------------------------------------------------------- + // SFesCtrlReplyPkg // required string strSourceTag = 1; @@ -14783,28 +15043,28 @@ inline void SFesPiValue::set_npointno(::google::protobuf::int32 value) { // @@protoc_insertion_point(field_set:iot_idl.SFesPiValue.nPointNo) } -// required int64 nValue = 2; -inline bool SFesPiValue::has_nvalue() const { +// required double dValue = 2; +inline bool SFesPiValue::has_dvalue() const { return (_has_bits_[0] & 0x00000002u) != 0; } -inline void SFesPiValue::set_has_nvalue() { +inline void SFesPiValue::set_has_dvalue() { _has_bits_[0] |= 0x00000002u; } -inline void SFesPiValue::clear_has_nvalue() { +inline void SFesPiValue::clear_has_dvalue() { _has_bits_[0] &= ~0x00000002u; } -inline void SFesPiValue::clear_nvalue() { - nvalue_ = GOOGLE_LONGLONG(0); - clear_has_nvalue(); +inline void SFesPiValue::clear_dvalue() { + dvalue_ = 0; + clear_has_dvalue(); } -inline ::google::protobuf::int64 SFesPiValue::nvalue() const { - // @@protoc_insertion_point(field_get:iot_idl.SFesPiValue.nValue) - return nvalue_; +inline double SFesPiValue::dvalue() const { + // @@protoc_insertion_point(field_get:iot_idl.SFesPiValue.dValue) + return dvalue_; } -inline void SFesPiValue::set_nvalue(::google::protobuf::int64 value) { - set_has_nvalue(); - nvalue_ = value; - // @@protoc_insertion_point(field_set:iot_idl.SFesPiValue.nValue) +inline void SFesPiValue::set_dvalue(double value) { + set_has_dvalue(); + dvalue_ = value; + // @@protoc_insertion_point(field_set:iot_idl.SFesPiValue.dValue) } // required uint32 uStatus = 3; @@ -15761,6 +16021,11 @@ template <> inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enFesMsgType>() { return ::iot_idl::enFesMsgType_descriptor(); } +template <> struct is_proto_enum< ::iot_idl::enFesCtrlReplyType> : ::google::protobuf::internal::true_type {}; +template <> +inline const EnumDescriptor* GetEnumDescriptor< ::iot_idl::enFesCtrlReplyType>() { + return ::iot_idl::enFesCtrlReplyType_descriptor(); +} } // namespace google } // namespace protobuf diff --git a/platform/src/idl_files/FesMessage.proto b/platform/src/idl_files/FesMessage.proto index eda62ad2..8def5cc2 100644 --- a/platform/src/idl_files/FesMessage.proto +++ b/platform/src/idl_files/FesMessage.proto @@ -12,168 +12,182 @@ package iot_idl; enum enFesMsgType { // Fes 前置实时数据(变化数据全数据)消息类型定义. - //==================================================================================== - MT_FES_DI_CHANGE = 1; //变化遥信 - MT_FES_DI_UPDATE = 2; //全遥信 - MT_FES_DI_SOE = 3; //SOE - MT_FES_AI_CHANGE = 4; //变化遥测 - MT_FES_AI_UPDATE = 5; //全遥测 - MT_FES_MI_CHANGE = 6; //变化遥测 - MT_FES_MI_UPDATE = 7; //全遥测 - MT_FES_PI_CHANGE = 8; //变化累积量 - MT_FES_PI_UPDATE = 9; //全累积量 - MT_FES_DATA_REQUEST = 10; //查询数据 + //==================================================================================== + MT_FES_DI_CHANGE = 1; //变化遥信 + MT_FES_DI_UPDATE = 2; //全遥信 + MT_FES_DI_SOE = 3; //SOE + MT_FES_AI_CHANGE = 4; //变化遥测 + MT_FES_AI_UPDATE = 5; //全遥测 + MT_FES_MI_CHANGE = 6; //变化遥测 + MT_FES_MI_UPDATE = 7; //全遥测 + MT_FES_PI_CHANGE = 8; //变化累积量 + MT_FES_PI_UPDATE = 9; //全累积量 + MT_FES_DATA_REQUEST = 10; //查询数据 // Fes 前置RTU间实时数据(全数据)响应消息类型定义. - //==================================================================================== - MT_FES_RTU_DATA_REQUEST = 20; //全遥信 - MT_FES_RTU_DI_UPDATE = 21; //SDI全遥信 - MT_FES_RTU_AI_UPDATE = 22; //全遥测 - MT_FES_RTU_MI_UPDATE = 23; //全混合量 - MT_FES_RTU_ACC_UPDATE = 24; //全累积量 - MT_FES_RTU_WAVE_UPDATE = 25; //录波数据 - MT_FES_RTU_WAVE_RESEND_REQUEST = 26; //录波请求(重发) - MT_FES_RTU_DDI_UPDATE = 27; //DDI全遥信 - + //==================================================================================== + MT_FES_RTU_DATA_REQUEST = 20; //全遥信 + MT_FES_RTU_DI_UPDATE = 21; //SDI全遥信 + MT_FES_RTU_AI_UPDATE = 22; //全遥测 + MT_FES_RTU_MI_UPDATE = 23; //全混合量 + MT_FES_RTU_ACC_UPDATE = 24; //全累积量 + MT_FES_RTU_WAVE_UPDATE = 25; //录波数据 + MT_FES_RTU_WAVE_RESEND_REQUEST = 26; //录波请求(重发) + MT_FES_RTU_DDI_UPDATE = 27; //DDI全遥信 + // 前置部分(控制命令)消息类型定义. - //==================================================================================== - MT_FES_DO_SELECT = 30; // 数字量控制选择 - MT_FES_DO_EXECUTE = 31; // 数字量控制执行 - MT_FES_DO_CANCEL = 32; // 数字量控制取消 - MT_FES_DO_PREVENT = 33; // 五防校验请求 operate_server->FES + //==================================================================================== + MT_FES_DO_SELECT = 30; // 数字量控制选择 + MT_FES_DO_EXECUTE = 31; // 数字量控制执行 + MT_FES_DO_CANCEL = 32; // 数字量控制取消 + MT_FES_DO_PREVENT = 33; // 五防校验请求 operate_server->FES - MT_FES_DO_SELECT_REPLY = 35; // 数字量控制预置返校 - MT_FES_DO_EXECUTE_REPLY = 36; // 数字量控制执行确认返回 - MT_FES_DO_CANCEL_REPLY = 37; // 数字量控制取消确认 FES->OPT - MT_FES_DO_PREVENT_REPLY = 38; // 五防校验回复 operate_server<-FES + MT_FES_DO_SELECT_REPLY = 35; // 数字量控制预置返校 + MT_FES_DO_EXECUTE_REPLY = 36; // 数字量控制执行确认返回 + MT_FES_DO_CANCEL_REPLY = 37; // 数字量控制取消确认 FES->OPT + MT_FES_DO_PREVENT_REPLY = 38; // 五防校验回复 operate_server<-FES - MT_FES_DO_DIRECTEXE = 39; // 数字量控制直接执行 - MT_FES_DO_AUTOEXE = 40; // 数字量控制自动执行 - - MT_FES_AO_EXECUTE = 45; // 模拟量控制执行 - MT_FES_AO_EXECUTE_REPLY = 46; // 模拟量控制确认 - - MT_FES_MO_SELECT = 50; // 混合量控制选择 - MT_FES_MO_EXECUTE = 51; // 混合量控制执行 - MT_FES_MO_CANCEL = 52; // 混合量控制取消 - MT_FES_MO_PREVENT = 53; // 五防校验请求 - - MT_FES_MO_SELECT_REPLY = 55; // 数字量控制预置返校 - MT_FES_MO_EXECUTE_REPLY = 56; // 数字量控制执行确认返回 - MT_FES_MO_CANCEL_REPLY = 57; // 数字量控制取消确认 FES->OPT - MT_FES_MO_PREVENT_REPLY = 58; // 五防校验回复 operate_server<-FES - - MT_FES_SETTING_READ = 60; // 读取保护定值 - MT_FES_SETTING_DOWN = 61; // 下装保护定值 - MT_FES_SETTING_ACK = 62; // 确定修改保护定值 - MT_FES_SETTING_READ_REPLY = 63; // 读取定值返校 - MT_FES_SETTING_DOWN_REPLY = 64; // 下装定值返校 - MT_FES_SETTING_ACK_REPLY = 65; // 确定修改定值返校 - MT_FES_DEFINE_CMD = 66; // 自定义命令消息 - MT_FES_DEFINE_CMD_REPLAY = 67; // 自定义命令返校 - MT_FES_VIRTUAL_CTRL = 68; // 虚拟数据控制 - + MT_FES_DO_DIRECTEXE = 39; // 数字量控制直接执行 + MT_FES_DO_AUTOEXE = 40; // 数字量控制自动执行 + + MT_FES_AO_EXECUTE = 45; // 模拟量控制执行 + MT_FES_AO_EXECUTE_REPLY = 46; // 模拟量控制确认 + + MT_FES_MO_SELECT = 50; // 混合量控制选择 + MT_FES_MO_EXECUTE = 51; // 混合量控制执行 + MT_FES_MO_CANCEL = 52; // 混合量控制取消 + MT_FES_MO_PREVENT = 53; // 五防校验请求 + + MT_FES_MO_SELECT_REPLY = 55; // 数字量控制预置返校 + MT_FES_MO_EXECUTE_REPLY = 56; // 数字量控制执行确认返回 + MT_FES_MO_CANCEL_REPLY = 57; // 数字量控制取消确认 FES->OPT + MT_FES_MO_PREVENT_REPLY = 58; // 五防校验回复 operate_server<-FES + + MT_FES_SETTING_READ = 60; // 读取保护定值 + MT_FES_SETTING_DOWN = 61; // 下装保护定值 + MT_FES_SETTING_ACK = 62; // 确定修改保护定值 + MT_FES_SETTING_READ_REPLY = 63; // 读取定值返校 + MT_FES_SETTING_DOWN_REPLY = 64; // 下装定值返校 + MT_FES_SETTING_ACK_REPLY = 65; // 确定修改定值返校 + MT_FES_DEFINE_CMD = 66; // 自定义命令消息 + MT_FES_DEFINE_CMD_REPLAY = 67; // 自定义命令返校 + MT_FES_VIRTUAL_CTRL = 68; // 虚拟数据控制 + MT_FES_BATCH_PNT_CMD = 69; //批量测点控制 + // 前置部分(状态反馈)消息类型定义. - //==================================================================================== - MT_FES_CHAN_UPDATE = 70; // 通道状态消息 - MT_FES_RTU_UPDATE = 71; // RTU状态信息 - MT_FES_SOE_EVENT = 72; // SOE事件信息 - MT_FES_RTU_EVENT = 73; // RTU事件信息 - MT_FES_CHAN_EVENT = 74; // CHAN事件信息 - MT_FES_CONFIG_UPDATE = 75; // 配置更新消息 - MT_FES_CONFIG_UPDATE_REPLAY = 76; // 配置更新返校消息 + //==================================================================================== + MT_FES_CHAN_UPDATE = 70; // 通道状态消息 + MT_FES_RTU_UPDATE = 71; // RTU状态信息 + MT_FES_SOE_EVENT = 72; // SOE事件信息 + MT_FES_RTU_EVENT = 73; // RTU事件信息 + MT_FES_CHAN_EVENT = 74; // CHAN事件信息 + MT_FES_CONFIG_UPDATE = 75; // 配置更新消息 + MT_FES_CONFIG_UPDATE_REPLAY = 76; // 配置更新返校消息 + + //==================================================================================== + // 基于RTU的JSON自定义命令 + MT_FES_JSON_RTU_CMD_REQ = 80; //基于RTU的JSON类型自定义命令 + MT_FES_JSON_RTU_CMD_REPLAY = 81; //基于RTU的JSON类型自定义命令反馈 +} + +//对应后台测点属性:是否等待返信,对应dict_menu_info表中的[遥控等待类型] +enum enFesCtrlReplyType +{ + CTRL_TYPE_NWAIT_RTN = 0; //不等待返信 + CTRL_TYPE_WAIT_RTN = 1; //等待返信 + CTRL_TYPE_NWAIT_ACK = 2; //不等待遥控确认 } // Fes Real Data Pagkage Head -//======================================================================================== -message SFesRealPkgHead +//======================================================================================== +message SFesRealPkgHead { - required string strFesSource =1; //????????????? - required int32 nPackageType =2; //???? AI/DI/PI/MI/Event - required int32 nDataNum =3; - required uint64 ulMessageID =4; - optional int32 nResPara1 =5; - optional int32 nResPara2 =6; + required string strFesSource =1; //????????????? + required int32 nPackageType =2; //???? AI/DI/PI/MI/Event + required int32 nDataNum =3; + required uint64 ulMessageID =4; + optional int32 nResPara1 =5; + optional int32 nResPara2 =6; } //Analog Data With Time struct //======================================================================================== message SFesAiDataWithTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required float fValue =5; - required uint64 ulTime =6; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required float fValue =5; + required uint64 ulTime =6; } //Analog Data Without Time struct //======================================================================================== message SFesAiDataWithoutTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required float fValue =5; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required float fValue =5; } //analog all change data package struct //======================================================================================== message SFesChangeAiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesAiDataWithTm stAiData =2; + required SFesRealPkgHead stHead =1; + repeated SFesAiDataWithTm stAiData =2; } //analog update data package struct //======================================================================================== message SFesUpdateAiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesAiDataWithoutTm stAiData =2; - required uint64 ulTime =3; + required SFesRealPkgHead stHead =1; + repeated SFesAiDataWithoutTm stAiData =2; + required uint64 ulTime =3; } //Digital Data With Time struct //======================================================================================== message SFesDiDataWithTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required int32 nValue =5; - required uint64 ulTime =6; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required int32 nValue =5; + required uint64 ulTime =6; } //Digital Data Without Time struct //======================================================================================== message SFesDiDataWithoutTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required int32 nValue =5; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required int32 nValue =5; } //Digital all change data package struct //======================================================================================== message SFesChangeDiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesDiDataWithTm stDiData =2; + required SFesRealPkgHead stHead =1; + repeated SFesDiDataWithTm stDiData =2; } //Digital update data package struct //======================================================================================== message SFesUpdateDiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesDiDataWithoutTm stDiData =2; - required uint64 ulTime =3; + required SFesRealPkgHead stHead =1; + repeated SFesDiDataWithoutTm stDiData =2; + required uint64 ulTime =3; } //Pluse data struct define @@ -181,112 +195,113 @@ message SFesUpdateDiPkg //Pluse Data With Time struct message SFesPiDataWithTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required int64 nValue =5; - required uint64 ulTime =6; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required double dValue =5; + required uint64 ulTime =6; } //Pluse Data Without Time struct //======================================================================================== message SFesPiDataWithoutTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required int64 nValue =5; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required double dValue =5; } //Pluse all change data package struct //======================================================================================== message SFesChangePiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesPiDataWithTm stPiData =2; + required SFesRealPkgHead stHead =1; + repeated SFesPiDataWithTm stPiData =2; } //Pluse update data package struct //======================================================================================== message SFesUpdatePiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesPiDataWithoutTm stPiData =2; - required uint64 ulTime =3; + required SFesRealPkgHead stHead =1; + repeated SFesPiDataWithoutTm stPiData =2; + required uint64 ulTime =3; } //Mi Data With Time struct //======================================================================================== message SFesMiDataWithTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required int32 nValue =5; - required uint64 ulTime =6; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required int32 nValue =5; + required uint64 ulTime =6; } //Mi Data Without Time struct //======================================================================================== message SFesMiDataWithoutTm { - required string strAppTableName =1; - required string strAppColumnName =2; - required string strAppTagName =3; - required uint32 uStatus =4; - required int32 nValue =5; + required string strAppTableName =1; + required string strAppColumnName =2; + required string strAppTagName =3; + required uint32 uStatus =4; + required int32 nValue =5; } //Mi all change data package struct //======================================================================================== message SFesChangeMiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesMiDataWithTm stMiData =2; + required SFesRealPkgHead stHead =1; + repeated SFesMiDataWithTm stMiData =2; } //Digital update data package struct //======================================================================================== message SFesUpdateMiPkg { - required SFesRealPkgHead stHead =1; - repeated SFesMiDataWithoutTm stMiData =2; - required uint64 ulTime =3; + required SFesRealPkgHead stHead =1; + repeated SFesMiDataWithoutTm stMiData =2; + required uint64 ulTime =3; } //FES DO Control opt->fes //======================================================================================== -message SFesDoRequestPkg +message SFesDoRequestPkg { - required string strSourceTag =1; - required string strAppTableName =2; - required string strAppColumnName =3; - required string strAppTagName =4; - required string strRtuName =5; - required int32 nOrder =6; //yk no + required string strSourceTag =1; + required string strAppTableName =2; + required string strAppColumnName =3; + required string strAppTagName =4; + required string strRtuName =5; + required int32 nOrder =6; //yk no required int32 nAction =7; //1/0 required int32 nIfTagtState =9; optional int64 lPara1 =10; optional int64 lPara2 =11; optional float fPara =12; optional string strPara =13; + required int32 nCtrlType =14; //控制类型,对应enFesMsgType的值 } //Fes AO Control //======================================================================================== -message SFesAoRequestPkg +message SFesAoRequestPkg { - required string strSourceTag =1; - required string strAppTableName =2; - required string strAppColumnName =3; - required string strAppTagName =4; - required string strRtuName =5; - required int32 nOrder =6; - required float fValue =7; - required int32 nCtrlType =8; + required string strSourceTag =1; + required string strAppTableName =2; + required string strAppColumnName =3; + required string strAppTagName =4; + required string strRtuName =5; + required int32 nOrder =6; + required float fValue =7; + required int32 nCtrlType =8; //控制类型,对应enFesMsgType的值 required int32 nIfTagtState =9; optional int64 lPara1 =10; optional int64 lPara2 =11; @@ -296,31 +311,38 @@ message SFesAoRequestPkg //Fes MO Control //======================================================================================== -message SFesMoRequestPkg +message SFesMoRequestPkg { - required string strSourceTag =1; - required string strAppTableName =2; - required string strAppColumnName =3; - required string strAppTagName =4; - required string strRtuName =5; - required int32 nOrder =6; - required int32 nValue =7; - required int32 nCtrlType =8; - required int32 nIfTagtState =9; + required string strSourceTag =1; + required string strAppTableName =2; + required string strAppColumnName =3; + required string strAppTagName =4; + required string strRtuName =5; + required int32 nOrder =6; + required int32 nValue =7; + required int32 nCtrlType =8; //控制类型,对应enFesMsgType的值 + required int32 nIfTagtState =9; //是否等待目标状态 optional int64 lPara1 =10; optional int64 lPara2 =11; optional float fPara =12; optional string strPara =13; } +message SFesCtrlRequestSeq +{ + repeated SFesDoRequestPkg do_seq = 1; + repeated SFesAoRequestPkg ao_seq = 2; + repeated SFesMoRequestPkg mo_seq = 3; +} + //DO/AO/MO Control Reply //======================================================================================== -message SFesCtrlReplyPkg +message SFesCtrlReplyPkg { - required string strSourceTag =1; - required string strAppTableName =2; - required string strAppColumnName =3; - required string strAppTagName =4; + required string strSourceTag =1; + required string strAppTableName =2; + required string strAppColumnName =3; + required string strAppTagName =4; required int32 nResult =5; optional int64 lPara1 =10; optional int64 lPara2 =11; @@ -332,211 +354,211 @@ message SFesCtrlReplyPkg //======================================================================================== message SFesCustCmdQueue { - required string strKeyName =1; - required string strKeyValue =2; + required string strKeyName =1; + required string strKeyValue =2; } //Custom Commanad operate_server ->fes //======================================================================================== message SFesCustCmdRequestPkg { - required string strSourceTag =1; - required string strAppTableName =2; - required string strAppTagName =3; - required string strAppColumnName =4; - required string strRtuName =5; - optional int32 nDevId =6; - optional int32 nDataLen =7; - repeated SFesCustCmdQueue seqCustCmdData =8; + required string strSourceTag =1; + required string strAppTableName =2; + required string strAppTagName =3; + required string strAppColumnName =4; + required string strRtuName =5; + optional int32 nDevId =6; + optional int32 nDataLen =7; + repeated SFesCustCmdQueue seqCustCmdData =8; } //Custom Commanad Reply fes->operate_server //======================================================================================== message SFesCustCmdReplyPkg { - required string strSourceTag =1; - required string strAppTableName =2; - required string strAppTagName =4; - required string strAppColumnName =3; - required string strRtuName =5; - optional int32 nDevId =6; // DevId - optional int32 nStatus =7; // REQ??????RESP?????? - optional int32 nDataLen =8; // ???? - repeated SFesCustCmdQueue seqCustCmdData =9; // ????? + required string strSourceTag =1; + required string strAppTableName =2; + required string strAppTagName =4; + required string strAppColumnName =3; + required string strRtuName =5; + optional int32 nDevId =6; // DevId + optional int32 nStatus =7; // REQ??????RESP?????? + optional int32 nDataLen =8; // ???? + repeated SFesCustCmdQueue seqCustCmdData =9; // ????? required int32 nResult =10; // 1:sucess 0 fail - optional string strRetResult =11; // ????????????? + optional string strRetResult =11; // ????????????? } //Const queue operate_server ->fes //======================================================================================== message SConstSetQueue { - required string strTagName =1; - required int32 nConstID =2; - required int32 nValue =3; //?? + required string strTagName =1; + required int32 nConstID =2; + required int32 nValue =3; //?? } //Const set operate_server ->fes //======================================================================================== message SFesConstSetRequestPkg { - required int32 nRtuNo =1; - required int32 nDevId =2; //PCS3000 ??DevId - required int32 nNum =3; //???????????????????Num=0?, ?????Num!=0?????100? - repeated SConstSetQueue seqValue =4; + required int32 nRtuNo =1; + required int32 nDevId =2; //PCS3000 ??DevId + required int32 nNum =3; //???????????????????Num=0?, ?????Num!=0?????100? + repeated SConstSetQueue seqValue =4; } //Const Set Reply fes->operate_server //======================================================================================== message SFesConstReadReplyPkg { - required int32 nRtuNo =1; // RTU? - required int32 nDevId =2; // PCS3000 ??DevId - required int32 nRetStatus =3; // REQ??????RESP?????? - repeated SConstSetQueue seqValue =4; - optional string strRetResult =5; // ????????????? + required int32 nRtuNo =1; // RTU? + required int32 nDevId =2; // PCS3000 ??DevId + required int32 nRetStatus =3; // REQ??????RESP?????? + repeated SConstSetQueue seqValue =4; + optional string strRetResult =5; // ????????????? } //Channel status data up struct //======================================================================================== message SFesChanStatusInfo { - required int32 nChanNo =1; - required uint32 uStatus =2; - required float fErrRate =3; - required uint64 ulTime =4; + required int32 nChanNo =1; + required uint32 uStatus =2; + required float fErrRate =3; + required uint64 ulTime =4; } //Channel status data up package struct //======================================================================================== message SFesChanStatusPkg { - required SFesRealPkgHead stHead =1; - repeated SFesChanStatusInfo stChanStatus =2; + required SFesRealPkgHead stHead =1; + repeated SFesChanStatusInfo stChanStatus =2; } //RTU status data up struct //======================================================================================== message SFesRTUStatusInfo { - required int32 nRtuNo =1; - required uint32 uStatus =2; - required uint64 ulTime =3; + required int32 nRtuNo =1; + required uint32 uStatus =2; + required uint64 ulTime =3; } //RTU status data up package struct //======================================================================================== message SFesRTUStatusPkg { - required SFesRealPkgHead stHead =1; - repeated SFesRTUStatusInfo stRtuStatus =2; + required SFesRealPkgHead stHead =1; + repeated SFesRTUStatusInfo stRtuStatus =2; } //SOE Event //======================================================================================== message SFesSoeEventInfo { - required string strAppTableName =1; - required string strAppColumnName=2; - required string strAppTagName =3; - required uint32 uStatus =4; - required int32 nValue =5; - required uint64 ulTime =6; - optional string strFaultDesc =7; - //required int32 nFaultNum =8; - //repeated int32 nFaultValTag =9; - //repeated float fFaultVal =10; + required string strAppTableName =1; + required string strAppColumnName=2; + required string strAppTagName =3; + required uint32 uStatus =4; + required int32 nValue =5; + required uint64 ulTime =6; + optional string strFaultDesc =7; + //required int32 nFaultNum =8; + //repeated int32 nFaultValTag =9; + //repeated float fFaultVal =10; } //Channel Event struct //======================================================================================== message SFesChanEventInfo { - required string strChanTag =1; - required uint32 uStatus =2; - required float fErrRate =3; - required uint64 ulTime =4; + required string strChanTag =1; + required uint32 uStatus =2; + required float fErrRate =3; + required uint64 ulTime =4; } //RTU Event struct //======================================================================================== message SFesRTUEventInfo { - required string strRtuTag =1; - required uint32 uStatus =2; - required int32 nCurChanNo =3; - required uint64 ulTime =4; + required string strRtuTag =1; + required uint32 uStatus =2; + required int32 nCurChanNo =3; + required uint64 ulTime =4; } //Soe Events data package struct //======================================================================================== message SFesSoeEventPkg { - required SFesRealPkgHead stHead =1; - repeated SFesSoeEventInfo stSoeEvent =2; + required SFesRealPkgHead stHead =1; + repeated SFesSoeEventInfo stSoeEvent =2; } //Channel Events data package struct //======================================================================================== message SFesChanEventPkg { - required SFesRealPkgHead stHead =1; - repeated SFesChanEventInfo stChanEvent =2; + required SFesRealPkgHead stHead =1; + repeated SFesChanEventInfo stChanEvent =2; } //Rtu Events data package struct //======================================================================================== message SFesRTUEventPkg { - required SFesRealPkgHead stHead =1; - repeated SFesRTUEventInfo stRtuEvent =2; + required SFesRealPkgHead stHead =1; + repeated SFesRTUEventInfo stRtuEvent =2; } //Fes AiValue struct //======================================================================================== message SFesAiValue { - required int32 nPointNo =1; - required float fValue =2; - required uint32 uStatus =3; - required uint64 ulTime =4; + required int32 nPointNo =1; + required float fValue =2; + required uint32 uStatus =3; + required uint64 ulTime =4; } //Fes DiValue struct //======================================================================================== message SFesDiValue { - required int32 nPointNo =1; - required int32 nValue =2; - required uint32 uStatus =3; - required uint64 ulTime =4; + required int32 nPointNo =1; + required int32 nValue =2; + required uint32 uStatus =3; + required uint64 ulTime =4; } //Fes PiValue struct //======================================================================================== message SFesPiValue { - required int32 nPointNo =1; - required int64 nValue =2; - required uint32 uStatus =3; - required uint64 ulTime =4; + required int32 nPointNo =1; + required double dValue =2; + required uint32 uStatus =3; + required uint64 ulTime =4; } //Fes MiValue struct //======================================================================================== message SFesMiValue { - required int32 nPointNo =1; - required int32 nValue =2; - required uint32 uStatus =3; - required uint64 ulTime =4; + required int32 nPointNo =1; + required int32 nValue =2; + required uint32 uStatus =3; + required uint64 ulTime =4; } //Fes AiValue data request package struct //======================================================================================== message SFesValueReqPkg { - required SFesRealPkgHead stHead =1; + required SFesRealPkgHead stHead =1; required int32 nRtuNo =2; } @@ -544,36 +566,36 @@ message SFesValueReqPkg //======================================================================================== message SFesAiValueRespPkg { - required SFesRealPkgHead stHead =1; - required int32 nRtuNo =2; - repeated SFesAiValue stAiValue =3; + required SFesRealPkgHead stHead =1; + required int32 nRtuNo =2; + repeated SFesAiValue stAiValue =3; } //Fes DiValue data response package struct //======================================================================================== message SFesDiValueRespPkg { - required SFesRealPkgHead stHead =1; + required SFesRealPkgHead stHead =1; required int32 nRtuNo =2; - repeated SFesDiValue stDiValue =3; + repeated SFesDiValue stDiValue =3; } //Fes PiValue data response package struct //======================================================================================== message SFesPiValueRespPkg { - required SFesRealPkgHead stHead =1; + required SFesRealPkgHead stHead =1; required int32 nRtuNo =2; - repeated SFesPiValue stPiValue =3; + repeated SFesPiValue stPiValue =3; } //Fes MiValue data response package struct //======================================================================================== message SFesMiValueRespPkg { - required SFesRealPkgHead stHead =1; + required SFesRealPkgHead stHead =1; required int32 nRtuNo =2; - repeated SFesMiValue stMiValue =3; + repeated SFesMiValue stMiValue =3; } //FES Virtual Data Report fes->dp @@ -581,17 +603,17 @@ message SFesMiValueRespPkg //Virtual Data struct message SFesVirtualData { - required string strRtuTag =1; - required string strPointTag =2; + required string strRtuTag =1; + required string strPointTag =2; required int32 nPointType =3; //DO:5 AO:6 - required int32 nOrder =4; //PointNo + required int32 nOrder =4; //PointNo required float fValue =5; - required uint64 ulTime =6; + required uint64 ulTime =6; } -message SFesChangeVirtualDataPkg +message SFesChangeVirtualDataPkg { - required SFesRealPkgHead stHead =1; - repeated SFesVirtualData stData =2; + required SFesRealPkgHead stHead =1; + repeated SFesVirtualData stData =2; } diff --git a/platform/src/idl_files/IntelliAlmMsg.pb.cc b/platform/src/idl_files/IntelliAlmMsg.pb.cc index 696d732c..ffae780a 100644 --- a/platform/src/idl_files/IntelliAlmMsg.pb.cc +++ b/platform/src/idl_files/IntelliAlmMsg.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: IntelliAlmMsg.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -224,30 +224,30 @@ void protobuf_AddDesc_IntelliAlmMsg_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\023IntelliAlmMsg.proto\022\013iot_idl\"\327\001\n\017S" - "IntelliAlmInfo\0228\n\013logic_state\030\001 \002(\0162#.kb" - "d_idlfile.enIntelliAlmLogicState\022\021\n\tdoma" - "in_id\030\002 \002(\005\022\020\n\010priority\030\003 \002(\005\022\022\n\ntime_st" - "amp\030\004 \002(\003\022\023\n\013uuid_base64\030\005 \002(\t\022\017\n\007conten" - "t\030\006 \002(\t\022\025\n\rdisposal_plan\030\007 \001(\t\022\024\n\014raw_al" - "m_uuid\030\010 \003(\t\"@\n\016SIntelliAlmAdd\022.\n\010alm_in" - "fo\030\001 \003(\0132\034.iot_idl.SIntelliAlmInfo\"8" - "\n\016SIntelliAlmDel\022\021\n\tdomain_id\030\001 \002(\005\022\023\n\013u" - "uid_base64\030\002 \003(\t\"(\n\021SIntelliAlmBroken\022\023\n" - "\013uuid_base64\030\001 \003(\t\")\n\022SIntelliAlmRelease" - "\022\023\n\013uuid_base64\030\001 \003(\t\":\n\017SIntelliAlmSepr" - "\022\021\n\tdomain_id\030\001 \002(\005\022\024\n\014raw_alm_uuid\030\002 \003(" - "\t\";\n\020SIntelliAlmMerge\022\021\n\tdomain_id\030\001 \002(\005" - "\022\024\n\014raw_alm_uuid\030\002 \003(\t*\236\002\n\023enIntelliAlmM" - "sgType\022\023\n\017MT_IA_S2C_SEQNO\020\001\022\027\n\023MT_IA_C2S" - "_SEQNO_REQ\020\002\022\021\n\rMT_IA_S2C_ALL\020\003\022\025\n\021MT_IA" - "_C2S_ALL_REQ\020\004\022\024\n\020MT_IA_C2S_RT_REQ\020\005\022\021\n\r" - "MT_IA_S2C_ADD\020\006\022\021\n\rMT_IA_S2C_DEL\020\007\022\025\n\021MT" - "_IA_C2S_DEL_REQ\020\010\022\024\n\020MT_IA_S2C_BROKEN\020\t\022" - "\025\n\021MT_IA_S2C_RELEASE\020\n\022\026\n\022MT_IA_C2S_SEPR" - "_REQ\020\013\022\027\n\023MT_IA_C2S_MERGE_REQ\020\014*L\n\026enInt" - "elliAlmLogicState\022\017\n\013IALS_NORMAL\020\001\022\020\n\014IA" - "LS_DELETED\020\002\022\017\n\013IALS_BROKEN\020\003", 949); + "\n\023IntelliAlmMsg.proto\022\007iot_idl\"\323\001\n\017SInte" + "lliAlmInfo\0224\n\013logic_state\030\001 \002(\0162\037.iot_id" + "l.enIntelliAlmLogicState\022\021\n\tdomain_id\030\002 " + "\002(\005\022\020\n\010priority\030\003 \002(\005\022\022\n\ntime_stamp\030\004 \002(" + "\003\022\023\n\013uuid_base64\030\005 \002(\t\022\017\n\007content\030\006 \002(\t\022" + "\025\n\rdisposal_plan\030\007 \001(\t\022\024\n\014raw_alm_uuid\030\010" + " \003(\t\"<\n\016SIntelliAlmAdd\022*\n\010alm_info\030\001 \003(\013" + "2\030.iot_idl.SIntelliAlmInfo\"8\n\016SIntelliAl" + "mDel\022\021\n\tdomain_id\030\001 \002(\005\022\023\n\013uuid_base64\030\002" + " \003(\t\"(\n\021SIntelliAlmBroken\022\023\n\013uuid_base64" + "\030\001 \003(\t\")\n\022SIntelliAlmRelease\022\023\n\013uuid_bas" + "e64\030\001 \003(\t\":\n\017SIntelliAlmSepr\022\021\n\tdomain_i" + "d\030\001 \002(\005\022\024\n\014raw_alm_uuid\030\002 \003(\t\";\n\020SIntell" + "iAlmMerge\022\021\n\tdomain_id\030\001 \002(\005\022\024\n\014raw_alm_" + "uuid\030\002 \003(\t*\236\002\n\023enIntelliAlmMsgType\022\023\n\017MT" + "_IA_S2C_SEQNO\020\001\022\027\n\023MT_IA_C2S_SEQNO_REQ\020\002" + "\022\021\n\rMT_IA_S2C_ALL\020\003\022\025\n\021MT_IA_C2S_ALL_REQ" + "\020\004\022\024\n\020MT_IA_C2S_RT_REQ\020\005\022\021\n\rMT_IA_S2C_AD" + "D\020\006\022\021\n\rMT_IA_S2C_DEL\020\007\022\025\n\021MT_IA_C2S_DEL_" + "REQ\020\010\022\024\n\020MT_IA_S2C_BROKEN\020\t\022\025\n\021MT_IA_S2C" + "_RELEASE\020\n\022\026\n\022MT_IA_C2S_SEPR_REQ\020\013\022\027\n\023MT" + "_IA_C2S_MERGE_REQ\020\014*L\n\026enIntelliAlmLogic" + "State\022\017\n\013IALS_NORMAL\020\001\022\020\n\014IALS_DELETED\020\002" + "\022\017\n\013IALS_BROKEN\020\003", 937); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "IntelliAlmMsg.proto", &protobuf_RegisterTypes); SIntelliAlmInfo::default_instance_ = new SIntelliAlmInfo(); diff --git a/platform/src/idl_files/IntelliAlmMsg.pb.h b/platform/src/idl_files/IntelliAlmMsg.pb.h index 1417d2bd..155593e1 100644 --- a/platform/src/idl_files/IntelliAlmMsg.pb.h +++ b/platform/src/idl_files/IntelliAlmMsg.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: IntelliAlmMsg.proto #ifndef PROTOBUF_IntelliAlmMsg_2eproto__INCLUDED diff --git a/platform/src/idl_files/NodeMngMessage.pb.cc b/platform/src/idl_files/NodeMngMessage.pb.cc index 683cbf61..d5f6181a 100644 --- a/platform/src/idl_files/NodeMngMessage.pb.cc +++ b/platform/src/idl_files/NodeMngMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: NodeMngMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -166,26 +166,26 @@ void protobuf_AddDesc_NodeMngMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024NodeMngMessage.proto\022\013iot_idl\"\272\001\n\020" - "SAppHeartbeatMsg\022\016\n\006nAppId\030\001 \002(\005\022\021\n\tnPri" - "ority\030\002 \002(\005\022\022\n\nbIP1Active\030\003 \002(\010\022\022\n\nbIP2A" - "ctive\030\004 \002(\010\022\017\n\007bActive\030\005 \002(\010\022\017\n\007bMaster\030" - "\006 \002(\010\022\016\n\006bSlave\030\007 \002(\010\022\022\n\nbHasMaster\030\010 \002(" - "\010\022\025\n\rbSwitchFailed\030\t \002(\010\"\223\001\n\021SNodeHeartb" - "eatMsg\022\021\n\tnDomainId\030\001 \002(\005\022\023\n\013strNodeName" - "\030\002 \002(\t\022\016\n\006strIP1\030\003 \002(\t\022\016\n\006strIP2\030\004 \002(\t\0226" - "\n\017vecAppHeartbeat\030\005 \003(\0132\035.iot_idl.SA" - "ppHeartbeatMsg\"R\n\026SMultiNodeHeartbeatMsg" - "\0228\n\020vecNodeHeartBeat\030\001 \003(\0132\036.iot_idl" - ".SNodeHeartbeatMsg\"\325\001\n\021SRedundancyCmdMsg" - "\022\021\n\tnDomainId\030\001 \002(\005\022\016\n\006nAppId\030\002 \002(\005\022\031\n\021s" - "trSwitchNodeName\030\003 \002(\t\022\032\n\022strArbiterNode" - "Name\030\004 \002(\t\022\031\n\021strArbiterNodeIP1\030\005 \002(\t\022\031\n" - "\021strArbiterNodeIP2\030\006 \002(\t\022\017\n\007bActive\030\007 \002(" - "\010\022\017\n\007bMaster\030\010 \002(\010\022\016\n\006bSlave\030\t \002(\010*{\n\017EN" - "odeMngMsgType\022\026\n\022MT_NodeInfoInvalid\020\000\022\032\n" - "\026MT_IntraDomainNodeInfo\020\001\022\032\n\026MT_InterDom" - "ainNodeInfo\020\002\022\030\n\024MT_RedundancyCommand\020\003", 799); + "\n\024NodeMngMessage.proto\022\007iot_idl\"\272\001\n\020SApp" + "HeartbeatMsg\022\016\n\006nAppId\030\001 \002(\005\022\021\n\tnPriorit" + "y\030\002 \002(\005\022\022\n\nbIP1Active\030\003 \002(\010\022\022\n\nbIP2Activ" + "e\030\004 \002(\010\022\017\n\007bActive\030\005 \002(\010\022\017\n\007bMaster\030\006 \002(" + "\010\022\016\n\006bSlave\030\007 \002(\010\022\022\n\nbHasMaster\030\010 \002(\010\022\025\n" + "\rbSwitchFailed\030\t \002(\010\"\217\001\n\021SNodeHeartbeatM" + "sg\022\021\n\tnDomainId\030\001 \002(\005\022\023\n\013strNodeName\030\002 \002" + "(\t\022\016\n\006strIP1\030\003 \002(\t\022\016\n\006strIP2\030\004 \002(\t\0222\n\017ve" + "cAppHeartbeat\030\005 \003(\0132\031.iot_idl.SAppHeartb" + "eatMsg\"N\n\026SMultiNodeHeartbeatMsg\0224\n\020vecN" + "odeHeartBeat\030\001 \003(\0132\032.iot_idl.SNodeHeartb" + "eatMsg\"\325\001\n\021SRedundancyCmdMsg\022\021\n\tnDomainI" + "d\030\001 \002(\005\022\016\n\006nAppId\030\002 \002(\005\022\031\n\021strSwitchNode" + "Name\030\003 \002(\t\022\032\n\022strArbiterNodeName\030\004 \002(\t\022\031" + "\n\021strArbiterNodeIP1\030\005 \002(\t\022\031\n\021strArbiterN" + "odeIP2\030\006 \002(\t\022\017\n\007bActive\030\007 \002(\010\022\017\n\007bMaster" + "\030\010 \002(\010\022\016\n\006bSlave\030\t \002(\010*{\n\017ENodeMngMsgTyp" + "e\022\026\n\022MT_NodeInfoInvalid\020\000\022\032\n\026MT_IntraDom" + "ainNodeInfo\020\001\022\032\n\026MT_InterDomainNodeInfo\020" + "\002\022\030\n\024MT_RedundancyCommand\020\003", 787); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "NodeMngMessage.proto", &protobuf_RegisterTypes); SAppHeartbeatMsg::default_instance_ = new SAppHeartbeatMsg(); diff --git a/platform/src/idl_files/NodeMngMessage.pb.h b/platform/src/idl_files/NodeMngMessage.pb.h index 1e9e4b72..ef71c4a8 100644 --- a/platform/src/idl_files/NodeMngMessage.pb.h +++ b/platform/src/idl_files/NodeMngMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: NodeMngMessage.proto #ifndef PROTOBUF_NodeMngMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/OptDataMessage.pb.cc b/platform/src/idl_files/OptDataMessage.pb.cc index 40059ee8..4eb9e2e3 100644 --- a/platform/src/idl_files/OptDataMessage.pb.cc +++ b/platform/src/idl_files/OptDataMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: OptDataMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -186,34 +186,33 @@ void protobuf_AddDesc_OptDataMessage_2eproto() { ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\024OptDataMessage.proto\022\013iot_idl\032\014Pub" - "lic.proto\"e\n\017SOptDataPkgHead\022\023\n\013str_src_" - "tag\030\001 \002(\t\022\024\n\014n_point_type\030\002 \002(\005\022\023\n\013b_not" - "_alarm\030\003 \002(\010\022\022\n\nn_opt_time\030\004 \002(\003\"}\n\016SOpt" - "SetDataMsg\022\024\n\014str_tag_name\030\001 \002(\t\022\024\n\014u_ad" - "d_status\030\002 \002(\r\022\024\n\014u_del_status\030\003 \002(\r\022)\n\t" - "var_value\030\004 \002(\0132\026.iot_idl.SVariable\"" - "|\n\016SOptSetDataPkg\0222\n\014package_head\030\001 \002(\0132" - "\034.iot_idl.SOptDataPkgHead\0226\n\021seq_set" - "_data_info\030\002 \003(\0132\033.iot_idl.SOptSetDa" - "taMsg\"\202\001\n\023SOptVirtCtrlRequest\022\024\n\014str_tab" - "_name\030\001 \002(\t\022\024\n\014str_tag_name\030\002 \002(\t\022\024\n\014str" - "_col_name\030\003 \002(\t\022)\n\tvar_value\030\004 \002(\0132\026.kbd" - "_idlfile.SVariable\"\225\001\n\021SOptVirtCtrlReply" - "\022\024\n\014str_tab_name\030\001 \002(\t\022\024\n\014str_tag_name\030\002" - " \002(\t\022\024\n\014str_col_name\030\003 \002(\t\022\025\n\rn_ctrl_res" - "ult\030\004 \002(\005\022\017\n\007str_err\030\005 \001(\t\022\026\n\016str_source" - "_tag\030\006 \001(\t*\217\001\n\023enOptSetDataMsgType\022\034\n\030MT" - "_OPT_SET_TAG_DATA_DOWN\020\001\022\035\n\031MT_OPT_SET_T" - "AG_DATA_REPLY\020\002\022\034\n\030MT_OPT_SET_CAL_DATA_D" - "OWN\020\003\022\035\n\031MT_OPT_SET_CAL_DATA_REPLY\020\004*\364\001\n" - "\024enOptVirtCtrlMsgType\022$\n MT_OPT2APP_VIRT" - "_CTRL_ANA_REQUEST\020\001\022$\n MT_OPT2APP_VIRT_C" - "TRL_DIG_REQUEST\020\002\022$\n MT_OPT2APP_VIRT_CTR" - "L_MIX_REQUEST\020\003\022\"\n\036MT_APP2OPT_VIRT_CTRL_" - "ANA_REPLY\020e\022\"\n\036MT_APP2OPT_VIRT_CTRL_DIG_" - "REPLY\020f\022\"\n\036MT_APP2OPT_VIRT_CTRL_MIX_REPL" - "Y\020g", 1083); + "\n\024OptDataMessage.proto\022\007iot_idl\032\014Public." + "proto\"e\n\017SOptDataPkgHead\022\023\n\013str_src_tag\030" + "\001 \002(\t\022\024\n\014n_point_type\030\002 \002(\005\022\023\n\013b_not_ala" + "rm\030\003 \002(\010\022\022\n\nn_opt_time\030\004 \002(\003\"y\n\016SOptSetD" + "ataMsg\022\024\n\014str_tag_name\030\001 \002(\t\022\024\n\014u_add_st" + "atus\030\002 \002(\r\022\024\n\014u_del_status\030\003 \002(\r\022%\n\tvar_" + "value\030\004 \002(\0132\022.iot_idl.SVariable\"t\n\016SOptS" + "etDataPkg\022.\n\014package_head\030\001 \002(\0132\030.iot_id" + "l.SOptDataPkgHead\0222\n\021seq_set_data_info\030\002" + " \003(\0132\027.iot_idl.SOptSetDataMsg\"~\n\023SOptVir" + "tCtrlRequest\022\024\n\014str_tab_name\030\001 \002(\t\022\024\n\014st" + "r_tag_name\030\002 \002(\t\022\024\n\014str_col_name\030\003 \002(\t\022%" + "\n\tvar_value\030\004 \002(\0132\022.iot_idl.SVariable\"\225\001" + "\n\021SOptVirtCtrlReply\022\024\n\014str_tab_name\030\001 \002(" + "\t\022\024\n\014str_tag_name\030\002 \002(\t\022\024\n\014str_col_name\030" + "\003 \002(\t\022\025\n\rn_ctrl_result\030\004 \002(\005\022\017\n\007str_err\030" + "\005 \001(\t\022\026\n\016str_source_tag\030\006 \001(\t*\217\001\n\023enOptS" + "etDataMsgType\022\034\n\030MT_OPT_SET_TAG_DATA_DOW" + "N\020\001\022\035\n\031MT_OPT_SET_TAG_DATA_REPLY\020\002\022\034\n\030MT" + "_OPT_SET_CAL_DATA_DOWN\020\003\022\035\n\031MT_OPT_SET_C" + "AL_DATA_REPLY\020\004*\364\001\n\024enOptVirtCtrlMsgType" + "\022$\n MT_OPT2APP_VIRT_CTRL_ANA_REQUEST\020\001\022$" + "\n MT_OPT2APP_VIRT_CTRL_DIG_REQUEST\020\002\022$\n " + "MT_OPT2APP_VIRT_CTRL_MIX_REQUEST\020\003\022\"\n\036MT" + "_APP2OPT_VIRT_CTRL_ANA_REPLY\020e\022\"\n\036MT_APP" + "2OPT_VIRT_CTRL_DIG_REPLY\020f\022\"\n\036MT_APP2OPT" + "_VIRT_CTRL_MIX_REPLY\020g", 1062); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "OptDataMessage.proto", &protobuf_RegisterTypes); SOptDataPkgHead::default_instance_ = new SOptDataPkgHead(); diff --git a/platform/src/idl_files/OptDataMessage.pb.h b/platform/src/idl_files/OptDataMessage.pb.h index bbd83890..9c047df3 100644 --- a/platform/src/idl_files/OptDataMessage.pb.h +++ b/platform/src/idl_files/OptDataMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: OptDataMessage.proto #ifndef PROTOBUF_OptDataMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/OptDataMessage.proto b/platform/src/idl_files/OptDataMessage.proto index c3319642..c5bc09c4 100644 --- a/platform/src/idl_files/OptDataMessage.proto +++ b/platform/src/idl_files/OptDataMessage.proto @@ -4,7 +4,7 @@ // @author zhouzhenlgong //======================================================================================== syntax="proto2" ; -package iot_idl ; +package iot_idl; import "Public.proto"; enum enOptSetDataMsgType diff --git a/platform/src/idl_files/Public.pb.cc b/platform/src/idl_files/Public.pb.cc index c31cb4b2..328f7fb2 100644 --- a/platform/src/idl_files/Public.pb.cc +++ b/platform/src/idl_files/Public.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: Public.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -92,23 +92,22 @@ void protobuf_AddDesc_Public_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\014Public.proto\022\013iot_idl\"\270\001\n\tSVariabl" - "e\022(\n\teDataType\030\001 \002(\0162\025.iot_idl.DataT" - "ype\022\016\n\006bValue\030\002 \001(\010\022\016\n\006uValue\030\003 \001(\r\022\016\n\006n" - "Value\030\004 \001(\005\022\017\n\007ulValue\030\005 \001(\004\022\016\n\006lValue\030\006" - " \001(\003\022\016\n\006fValue\030\007 \001(\002\022\016\n\006dValue\030\010 \001(\001\022\020\n\010" - "strValue\030\t \001(\t*\334\001\n\010DataType\022\024\n\020CN_DATATY" - "PE_BOOL\020\001\022\026\n\022CN_DATATYPE_UINT32\020\002\022\025\n\021CN_" - "DATATYPE_INT32\020\003\022\026\n\022CN_DATATYPE_UINT64\020\004" - "\022\025\n\021CN_DATATYPE_INT64\020\005\022\025\n\021CN_DATATYPE_F" - "LOAT\020\006\022\026\n\022CN_DATATYPE_DOUBLE\020\007\022\026\n\022CN_DAT" - "ATYPE_STRING\020\010\022\025\n\021CN_DATATYPE_BYTES\020\t*3\n" - "\020ENConditionLogic\022\017\n\013enumCondAnd\020\000\022\016\n\nen" - "umCondOr\020\001*\224\001\n\023ENConditionRelation\022\021\n\ren" - "umCondEqual\020\000\022\021\n\renumCondLarge\020\001\022\021\n\renum" - "CondSmall\020\002\022\026\n\022enumCondLargeEqual\020\003\022\026\n\022e" - "numCondSmallEqual\020\004\022\024\n\020enumCondNotEqual\020" - "\005", 641); + "\n\014Public.proto\022\007iot_idl\"\264\001\n\tSVariable\022$\n" + "\teDataType\030\001 \002(\0162\021.iot_idl.DataType\022\016\n\006b" + "Value\030\002 \001(\010\022\016\n\006uValue\030\003 \001(\r\022\016\n\006nValue\030\004 " + "\001(\005\022\017\n\007ulValue\030\005 \001(\004\022\016\n\006lValue\030\006 \001(\003\022\016\n\006" + "fValue\030\007 \001(\002\022\016\n\006dValue\030\010 \001(\001\022\020\n\010strValue" + "\030\t \001(\t*\334\001\n\010DataType\022\024\n\020CN_DATATYPE_BOOL\020" + "\001\022\026\n\022CN_DATATYPE_UINT32\020\002\022\025\n\021CN_DATATYPE" + "_INT32\020\003\022\026\n\022CN_DATATYPE_UINT64\020\004\022\025\n\021CN_D" + "ATATYPE_INT64\020\005\022\025\n\021CN_DATATYPE_FLOAT\020\006\022\026" + "\n\022CN_DATATYPE_DOUBLE\020\007\022\026\n\022CN_DATATYPE_ST" + "RING\020\010\022\025\n\021CN_DATATYPE_BYTES\020\t*3\n\020ENCondi" + "tionLogic\022\017\n\013enumCondAnd\020\000\022\016\n\nenumCondOr" + "\020\001*\224\001\n\023ENConditionRelation\022\021\n\renumCondEq" + "ual\020\000\022\021\n\renumCondLarge\020\001\022\021\n\renumCondSmal" + "l\020\002\022\026\n\022enumCondLargeEqual\020\003\022\026\n\022enumCondS" + "mallEqual\020\004\022\024\n\020enumCondNotEqual\020\005", 633); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "Public.proto", &protobuf_RegisterTypes); SVariable::default_instance_ = new SVariable(); diff --git a/platform/src/idl_files/Public.pb.h b/platform/src/idl_files/Public.pb.h index 9caa1cd7..3b8c59bf 100644 --- a/platform/src/idl_files/Public.pb.h +++ b/platform/src/idl_files/Public.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: Public.proto #ifndef PROTOBUF_Public_2eproto__INCLUDED diff --git a/platform/src/idl_files/PushMessage.pb.cc b/platform/src/idl_files/PushMessage.pb.cc index bb127718..b5addac1 100644 --- a/platform/src/idl_files/PushMessage.pb.cc +++ b/platform/src/idl_files/PushMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: PushMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -119,23 +119,22 @@ void protobuf_AddDesc_PushMessage_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\021PushMessage.proto\022\013iot_idl\"\331\002\n\nSSM" - "TP_MAIL\022\026\n\016server_address\030\001 \002(\t\022\014\n\004port\030" - "\002 \002(\t\022T\n\017connecttionType\030\003 \002(\0162(.kbd_idl" - "file.SSMTP_MAIL.enConnectionType:\021CT_TCP" - "_CONNECTION\022\016\n\006sender\030\004 \002(\t\022\022\n\nrecipient" - "s\030\005 \002(\t\022\020\n\010username\030\006 \002(\t\022\020\n\010password\030\007 " - "\002(\t\022\017\n\007subject\030\010 \002(\t\022\017\n\007content\030\t \002(\t\022\014\n" - "\004time\030\n \002(\003\"W\n\020enConnectionType\022\025\n\021CT_TC" - "P_CONNECTION\020\000\022\025\n\021CT_SSL_CONNECTION\020\001\022\025\n" - "\021CT_TLS_CONNECTION\020\002\"\211\001\n\014SBBNIOT_VSMS\022\026\n" - "\016server_address\030\001 \002(\t\022\020\n\010username\030\002 \002(\t\022" - "\020\n\010password\030\003 \002(\t\022\016\n\006method\030\004 \002(\t\022\016\n\006num" - "ber\030\005 \002(\t\022\017\n\007content\030\006 \002(\t\022\014\n\004time\030\007 \002(\003" - "*{\n\021enPushTypeMessage\022\025\n\021MT_PUSH_SMTP_MA" - "IL\020\001\022\031\n\025MT_PUSH_SMTP_MAIL_ACK\020\002\022\027\n\023MT_PU" - "SH_BBNIOT_VSMS\020\003\022\033\n\027MT_PUSH_BBNIOT_VSMS_" - "ACK\020\004", 645); + "\n\021PushMessage.proto\022\007iot_idl\"\325\002\n\nSSMTP_M" + "AIL\022\026\n\016server_address\030\001 \002(\t\022\014\n\004port\030\002 \002(" + "\t\022P\n\017connecttionType\030\003 \002(\0162$.iot_idl.SSM" + "TP_MAIL.enConnectionType:\021CT_TCP_CONNECT" + "ION\022\016\n\006sender\030\004 \002(\t\022\022\n\nrecipients\030\005 \002(\t\022" + "\020\n\010username\030\006 \002(\t\022\020\n\010password\030\007 \002(\t\022\017\n\007s" + "ubject\030\010 \002(\t\022\017\n\007content\030\t \002(\t\022\014\n\004time\030\n " + "\002(\003\"W\n\020enConnectionType\022\025\n\021CT_TCP_CONNEC" + "TION\020\000\022\025\n\021CT_SSL_CONNECTION\020\001\022\025\n\021CT_TLS_" + "CONNECTION\020\002\"\211\001\n\014SBBNIOT_VSMS\022\026\n\016server_" + "address\030\001 \002(\t\022\020\n\010username\030\002 \002(\t\022\020\n\010passw" + "ord\030\003 \002(\t\022\016\n\006method\030\004 \002(\t\022\016\n\006number\030\005 \002(" + "\t\022\017\n\007content\030\006 \002(\t\022\014\n\004time\030\007 \002(\003*{\n\021enPu" + "shTypeMessage\022\025\n\021MT_PUSH_SMTP_MAIL\020\001\022\031\n\025" + "MT_PUSH_SMTP_MAIL_ACK\020\002\022\027\n\023MT_PUSH_BBNIO" + "T_VSMS\020\003\022\033\n\027MT_PUSH_BBNIOT_VSMS_ACK\020\004", 637); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "PushMessage.proto", &protobuf_RegisterTypes); SSMTP_MAIL::default_instance_ = new SSMTP_MAIL(); diff --git a/platform/src/idl_files/PushMessage.pb.h b/platform/src/idl_files/PushMessage.pb.h index f0118fc0..f6ca84f8 100644 --- a/platform/src/idl_files/PushMessage.pb.h +++ b/platform/src/idl_files/PushMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: PushMessage.proto #ifndef PROTOBUF_PushMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/RdbServerMessage.pb.cc b/platform/src/idl_files/RdbServerMessage.pb.cc index cde557ea..dbbfd800 100644 --- a/platform/src/idl_files/RdbServerMessage.pb.cc +++ b/platform/src/idl_files/RdbServerMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: RdbServerMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -373,53 +373,51 @@ void protobuf_AddDesc_RdbServerMessage_2eproto() { ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\026RdbServerMessage.proto\022\013iot_idl\032\014P" - "ublic.proto\"\265\001\n\014RdbCondition\022.\n\007enLogic\030" - "\001 \001(\0162\035.iot_idl.ENConditionLogic\0224\n\n" - "enRelation\030\002 \002(\0162 .iot_idl.ENConditi" - "onRelation\022\025\n\rstrColumnName\030\003 \002(\t\022(\n\010msg" - "Value\030\005 \002(\0132\026.iot_idl.SVariable\":\n\tR" - "dbRecord\022-\n\rmsgValueArray\030\001 \003(\0132\026.kbd_id" - "lfile.SVariable\"Q\n\016RdbUpdateValue\022\025\n\rstr" - "ColumnName\030\001 \002(\t\022(\n\010msgValue\030\002 \002(\0132\026.kbd" - "_idlfile.SVariable\"\233\001\n\010RdbQuery\022\024\n\014strTa" - "bleName\030\001 \002(\t\022\033\n\023strSelectColNameArr\030\002 \003" - "(\t\022\032\n\022strOrderColNameArr\030\003 \003(\t\022/\n\014msgCon" - "dition\030\004 \003(\0132\031.iot_idl.RdbCondition\022" - "\017\n\004nAsc\030\005 \001(\005:\0011\"a\n\tRdbInsert\022\024\n\014strTabl" - "eName\030\001 \002(\t\022\025\n\rstrColumnName\030\002 \003(\t\022\'\n\007ms" - "gData\030\003 \003(\0132\026.iot_idl.RdbRecord\"V\n\tR" - "dbRemove\022\024\n\014strTableName\030\001 \002(\t\0223\n\020msgCon" - "dtionArray\030\002 \003(\0132\031.iot_idl.RdbCondit" - "ion\"\207\001\n\tRdbUpdate\022\024\n\014strTableName\030\001 \002(\t\022" - "/\n\014msgCondition\030\002 \003(\0132\031.iot_idl.RdbC" - "ondition\0223\n\016msgUpdateValue\030\003 \003(\0132\033.kbd_i" - "dlfile.RdbUpdateValue\"3\n\014RdbLockTable\022\024\n" - "\014strTableName\030\001 \002(\t\022\r\n\005bLock\030\002 \002(\010\"S\n\006Rd" - "bRet\022\016\n\003ret\030\002 \002(\005:\0010\022)\n\tmsgRecord\030\003 \003(\0132" - "\026.iot_idl.RdbRecord\022\016\n\006strErr\030\004 \001(\t\"" - "\216\002\n\nRdbRequest\022\024\n\014strSessionID\030\001 \002(\t\022\024\n\014" - "strPackageId\030\002 \002(\t\022\'\n\010msgQuery\030\004 \001(\0132\025.k" - "bd_idlfile.RdbQuery\022)\n\tmsgInsert\030\005 \001(\0132\026" - ".iot_idl.RdbInsert\022)\n\tmsgRemove\030\006 \001(" - "\0132\026.iot_idl.RdbRemove\022)\n\tmsgUpdate\030\007" - " \001(\0132\026.iot_idl.RdbUpdate\022*\n\007msgLock\030" - "\010 \001(\0132\031.iot_idl.RdbLockTable\"X\n\010RdbR" - "eply\022\024\n\014strSessionID\030\001 \002(\t\022\024\n\014strPackage" - "Id\030\003 \002(\t\022 \n\003ret\030\002 \002(\0132\023.iot_idl.RdbR" - "et\"f\n\nRdbReplace\022\024\n\014strSessionID\030\001 \002(\t\022\024" - "\n\014strTableName\030\002 \002(\t\022,\n\tmsgUpdate\030\003 \003(\0132" - "\031.iot_idl.RdbSynUpdate\"\205\001\n\014RdbSynUpd" - "ate\022/\n\014msgCondition\030\001 \003(\0132\031.iot_idl." - "RdbCondition\0223\n\016msgUpdateValue\030\002 \003(\0132\033.k" - "bd_idlfile.RdbUpdateValue\022\017\n\007strKeys\030\003 \001" - "(\t*\371\001\n\022enRdbServerMessage\022\036\n\032MT_DBMS_RTD" - "ATA_NET_REQUEST\020\001\022\035\n\031MT_DBMS_RTDATA_NET_" - "REPLAY\020\002\022 \n\034MT_DBMS_RTDATA_NET_DELETECLI" - "\020\003\022\035\n\031MT_DBMS_RTDATA_SYN_SUDDEN\020\004\022\033\n\027MT_" - "DBMS_RTDATA_SYN_SNAP\020\005\022#\n\037MT_DBMS_RTDATA" - "_SYN_SNAP_REQUEST\020\006\022!\n\035MT_DBMS_RTDATA_SY" - "N_VALUETABLE\020\007", 1854); + "\n\026RdbServerMessage.proto\022\007iot_idl\032\014Publi" + "c.proto\"\251\001\n\014RdbCondition\022*\n\007enLogic\030\001 \001(" + "\0162\031.iot_idl.ENConditionLogic\0220\n\nenRelati" + "on\030\002 \002(\0162\034.iot_idl.ENConditionRelation\022\025" + "\n\rstrColumnName\030\003 \002(\t\022$\n\010msgValue\030\005 \002(\0132" + "\022.iot_idl.SVariable\"6\n\tRdbRecord\022)\n\rmsgV" + "alueArray\030\001 \003(\0132\022.iot_idl.SVariable\"M\n\016R" + "dbUpdateValue\022\025\n\rstrColumnName\030\001 \002(\t\022$\n\010" + "msgValue\030\002 \002(\0132\022.iot_idl.SVariable\"\227\001\n\010R" + "dbQuery\022\024\n\014strTableName\030\001 \002(\t\022\033\n\023strSele" + "ctColNameArr\030\002 \003(\t\022\032\n\022strOrderColNameArr" + "\030\003 \003(\t\022+\n\014msgCondition\030\004 \003(\0132\025.iot_idl.R" + "dbCondition\022\017\n\004nAsc\030\005 \001(\005:\0011\"]\n\tRdbInser" + "t\022\024\n\014strTableName\030\001 \002(\t\022\025\n\rstrColumnName" + "\030\002 \003(\t\022#\n\007msgData\030\003 \003(\0132\022.iot_idl.RdbRec" + "ord\"R\n\tRdbRemove\022\024\n\014strTableName\030\001 \002(\t\022/" + "\n\020msgCondtionArray\030\002 \003(\0132\025.iot_idl.RdbCo" + "ndition\"\177\n\tRdbUpdate\022\024\n\014strTableName\030\001 \002" + "(\t\022+\n\014msgCondition\030\002 \003(\0132\025.iot_idl.RdbCo" + "ndition\022/\n\016msgUpdateValue\030\003 \003(\0132\027.iot_id" + "l.RdbUpdateValue\"3\n\014RdbLockTable\022\024\n\014strT" + "ableName\030\001 \002(\t\022\r\n\005bLock\030\002 \002(\010\"O\n\006RdbRet\022" + "\016\n\003ret\030\002 \002(\005:\0010\022%\n\tmsgRecord\030\003 \003(\0132\022.iot" + "_idl.RdbRecord\022\016\n\006strErr\030\004 \001(\t\"\372\001\n\nRdbRe" + "quest\022\024\n\014strSessionID\030\001 \002(\t\022\024\n\014strPackag" + "eId\030\002 \002(\t\022#\n\010msgQuery\030\004 \001(\0132\021.iot_idl.Rd" + "bQuery\022%\n\tmsgInsert\030\005 \001(\0132\022.iot_idl.RdbI" + "nsert\022%\n\tmsgRemove\030\006 \001(\0132\022.iot_idl.RdbRe" + "move\022%\n\tmsgUpdate\030\007 \001(\0132\022.iot_idl.RdbUpd" + "ate\022&\n\007msgLock\030\010 \001(\0132\025.iot_idl.RdbLockTa" + "ble\"T\n\010RdbReply\022\024\n\014strSessionID\030\001 \002(\t\022\024\n" + "\014strPackageId\030\003 \002(\t\022\034\n\003ret\030\002 \002(\0132\017.iot_i" + "dl.RdbRet\"b\n\nRdbReplace\022\024\n\014strSessionID\030" + "\001 \002(\t\022\024\n\014strTableName\030\002 \002(\t\022(\n\tmsgUpdate" + "\030\003 \003(\0132\025.iot_idl.RdbSynUpdate\"}\n\014RdbSynU" + "pdate\022+\n\014msgCondition\030\001 \003(\0132\025.iot_idl.Rd" + "bCondition\022/\n\016msgUpdateValue\030\002 \003(\0132\027.iot" + "_idl.RdbUpdateValue\022\017\n\007strKeys\030\003 \001(\t*\371\001\n" + "\022enRdbServerMessage\022\036\n\032MT_DBMS_RTDATA_NE" + "T_REQUEST\020\001\022\035\n\031MT_DBMS_RTDATA_NET_REPLAY" + "\020\002\022 \n\034MT_DBMS_RTDATA_NET_DELETECLI\020\003\022\035\n\031" + "MT_DBMS_RTDATA_SYN_SUDDEN\020\004\022\033\n\027MT_DBMS_R" + "TDATA_SYN_SNAP\020\005\022#\n\037MT_DBMS_RTDATA_SYN_S" + "NAP_REQUEST\020\006\022!\n\035MT_DBMS_RTDATA_SYN_VALU" + "ETABLE\020\007", 1768); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "RdbServerMessage.proto", &protobuf_RegisterTypes); RdbCondition::default_instance_ = new RdbCondition(); diff --git a/platform/src/idl_files/RdbServerMessage.pb.h b/platform/src/idl_files/RdbServerMessage.pb.h index f631a983..22341f04 100644 --- a/platform/src/idl_files/RdbServerMessage.pb.h +++ b/platform/src/idl_files/RdbServerMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: RdbServerMessage.proto #ifndef PROTOBUF_RdbServerMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/TsdbSaveMessage.pb.cc b/platform/src/idl_files/TsdbSaveMessage.pb.cc index 8aa15bfa..f69be833 100644 --- a/platform/src/idl_files/TsdbSaveMessage.pb.cc +++ b/platform/src/idl_files/TsdbSaveMessage.pb.cc @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: TsdbSaveMessage.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION @@ -111,19 +111,18 @@ void protobuf_AddDesc_TsdbSaveMessage_2eproto() { ::iot_idl::protobuf_AddDesc_Public_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\025TsdbSaveMessage.proto\022\013iot_idl\032\014Pu" - "blic.proto\"\\\n\nSTsdbPoint\022\022\n\ntime_stamp\030\001" - " \002(\003\022\017\n\007tag_val\030\002 \003(\t\022)\n\tfield_val\030\003 \003(\013" - "2\026.iot_idl.SVariable\"\240\001\n\nSTssInsert\022" - "1\n\013save_action\030\001 \002(\0162\034.iot_idl.enTss" - "SaveAction\022\021\n\tmeas_name\030\002 \002(\t\022\020\n\010tag_nam" - "e\030\003 \003(\t\022\022\n\nfield_name\030\004 \003(\t\022&\n\005point\030\005 \003" - "(\0132\027.iot_idl.STsdbPoint*B\n\014enTssMsgT" - "ype\022\026\n\022MT_TSS_APP2SRV_ADD\020\001\022\032\n\026MT_TSS_SR" - "V2APP_ADD_ACK\020\002*p\n\017enTssSaveAction\022\025\n\021SA" - "_TSS_DO_NOTHING\020\000\022\025\n\021SA_TSS_LOCAL_ONLY\020\001" - "\022\026\n\022SA_TSS_REMOTE_ONLY\020\002\022\027\n\023SA_TSS_LOCAL" - "_REMOTE\020\003", 489); + "\n\025TsdbSaveMessage.proto\022\007iot_idl\032\014Public" + ".proto\"X\n\nSTsdbPoint\022\022\n\ntime_stamp\030\001 \002(\003" + "\022\017\n\007tag_val\030\002 \003(\t\022%\n\tfield_val\030\003 \003(\0132\022.i" + "ot_idl.SVariable\"\230\001\n\nSTssInsert\022-\n\013save_" + "action\030\001 \002(\0162\030.iot_idl.enTssSaveAction\022\021" + "\n\tmeas_name\030\002 \002(\t\022\020\n\010tag_name\030\003 \003(\t\022\022\n\nf" + "ield_name\030\004 \003(\t\022\"\n\005point\030\005 \003(\0132\023.iot_idl" + ".STsdbPoint*B\n\014enTssMsgType\022\026\n\022MT_TSS_AP" + "P2SRV_ADD\020\001\022\032\n\026MT_TSS_SRV2APP_ADD_ACK\020\002*" + "p\n\017enTssSaveAction\022\025\n\021SA_TSS_DO_NOTHING\020" + "\000\022\025\n\021SA_TSS_LOCAL_ONLY\020\001\022\026\n\022SA_TSS_REMOT" + "E_ONLY\020\002\022\027\n\023SA_TSS_LOCAL_REMOTE\020\003", 473); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "TsdbSaveMessage.proto", &protobuf_RegisterTypes); STsdbPoint::default_instance_ = new STsdbPoint(); diff --git a/platform/src/idl_files/TsdbSaveMessage.pb.h b/platform/src/idl_files/TsdbSaveMessage.pb.h index c29ee9cc..6be88d0a 100644 --- a/platform/src/idl_files/TsdbSaveMessage.pb.h +++ b/platform/src/idl_files/TsdbSaveMessage.pb.h @@ -1,4 +1,4 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: TsdbSaveMessage.proto #ifndef PROTOBUF_TsdbSaveMessage_2eproto__INCLUDED diff --git a/platform/src/idl_files/build.bat b/platform/src/idl_files/build.bat index 3f47eca8..8dbf417d 100644 --- a/platform/src/idl_files/build.bat +++ b/platform/src/idl_files/build.bat @@ -1,25 +1,25 @@ -@echo off - -::协议文件路径 -set SOURCE_FOLDER=. - - -::cpp编译器路径 -set CPP_COMPILER_PATH=.\protoc.exe - -::cpp文件生成路径 -set CPP_TARGET_PATH=. - -::删除之前创建的文件 -del %CPP_TARGET_PATH%\*.h /f /s /q -del %CPP_TARGET_PATH%\*.cc /f /s /q - -::遍历所有文件 -for /f "delims=" %%i in ('dir /b "%SOURCE_FOLDER%\*.proto"') do ( - ::生成 cpp 代码 - echo %CPP_COMPILER_PATH% --cpp_out=dllexport_decl=IDL_FILES_EXPORT:%CPP_TARGET_PATH% %%i - %CPP_COMPILER_PATH% --cpp_out=dllexport_decl=IDL_FILES_EXPORT:%CPP_TARGET_PATH% %%i -) -echo gen finish - +@echo off + +::协议文件路径 +set SOURCE_FOLDER=. + + +::cpp编译器路径 +set CPP_COMPILER_PATH=.\protoc.exe + +::cpp文件生成路径 +set CPP_TARGET_PATH=. + +::删除之前创建的文件 +del %CPP_TARGET_PATH%\*.h /f /s /q +del %CPP_TARGET_PATH%\*.cc /f /s /q + +::遍历所有文件 +for /f "delims=" %%i in ('dir /b "%SOURCE_FOLDER%\*.proto"') do ( + ::生成 cpp 代码 + echo %CPP_COMPILER_PATH% --cpp_out=dllexport_decl=IDL_FILES_EXPORT:%CPP_TARGET_PATH% %%i + %CPP_COMPILER_PATH% --cpp_out=dllexport_decl=IDL_FILES_EXPORT:%CPP_TARGET_PATH% %%i +) +echo gen finish + pause \ No newline at end of file diff --git a/platform/src/idl_files/idl_files.pro b/platform/src/idl_files/idl_files.pro index 204a659c..a0fdc926 100644 --- a/platform/src/idl_files/idl_files.pro +++ b/platform/src/idl_files/idl_files.pro @@ -8,6 +8,8 @@ win32{ QMAKE_CXXFLAGS += /wd"4251" QMAKE_CXXFLAGS += /wd"4275" QMAKE_CXXFLAGS += /wd"4267" + QMAKE_CXXFLAGS += /wd"4100" + contains (QMAKE_CXXFLAGS_WARN_ON, -w34100) : QMAKE_CXXFLAGS_WARN_ON -= -w34100 } HEADERS += \