Procházet zdrojové kódy

20211126, base communication

huli před 3 roky
rodič
revize
569e3d8707

+ 4 - 11
dispatch/dispatch_manager.cpp

@@ -282,19 +282,13 @@ Error_manager Dispatch_manager::encapsulate_send_dispatch_manager_status()
 	t_dispatch_terminal_status_msg.mutable_base_info()->set_sender(message::Communicator::eDispatch_manager);
 	t_dispatch_terminal_status_msg.mutable_base_info()->set_receiver(message::Communicator::eEmpty);
 
-	t_dispatch_terminal_status_msg.set_terminal_id(t_dispatch_manager_id*2);
+	t_dispatch_terminal_status_msg.mutable_id_struct()->set_unit_id(t_dispatch_manager_id);
 	t_dispatch_terminal_status_msg.set_terminal_status(message::Terminal_status::E_TERMINAL_READY);
 	t_dispatch_terminal_status_msg.set_passageway_direction(message::Passageway_direction::E_BILATERAL);
 
 	t_msg1 = t_dispatch_terminal_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg1);
-//	std::cout << " huli test :::: " << " t_dispatch_terminal_status_msg = " << t_dispatch_terminal_status_msg.DebugString() << std::endl;
-	t_dispatch_terminal_status_msg.set_terminal_id(t_dispatch_manager_id*2+1);
-	t_msg1 = t_dispatch_terminal_status_msg.SerializeAsString();
-	System_communication::get_instance_references().encapsulate_msg(t_msg1);
-//	std::cout << " huli test :::: " << " t_dispatch_terminal_status_msg = " << t_dispatch_terminal_status_msg.DebugString() << std::endl;
-
-
+/*
 	std::string t_msg2;
 	//创建一条 调度管理总管理的状态  新版
 	message::Dispatch_manager_status_msg t_dispatch_manager_status_msg;
@@ -309,12 +303,11 @@ Error_manager Dispatch_manager::encapsulate_send_dispatch_manager_status()
 
 	t_msg2 = t_dispatch_manager_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg2);
-//	std::cout << " huli test :::: " << " t_dispatch_manager_status_msg = " << t_dispatch_manager_status_msg.DebugString() << std::endl;
 	t_dispatch_manager_status_msg.set_dispatch_id(t_dispatch_manager_id*2+1);
 	t_msg2 = t_dispatch_manager_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg2);
-//	std::cout << " huli test :::: " << " t_dispatch_manager_status_msg = " << t_dispatch_manager_status_msg.DebugString() << std::endl;
-//std::cout << " huli test :::: " << " ------------------------------------------------- = " << 1 << std::endl;
+*/
+
 	return Error_code::SUCCESS;
 }
 

+ 0 - 10
main.cpp

@@ -172,16 +172,6 @@ int main(int argc,char* argv[])
 
 
 
