20211117,tx

dispatch/dispatch_communication.cpp

@@ -89,7 +89,7 @@ Error_manager Dispatch_communication::communication_init(int plc_id)
 	t_index += sizeof(unsigned char)*20;
 	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_request_car_type", typeid(unsigned char).name(), t_index,sizeof(unsigned char), 1 });
 	t_index += sizeof(unsigned char)*1;
-	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_reserved189_192", typeid(unsigned char).name(), t_index,sizeof(unsigned char), 3 });
+	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_reserved189_191", typeid(unsigned char).name(), t_index,sizeof(unsigned char), 3 });
 	t_index += sizeof(unsigned char)*3;
 	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_request_uniformed_car_x", typeid(float).name(), t_index,sizeof(float), 1 });
 	t_index += sizeof(float)*1;
@@ -179,7 +179,7 @@ Error_manager Dispatch_communication::communication_init(int plc_id)
 	t_index += sizeof(unsigned char)*20;
 	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_request_car_type", typeid(unsigned char).name(), t_index,sizeof(unsigned char), 1 });
 	t_index += sizeof(unsigned char)*1;
-	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_reserved189_192", typeid(unsigned char).name(), t_index,sizeof(unsigned char), 3 });
+	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_reserved189_191", typeid(unsigned char).name(), t_index,sizeof(unsigned char), 3 });
 	t_index += sizeof(unsigned char)*3;
 	t_variable_information_vector.push_back(Snap7_buf::Variable_information{"m_request_uniformed_car_x", typeid(float).name(), t_index,sizeof(float), 1 });
 	t_index += sizeof(float)*1;

dispatch/dispatch_communication.h

@@ -329,7 +329,7 @@ public:
 		unsigned char			m_reserved168_187[20] = {0};							//预留
 
 		unsigned char			m_request_car_type = 0;						//0=未知，1=小车，2=中车,3=大车 ..188
-		unsigned char			m_reserved189_192[3] = {0};							//预留
+		unsigned char			m_reserved189_191[3] = {0};							//预留
 
 		float					m_request_uniformed_car_x = 0;					//转角复位后,车辆中心点x
 		float					m_request_uniformed_car_y = 0;					//转角复位后,车辆中心点y
@@ -388,7 +388,7 @@ public:
 		unsigned char			m_reserved168_187[20] = {0};							//预留
 
 		unsigned char			m_response_car_type = 0;						//0=未知，1=小车，2=中车,3=大车 ..188
-		unsigned char			m_reserved189_192[3] = {0};							//预留
+		unsigned char			m_reserved189_191[3] = {0};							//预留
 
 		float					m_response_uniformed_car_x = 0;					//转角复位后,车辆中心点x
 		float					m_response_uniformed_car_y = 0;					//转角复位后,车辆中心点y

message/parkspace_allocation_message.proto

@@ -55,7 +55,7 @@ message Parkspace_allocation_response_msg
     optional Car_type                   car_type = 5;//汽车类型
 }
 
-//2.查询车辆位置请求
+//2.查询车辆位置请求（根据车辆唯一标识码查询）
 message Parkspace_search_request_msg
 {
     required Base_info                  base_info=1;            //消息类型
@@ -71,6 +71,22 @@ message Parkspace_search_response_msg
     required Error_manager              error_manager=3;        //分配成功与否标志
     repeated Parkspace_info             query_parkspace_info_ex=4;         //待查询车辆存放位置
 }
+//手动查询车辆位置请求（根据车牌号查询）
+message Parkspace_manual_search_request_msg
+{
+    required Base_info                  base_info=1;            //消息类型
+    required string                     command_key=2;           //指令唯一标识符id
+    required Car_info                   car_info=3;              //车辆凭证或号牌
+}
+
+//手动查询车辆位置反馈
+message Parkspace_manual_search_response_msg
+{
+    required Base_info                  base_info=1;            //消息类型
+    required string                     command_key=2;           //指令唯一标识符id
+    required Error_manager              error_manager=3;        //分配成功与否标志
+    repeated Parkspace_info             query_parkspace_info_ex=4;         //待查询车辆存放位置
+}
 
 //3.释放车位请求
 message Parkspace_release_request_msg