Bläddra i källkod

20211215 msg 3c 3d

yct 3 år sedan
förälder
incheckning
e9b59f0f66

+ 2 - 2
message/message_base.pb.cc

@@ -401,8 +401,8 @@ void AddDescriptorsImpl() {
       "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\036eParkspace_refresh_req"
+      "uest_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"

+ 1 - 1
message/message_base.pb.h

@@ -104,7 +104,7 @@ enum Message_type {
   eParkspace_force_update_response_msg = 57,
   eParkspace_confirm_alloc_request_msg = 58,
   eParkspace_confirm_alloc_response_msg = 59,
-  eParkspace_allocation_data_msg = 60,
+  eParkspace_refresh_request_msg = 60,
   eParkspace_allocation_data_response_msg = 61,
   eParkspace_manual_search_request_msg = 62,
   eParkspace_manual_search_response_msg = 63,

+ 3 - 3
message/message_base.proto

@@ -30,8 +30,8 @@ enum Message_type
     eParkspace_force_update_response_msg = 0x39;//手动修改车位反馈消息
     eParkspace_confirm_alloc_request_msg = 0x3A;//确认分配车位请求消息
     eParkspace_confirm_alloc_response_msg = 0x3B;//确认分配车位反馈消息
-    eParkspace_allocation_data_msg = 0x3C;     //车位分配模块车位数据消息
-    eParkspace_allocation_data_response_msg =0x3D;//车位数据反馈消息
+    eParkspace_refresh_request_msg=0x3C;                //请求更新车位数据
+    eParkspace_allocation_data_response_msg=0x3D;       //车位数据反馈消息
     eParkspace_manual_search_request_msg = 0x3E;	//手动查询车位请求消息
     eParkspace_manual_search_response_msg = 0x3F;//手动查询车位反馈消息
 
@@ -57,7 +57,7 @@ enum Message_type
     eNotify_status_msg=0xc2;                //等候区通知节点状态
 
     eUnNormalized_module_statu_msg = 0xd0; //非标节点状态
-;
+
     eDispatch_plan_request_msg          = 0xe0;     //调度总规划的请求(用于启动整个调度算法)(调度管理->调度算法)
     eDispatch_plan_response_msg         = 0xe1;     //调度总规划的答复(调度算法->调度管理)
     eDispatch_control_request_msg       = 0xe2;     //调度控制的任务请求(调度算法->调度管理)

+ 1 - 1
parkspace_allocation/parkspace_manager.cpp

@@ -270,7 +270,7 @@ Error_manager Parkspace_manager::send_parkspace_data()
 	}
 	message::Base_info t_base_info;
 	message::Error_manager error;
-	t_base_info.set_msg_type(message::Message_type::eParkspace_allocation_data_msg);
+	t_base_info.set_msg_type(message::Message_type::eParkspace_allocation_data_response_msg);
 	t_base_info.set_timeout_ms(5000);
 	t_base_info.set_sender(message::Communicator::eParkspace);
 	t_base_info.set_receiver(message::Communicator::eMain);