-
-
-
-
-
-
-
-
-
-
 	while (1)
 	{
 

+ 183 - 167
message/dispatch_message.pb.cc

@@ -71,6 +71,7 @@ void InitDefaultsDispatch_terminal_status_msgImpl() {
   ::google::protobuf::internal::InitProtobufDefaults();
 #endif  // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
   protobuf_message_5fbase_2eproto::InitDefaultsBase_info();
+  protobuf_message_5fbase_2eproto::InitDefaultsId_struct();
   {
     void* ptr = &::message::_Dispatch_terminal_status_msg_default_instance_;
     new (ptr) ::message::Dispatch_terminal_status_msg();
@@ -254,7 +255,7 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Dispatch_terminal_status_msg, base_info_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Dispatch_terminal_status_msg, terminal_id_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Dispatch_terminal_status_msg, id_struct_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Dispatch_terminal_status_msg, terminal_status_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Dispatch_terminal_status_msg, passageway_direction_),
   0,
@@ -494,12 +495,21 @@ void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
       "\n\026dispatch_message.proto\022\007message\032\022messa"
-      "ge_base.proto\"\312\001\n\034Dispatch_terminal_stat"
+      "ge_base.proto\"\334\001\n\034Dispatch_terminal_stat"
       "us_msg\022%\n\tbase_info\030\001 \002(\0132\022.message.Base"
-      "_info\022\023\n\013terminal_id\030\002 \002(\005\0221\n\017terminal_s"
-      "tatus\030\003 \002(\0162\030.message.Terminal_status\022;\n"
-      "\024passageway_direction\030\004 \002(\0162\035.message.Pa"
-      "ssageway_direction\"\322\002\n\024Dispatch_request_"
+      "_info\022%\n\tid_struct\030\002 \001(\0132\022.message.Id_st"
+      "ruct\0221\n\017terminal_status\030\003 \002(\0162\030.message."
+      "Terminal_status\022;\n\024passageway_direction\030"
+      "\004 \002(\0162\035.message.Passageway_direction\"\322\002\n"
+      "\024Dispatch_request_msg\022%\n\tbase_info\030\001 \002(\013"
+      "2\022.message.Base_info\022\023\n\013command_key\030\002 \002("
+      "\t\022E\n\031dispatch_motion_direction\030\003 \001(\0162\".m"
+      "essage.Dispatch_motion_direction\022%\n\tid_s"
+      "truct\030\004 \001(\0132\022.message.Id_struct\0227\n\022locat"
+      "e_information\030\005 \001(\0132\033.message.Locate_inf"
+      "ormation\0222\n\021parkspace_info_ex\030\006 \003(\0132\027.me"
+      "ssage.Parkspace_info\022#\n\010car_type\030\007 \001(\0162\021"
+      ".message.Car_type\"\202\003\n\025Dispatch_response_"
       "msg\022%\n\tbase_info\030\001 \002(\0132\022.message.Base_in"
       "fo\022\023\n\013command_key\030\002 \002(\t\022E\n\031dispatch_moti"
       "on_direction\030\003 \001(\0162\".message.Dispatch_mo"
@@ -507,136 +517,128 @@ void AddDescriptorsImpl() {
       "age.Id_struct\0227\n\022locate_information\030\005 \001("
       "\0132\033.message.Locate_information\0222\n\021parksp"
       "ace_info_ex\030\006 \003(\0132\027.message.Parkspace_in"
-      "fo\022#\n\010car_type\030\007 \001(\0162\021.message.Car_type\""
-      "\202\003\n\025Dispatch_response_msg\022%\n\tbase_info\030\001"
-      " \002(\0132\022.message.Base_info\022\023\n\013command_key\030"
-      "\002 \002(\t\022E\n\031dispatch_motion_direction\030\003 \001(\016"
-      "2\".message.Dispatch_motion_direction\022%\n\t"
-      "id_struct\030\004 \001(\0132\022.message.Id_struct\0227\n\022l"
-      "ocate_information\030\005 \001(\0132\033.message.Locate"
-      "_information\0222\n\021parkspace_info_ex\030\006 \003(\0132"
-      "\027.message.Parkspace_info\022#\n\010car_type\030\007 \001"
-      "(\0162\021.message.Car_type\022-\n\rerror_manager\030\010"
-      " \001(\0132\026.message.Error_manager\"\313\005\n\014Catcher"
-      "_data\022;\n\024dispatch_device_type\030\001 \002(\0162\035.me"
-      "ssage.Dispatch_device_type\022\?\n\026dispatch_d"
-      "evice_status\030\002 \002(\0162\037.message.Dispatch_de"
-      "vice_status\022\021\n\tdevice_id\030\003 \002(\005\022=\n\024actual"
-      "_device_status\030\004 \001(\0162\037.message.Hardware_"
-      "device_status\0220\n\022actual_load_status\030\005 \001("
-      "\0162\024.message.Load_status\022\035\n\025actual_coordi"
-      "nates_id\030\006 \001(\005\022\020\n\010actual_x\030\007 \001(\002\022\020\n\010actu"
-      "al_y\030\010 \001(\002\022\020\n\010actual_b\030\t \001(\002\022\020\n\010actual_z"
-      "\030\n \001(\002\022\021\n\tactual_d1\030\013 \001(\002\022\021\n\tactual_d2\030\014"
-      " \001(\002\0223\n\024actual_clamp_motion1\030\r \001(\0162\025.mes"
-      "sage.Clamp_motion\0223\n\024actual_clamp_motion"
-      "2\030\016 \001(\0162\025.message.Clamp_motion\0223\n\024actual"
-      "_clamp_motion3\030\017 \001(\0162\025.message.Clamp_mot"
-      "ion\0223\n\024actual_clamp_motion4\030\020 \001(\0162\025.mess"
-      "age.Clamp_motion\022\031\n\021actual_error_code\030\021 "
-      "\001(\t\022\033\n\023actual_warning_code\030\022 \001(\t\022 \n\030actu"
-      "al_error_description\030\023 \001(\t\"\207\006\n\014Carrier_d"
-      "ata\022;\n\024dispatch_device_type\030\001 \002(\0162\035.mess"
-      "age.Dispatch_device_type\022\?\n\026dispatch_dev"
-      "ice_status\030\002 \002(\0162\037.message.Dispatch_devi"
-      "ce_status\022\021\n\tdevice_id\030\003 \002(\005\022=\n\024actual_d"
-      "evice_status\030\004 \001(\0162\037.message.Hardware_de"
-      "vice_status\0220\n\022actual_load_status\030\005 \001(\0162"
-      "\024.message.Load_status\022\035\n\025actual_coordina"
-      "tes_id\030\006 \001(\005\022\020\n\010actual_x\030\007 \001(\002\022\020\n\010actual"
-      "_y\030\010 \001(\002\022\020\n\010actual_z\030\t \001(\002\022\021\n\tactual_y1\030"
-      "\n \001(\002\022\021\n\tactual_y2\030\013 \001(\002\0223\n\024actual_clamp"
-      "_motion1\030\014 \001(\0162\025.message.Clamp_motion\0223\n"
-      "\024actual_clamp_motion2\030\r \001(\0162\025.message.Cl"
-      "amp_motion\022H\n\036actual_small_sports_car_mo"
-      "tion\030\016 \001(\0162 .message.Small_sports_car_mo"
-      "tion\0225\n\026actual_joint_motion_x1\030\017 \001(\0162\025.m"
-      "essage.Joint_motion\0225\n\026actual_joint_moti"
-      "on_x2\030\020 \001(\0162\025.message.Joint_motion\022\031\n\021ac"
+      "fo\022#\n\010car_type\030\007 \001(\0162\021.message.Car_type\022"
+      "-\n\rerror_manager\030\010 \001(\0132\026.message.Error_m"
+      "anager\"\313\005\n\014Catcher_data\022;\n\024dispatch_devi"
+      "ce_type\030\001 \002(\0162\035.message.Dispatch_device_"
+      "type\022\?\n\026dispatch_device_status\030\002 \002(\0162\037.m"
+      "essage.Dispatch_device_status\022\021\n\tdevice_"
+      "id\030\003 \002(\005\022=\n\024actual_device_status\030\004 \001(\0162\037"
+      ".message.Hardware_device_status\0220\n\022actua"
+      "l_load_status\030\005 \001(\0162\024.message.Load_statu"
+      "s\022\035\n\025actual_coordinates_id\030\006 \001(\005\022\020\n\010actu"
+      "al_x\030\007 \001(\002\022\020\n\010actual_y\030\010 \001(\002\022\020\n\010actual_b"
+      "\030\t \001(\002\022\020\n\010actual_z\030\n \001(\002\022\021\n\tactual_d1\030\013 "
+      "\001(\002\022\021\n\tactual_d2\030\014 \001(\002\0223\n\024actual_clamp_m"
+      "otion1\030\r \001(\0162\025.message.Clamp_motion\0223\n\024a"
+      "ctual_clamp_motion2\030\016 \001(\0162\025.message.Clam"
+      "p_motion\0223\n\024actual_clamp_motion3\030\017 \001(\0162\025"
+      ".message.Clamp_motion\0223\n\024actual_clamp_mo"
+      "tion4\030\020 \001(\0162\025.message.Clamp_motion\022\031\n\021ac"
       "tual_error_code\030\021 \001(\t\022\033\n\023actual_warning_"
       "code\030\022 \001(\t\022 \n\030actual_error_description\030\023"
-      " \001(\t\"\275\007\n\017Passageway_data\022;\n\024dispatch_dev"
-      "ice_type\030\001 \002(\0162\035.message.Dispatch_device"
-      "_type\022\?\n\026dispatch_device_status\030\002 \002(\0162\037."
-      "message.Dispatch_device_status\022\021\n\tdevice"
-      "_id\030\003 \002(\005\022=\n\024actual_device_status\030\004 \001(\0162"
-      "\037.message.Hardware_device_status\0227\n\031actu"
-      "al_inside_load_status\030\005 \001(\0162\024.message.Lo"
-      "ad_status\0228\n\032actual_outside_load_status\030"
-      "\006 \001(\0162\024.message.Load_status\022J\n\"actual_fr"
-      "ont_overstep_the_boundary\030\007 \001(\0162\036.messag"
-      "e.Overstep_the_boundary\022I\n!actual_back_o"
-      "verstep_the_boundary\030\010 \001(\0162\036.message.Ove"
-      "rstep_the_boundary\022K\n#actual_height_over"
-      "step_the_boundary\030\t \001(\0162\036.message.Overst"
-      "ep_the_boundary\0228\n\032actual_outside_door_s"
-      "ensor\030\n \001(\0162\024.message.Load_status\0227\n\031act"
-      "ual_inside_door_motion\030\013 \001(\0162\024.message.D"
-      "oor_motion\0228\n\032actual_outside_door_motion"
-      "\030\014 \001(\0162\024.message.Door_motion\022:\n\034actual_t"
-      "urntable_load_status\030\r \001(\0162\024.message.Loa"
-      "d_status\022@\n\032actual_turntable_direction\030\016"
-      " \001(\0162\034.message.Turntable_direction\022\031\n\021ac"
-      "tual_error_code\030\017 \001(\t\022\033\n\023actual_warning_"
-      "code\030\020 \001(\t\022 \n\030actual_error_description\030\021"
-      " \001(\t\"\265\002\n\033Dispatch_manager_status_msg\022%\n\t"
-      "base_info\030\001 \002(\0132\022.message.Base_info\022\023\n\013d"
-      "ispatch_id\030\002 \002(\005\022A\n\027dispatch_manager_sta"
-      "tus\030\003 \002(\0162 .message.Dispatch_manager_sta"
-      "tus\022/\n\020catcher_data_map\030\004 \003(\0132\025.message."
-      "Catcher_data\022/\n\020carrier_data_map\030\005 \003(\0132\025"
-      ".message.Carrier_data\0225\n\023passageway_data"
-      "_map\030\006 \003(\0132\030.message.Passageway_data\"\033\n\031"
-      "Dispatch_manager_data_msg*\201\001\n\017Terminal_s"
-      "tatus\022\025\n\021E_TERMINAL_UNKNOW\020\000\022\024\n\020E_TERMIN"
-      "AL_READY\020\001\022\024\n\020E_TERMINAL_STORE\020\002\022\025\n\021E_TE"
-      "RMINAL_PICKUP\020\003\022\024\n\020E_TERMINAL_FAULT\020\n*B\n"
-      "\024Passageway_direction\022\013\n\007E_INLET\020\000\022\014\n\010E_"
-      "OUTLET\020\001\022\017\n\013E_BILATERAL\020\002*>\n\031Dispatch_mo"
-      "tion_direction\022\017\n\013E_STORE_CAR\020\000\022\020\n\014E_PIC"
-      "KUP_CAR\020\001*\261\001\n\027Dispatch_manager_status\022\035\n"
-      "\031E_DISPATCH_MANAGER_UNKNOW\020\000\022\034\n\030E_DISPAT"
-      "CH_MANAGER_READY\020\001\022\034\n\030E_DISPATCH_MANAGER"
-      "_STORE\020\002\022\035\n\031E_DISPATCH_MANAGER_PICKUP\020\003\022"
-      "\034\n\030E_DISPATCH_MANAGER_FAULT\020d*\200\003\n\026Dispat"
-      "ch_device_status\022\032\n\026DISPATCH_DEVICE_UNKN"
-      "OW\020\000\022\031\n\025DISPATCH_DEVICE_READY\020\001\022\030\n\024DISPA"
-      "TCH_DEVICE_BUSY\020\002\022\"\n\036DISPATCH_DEVICE_ONE"
-      "_LEVEL_OVER\020\003\022\"\n\036DISPATCH_DEVICE_ONE_LEV"
-      "EL_WORK\020\004\022\"\n\036DISPATCH_DEVICE_TWO_LEVEL_O"
-      "VER\020\005\022\"\n\036DISPATCH_DEVICE_TWO_LEVEL_WORK\020"
-      "\006\022$\n DISPATCH_DEVICE_THREE_LEVEL_OVER\020\007\022"
-      "$\n DISPATCH_DEVICE_THREE_LEVEL_WORK\020\010\022\031\n"
-      "\025DISPATCH_DEVICE_FAULT\020d\022\036\n\032DISPATCH_DEV"
-      "ICE_DISCONNECT\020e*n\n\023Dispatch_task_level\022"
-      "\033\n\027DISPATCH_TASK_ONE_LEVEL\020\001\022\033\n\027DISPATCH"
-      "_TASK_TWO_LEVEL\020\002\022\035\n\031DISPATCH_TASK_THREE"
-      "_LEVEL\020\003*K\n\014Clamp_motion\022\025\n\021E_CLAMP_NO_A"
-      "CTION\020\000\022\021\n\rE_CLAMP_TIGHT\020\001\022\021\n\rE_CLAMP_LO"
-      "OSE\020\002*R\n\014Joint_motion\022\025\n\021E_JOINT_NO_ACTI"
-      "ON\020\000\022\024\n\020E_JOINT_HOLD_OUT\020\001\022\025\n\021E_JOINT_TA"
-      "KE_BACK\020\002*y\n\027Small_sports_car_motion\022\034\n\030"
-      "E_SMALL_SPORTS_NO_ACTION\020\000\022\037\n\033E_SMALL_SP"
-      "ORTS_CAR_GET_AWAY\020\001\022\037\n\033E_SMALL_SPORTS_CA"
-      "R_GET_BACK\020\002*l\n\016Respons_status\022\023\n\017RESPON"
-      "S_WORKING\020\000\022\020\n\014RESPONS_OVER\020\001\022\027\n\023RESPONS"
-      "_MINOR_ERROR\020d\022\032\n\026RESPONS_CRITICAL_ERROR"
-      "\020e*\252\001\n\026Hardware_device_status\022\022\n\016DEVICE_"
-      "UNKNOWN\020\000\022\020\n\014DEVICE_READY\020\001\022\022\n\016DEVICE_WO"
-      "RKING\020\002\022\031\n\025DEVICE_EMERGENCY_STOP\020\003\022\023\n\017DE"
-      "VICE_UNSAFETY\020\004\022\024\n\020DEVICE_COLLISION\020\005\022\020\n"
-      "\014DEVICE_FAULT\020\006*9\n\013Load_status\022\020\n\014LOAD_U"
-      "NKNOWN\020\000\022\014\n\010HAVE_CAR\020\001\022\n\n\006NO_CAR\020\002*w\n\023Tu"
-      "rntable_direction\022\037\n\033TURNTABLE_DIRECTION"
-      "_UNKNOWN\020\000\022\036\n\032TURNTABLE_DIRECTION_INSIDE"
-      "\020\001\022\037\n\033TURNTABLE_DIRECTION_OUTSIDE\020\002*N\n\013D"
-      "oor_motion\022\020\n\014DOOR_UNKNOWN\020\000\022\r\n\tDOOR_OPE"
-      "N\020\001\022\016\n\nDOOR_CLOSE\020\002\022\016\n\nDOOR_ERROR\020\003*C\n\025O"
-      "verstep_the_boundary\022\023\n\017BOUNDARY_NORMAL\020"
-      "\000\022\025\n\021BOUNDARY_OVERSTEP\020\001"
+      " \001(\t\"\207\006\n\014Carrier_data\022;\n\024dispatch_device"
+      "_type\030\001 \002(\0162\035.message.Dispatch_device_ty"
+      "pe\022\?\n\026dispatch_device_status\030\002 \002(\0162\037.mes"
+      "sage.Dispatch_device_status\022\021\n\tdevice_id"
+      "\030\003 \002(\005\022=\n\024actual_device_status\030\004 \001(\0162\037.m"
+      "essage.Hardware_device_status\0220\n\022actual_"
+      "load_status\030\005 \001(\0162\024.message.Load_status\022"
+      "\035\n\025actual_coordinates_id\030\006 \001(\005\022\020\n\010actual"
+      "_x\030\007 \001(\002\022\020\n\010actual_y\030\010 \001(\002\022\020\n\010actual_z\030\t"
+      " \001(\002\022\021\n\tactual_y1\030\n \001(\002\022\021\n\tactual_y2\030\013 \001"
+      "(\002\0223\n\024actual_clamp_motion1\030\014 \001(\0162\025.messa"
+      "ge.Clamp_motion\0223\n\024actual_clamp_motion2\030"
+      "\r \001(\0162\025.message.Clamp_motion\022H\n\036actual_s"
+      "mall_sports_car_motion\030\016 \001(\0162 .message.S"
+      "mall_sports_car_motion\0225\n\026actual_joint_m"
+      "otion_x1\030\017 \001(\0162\025.message.Joint_motion\0225\n"
+      "\026actual_joint_motion_x2\030\020 \001(\0162\025.message."
+      "Joint_motion\022\031\n\021actual_error_code\030\021 \001(\t\022"
+      "\033\n\023actual_warning_code\030\022 \001(\t\022 \n\030actual_e"
+      "rror_description\030\023 \001(\t\"\275\007\n\017Passageway_da"
+      "ta\022;\n\024dispatch_device_type\030\001 \002(\0162\035.messa"
+      "ge.Dispatch_device_type\022\?\n\026dispatch_devi"
+      "ce_status\030\002 \002(\0162\037.message.Dispatch_devic"
+      "e_status\022\021\n\tdevice_id\030\003 \002(\005\022=\n\024actual_de"
+      "vice_status\030\004 \001(\0162\037.message.Hardware_dev"
+      "ice_status\0227\n\031actual_inside_load_status\030"
+      "\005 \001(\0162\024.message.Load_status\0228\n\032actual_ou"
+      "tside_load_status\030\006 \001(\0162\024.message.Load_s"
+      "tatus\022J\n\"actual_front_overstep_the_bound"
+      "ary\030\007 \001(\0162\036.message.Overstep_the_boundar"
+      "y\022I\n!actual_back_overstep_the_boundary\030\010"
+      " \001(\0162\036.message.Overstep_the_boundary\022K\n#"
+      "actual_height_overstep_the_boundary\030\t \001("
+      "\0162\036.message.Overstep_the_boundary\0228\n\032act"
+      "ual_outside_door_sensor\030\n \001(\0162\024.message."
+      "Load_status\0227\n\031actual_inside_door_motion"
+      "\030\013 \001(\0162\024.message.Door_motion\0228\n\032actual_o"
+      "utside_door_motion\030\014 \001(\0162\024.message.Door_"
+      "motion\022:\n\034actual_turntable_load_status\030\r"
+      " \001(\0162\024.message.Load_status\022@\n\032actual_tur"
+      "ntable_direction\030\016 \001(\0162\034.message.Turntab"
+      "le_direction\022\031\n\021actual_error_code\030\017 \001(\t\022"
+      "\033\n\023actual_warning_code\030\020 \001(\t\022 \n\030actual_e"
+      "rror_description\030\021 \001(\t\"\265\002\n\033Dispatch_mana"
+      "ger_status_msg\022%\n\tbase_info\030\001 \002(\0132\022.mess"
+      "age.Base_info\022\023\n\013dispatch_id\030\002 \002(\005\022A\n\027di"
+      "spatch_manager_status\030\003 \002(\0162 .message.Di"
+      "spatch_manager_status\022/\n\020catcher_data_ma"
+      "p\030\004 \003(\0132\025.message.Catcher_data\022/\n\020carrie"
+      "r_data_map\030\005 \003(\0132\025.message.Carrier_data\022"
+      "5\n\023passageway_data_map\030\006 \003(\0132\030.message.P"
+      "assageway_data\"\033\n\031Dispatch_manager_data_"
+      "msg*\201\001\n\017Terminal_status\022\025\n\021E_TERMINAL_UN"
+      "KNOW\020\000\022\024\n\020E_TERMINAL_READY\020\001\022\024\n\020E_TERMIN"
+      "AL_STORE\020\002\022\025\n\021E_TERMINAL_PICKUP\020\003\022\024\n\020E_T"
+      "ERMINAL_FAULT\020\n*B\n\024Passageway_direction\022"
+      "\013\n\007E_INLET\020\000\022\014\n\010E_OUTLET\020\001\022\017\n\013E_BILATERA"
+      "L\020\002*>\n\031Dispatch_motion_direction\022\017\n\013E_ST"
+      "ORE_CAR\020\000\022\020\n\014E_PICKUP_CAR\020\001*\261\001\n\027Dispatch"
+      "_manager_status\022\035\n\031E_DISPATCH_MANAGER_UN"
+      "KNOW\020\000\022\034\n\030E_DISPATCH_MANAGER_READY\020\001\022\034\n\030"
+      "E_DISPATCH_MANAGER_STORE\020\002\022\035\n\031E_DISPATCH"
+      "_MANAGER_PICKUP\020\003\022\034\n\030E_DISPATCH_MANAGER_"
+      "FAULT\020d*\200\003\n\026Dispatch_device_status\022\032\n\026DI"
+      "SPATCH_DEVICE_UNKNOW\020\000\022\031\n\025DISPATCH_DEVIC"
+      "E_READY\020\001\022\030\n\024DISPATCH_DEVICE_BUSY\020\002\022\"\n\036D"
+      "ISPATCH_DEVICE_ONE_LEVEL_OVER\020\003\022\"\n\036DISPA"
+      "TCH_DEVICE_ONE_LEVEL_WORK\020\004\022\"\n\036DISPATCH_"
+      "DEVICE_TWO_LEVEL_OVER\020\005\022\"\n\036DISPATCH_DEVI"
+      "CE_TWO_LEVEL_WORK\020\006\022$\n DISPATCH_DEVICE_T"
+      "HREE_LEVEL_OVER\020\007\022$\n DISPATCH_DEVICE_THR"
+      "EE_LEVEL_WORK\020\010\022\031\n\025DISPATCH_DEVICE_FAULT"
+      "\020d\022\036\n\032DISPATCH_DEVICE_DISCONNECT\020e*n\n\023Di"
+      "spatch_task_level\022\033\n\027DISPATCH_TASK_ONE_L"
+      "EVEL\020\001\022\033\n\027DISPATCH_TASK_TWO_LEVEL\020\002\022\035\n\031D"
+      "ISPATCH_TASK_THREE_LEVEL\020\003*K\n\014Clamp_moti"
+      "on\022\025\n\021E_CLAMP_NO_ACTION\020\000\022\021\n\rE_CLAMP_TIG"
+      "HT\020\001\022\021\n\rE_CLAMP_LOOSE\020\002*R\n\014Joint_motion\022"
+      "\025\n\021E_JOINT_NO_ACTION\020\000\022\024\n\020E_JOINT_HOLD_O"
+      "UT\020\001\022\025\n\021E_JOINT_TAKE_BACK\020\002*y\n\027Small_spo"
+      "rts_car_motion\022\034\n\030E_SMALL_SPORTS_NO_ACTI"
+      "ON\020\000\022\037\n\033E_SMALL_SPORTS_CAR_GET_AWAY\020\001\022\037\n"
+      "\033E_SMALL_SPORTS_CAR_GET_BACK\020\002*l\n\016Respon"
+      "s_status\022\023\n\017RESPONS_WORKING\020\000\022\020\n\014RESPONS"
+      "_OVER\020\001\022\027\n\023RESPONS_MINOR_ERROR\020d\022\032\n\026RESP"
+      "ONS_CRITICAL_ERROR\020e*\252\001\n\026Hardware_device"
+      "_status\022\022\n\016DEVICE_UNKNOWN\020\000\022\020\n\014DEVICE_RE"
+      "ADY\020\001\022\022\n\016DEVICE_WORKING\020\002\022\031\n\025DEVICE_EMER"
+      "GENCY_STOP\020\003\022\023\n\017DEVICE_UNSAFETY\020\004\022\024\n\020DEV"
+      "ICE_COLLISION\020\005\022\020\n\014DEVICE_FAULT\020\006*9\n\013Loa"
+      "d_status\022\020\n\014LOAD_UNKNOWN\020\000\022\014\n\010HAVE_CAR\020\001"
+      "\022\n\n\006NO_CAR\020\002*w\n\023Turntable_direction\022\037\n\033T"
+      "URNTABLE_DIRECTION_UNKNOWN\020\000\022\036\n\032TURNTABL"
+      "E_DIRECTION_INSIDE\020\001\022\037\n\033TURNTABLE_DIRECT"
+      "ION_OUTSIDE\020\002*N\n\013Door_motion\022\020\n\014DOOR_UNK"
+      "NOWN\020\000\022\r\n\tDOOR_OPEN\020\001\022\016\n\nDOOR_CLOSE\020\002\022\016\n"
+      "\nDOOR_ERROR\020\003*C\n\025Overstep_the_boundary\022\023"
+      "\n\017BOUNDARY_NORMAL\020\000\022\025\n\021BOUNDARY_OVERSTEP"
+      "\020\001"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 5624);
+      descriptor, 5642);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "dispatch_message.proto", &protobuf_RegisterTypes);
   ::protobuf_message_5fbase_2eproto::AddDescriptors();
@@ -901,14 +903,20 @@ bool Overstep_the_boundary_IsValid(int value) {
 void Dispatch_terminal_status_msg::InitAsDefaultInstance() {
   ::message::_Dispatch_terminal_status_msg_default_instance_._instance.get_mutable()->base_info_ = const_cast< ::message::Base_info*>(
       ::message::Base_info::internal_default_instance());
+  ::message::_Dispatch_terminal_status_msg_default_instance_._instance.get_mutable()->id_struct_ = const_cast< ::message::Id_struct*>(
+      ::message::Id_struct::internal_default_instance());
 }
 void Dispatch_terminal_status_msg::clear_base_info() {
   if (base_info_ != NULL) base_info_->Clear();
   clear_has_base_info();
 }
+void Dispatch_terminal_status_msg::clear_id_struct() {
+  if (id_struct_ != NULL) id_struct_->Clear();
+  clear_has_id_struct();
+}
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Dispatch_terminal_status_msg::kBaseInfoFieldNumber;
-const int Dispatch_terminal_status_msg::kTerminalIdFieldNumber;
+const int Dispatch_terminal_status_msg::kIdStructFieldNumber;
 const int Dispatch_terminal_status_msg::kTerminalStatusFieldNumber;
 const int Dispatch_terminal_status_msg::kPassagewayDirectionFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
@@ -932,9 +940,14 @@ Dispatch_terminal_status_msg::Dispatch_terminal_status_msg(const Dispatch_termin
   } else {
     base_info_ = NULL;
   }
-  ::memcpy(&terminal_id_, &from.terminal_id_,
+  if (from.has_id_struct()) {
+    id_struct_ = new ::message::Id_struct(*from.id_struct_);
+  } else {
+    id_struct_ = NULL;
+  }
+  ::memcpy(&terminal_status_, &from.terminal_status_,
     static_cast<size_t>(reinterpret_cast<char*>(&passageway_direction_) -
-    reinterpret_cast<char*>(&terminal_id_)) + sizeof(passageway_direction_));
+    reinterpret_cast<char*>(&terminal_status_)) + sizeof(passageway_direction_));
   // @@protoc_insertion_point(copy_constructor:message.Dispatch_terminal_status_msg)
 }
 
@@ -952,6 +965,7 @@ Dispatch_terminal_status_msg::~Dispatch_terminal_status_msg() {
 
 void Dispatch_terminal_status_msg::SharedDtor() {
   if (this != internal_default_instance()) delete base_info_;
+  if (this != internal_default_instance()) delete id_struct_;
 }
 
 void Dispatch_terminal_status_msg::SetCachedSize(int size) const {
@@ -984,14 +998,20 @@ void Dispatch_terminal_status_msg::Clear() {
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    GOOGLE_DCHECK(base_info_ != NULL);
-    base_info_->Clear();
+  if (cached_has_bits & 3u) {
+    if (cached_has_bits & 0x00000001u) {
+      GOOGLE_DCHECK(base_info_ != NULL);
+      base_info_->Clear();
+    }
+    if (cached_has_bits & 0x00000002u) {
+      GOOGLE_DCHECK(id_struct_ != NULL);
+      id_struct_->Clear();
+    }
   }
-  if (cached_has_bits & 14u) {
-    ::memset(&terminal_id_, 0, static_cast<size_t>(
+  if (cached_has_bits & 12u) {
+    ::memset(&terminal_status_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&passageway_direction_) -
-        reinterpret_cast<char*>(&terminal_id_)) + sizeof(passageway_direction_));
+        reinterpret_cast<char*>(&terminal_status_)) + sizeof(passageway_direction_));
   }
   _has_bits_.Clear();
   _internal_metadata_.Clear();
@@ -1019,14 +1039,12 @@ bool Dispatch_terminal_status_msg::MergePartialFromCodedStream(
         break;
       }
 
-      // required int32 terminal_id = 2;
+      // optional .message.Id_struct id_struct = 2;
       case 2: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          set_has_terminal_id();
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &terminal_id_)));
+            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+               input, mutable_id_struct()));
         } else {
           goto handle_unusual;
         }
@@ -1106,9 +1124,10 @@ void Dispatch_terminal_status_msg::SerializeWithCachedSizes(
       1, *this->base_info_, output);
   }
 
-  // required int32 terminal_id = 2;
+  // optional .message.Id_struct id_struct = 2;
   if (cached_has_bits & 0x00000002u) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->terminal_id(), output);
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, *this->id_struct_, output);
   }
 
   // required .message.Terminal_status terminal_status = 3;
@@ -1145,9 +1164,11 @@ void Dispatch_terminal_status_msg::SerializeWithCachedSizes(
         1, *this->base_info_, deterministic, target);
   }
 
-  // required int32 terminal_id = 2;
+  // optional .message.Id_struct id_struct = 2;
   if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->terminal_id(), target);
+    target = ::google::protobuf::internal::WireFormatLite::
+      InternalWriteMessageToArray(
+        2, *this->id_struct_, deterministic, target);
   }
 
   // required .message.Terminal_status terminal_status = 3;
@@ -1181,13 +1202,6 @@ size_t Dispatch_terminal_status_msg::RequiredFieldsByteSizeFallback() const {
         *this->base_info_);
   }
 
-  if (has_terminal_id()) {
-    // required int32 terminal_id = 2;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::Int32Size(
-        this->terminal_id());
-  }
-
   if (has_terminal_status()) {
     // required .message.Terminal_status terminal_status = 3;
     total_size += 1 +
@@ -1211,17 +1225,12 @@ size_t Dispatch_terminal_status_msg::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
         _internal_metadata_.unknown_fields());
   }
-  if (((_has_bits_[0] & 0x0000000f) ^ 0x0000000f) == 0) {  // All required fields are present.
+  if (((_has_bits_[0] & 0x0000000d) ^ 0x0000000d) == 0) {  // All required fields are present.
     // required .message.Base_info base_info = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *this->base_info_);
 
-    // required int32 terminal_id = 2;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::Int32Size(
-        this->terminal_id());
-
     // required .message.Terminal_status terminal_status = 3;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->terminal_status());
@@ -1233,6 +1242,13 @@ size_t Dispatch_terminal_status_msg::ByteSizeLong() const {
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
+  // optional .message.Id_struct id_struct = 2;
+  if (has_id_struct()) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *this->id_struct_);
+  }
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = cached_size;
@@ -1268,7 +1284,7 @@ void Dispatch_terminal_status_msg::MergeFrom(const Dispatch_terminal_status_msg&
       mutable_base_info()->::message::Base_info::MergeFrom(from.base_info());
     }
     if (cached_has_bits & 0x00000002u) {
-      terminal_id_ = from.terminal_id_;
+      mutable_id_struct()->::message::Id_struct::MergeFrom(from.id_struct());
     }
     if (cached_has_bits & 0x00000004u) {
       terminal_status_ = from.terminal_status_;
@@ -1295,7 +1311,7 @@ void Dispatch_terminal_status_msg::CopyFrom(const Dispatch_terminal_status_msg&
 }
 
 bool Dispatch_terminal_status_msg::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+  if ((_has_bits_[0] & 0x0000000d) != 0x0000000d) return false;
   if (has_base_info()) {
     if (!this->base_info_->IsInitialized()) return false;
   }
@@ -1309,7 +1325,7 @@ void Dispatch_terminal_status_msg::Swap(Dispatch_terminal_status_msg* other) {
 void Dispatch_terminal_status_msg::InternalSwap(Dispatch_terminal_status_msg* other) {
   using std::swap;
   swap(base_info_, other->base_info_);
-  swap(terminal_id_, other->terminal_id_);
+  swap(id_struct_, other->id_struct_);
   swap(terminal_status_, other->terminal_status_);
   swap(passageway_direction_, other->passageway_direction_);
   swap(_has_bits_[0], other->_has_bits_[0]);

+ 51 - 23
message/dispatch_message.pb.h

@@ -515,12 +515,14 @@ class Dispatch_terminal_status_msg : public ::google::protobuf::Message /* @@pro
   ::message::Base_info* mutable_base_info();
   void set_allocated_base_info(::message::Base_info* base_info);
 
-  // required int32 terminal_id = 2;
-  bool has_terminal_id() const;
-  void clear_terminal_id();
-  static const int kTerminalIdFieldNumber = 2;
-  ::google::protobuf::int32 terminal_id() const;
-  void set_terminal_id(::google::protobuf::int32 value);
+  // optional .message.Id_struct id_struct = 2;
+  bool has_id_struct() const;
+  void clear_id_struct();
+  static const int kIdStructFieldNumber = 2;
+  const ::message::Id_struct& id_struct() const;
+  ::message::Id_struct* release_id_struct();
+  ::message::Id_struct* mutable_id_struct();
+  void set_allocated_id_struct(::message::Id_struct* id_struct);
 
   // required .message.Terminal_status terminal_status = 3;
   bool has_terminal_status() const;
@@ -540,8 +542,8 @@ class Dispatch_terminal_status_msg : public ::google::protobuf::Message /* @@pro
  private:
   void set_has_base_info();
   void clear_has_base_info();
-  void set_has_terminal_id();
-  void clear_has_terminal_id();
+  void set_has_id_struct();
+  void clear_has_id_struct();
   void set_has_terminal_status();
   void clear_has_terminal_status();
   void set_has_passageway_direction();
@@ -554,7 +556,7 @@ class Dispatch_terminal_status_msg : public ::google::protobuf::Message /* @@pro
   ::google::protobuf::internal::HasBits<1> _has_bits_;
   mutable int _cached_size_;
   ::message::Base_info* base_info_;
-  ::google::protobuf::int32 terminal_id_;
+  ::message::Id_struct* id_struct_;
   int terminal_status_;
   int passageway_direction_;
   friend struct ::protobuf_dispatch_5fmessage_2eproto::TableStruct;
@@ -2218,28 +2220,54 @@ inline void Dispatch_terminal_status_msg::set_allocated_base_info(::message::Bas
   // @@protoc_insertion_point(field_set_allocated:message.Dispatch_terminal_status_msg.base_info)
 }
 
-// required int32 terminal_id = 2;
-inline bool Dispatch_terminal_status_msg::has_terminal_id() const {
+// optional .message.Id_struct id_struct = 2;
+inline bool Dispatch_terminal_status_msg::has_id_struct() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Dispatch_terminal_status_msg::set_has_terminal_id() {
+inline void Dispatch_terminal_status_msg::set_has_id_struct() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void Dispatch_terminal_status_msg::clear_has_terminal_id() {
+inline void Dispatch_terminal_status_msg::clear_has_id_struct() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void Dispatch_terminal_status_msg::clear_terminal_id() {
-  terminal_id_ = 0;
-  clear_has_terminal_id();
+inline const ::message::Id_struct& Dispatch_terminal_status_msg::id_struct() const {
+  const ::message::Id_struct* p = id_struct_;
+  // @@protoc_insertion_point(field_get:message.Dispatch_terminal_status_msg.id_struct)
+  return p != NULL ? *p : *reinterpret_cast<const ::message::Id_struct*>(
+      &::message::_Id_struct_default_instance_);
 }
-inline ::google::protobuf::int32 Dispatch_terminal_status_msg::terminal_id() const {
-  // @@protoc_insertion_point(field_get:message.Dispatch_terminal_status_msg.terminal_id)
-  return terminal_id_;
+inline ::message::Id_struct* Dispatch_terminal_status_msg::release_id_struct() {
+  // @@protoc_insertion_point(field_release:message.Dispatch_terminal_status_msg.id_struct)
+  clear_has_id_struct();
+  ::message::Id_struct* temp = id_struct_;
+  id_struct_ = NULL;
+  return temp;
 }
-inline void Dispatch_terminal_status_msg::set_terminal_id(::google::protobuf::int32 value) {
-  set_has_terminal_id();
-  terminal_id_ = value;
-  // @@protoc_insertion_point(field_set:message.Dispatch_terminal_status_msg.terminal_id)
+inline ::message::Id_struct* Dispatch_terminal_status_msg::mutable_id_struct() {
+  set_has_id_struct();
+  if (id_struct_ == NULL) {
+    id_struct_ = new ::message::Id_struct;
+  }
+  // @@protoc_insertion_point(field_mutable:message.Dispatch_terminal_status_msg.id_struct)
+  return id_struct_;
+}
+inline void Dispatch_terminal_status_msg::set_allocated_id_struct(::message::Id_struct* id_struct) {
+  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
+  if (message_arena == NULL) {
+    delete reinterpret_cast< ::google::protobuf::MessageLite*>(id_struct_);
+  }
+  if (id_struct) {
+    ::google::protobuf::Arena* submessage_arena = NULL;
+    if (message_arena != submessage_arena) {
+      id_struct = ::google::protobuf::internal::GetOwnedMessage(
+          message_arena, id_struct, submessage_arena);
+    }
+    set_has_id_struct();
+  } else {
+    clear_has_id_struct();
+  }
+  id_struct_ = id_struct;
+  // @@protoc_insertion_point(field_set_allocated:message.Dispatch_terminal_status_msg.id_struct)
 }
 
 // required .message.Terminal_status terminal_status = 3;

+ 1 - 1
message/dispatch_message.proto

@@ -27,7 +27,7 @@ enum Passageway_direction
 message Dispatch_terminal_status_msg
 {
     required Base_info                  base_info=1;                    //消息类型
-    required int32                      terminal_id=2;                  //终端id
+    optional Id_struct                  id_struct=2;                              //id
     required Terminal_status            terminal_status = 3;            //终端流程状态, 表示这个出入口到楼上停车位之间的所有设备总状态
     required Passageway_direction       passageway_direction = 4;       //通道口属性, 出入口的方向属性, 表示这个通道允许停车或者取车
 }

+ 98 - 207
message/message_base.pb.cc

@@ -335,12 +335,8 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   ~0u,  // no _weak_field_map_
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Id_struct, terminal_id_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Id_struct, unit_id_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Id_struct, direction_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Id_struct, ip_address_),
-  1,
-  2,
-  3,
   0,
+  1,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 9, sizeof(::message::Base_info)},
@@ -349,7 +345,7 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROT
   { 31, 48, sizeof(::message::Locate_information)},
   { 60, 72, sizeof(::message::Car_info)},
   { 79, 101, sizeof(::message::Parkspace_info)},
-  { 118, 127, sizeof(::message::Id_struct)},
+  { 118, 125, sizeof(::message::Id_struct)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -422,92 +418,90 @@ void AddDescriptorsImpl() {
       "message.Parkspace_path\022\032\n\022path_estimate_"
       "time\030\017 \001(\002\022:\n\027parkspace_status_target\030\020 "
       "\001(\0162\031.message.Parkspace_status\022#\n\010car_ty"
-      "pe\030\021 \001(\0162\021.message.Car_type\"l\n\tId_struct"
-      "\022\023\n\013terminal_id\030\001 \001(\005\022\017\n\007unit_id\030\002 \001(\005\022%"
-      "\n\tdirection\030\003 \001(\0162\022.message.Direction\022\022\n"
-      "\nip_address\030\004 \001(\t*\307\014\n\014Message_type\022\r\n\teB"
-      "ase_msg\020\000\022\020\n\014eCommand_msg\020\001\022\026\n\022eLocate_s"
-      "tatus_msg\020\021\022\027\n\023eLocate_request_msg\020\022\022\030\n\024"
-      "eLocate_response_msg\020\023\022\034\n\030eLocate_sift_r"
-      "equest_msg\020\024\022\035\n\031eLocate_sift_response_ms"
-      "g\020\025\022\030\n\024eDispatch_status_msg\020!\022\031\n\025eDispat"
-      "ch_request_msg\020\"\022\032\n\026eDispatch_response_m"
-      "sg\020#\022$\n eParkspace_allocation_status_msg"
-      "\0201\022%\n!eParkspace_allocation_request_msg\020"
-      "2\022&\n\"eParkspace_allocation_response_msg\020"
-      "3\022!\n\035eParkspace_search_request_msg\0204\022\"\n\036"
-      "eParkspace_search_response_msg\0205\022\"\n\036ePar"
-      "kspace_release_request_msg\0206\022#\n\037eParkspa"
-      "ce_release_response_msg\0207\022\'\n#eParkspace_"
-      "force_update_request_msg\0208\022(\n$eParkspace"
-      "_force_update_response_msg\0209\022(\n$eParkspa"
-      "ce_confirm_alloc_request_msg\020:\022)\n%eParks"
-      "pace_confirm_alloc_response_msg\020;\022\"\n\036ePa"
-      "rkspace_allocation_data_msg\020<\022+\n\'eParksp"
-      "ace_allocation_data_response_msg\020=\022(\n$eP"
-      "arkspace_manual_search_request_msg\020>\022)\n%"
-      "eParkspace_manual_search_response_msg\020\?\022"
-      "\036\n\032eStore_command_request_msg\020A\022\037\n\033eStor"
-      "e_command_response_msg\020B\022\037\n\033ePickup_comm"
-      "and_request_msg\020C\022 \n\034ePickup_command_res"
-      "ponse_msg\020D\022\030\n\024eTerminal_status_msg\020P\022\037\n"
-      "\032eStoring_process_statu_msg\020\220\001\022\037\n\032ePicki"
-      "ng_process_statu_msg\020\221\001\022\"\n\035eCentral_cont"
-      "roller_statu_msg\020\240\001\022#\n\036eEntrance_manual_"
-      "operation_msg\020\260\001\022\"\n\035eProcess_manual_oper"
-      "ation_msg\020\261\001\022\030\n\023eNotify_request_msg\020\300\001\022\031"
-      "\n\024eNotify_response_msg\020\301\001\022\027\n\022eNotify_sta"
-      "tus_msg\020\302\001\022#\n\036eUnNormalized_module_statu"
-      "_msg\020\320\001\022\037\n\032eDispatch_plan_request_msg\020\340\001"
-      "\022 \n\033eDispatch_plan_response_msg\020\341\001\022\"\n\035eD"
-      "ispatch_control_request_msg\020\342\001\022#\n\036eDispa"
-      "tch_control_response_msg\020\343\001\022!\n\034eDispatch"
-      "_manager_status_msg\020\352\001\022\037\n\032eDispatch_mana"
-      "ger_data_msg\020\353\001\022\037\n\032eGround_detect_reques"
-      "t_msg\020\360\001\022 \n\033eGround_detect_response_msg\020"
-      "\361\001\022\027\n\022eGround_status_msg\020\362\001*\307\001\n\014Communic"
-      "ator\022\n\n\006eEmpty\020\000\022\t\n\005eMain\020\001\022\016\n\teTerminor"
-      "\020\200\002\022\017\n\neParkspace\020\200\004\022\016\n\teMeasurer\020\200\006\022\032\n\025"
-      "eMeasurer_sift_server\020\201\006\022\026\n\021eDispatch_ma"
-      "nager\020\200\010\022\026\n\021eDispatch_control\020\201\010\022\014\n\007eNot"
-      "ify\020\201\n\022\025\n\020eGround_measurer\020\200\036**\n\014Process"
-      "_type\022\014\n\010eStoring\020\001\022\014\n\010ePicking\020\002*e\n\013Err"
-      "or_level\022\n\n\006NORMAL\020\000\022\024\n\020NEGLIGIBLE_ERROR"
-      "\020\001\022\017\n\013MINOR_ERROR\020\002\022\017\n\013MAJOR_ERROR\020\003\022\022\n\016"
-      "CRITICAL_ERROR\020\004*\245\001\n\020Parkspace_status\022\034\n"
-      "\030eParkspace_status_unknow\020\000\022\024\n\020eParkspac"
-      "e_empty\020\001\022\027\n\023eParkspace_occupied\020\002\022\027\n\023eP"
-      "arkspace_reserved\020\003\022\025\n\021eParkspace_locked"
-      "\020\004\022\024\n\020eParkspace_error\020\005*\?\n\tDirection\022\025\n"
-      "\021eDirection_unknow\020\000\022\014\n\010eForward\020\001\022\r\n\teB"
-      "ackward\020\002*l\n\016Parkspace_path\022\017\n\013UNKNOW_PA"
-      "TH\020\000\022\020\n\014OPTIMAL_PATH\020\001\022\r\n\tLEFT_PATH\020\002\022\016\n"
-      "\nRIGHT_PATH\020\003\022\030\n\024TEMPORARY_CACHE_PATH\020\004*"
-      "m\n\016Parkspace_type\022\031\n\025UNKNOW_PARKSPACE_TY"
-      "PE\020\000\022\024\n\020MIN_PARKINGSPACE\020\001\022\024\n\020MID_PARKIN"
-      "GSPACE\020\002\022\024\n\020BIG_PARKINGSPACE\020\003*F\n\010Car_ty"
-      "pe\022\023\n\017UNKNOW_CAR_TYPE\020\000\022\013\n\007MIN_CAR\020\001\022\013\n\007"
-      "MID_CAR\020\002\022\013\n\007BIG_CAR\020\003*\335\002\n\tStep_type\022\017\n\013"
-      "eAlloc_step\020\000\022\021\n\reMeasure_step\020\001\022\021\n\reCom"
-      "pare_step\020\002\022\022\n\016eDispatch_step\020\003\022\021\n\reConf"
-      "irm_step\020\004\022\020\n\014eSearch_step\020\005\022\016\n\neWait_st"
-      "ep\020\006\022\021\n\reRelease_step\020\007\022\r\n\teComplete\020\010\022\025"
-      "\n\021eBackConfirm_step\020\t\022\026\n\022eBack_compare_s"
-      "tep\020\n\022\025\n\021eBackMeasure_step\020\013\022\023\n\017eBackAll"
-      "oc_step\020\014\022\022\n\016eBackWait_step\020\r\022\026\n\022eBackDi"
-      "spatch_step\020\016\022\024\n\020eBackSearch_step\020\017\022\021\n\re"
-      "BackComplete\020\020*C\n\nStep_statu\022\014\n\010eWaiting"
-      "\020\000\022\014\n\010eWorking\020\001\022\n\n\006eError\020\002\022\r\n\teFinishe"
-      "d\020\003*\370\001\n\024Dispatch_device_type\022\013\n\007ROBOT_1\020"
-      "e\022\013\n\007ROBOT_2\020f\022\016\n\tCARRIER_1\020\310\001\022\016\n\tCARRIE"
-      "R_2\020\317\001\022\016\n\tCARRIER_3\020\313\001\022\021\n\014PASSAGEWAY_0\020\254"
-      "\002\022\021\n\014PASSAGEWAY_1\020\255\002\022\021\n\014PASSAGEWAY_2\020\256\002\022"
-      "\021\n\014PASSAGEWAY_3\020\257\002\022\021\n\014PASSAGEWAY_4\020\260\002\022\021\n"
-      "\014PASSAGEWAY_5\020\261\002\022\021\n\014PASSAGEWAY_6\020\262\002\022\021\n\014P"
-      "ASSAGEWAY_7\020\263\002"
+      "pe\030\021 \001(\0162\021.message.Car_type\"1\n\tId_struct"
+      "\022\023\n\013terminal_id\030\001 \001(\005\022\017\n\007unit_id\030\002 \001(\005*\307"
+      "\014\n\014Message_type\022\r\n\teBase_msg\020\000\022\020\n\014eComma"
+      "nd_msg\020\001\022\026\n\022eLocate_status_msg\020\021\022\027\n\023eLoc"
+      "ate_request_msg\020\022\022\030\n\024eLocate_response_ms"
+      "g\020\023\022\034\n\030eLocate_sift_request_msg\020\024\022\035\n\031eLo"
+      "cate_sift_response_msg\020\025\022\030\n\024eDispatch_st"
+      "atus_msg\020!\022\031\n\025eDispatch_request_msg\020\"\022\032\n"
+      "\026eDispatch_response_msg\020#\022$\n eParkspace_"
+      "allocation_status_msg\0201\022%\n!eParkspace_al"
+      "location_request_msg\0202\022&\n\"eParkspace_all"
+      "ocation_response_msg\0203\022!\n\035eParkspace_sea"
+      "rch_request_msg\0204\022\"\n\036eParkspace_search_r"
+      "esponse_msg\0205\022\"\n\036eParkspace_release_requ"
+      "est_msg\0206\022#\n\037eParkspace_release_response"
+      "_msg\0207\022\'\n#eParkspace_force_update_reques"
+      "t_msg\0208\022(\n$eParkspace_force_update_respo"
+      "nse_msg\0209\022(\n$eParkspace_confirm_alloc_re"
+      "quest_msg\020:\022)\n%eParkspace_confirm_alloc_"
+      "response_msg\020;\022\"\n\036eParkspace_allocation_"
+      "data_msg\020<\022+\n\'eParkspace_allocation_data"
+      "_response_msg\020=\022(\n$eParkspace_manual_sea"
+      "rch_request_msg\020>\022)\n%eParkspace_manual_s"
+      "earch_response_msg\020\?\022\036\n\032eStore_command_r"
+      "equest_msg\020A\022\037\n\033eStore_command_response_"
+      "msg\020B\022\037\n\033ePickup_command_request_msg\020C\022 "
+      "\n\034ePickup_command_response_msg\020D\022\030\n\024eTer"
+      "minal_status_msg\020P\022\037\n\032eStoring_process_s"
+      "tatu_msg\020\220\001\022\037\n\032ePicking_process_statu_ms"
+      "g\020\221\001\022\"\n\035eCentral_controller_statu_msg\020\240\001"
+      "\022#\n\036eEntrance_manual_operation_msg\020\260\001\022\"\n"
+      "\035eProcess_manual_operation_msg\020\261\001\022\030\n\023eNo"
+      "tify_request_msg\020\300\001\022\031\n\024eNotify_response_"
+      "msg\020\301\001\022\027\n\022eNotify_status_msg\020\302\001\022#\n\036eUnNo"
+      "rmalized_module_statu_msg\020\320\001\022\037\n\032eDispatc"
+      "h_plan_request_msg\020\340\001\022 \n\033eDispatch_plan_"
+      "response_msg\020\341\001\022\"\n\035eDispatch_control_req"
+      "uest_msg\020\342\001\022#\n\036eDispatch_control_respons"
+      "e_msg\020\343\001\022!\n\034eDispatch_manager_status_msg"
+      "\020\352\001\022\037\n\032eDispatch_manager_data_msg\020\353\001\022\037\n\032"
+      "eGround_detect_request_msg\020\360\001\022 \n\033eGround"
+      "_detect_response_msg\020\361\001\022\027\n\022eGround_statu"
+      "s_msg\020\362\001*\307\001\n\014Communicator\022\n\n\006eEmpty\020\000\022\t\n"
+      "\005eMain\020\001\022\016\n\teTerminor\020\200\002\022\017\n\neParkspace\020\200"
+      "\004\022\016\n\teMeasurer\020\200\006\022\032\n\025eMeasurer_sift_serv"
+      "er\020\201\006\022\026\n\021eDispatch_manager\020\200\010\022\026\n\021eDispat"
+      "ch_control\020\201\010\022\014\n\007eNotify\020\201\n\022\025\n\020eGround_m"
+      "easurer\020\200\036**\n\014Process_type\022\014\n\010eStoring\020\001"
+      "\022\014\n\010ePicking\020\002*e\n\013Error_level\022\n\n\006NORMAL\020"
+      "\000\022\024\n\020NEGLIGIBLE_ERROR\020\001\022\017\n\013MINOR_ERROR\020\002"
+      "\022\017\n\013MAJOR_ERROR\020\003\022\022\n\016CRITICAL_ERROR\020\004*\245\001"
+      "\n\020Parkspace_status\022\034\n\030eParkspace_status_"
+      "unknow\020\000\022\024\n\020eParkspace_empty\020\001\022\027\n\023eParks"
+      "pace_occupied\020\002\022\027\n\023eParkspace_reserved\020\003"
+      "\022\025\n\021eParkspace_locked\020\004\022\024\n\020eParkspace_er"
+      "ror\020\005*\?\n\tDirection\022\025\n\021eDirection_unknow\020"
+      "\000\022\014\n\010eForward\020\001\022\r\n\teBackward\020\002*l\n\016Parksp"
+      "ace_path\022\017\n\013UNKNOW_PATH\020\000\022\020\n\014OPTIMAL_PAT"
+      "H\020\001\022\r\n\tLEFT_PATH\020\002\022\016\n\nRIGHT_PATH\020\003\022\030\n\024TE"
+      "MPORARY_CACHE_PATH\020\004*m\n\016Parkspace_type\022\031"
+      "\n\025UNKNOW_PARKSPACE_TYPE\020\000\022\024\n\020MIN_PARKING"
+      "SPACE\020\001\022\024\n\020MID_PARKINGSPACE\020\002\022\024\n\020BIG_PAR"
+      "KINGSPACE\020\003*F\n\010Car_type\022\023\n\017UNKNOW_CAR_TY"
+      "PE\020\000\022\013\n\007MIN_CAR\020\001\022\013\n\007MID_CAR\020\002\022\013\n\007BIG_CA"
+      "R\020\003*\335\002\n\tStep_type\022\017\n\013eAlloc_step\020\000\022\021\n\reM"
+      "easure_step\020\001\022\021\n\reCompare_step\020\002\022\022\n\016eDis"
+      "patch_step\020\003\022\021\n\reConfirm_step\020\004\022\020\n\014eSear"
+      "ch_step\020\005\022\016\n\neWait_step\020\006\022\021\n\reRelease_st"
+      "ep\020\007\022\r\n\teComplete\020\010\022\025\n\021eBackConfirm_step"
+      "\020\t\022\026\n\022eBack_compare_step\020\n\022\025\n\021eBackMeasu"
+      "re_step\020\013\022\023\n\017eBackAlloc_step\020\014\022\022\n\016eBackW"
+      "ait_step\020\r\022\026\n\022eBackDispatch_step\020\016\022\024\n\020eB"
+      "ackSearch_step\020\017\022\021\n\reBackComplete\020\020*C\n\nS"
+      "tep_statu\022\014\n\010eWaiting\020\000\022\014\n\010eWorking\020\001\022\n\n"
+      "\006eError\020\002\022\r\n\teFinished\020\003*\370\001\n\024Dispatch_de"
+      "vice_type\022\013\n\007ROBOT_1\020e\022\013\n\007ROBOT_2\020f\022\016\n\tC"
+      "ARRIER_1\020\310\001\022\016\n\tCARRIER_2\020\317\001\022\016\n\tCARRIER_3"
+      "\020\313\001\022\021\n\014PASSAGEWAY_0\020\254\002\022\021\n\014PASSAGEWAY_1\020\255"
+      "\002\022\021\n\014PASSAGEWAY_2\020\256\002\022\021\n\014PASSAGEWAY_3\020\257\002\022"
+      "\021\n\014PASSAGEWAY_4\020\260\002\022\021\n\014PASSAGEWAY_5\020\261\002\022\021\n"
+      "\014PASSAGEWAY_6\020\262\002\022\021\n\014PASSAGEWAY_7\020\263\002"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 4814);
+      descriptor, 4755);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "message_base.proto", &protobuf_RegisterTypes);
 }
@@ -3920,8 +3914,6 @@ void Id_struct::InitAsDefaultInstance() {
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Id_struct::kTerminalIdFieldNumber;
 const int Id_struct::kUnitIdFieldNumber;
-const int Id_struct::kDirectionFieldNumber;
-const int Id_struct::kIpAddressFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Id_struct::Id_struct()
@@ -3938,22 +3930,17 @@ Id_struct::Id_struct(const Id_struct& from)
       _has_bits_(from._has_bits_),
       _cached_size_(0) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ip_address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  if (from.has_ip_address()) {
-    ip_address_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.ip_address_);
-  }
   ::memcpy(&terminal_id_, &from.terminal_id_,
-    static_cast<size_t>(reinterpret_cast<char*>(&direction_) -
-    reinterpret_cast<char*>(&terminal_id_)) + sizeof(direction_));
+    static_cast<size_t>(reinterpret_cast<char*>(&unit_id_) -
+    reinterpret_cast<char*>(&terminal_id_)) + sizeof(unit_id_));
   // @@protoc_insertion_point(copy_constructor:message.Id_struct)
 }
 
 void Id_struct::SharedCtor() {
   _cached_size_ = 0;
-  ip_address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&terminal_id_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&direction_) -
-      reinterpret_cast<char*>(&terminal_id_)) + sizeof(direction_));
+      reinterpret_cast<char*>(&unit_id_) -
+      reinterpret_cast<char*>(&terminal_id_)) + sizeof(unit_id_));
 }
 
 Id_struct::~Id_struct() {
@@ -3962,7 +3949,6 @@ Id_struct::~Id_struct() {
 }
 
 void Id_struct::SharedDtor() {
-  ip_address_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 
 void Id_struct::SetCachedSize(int size) const {
@@ -3995,14 +3981,10 @@ void Id_struct::Clear() {
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    GOOGLE_DCHECK(!ip_address_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()));
-    (*ip_address_.UnsafeRawStringPointer())->clear();
-  }
-  if (cached_has_bits & 14u) {
+  if (cached_has_bits & 3u) {
     ::memset(&terminal_id_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&direction_) -
-        reinterpret_cast<char*>(&terminal_id_)) + sizeof(direction_));
+        reinterpret_cast<char*>(&unit_id_) -
+        reinterpret_cast<char*>(&terminal_id_)) + sizeof(unit_id_));
   }
   _has_bits_.Clear();
   _internal_metadata_.Clear();
@@ -4046,42 +4028,6 @@ bool Id_struct::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .message.Direction direction = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(24u /* 24 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::message::Direction_IsValid(value)) {
-            set_direction(static_cast< ::message::Direction >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(
-                3, static_cast< ::google::protobuf::uint64>(value));
-          }
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // optional string ip_address = 4;
-      case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_ip_address()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->ip_address().data(), static_cast<int>(this->ip_address().length()),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "message.Id_struct.ip_address");
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
       default: {
       handle_unusual:
         if (tag == 0) {
@@ -4110,31 +4056,15 @@ void Id_struct::SerializeWithCachedSizes(
 
   cached_has_bits = _has_bits_[0];
   // optional int32 terminal_id = 1;
-  if (cached_has_bits & 0x00000002u) {
+  if (cached_has_bits & 0x00000001u) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->terminal_id(), output);
   }
 
   // optional int32 unit_id = 2;
-  if (cached_has_bits & 0x00000004u) {
+  if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->unit_id(), output);
   }
 
-  // optional .message.Direction direction = 3;
-  if (cached_has_bits & 0x00000008u) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      3, this->direction(), output);
-  }
-
-  // optional string ip_address = 4;
-  if (cached_has_bits & 0x00000001u) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->ip_address().data(), static_cast<int>(this->ip_address().length()),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "message.Id_struct.ip_address");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      4, this->ip_address(), output);
-  }
-
   if (_internal_metadata_.have_unknown_fields()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
@@ -4151,32 +4081,15 @@ void Id_struct::SerializeWithCachedSizes(
 
   cached_has_bits = _has_bits_[0];
   // optional int32 terminal_id = 1;
-  if (cached_has_bits & 0x00000002u) {
+  if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->terminal_id(), target);
   }
 
   // optional int32 unit_id = 2;
-  if (cached_has_bits & 0x00000004u) {
+  if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->unit_id(), target);
   }
 
-  // optional .message.Direction direction = 3;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      3, this->direction(), target);
-  }
-
-  // optional string ip_address = 4;
-  if (cached_has_bits & 0x00000001u) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->ip_address().data(), static_cast<int>(this->ip_address().length()),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "message.Id_struct.ip_address");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        4, this->ip_address(), target);
-  }
-
   if (_internal_metadata_.have_unknown_fields()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
@@ -4194,14 +4107,7 @@ size_t Id_struct::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
         _internal_metadata_.unknown_fields());
   }
-  if (_has_bits_[0 / 32] & 15u) {
-    // optional string ip_address = 4;
-    if (has_ip_address()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->ip_address());
-    }
-
+  if (_has_bits_[0 / 32] & 3u) {
     // optional int32 terminal_id = 1;
     if (has_terminal_id()) {
       total_size += 1 +
@@ -4216,12 +4122,6 @@ size_t Id_struct::ByteSizeLong() const {
           this->unit_id());
     }
 
-    // optional .message.Direction direction = 3;
-    if (has_direction()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->direction());
-    }
-
   }
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
@@ -4253,20 +4153,13 @@ void Id_struct::MergeFrom(const Id_struct& from) {
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 15u) {
+  if (cached_has_bits & 3u) {
     if (cached_has_bits & 0x00000001u) {
-      set_has_ip_address();
-      ip_address_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.ip_address_);
-    }
-    if (cached_has_bits & 0x00000002u) {
       terminal_id_ = from.terminal_id_;
     }
-    if (cached_has_bits & 0x00000004u) {
+    if (cached_has_bits & 0x00000002u) {
       unit_id_ = from.unit_id_;
     }
-    if (cached_has_bits & 0x00000008u) {
-      direction_ = from.direction_;
-    }
     _has_bits_[0] |= cached_has_bits;
   }
 }
@@ -4295,10 +4188,8 @@ void Id_struct::Swap(Id_struct* other) {
 }
 void Id_struct::InternalSwap(Id_struct* other) {
   using std::swap;
-  ip_address_.Swap(&other->ip_address_);
   swap(terminal_id_, other->terminal_id_);
   swap(unit_id_, other->unit_id_);
-  swap(direction_, other->direction_);
   swap(_has_bits_[0], other->_has_bits_[0]);
   _internal_metadata_.Swap(&other->_internal_metadata_);
   swap(_cached_size_, other->_cached_size_);

+ 6 - 122
message/message_base.pb.h

@@ -1595,21 +1595,6 @@ class Id_struct : public ::google::protobuf::Message /* @@protoc_insertion_point
 
   // accessors -------------------------------------------------------
 
-  // optional string ip_address = 4;
-  bool has_ip_address() const;
-  void clear_ip_address();
-  static const int kIpAddressFieldNumber = 4;
-  const ::std::string& ip_address() const;
-  void set_ip_address(const ::std::string& value);
-  #if LANG_CXX11
-  void set_ip_address(::std::string&& value);
-  #endif
-  void set_ip_address(const char* value);
-  void set_ip_address(const char* value, size_t size);
-  ::std::string* mutable_ip_address();
-  ::std::string* release_ip_address();
-  void set_allocated_ip_address(::std::string* ip_address);
-
   // optional int32 terminal_id = 1;
   bool has_terminal_id() const;
   void clear_terminal_id();
@@ -1624,31 +1609,18 @@ class Id_struct : public ::google::protobuf::Message /* @@protoc_insertion_point
   ::google::protobuf::int32 unit_id() const;
   void set_unit_id(::google::protobuf::int32 value);
 
-  // optional .message.Direction direction = 3;
-  bool has_direction() const;
-  void clear_direction();
-  static const int kDirectionFieldNumber = 3;
-  ::message::Direction direction() const;
-  void set_direction(::message::Direction value);
-
   // @@protoc_insertion_point(class_scope:message.Id_struct)
  private:
   void set_has_terminal_id();
   void clear_has_terminal_id();
   void set_has_unit_id();
   void clear_has_unit_id();
-  void set_has_direction();
-  void clear_has_direction();
-  void set_has_ip_address();
-  void clear_has_ip_address();
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::HasBits<1> _has_bits_;
   mutable int _cached_size_;
-  ::google::protobuf::internal::ArenaStringPtr ip_address_;
   ::google::protobuf::int32 terminal_id_;
   ::google::protobuf::int32 unit_id_;
-  int direction_;
   friend struct ::protobuf_message_5fbase_2eproto::TableStruct;
   friend void ::protobuf_message_5fbase_2eproto::InitDefaultsId_structImpl();
 };
@@ -3010,13 +2982,13 @@ inline void Parkspace_info::set_car_type(::message::Car_type value) {
 
 // optional int32 terminal_id = 1;
 inline bool Id_struct::has_terminal_id() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
 inline void Id_struct::set_has_terminal_id() {
-  _has_bits_[0] |= 0x00000002u;
+  _has_bits_[0] |= 0x00000001u;
 }
 inline void Id_struct::clear_has_terminal_id() {
-  _has_bits_[0] &= ~0x00000002u;
+  _has_bits_[0] &= ~0x00000001u;
 }
 inline void Id_struct::clear_terminal_id() {
   terminal_id_ = 0;
@@ -3034,13 +3006,13 @@ inline void Id_struct::set_terminal_id(::google::protobuf::int32 value) {
 
 // optional int32 unit_id = 2;
 inline bool Id_struct::has_unit_id() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
 inline void Id_struct::set_has_unit_id() {
-  _has_bits_[0] |= 0x00000004u;
+  _has_bits_[0] |= 0x00000002u;
 }
 inline void Id_struct::clear_has_unit_id() {
-  _has_bits_[0] &= ~0x00000004u;
+  _has_bits_[0] &= ~0x00000002u;
 }
 inline void Id_struct::clear_unit_id() {
   unit_id_ = 0;
@@ -3056,94 +3028,6 @@ inline void Id_struct::set_unit_id(::google::protobuf::int32 value) {
   // @@protoc_insertion_point(field_set:message.Id_struct.unit_id)
 }
 
-// optional .message.Direction direction = 3;
-inline bool Id_struct::has_direction() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void Id_struct::set_has_direction() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void Id_struct::clear_has_direction() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void Id_struct::clear_direction() {
-  direction_ = 0;
-  clear_has_direction();
-}
-inline ::message::Direction Id_struct::direction() const {
-  // @@protoc_insertion_point(field_get:message.Id_struct.direction)
-  return static_cast< ::message::Direction >(direction_);
-}
-inline void Id_struct::set_direction(::message::Direction value) {
-  assert(::message::Direction_IsValid(value));
-  set_has_direction();
-  direction_ = value;
-  // @@protoc_insertion_point(field_set:message.Id_struct.direction)
-}
-
-// optional string ip_address = 4;
-inline bool Id_struct::has_ip_address() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void Id_struct::set_has_ip_address() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Id_struct::clear_has_ip_address() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void Id_struct::clear_ip_address() {
-  ip_address_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_ip_address();
-}
-inline const ::std::string& Id_struct::ip_address() const {
-  // @@protoc_insertion_point(field_get:message.Id_struct.ip_address)
-  return ip_address_.GetNoArena();
-}
-inline void Id_struct::set_ip_address(const ::std::string& value) {
-  set_has_ip_address();
-  ip_address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:message.Id_struct.ip_address)
-}
-#if LANG_CXX11
-inline void Id_struct::set_ip_address(::std::string&& value) {
-  set_has_ip_address();
-  ip_address_.SetNoArena(
-    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:message.Id_struct.ip_address)
-}
-#endif
-inline void Id_struct::set_ip_address(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_ip_address();
-  ip_address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:message.Id_struct.ip_address)
-}
-inline void Id_struct::set_ip_address(const char* value, size_t size) {
-  set_has_ip_address();
-  ip_address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
-      ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:message.Id_struct.ip_address)
-}
-inline ::std::string* Id_struct::mutable_ip_address() {
-  set_has_ip_address();
-  // @@protoc_insertion_point(field_mutable:message.Id_struct.ip_address)
-  return ip_address_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline ::std::string* Id_struct::release_ip_address() {
-  // @@protoc_insertion_point(field_release:message.Id_struct.ip_address)
-  clear_has_ip_address();
-  return ip_address_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-}
-inline void Id_struct::set_allocated_ip_address(::std::string* ip_address) {
-  if (ip_address != NULL) {
-    set_has_ip_address();
-  } else {
-    clear_has_ip_address();
-  }
-  ip_address_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ip_address);
-  // @@protoc_insertion_point(field_set_allocated:message.Id_struct.ip_address)
-}
-
 #ifdef __GNUC__
   #pragma GCC diagnostic pop
 #endif  // __GNUC__

+ 1 - 1
system/system_communication.cpp

@@ -57,7 +57,7 @@ Error_manager System_communication::execute_msg(Communication_message* p_msg)
 Error_manager System_communication::encapsulate_send_data()
 {
 	Error_manager t_error;
-//	return System_executor::get_instance_references().encapsulate_send_status();
+
 	return System_executor::get_instance_references().encapsulate_send_dispatch_manager_status();
 
 	return Error_code::SUCCESS;

+ 4 - 1
system/system_executor.cpp

@@ -360,6 +360,7 @@ Error_manager System_executor::check_status()
 Error_manager System_executor::encapsulate_send_status()
 {
 	Error_manager t_error;
+return Error_code::SUCCESS;
 
 	int t_dispatch_manager_id = Dispatch_manager::get_instance_references().get_dispatch_manager_id();
 	std::string t_msg;
@@ -380,7 +381,7 @@ Error_manager System_executor::encapsulate_send_status()
 	System_communication::get_instance_references().encapsulate_msg(t_msg);
 */
 
-
+/*
 	//创建4条 调度模块终端出入口的状态
 	message::Dispatch_terminal_status_msg t_dispatch_terminal_status_msg;
 	t_dispatch_terminal_status_msg.mutable_base_info()->set_msg_type(message::Message_type::eDispatch_status_msg);
@@ -422,6 +423,8 @@ Error_manager System_executor::encapsulate_send_status()
 	t_dispatch_terminal_status_msg.set_passageway_direction(message::Passageway_direction::E_OUTLET);
 	t_msg = t_dispatch_terminal_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg);
+
+ */
 	return Error_code::SUCCESS;
 }