Преглед на файлове

2021 0706, wangkang parkspace

wk преди 4 години
родител
ревизия
3874de74df
променени са 4 файла, в които са добавени 580 реда и са изтрити 424 реда
  1. 313 258
      message/message_base.pb.cc
  2. 179 112
      message/message_base.pb.h
  3. 68 34
      message/message_base.proto
  4. 20 20
      parkspace_allocation/parkspace_operating_function.cpp

Файловите разлики са ограничени, защото са твърде много
+ 313 - 258
message/message_base.pb.cc


+ 179 - 112
message/message_base.pb.h

@@ -92,6 +92,8 @@ enum Message_type {
   eLocate_status_msg = 17,
   eLocate_request_msg = 18,
   eLocate_response_msg = 19,
+  eLocate_sift_request_msg = 20,
+  eLocate_sift_response_msg = 21,
   eDispatch_status_msg = 33,
   eDispatch_request_msg = 34,
   eDispatch_response_msg = 35,
@@ -205,14 +207,15 @@ inline bool Error_level_Parse(
     Error_level_descriptor(), name, value);
 }
 enum Parkspace_status {
-  eParkspace_empty = 0,
-  eParkspace_occupied = 1,
-  eParkspace_reserved = 2,
-  eParkspace_locked = 3,
-  eParkspace_error = 4
+  eParkspace_status_unknow = 0,
+  eParkspace_empty = 1,
+  eParkspace_occupied = 2,
+  eParkspace_reserved = 3,
+  eParkspace_locked = 4,
+  eParkspace_error = 5
 };
 bool Parkspace_status_IsValid(int value);
-const Parkspace_status Parkspace_status_MIN = eParkspace_empty;
+const Parkspace_status Parkspace_status_MIN = eParkspace_status_unknow;
 const Parkspace_status Parkspace_status_MAX = eParkspace_error;
 const int Parkspace_status_ARRAYSIZE = Parkspace_status_MAX + 1;
 
@@ -227,11 +230,12 @@ inline bool Parkspace_status_Parse(
     Parkspace_status_descriptor(), name, value);
 }
 enum Direction {
+  eDirection_unknow = 0,
   eForward = 1,
   eBackward = 2
 };
 bool Direction_IsValid(int value);
-const Direction Direction_MIN = eForward;
+const Direction Direction_MIN = eDirection_unknow;
 const Direction Direction_MAX = eBackward;
 const int Direction_ARRAYSIZE = Direction_MAX + 1;
 
@@ -246,13 +250,14 @@ inline bool Direction_Parse(
     Direction_descriptor(), name, value);
 }
 enum Parkspace_path {
+  UNKNOW_PATH = 0,
   OPTIMAL_PATH = 1,
   LEFT_PATH = 2,
   RIGHT_PATH = 3,
   TEMPORARY_CACHE_PATH = 4
 };
 bool Parkspace_path_IsValid(int value);
-const Parkspace_path Parkspace_path_MIN = OPTIMAL_PATH;
+const Parkspace_path Parkspace_path_MIN = UNKNOW_PATH;
 const Parkspace_path Parkspace_path_MAX = TEMPORARY_CACHE_PATH;
 const int Parkspace_path_ARRAYSIZE = Parkspace_path_MAX + 1;
 
@@ -267,12 +272,13 @@ inline bool Parkspace_path_Parse(
     Parkspace_path_descriptor(), name, value);
 }
 enum Parkspace_type {
+  UNKNOW_PARKSPACE_TYPE = 0,
   MIN_PARKINGSPACE = 1,
   MID_PARKINGSPACE = 2,
   BIG_PARKINGSPACE = 3
 };
 bool Parkspace_type_IsValid(int value);
-const Parkspace_type Parkspace_type_MIN = MIN_PARKINGSPACE;
+const Parkspace_type Parkspace_type_MIN = UNKNOW_PARKSPACE_TYPE;
 const Parkspace_type Parkspace_type_MAX = BIG_PARKINGSPACE;
 const int Parkspace_type_ARRAYSIZE = Parkspace_type_MAX + 1;
 
@@ -286,6 +292,27 @@ inline bool Parkspace_type_Parse(
   return ::google::protobuf::internal::ParseNamedEnum<Parkspace_type>(
     Parkspace_type_descriptor(), name, value);
 }
+enum Car_type {
+  UNKNOW_CAR_TYPE = 0,
+  MIN_CAR = 1,
+  MID_CAR = 2,
+  BIG_CAR = 3
+};
+bool Car_type_IsValid(int value);
+const Car_type Car_type_MIN = UNKNOW_CAR_TYPE;
+const Car_type Car_type_MAX = BIG_CAR;
+const int Car_type_ARRAYSIZE = Car_type_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* Car_type_descriptor();
+inline const ::std::string& Car_type_Name(Car_type value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    Car_type_descriptor(), value);
+}
+inline bool Car_type_Parse(
+    const ::std::string& name, Car_type* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<Car_type>(
+    Car_type_descriptor(), name, value);
+}
 enum Step_type {
   eAlloc_step = 0,
   eMeasure_step = 1,
@@ -341,6 +368,36 @@ inline bool Step_statu_Parse(
   return ::google::protobuf::internal::ParseNamedEnum<Step_statu>(
     Step_statu_descriptor(), name, value);
 }
+enum Dispatch_device_type {
+  ROBOT_1 = 101,
+  ROBOT_2 = 102,
+  CARRIER_1 = 200,
+  CARRIER_2 = 207,
+  CARRIER_3 = 203,
+  PASSAGEWAY_0 = 300,
+  PASSAGEWAY_1 = 301,
+  PASSAGEWAY_2 = 302,
+  PASSAGEWAY_3 = 303,
+  PASSAGEWAY_4 = 304,
+  PASSAGEWAY_5 = 305,
+  PASSAGEWAY_6 = 306,
+  PASSAGEWAY_7 = 307
+};
+bool Dispatch_device_type_IsValid(int value);
+const Dispatch_device_type Dispatch_device_type_MIN = ROBOT_1;
+const Dispatch_device_type Dispatch_device_type_MAX = PASSAGEWAY_7;
+const int Dispatch_device_type_ARRAYSIZE = Dispatch_device_type_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* Dispatch_device_type_descriptor();
+inline const ::std::string& Dispatch_device_type_Name(Dispatch_device_type value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    Dispatch_device_type_descriptor(), value);
+}
+inline bool Dispatch_device_type_Parse(
+    const ::std::string& name, Dispatch_device_type* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<Dispatch_device_type>(
+    Dispatch_device_type_descriptor(), name, value);
+}
 // ===================================================================
 
 class Base_info : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:message.Base_info) */ {
@@ -432,28 +489,28 @@ class Base_info : public ::google::protobuf::Message /* @@protoc_insertion_point
 
   // accessors -------------------------------------------------------
 
-  // required .message.Message_type msg_type = 1;
+  // required .message.Message_type msg_type = 1 [default = eBase_msg];
   bool has_msg_type() const;
   void clear_msg_type();
   static const int kMsgTypeFieldNumber = 1;
   ::message::Message_type msg_type() const;
   void set_msg_type(::message::Message_type value);
 
-  // optional int32 timeout_ms = 2;
+  // optional int32 timeout_ms = 2 [default = 0];
   bool has_timeout_ms() const;
   void clear_timeout_ms();
   static const int kTimeoutMsFieldNumber = 2;
   ::google::protobuf::int32 timeout_ms() const;
   void set_timeout_ms(::google::protobuf::int32 value);
 
-  // required .message.Communicator sender = 3;
+  // required .message.Communicator sender = 3 [default = eEmpty];
   bool has_sender() const;
   void clear_sender();
   static const int kSenderFieldNumber = 3;
   ::message::Communicator sender() const;
   void set_sender(::message::Communicator value);
 
-  // required .message.Communicator receiver = 4;
+  // required .message.Communicator receiver = 4 [default = eEmpty];
   bool has_receiver() const;
   void clear_receiver();
   static const int kReceiverFieldNumber = 4;
@@ -687,7 +744,7 @@ class Error_manager : public ::google::protobuf::Message /* @@protoc_insertion_p
 
   // accessors -------------------------------------------------------
 
-  // optional string error_description = 3;
+  // optional string error_description = 3 [default = ""];
   bool has_error_description() const;
   void clear_error_description();
   static const int kErrorDescriptionFieldNumber = 3;
@@ -702,14 +759,14 @@ class Error_manager : public ::google::protobuf::Message /* @@protoc_insertion_p
   ::std::string* release_error_description();
   void set_allocated_error_description(::std::string* error_description);
 
-  // required int32 error_code = 1;
+  // required int32 error_code = 1 [default = 0];
   bool has_error_code() const;
   void clear_error_code();
   static const int kErrorCodeFieldNumber = 1;
   ::google::protobuf::int32 error_code() const;
   void set_error_code(::google::protobuf::int32 value);
 
-  // optional .message.Error_level error_level = 2;
+  // optional .message.Error_level error_level = 2 [default = NORMAL];
   bool has_error_level() const;
   void clear_error_level();
   static const int kErrorLevelFieldNumber = 2;
@@ -825,70 +882,70 @@ class Locate_information : public ::google::protobuf::Message /* @@protoc_insert
 
   // accessors -------------------------------------------------------
 
-  // optional float locate_x = 1;
+  // optional float locate_x = 1 [default = 0];
   bool has_locate_x() const;
   void clear_locate_x();
   static const int kLocateXFieldNumber = 1;
   float locate_x() const;
   void set_locate_x(float value);
 
-  // optional float locate_y = 2;
+  // optional float locate_y = 2 [default = 0];
   bool has_locate_y() const;
   void clear_locate_y();
   static const int kLocateYFieldNumber = 2;
   float locate_y() const;
   void set_locate_y(float value);
 
-  // optional float locate_angle = 3;
+  // optional float locate_angle = 3 [default = 0];
   bool has_locate_angle() const;
   void clear_locate_angle();
   static const int kLocateAngleFieldNumber = 3;
   float locate_angle() const;
   void set_locate_angle(float value);
 
-  // optional float locate_length = 4;
+  // optional float locate_length = 4 [default = 0];
   bool has_locate_length() const;
   void clear_locate_length();
   static const int kLocateLengthFieldNumber = 4;
   float locate_length() const;
   void set_locate_length(float value);
 
-  // optional float locate_width = 5;
+  // optional float locate_width = 5 [default = 0];
   bool has_locate_width() const;
   void clear_locate_width();
   static const int kLocateWidthFieldNumber = 5;
   float locate_width() const;
   void set_locate_width(float value);
 
-  // optional float locate_height = 6;
+  // optional float locate_height = 6 [default = 0];
   bool has_locate_height() const;
   void clear_locate_height();
   static const int kLocateHeightFieldNumber = 6;
   float locate_height() const;
   void set_locate_height(float value);
 
-  // optional float locate_wheel_base = 7;
+  // optional float locate_wheel_base = 7 [default = 0];
   bool has_locate_wheel_base() const;
   void clear_locate_wheel_base();
   static const int kLocateWheelBaseFieldNumber = 7;
   float locate_wheel_base() const;
   void set_locate_wheel_base(float value);
 
-  // optional float locate_wheel_width = 8;
+  // optional float locate_wheel_width = 8 [default = 0];
   bool has_locate_wheel_width() const;
   void clear_locate_wheel_width();
   static const int kLocateWheelWidthFieldNumber = 8;
   float locate_wheel_width() const;
   void set_locate_wheel_width(float value);
 
-  // optional bool locate_correct = 9;
+  // optional bool locate_correct = 9 [default = false];
   bool has_locate_correct() const;
   void clear_locate_correct();
   static const int kLocateCorrectFieldNumber = 9;
   bool locate_correct() const;
   void set_locate_correct(bool value);
 
-  // optional float locate_front_theta = 10;
+  // optional float locate_front_theta = 10 [default = 0];
   bool has_locate_front_theta() const;
   void clear_locate_front_theta();
   static const int kLocateFrontThetaFieldNumber = 10;
@@ -1025,7 +1082,7 @@ class Car_info : public ::google::protobuf::Message /* @@protoc_insertion_point(
 
   // accessors -------------------------------------------------------
 
-  // optional string license = 4;
+  // optional string license = 4 [default = ""];
   bool has_license() const;
   void clear_license();
   static const int kLicenseFieldNumber = 4;
@@ -1040,35 +1097,35 @@ class Car_info : public ::google::protobuf::Message /* @@protoc_insertion_point(
   ::std::string* release_license();
   void set_allocated_license(::std::string* license);
 
-  // optional float car_length = 1;
+  // optional float car_length = 1 [default = 0];
   bool has_car_length() const;
   void clear_car_length();
   static const int kCarLengthFieldNumber = 1;
   float car_length() const;
   void set_car_length(float value);
 
-  // optional float car_width = 2;
+  // optional float car_width = 2 [default = 0];
   bool has_car_width() const;
   void clear_car_width();
   static const int kCarWidthFieldNumber = 2;
   float car_width() const;
   void set_car_width(float value);
 
-  // optional float car_height = 3;
+  // optional float car_height = 3 [default = 0];
   bool has_car_height() const;
   void clear_car_height();
   static const int kCarHeightFieldNumber = 3;
   float car_height() const;
   void set_car_height(float value);
 
-  // optional float car_wheel_base = 5;
+  // optional float car_wheel_base = 5 [default = 0];
   bool has_car_wheel_base() const;
   void clear_car_wheel_base();
   static const int kCarWheelBaseFieldNumber = 5;
   float car_wheel_base() const;
   void set_car_wheel_base(float value);
 
-  // optional float car_wheel_width = 6;
+  // optional float car_wheel_width = 6 [default = 0];
   bool has_car_wheel_width() const;
   void clear_car_wheel_width();
   static const int kCarWheelWidthFieldNumber = 6;
@@ -1239,6 +1296,13 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
   ::google::protobuf::int32 parkingspace_index_id() const;
   void set_parkingspace_index_id(::google::protobuf::int32 value);
 
+  // optional .message.Parkspace_type parkingspace_type = 2;
+  bool has_parkingspace_type() const;
+  void clear_parkingspace_type();
+  static const int kParkingspaceTypeFieldNumber = 2;
+  ::message::Parkspace_type parkingspace_type() const;
+  void set_parkingspace_type(::message::Parkspace_type value);
+
   // optional int32 parkingspace_unit_id = 3;
   bool has_parkingspace_unit_id() const;
   void clear_parkingspace_unit_id();
@@ -1253,6 +1317,13 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
   ::google::protobuf::int32 parkingspace_room_id() const;
   void set_parkingspace_room_id(::google::protobuf::int32 value);
 
+  // optional .message.Direction parkingspace_direction = 5;
+  bool has_parkingspace_direction() const;
+  void clear_parkingspace_direction();
+  static const int kParkingspaceDirectionFieldNumber = 5;
+  ::message::Direction parkingspace_direction() const;
+  void set_parkingspace_direction(::message::Direction value);
+
   // optional int32 parkingspace_floor_id = 6;
   bool has_parkingspace_floor_id() const;
   void clear_parkingspace_floor_id();
@@ -1281,6 +1352,13 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
   ::message::Parkspace_status parkingspace_status() const;
   void set_parkingspace_status(::message::Parkspace_status value);
 
+  // optional .message.Parkspace_path parkspace_path = 13;
+  bool has_parkspace_path() const;
+  void clear_parkspace_path();
+  static const int kParkspacePathFieldNumber = 13;
+  ::message::Parkspace_path parkspace_path() const;
+  void set_parkspace_path(::message::Parkspace_path value);
+
   // optional float path_estimate_time = 14;
   bool has_path_estimate_time() const;
   void clear_path_estimate_time();
@@ -1295,27 +1373,6 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
   ::message::Parkspace_status parkspace_status_target() const;
   void set_parkspace_status_target(::message::Parkspace_status value);
 
-  // optional .message.Parkspace_path parkspace_path = 13;
-  bool has_parkspace_path() const;
-  void clear_parkspace_path();
-  static const int kParkspacePathFieldNumber = 13;
-  ::message::Parkspace_path parkspace_path() const;
-  void set_parkspace_path(::message::Parkspace_path value);
-
-  // optional .message.Parkspace_type parkingspace_type = 2;
-  bool has_parkingspace_type() const;
-  void clear_parkingspace_type();
-  static const int kParkingspaceTypeFieldNumber = 2;
-  ::message::Parkspace_type parkingspace_type() const;
-  void set_parkingspace_type(::message::Parkspace_type value);
-
-  // optional .message.Direction parkingspace_direction = 5;
-  bool has_parkingspace_direction() const;
-  void clear_parkingspace_direction();
-  static const int kParkingspaceDirectionFieldNumber = 5;
-  ::message::Direction parkingspace_direction() const;
-  void set_parkingspace_direction(::message::Direction value);
-
   // @@protoc_insertion_point(class_scope:message.Parkspace_info)
  private:
   void set_has_parkingspace_index_id();
@@ -1356,17 +1413,17 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
   ::google::protobuf::internal::ArenaStringPtr leave_time_;
   ::message::Car_info* car_info_;
   ::google::protobuf::int32 parkingspace_index_id_;
+  int parkingspace_type_;
   ::google::protobuf::int32 parkingspace_unit_id_;
   ::google::protobuf::int32 parkingspace_room_id_;
+  int parkingspace_direction_;
   ::google::protobuf::int32 parkingspace_floor_id_;
   float parkingspace_width_;
   float parkingspace_height_;
   int parkingspace_status_;
+  int parkspace_path_;
   float path_estimate_time_;
   int parkspace_status_target_;
-  int parkspace_path_;
-  int parkingspace_type_;
-  int parkingspace_direction_;
   friend struct ::protobuf_message_5fbase_2eproto::TableStruct;
   friend void ::protobuf_message_5fbase_2eproto::InitDefaultsParkspace_infoImpl();
 };
@@ -1381,7 +1438,7 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
 #endif  // __GNUC__
 // Base_info
 
-// required .message.Message_type msg_type = 1;
+// required .message.Message_type msg_type = 1 [default = eBase_msg];
 inline bool Base_info::has_msg_type() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -1406,7 +1463,7 @@ inline void Base_info::set_msg_type(::message::Message_type value) {
   // @@protoc_insertion_point(field_set:message.Base_info.msg_type)
 }
 
-// optional int32 timeout_ms = 2;
+// optional int32 timeout_ms = 2 [default = 0];
 inline bool Base_info::has_timeout_ms() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -1430,7 +1487,7 @@ inline void Base_info::set_timeout_ms(::google::protobuf::int32 value) {
   // @@protoc_insertion_point(field_set:message.Base_info.timeout_ms)
 }
 
-// required .message.Communicator sender = 3;
+// required .message.Communicator sender = 3 [default = eEmpty];
 inline bool Base_info::has_sender() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -1455,7 +1512,7 @@ inline void Base_info::set_sender(::message::Communicator value) {
   // @@protoc_insertion_point(field_set:message.Base_info.sender)
 }
 
-// required .message.Communicator receiver = 4;
+// required .message.Communicator receiver = 4 [default = eEmpty];
 inline bool Base_info::has_receiver() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -1542,7 +1599,7 @@ inline void Base_msg::set_allocated_base_info(::message::Base_info* base_info) {
 
 // Error_manager
 
-// required int32 error_code = 1;
+// required int32 error_code = 1 [default = 0];
 inline bool Error_manager::has_error_code() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -1566,7 +1623,7 @@ inline void Error_manager::set_error_code(::google::protobuf::int32 value) {
   // @@protoc_insertion_point(field_set:message.Error_manager.error_code)
 }
 
-// optional .message.Error_level error_level = 2;
+// optional .message.Error_level error_level = 2 [default = NORMAL];
 inline bool Error_manager::has_error_level() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -1591,7 +1648,7 @@ inline void Error_manager::set_error_level(::message::Error_level value) {
   // @@protoc_insertion_point(field_set:message.Error_manager.error_level)
 }
 
-// optional string error_description = 3;
+// optional string error_description = 3 [default = ""];
 inline bool Error_manager::has_error_description() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -1658,7 +1715,7 @@ inline void Error_manager::set_allocated_error_description(::std::string* error_
 
 // Locate_information
 
-// optional float locate_x = 1;
+// optional float locate_x = 1 [default = 0];
 inline bool Locate_information::has_locate_x() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -1682,7 +1739,7 @@ inline void Locate_information::set_locate_x(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_x)
 }
 
-// optional float locate_y = 2;
+// optional float locate_y = 2 [default = 0];
 inline bool Locate_information::has_locate_y() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -1706,7 +1763,7 @@ inline void Locate_information::set_locate_y(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_y)
 }
 
-// optional float locate_angle = 3;
+// optional float locate_angle = 3 [default = 0];
 inline bool Locate_information::has_locate_angle() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -1730,7 +1787,7 @@ inline void Locate_information::set_locate_angle(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_angle)
 }
 
-// optional float locate_length = 4;
+// optional float locate_length = 4 [default = 0];
 inline bool Locate_information::has_locate_length() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -1754,7 +1811,7 @@ inline void Locate_information::set_locate_length(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_length)
 }
 
-// optional float locate_width = 5;
+// optional float locate_width = 5 [default = 0];
 inline bool Locate_information::has_locate_width() const {
   return (_has_bits_[0] & 0x00000010u) != 0;
 }
@@ -1778,7 +1835,7 @@ inline void Locate_information::set_locate_width(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_width)
 }
 
-// optional float locate_height = 6;
+// optional float locate_height = 6 [default = 0];
 inline bool Locate_information::has_locate_height() const {
   return (_has_bits_[0] & 0x00000020u) != 0;
 }
@@ -1802,7 +1859,7 @@ inline void Locate_information::set_locate_height(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_height)
 }
 
-// optional float locate_wheel_base = 7;
+// optional float locate_wheel_base = 7 [default = 0];
 inline bool Locate_information::has_locate_wheel_base() const {
   return (_has_bits_[0] & 0x00000040u) != 0;
 }
@@ -1826,7 +1883,7 @@ inline void Locate_information::set_locate_wheel_base(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_wheel_base)
 }
 
-// optional float locate_wheel_width = 8;
+// optional float locate_wheel_width = 8 [default = 0];
 inline bool Locate_information::has_locate_wheel_width() const {
   return (_has_bits_[0] & 0x00000080u) != 0;
 }
@@ -1850,7 +1907,7 @@ inline void Locate_information::set_locate_wheel_width(float value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_wheel_width)
 }
 
-// optional bool locate_correct = 9;
+// optional bool locate_correct = 9 [default = false];
 inline bool Locate_information::has_locate_correct() const {
   return (_has_bits_[0] & 0x00000100u) != 0;
 }
@@ -1874,7 +1931,7 @@ inline void Locate_information::set_locate_correct(bool value) {
   // @@protoc_insertion_point(field_set:message.Locate_information.locate_correct)
 }
 
-// optional float locate_front_theta = 10;
+// optional float locate_front_theta = 10 [default = 0];
 inline bool Locate_information::has_locate_front_theta() const {
   return (_has_bits_[0] & 0x00000200u) != 0;
 }
@@ -1902,7 +1959,7 @@ inline void Locate_information::set_locate_front_theta(float value) {
 
 // Car_info
 
-// optional float car_length = 1;
+// optional float car_length = 1 [default = 0];
 inline bool Car_info::has_car_length() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -1926,7 +1983,7 @@ inline void Car_info::set_car_length(float value) {
   // @@protoc_insertion_point(field_set:message.Car_info.car_length)
 }
 
-// optional float car_width = 2;
+// optional float car_width = 2 [default = 0];
 inline bool Car_info::has_car_width() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -1950,7 +2007,7 @@ inline void Car_info::set_car_width(float value) {
   // @@protoc_insertion_point(field_set:message.Car_info.car_width)
 }
 
-// optional float car_height = 3;
+// optional float car_height = 3 [default = 0];
 inline bool Car_info::has_car_height() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -1974,7 +2031,7 @@ inline void Car_info::set_car_height(float value) {
   // @@protoc_insertion_point(field_set:message.Car_info.car_height)
 }
 
-// optional string license = 4;
+// optional string license = 4 [default = ""];
 inline bool Car_info::has_license() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -2037,7 +2094,7 @@ inline void Car_info::set_allocated_license(::std::string* license) {
   // @@protoc_insertion_point(field_set_allocated:message.Car_info.license)
 }
 
-// optional float car_wheel_base = 5;
+// optional float car_wheel_base = 5 [default = 0];
 inline bool Car_info::has_car_wheel_base() const {
   return (_has_bits_[0] & 0x00000010u) != 0;
 }
@@ -2061,7 +2118,7 @@ inline void Car_info::set_car_wheel_base(float value) {
   // @@protoc_insertion_point(field_set:message.Car_info.car_wheel_base)
 }
 
-// optional float car_wheel_width = 6;
+// optional float car_wheel_width = 6 [default = 0];
 inline bool Car_info::has_car_wheel_width() const {
   return (_has_bits_[0] & 0x00000020u) != 0;
 }
@@ -2115,16 +2172,16 @@ inline void Parkspace_info::set_parkingspace_index_id(::google::protobuf::int32
 
 // optional .message.Parkspace_type parkingspace_type = 2;
 inline bool Parkspace_info::has_parkingspace_type() const {
-  return (_has_bits_[0] & 0x00002000u) != 0;
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_type() {
-  _has_bits_[0] |= 0x00002000u;
+  _has_bits_[0] |= 0x00000010u;
 }
 inline void Parkspace_info::clear_has_parkingspace_type() {
-  _has_bits_[0] &= ~0x00002000u;
+  _has_bits_[0] &= ~0x00000010u;
 }
 inline void Parkspace_info::clear_parkingspace_type() {
-  parkingspace_type_ = 1;
+  parkingspace_type_ = 0;
   clear_has_parkingspace_type();
 }
 inline ::message::Parkspace_type Parkspace_info::parkingspace_type() const {
@@ -2140,13 +2197,13 @@ inline void Parkspace_info::set_parkingspace_type(::message::Parkspace_type valu
 
 // optional int32 parkingspace_unit_id = 3;
 inline bool Parkspace_info::has_parkingspace_unit_id() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_unit_id() {
-  _has_bits_[0] |= 0x00000010u;
+  _has_bits_[0] |= 0x00000020u;
 }
 inline void Parkspace_info::clear_has_parkingspace_unit_id() {
-  _has_bits_[0] &= ~0x00000010u;
+  _has_bits_[0] &= ~0x00000020u;
 }
 inline void Parkspace_info::clear_parkingspace_unit_id() {
   parkingspace_unit_id_ = 0;
@@ -2164,13 +2221,13 @@ inline void Parkspace_info::set_parkingspace_unit_id(::google::protobuf::int32 v
 
 // optional int32 parkingspace_room_id = 4;
 inline bool Parkspace_info::has_parkingspace_room_id() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+  return (_has_bits_[0] & 0x00000040u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_room_id() {
-  _has_bits_[0] |= 0x00000020u;
+  _has_bits_[0] |= 0x00000040u;
 }
 inline void Parkspace_info::clear_has_parkingspace_room_id() {
-  _has_bits_[0] &= ~0x00000020u;
+  _has_bits_[0] &= ~0x00000040u;
 }
 inline void Parkspace_info::clear_parkingspace_room_id() {
   parkingspace_room_id_ = 0;
@@ -2188,16 +2245,16 @@ inline void Parkspace_info::set_parkingspace_room_id(::google::protobuf::int32 v
 
 // optional .message.Direction parkingspace_direction = 5;
 inline bool Parkspace_info::has_parkingspace_direction() const {
-  return (_has_bits_[0] & 0x00004000u) != 0;
+  return (_has_bits_[0] & 0x00000080u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_direction() {
-  _has_bits_[0] |= 0x00004000u;
+  _has_bits_[0] |= 0x00000080u;
 }
 inline void Parkspace_info::clear_has_parkingspace_direction() {
-  _has_bits_[0] &= ~0x00004000u;
+  _has_bits_[0] &= ~0x00000080u;
 }
 inline void Parkspace_info::clear_parkingspace_direction() {
-  parkingspace_direction_ = 1;
+  parkingspace_direction_ = 0;
   clear_has_parkingspace_direction();
 }
 inline ::message::Direction Parkspace_info::parkingspace_direction() const {
@@ -2213,13 +2270,13 @@ inline void Parkspace_info::set_parkingspace_direction(::message::Direction valu
 
 // optional int32 parkingspace_floor_id = 6;
 inline bool Parkspace_info::has_parkingspace_floor_id() const {
-  return (_has_bits_[0] & 0x00000040u) != 0;
+  return (_has_bits_[0] & 0x00000100u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_floor_id() {
-  _has_bits_[0] |= 0x00000040u;
+  _has_bits_[0] |= 0x00000100u;
 }
 inline void Parkspace_info::clear_has_parkingspace_floor_id() {
-  _has_bits_[0] &= ~0x00000040u;
+  _has_bits_[0] &= ~0x00000100u;
 }
 inline void Parkspace_info::clear_parkingspace_floor_id() {
   parkingspace_floor_id_ = 0;
@@ -2237,13 +2294,13 @@ inline void Parkspace_info::set_parkingspace_floor_id(::google::protobuf::int32
 
 // optional float parkingspace_width = 7;
 inline bool Parkspace_info::has_parkingspace_width() const {
-  return (_has_bits_[0] & 0x00000080u) != 0;
+  return (_has_bits_[0] & 0x00000200u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_width() {
-  _has_bits_[0] |= 0x00000080u;
+  _has_bits_[0] |= 0x00000200u;
 }
 inline void Parkspace_info::clear_has_parkingspace_width() {
-  _has_bits_[0] &= ~0x00000080u;
+  _has_bits_[0] &= ~0x00000200u;
 }
 inline void Parkspace_info::clear_parkingspace_width() {
   parkingspace_width_ = 0;
@@ -2261,13 +2318,13 @@ inline void Parkspace_info::set_parkingspace_width(float value) {
 
 // optional float parkingspace_height = 8;
 inline bool Parkspace_info::has_parkingspace_height() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
+  return (_has_bits_[0] & 0x00000400u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_height() {
-  _has_bits_[0] |= 0x00000100u;
+  _has_bits_[0] |= 0x00000400u;
 }
 inline void Parkspace_info::clear_has_parkingspace_height() {
-  _has_bits_[0] &= ~0x00000100u;
+  _has_bits_[0] &= ~0x00000400u;
 }
 inline void Parkspace_info::clear_parkingspace_height() {
   parkingspace_height_ = 0;
@@ -2285,13 +2342,13 @@ inline void Parkspace_info::set_parkingspace_height(float value) {
 
 // optional .message.Parkspace_status parkingspace_status = 9;
 inline bool Parkspace_info::has_parkingspace_status() const {
-  return (_has_bits_[0] & 0x00000200u) != 0;
+  return (_has_bits_[0] & 0x00000800u) != 0;
 }
 inline void Parkspace_info::set_has_parkingspace_status() {
-  _has_bits_[0] |= 0x00000200u;
+  _has_bits_[0] |= 0x00000800u;
 }
 inline void Parkspace_info::clear_has_parkingspace_status() {
-  _has_bits_[0] &= ~0x00000200u;
+  _has_bits_[0] &= ~0x00000800u;
 }
 inline void Parkspace_info::clear_parkingspace_status() {
   parkingspace_status_ = 0;
@@ -2499,7 +2556,7 @@ inline void Parkspace_info::clear_has_parkspace_path() {
   _has_bits_[0] &= ~0x00001000u;
 }
 inline void Parkspace_info::clear_parkspace_path() {
-  parkspace_path_ = 1;
+  parkspace_path_ = 0;
   clear_has_parkspace_path();
 }
 inline ::message::Parkspace_path Parkspace_info::parkspace_path() const {
@@ -2515,13 +2572,13 @@ inline void Parkspace_info::set_parkspace_path(::message::Parkspace_path value)
 
 // optional float path_estimate_time = 14;
 inline bool Parkspace_info::has_path_estimate_time() const {
-  return (_has_bits_[0] & 0x00000400u) != 0;
+  return (_has_bits_[0] & 0x00002000u) != 0;
 }
 inline void Parkspace_info::set_has_path_estimate_time() {
-  _has_bits_[0] |= 0x00000400u;
+  _has_bits_[0] |= 0x00002000u;
 }
 inline void Parkspace_info::clear_has_path_estimate_time() {
-  _has_bits_[0] &= ~0x00000400u;
+  _has_bits_[0] &= ~0x00002000u;
 }
 inline void Parkspace_info::clear_path_estimate_time() {
   path_estimate_time_ = 0;
@@ -2539,13 +2596,13 @@ inline void Parkspace_info::set_path_estimate_time(float value) {
 
 // optional .message.Parkspace_status parkspace_status_target = 15;
 inline bool Parkspace_info::has_parkspace_status_target() const {
-  return (_has_bits_[0] & 0x00000800u) != 0;
+  return (_has_bits_[0] & 0x00004000u) != 0;
 }
 inline void Parkspace_info::set_has_parkspace_status_target() {
-  _has_bits_[0] |= 0x00000800u;
+  _has_bits_[0] |= 0x00004000u;
 }
 inline void Parkspace_info::clear_has_parkspace_status_target() {
-  _has_bits_[0] &= ~0x00000800u;
+  _has_bits_[0] &= ~0x00004000u;
 }
 inline void Parkspace_info::clear_parkspace_status_target() {
   parkspace_status_target_ = 0;
@@ -2623,6 +2680,11 @@ template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::message::Parkspace_type>() {
   return ::message::Parkspace_type_descriptor();
 }
+template <> struct is_proto_enum< ::message::Car_type> : ::google::protobuf::internal::true_type {};
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::message::Car_type>() {
+  return ::message::Car_type_descriptor();
+}
 template <> struct is_proto_enum< ::message::Step_type> : ::google::protobuf::internal::true_type {};
 template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::message::Step_type>() {
@@ -2633,6 +2695,11 @@ template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::message::Step_statu>() {
   return ::message::Step_statu_descriptor();
 }
+template <> struct is_proto_enum< ::message::Dispatch_device_type> : ::google::protobuf::internal::true_type {};
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::message::Dispatch_device_type>() {
+  return ::message::Dispatch_device_type_descriptor();
+}
 
 }  // namespace protobuf
 }  // namespace google

+ 68 - 34
message/message_base.proto

@@ -12,13 +12,14 @@ enum Message_type
     eLocate_request_msg=0x12;               //定位请求消息
     eLocate_response_msg=0x13;              //定位反馈消息
 
+    eLocate_sift_request_msg = 0x14;            //预测算法请求消息
+    eLocate_sift_response_msg = 0x15;           //预测算法反馈消息
 
     eDispatch_status_msg=0x21;                //调度模块硬件状态消息
     eDispatch_request_msg=0x22;              //请求调度消息
     eDispatch_response_msg=0x23;             //调度结果反馈消息
 
-    eParkspace_allocation_status_msg=0x31;  //车位分配模块状态消息
-
+    eParkspace_allocation_status_msg=0x31;  //车位分配模块状态消息,包括车位信息
     eParkspace_allocation_request_msg=0x32; //请求分配车位消息
     eParkspace_allocation_response_msg=0x33;//分配车位结果反馈消息
     eParkspace_search_request_msg = 0x34;		//查询车位请求消息
@@ -31,6 +32,7 @@ enum Message_type
     eParkspace_confirm_alloc_response_msg = 0x3B;//确认分配车位反馈消息
     eParkspace_allocation_data_msg = 0x3C;     //车位分配模块车位数据消息
 
+
     eStore_command_request_msg=0x41;        //终端停车请求消息
     eStore_command_response_msg=0x42;       //停车请求反馈消息
     ePickup_command_request_msg=0x43;       //取车请求消息
@@ -70,7 +72,7 @@ enum Communicator
     eMeasurer=0x0300;
     //测量单元的服务器
     eMeasurer_sift_server=0x0301;
-    //调度管理
+    //调度机构
     eDispatch_manager=0x0400;
     //调度机构
     eDispatch_control=0x0401;
@@ -81,10 +83,10 @@ enum Communicator
 ////base message 用于解析未知类型的消息
 message Base_info
 {
-    required Message_type               msg_type=1;
-    optional int32                      timeout_ms=2;
-    required Communicator               sender=3;                       //发送者
-    required Communicator               receiver=4;                     //接收者
+    required Message_type               msg_type=1[default = eBase_msg];
+    optional int32                      timeout_ms=2[default = 0];
+    required Communicator               sender=3[default = eEmpty];                       //发送者
+    required Communicator               receiver=4[default = eEmpty];                     //接收者
 }
 
 // 事件,停车或者取车
@@ -117,51 +119,52 @@ enum Error_level
 
 message Error_manager
 {
-    required int32                      error_code = 1;
-    optional Error_level                error_level = 2;
-    optional string                     error_description = 3;
+    required int32                      error_code = 1[default = 0];
+    optional Error_level                error_level = 2[default = NORMAL];
+    optional string                     error_description = 3[default = ""];
 }
 
 //测量结果结构体
 message Locate_information
 {
-    optional float locate_x = 1;				//整车的中心点x值; 四轮的中心
-    optional float locate_y = 2;				//整车的中心点y值; 四轮的中心
-    optional float locate_angle = 3;			//整车的旋转角; 四轮的旋转角
-    optional float locate_length = 4;		    //整车的长度; 用于规避碰撞
-    optional float locate_width = 5;			//整车的宽度; 用于规避碰撞
-    optional float locate_height = 6;		    //整车的高度; 用于规避碰撞
-    optional float locate_wheel_base = 7;	    //整车的轮距; 前后轮的距离; 用于机器人或agv的抓车
-    optional float locate_wheel_width = 8;	    //整车的轮距; 左右轮的距离; 用于机器人或agv的抓车
-    optional bool locate_correct = 9;		    //整车的校准标记位
-
-    optional float locate_front_theta = 10;	    //整车的前轮的旋转角
-
+    optional float locate_x = 1[default = 0];				//整车的中心点x值; 四轮的中心
+    optional float locate_y = 2[default = 0];				//整车的中心点y值; 四轮的中心
+    optional float locate_angle = 3[default = 0];			//整车的旋转角; 四轮的旋转角
+    optional float locate_length = 4[default = 0];		    //整车的长度; 用于规避碰撞
+    optional float locate_width = 5[default = 0];			//整车的宽度; 用于规避碰撞
+    optional float locate_height = 6[default = 0];		    //整车的高度; 用于规避碰撞
+    optional float locate_wheel_base = 7[default = 0];	    //整车的轮距; 前后轮的距离; 用于机器人或agv的抓车
+    optional float locate_wheel_width = 8[default = 0];	    //整车的轮距; 左右轮的距离; 用于机器人或agv的抓车
+    optional bool locate_correct = 9[default = false];		    //整车的校准标记位
+
+    optional float locate_front_theta = 10[default = 0];	    //整车的前轮的旋转角
 }
 
 //车辆基本信息
 message Car_info
 {
-    optional float                      car_length=1;           //车长
-    optional float                      car_width=2;            //车宽
-    optional float                      car_height=3;           //车高
-    optional string                     license=4;              //车辆凭证号
-    optional float                      car_wheel_base = 5;	    //整车的轮距; 前后轮的距离; 用于机器人或agv的抓车
-    optional float                      car_wheel_width = 6;	//整车的轮距; 左右轮的距离; 用于机器人或agv的抓车
+    optional float                      car_length=1[default = 0];           //车长
+    optional float                      car_width=2[default = 0];            //车宽
+    optional float                      car_height=3[default = 0];           //车高
+    optional string                     license=4[default = ""];              //车辆凭证号
+    optional float                      car_wheel_base = 5[default = 0];	    //整车的轮距; 前后轮的距离; 用于机器人或agv的抓车
+    optional float                      car_wheel_width = 6[default = 0];	//整车的轮距; 左右轮的距离; 用于机器人或agv的抓车
 }
 
 //车位状态枚举
 enum Parkspace_status
 {
-    eParkspace_empty            = 0;         //空闲,可分配
-    eParkspace_occupied         = 1;         //被占用,不可分配
-    eParkspace_reserved         = 2;         //被预约,预约车辆可分配,zhanshi buyong
-    eParkspace_locked           = 3;         //临时锁定,不可分配
-    eParkspace_error            = 4;         //车位机械结构或硬件故障
+    eParkspace_status_unknow    = 0;
+    eParkspace_empty            = 1;         //空闲,可分配
+    eParkspace_occupied         = 2;         //被占用,不可分配
+    eParkspace_reserved         = 3;         //被预约,预约车辆可分配
+    eParkspace_locked           = 4;         //临时锁定,不可分配
+    eParkspace_error            = 5;         //车位机械结构或硬件故障
 }
 
 enum Direction
 {
+    eDirection_unknow = 0;
     eForward = 1;
     eBackward = 2;
 }
@@ -169,20 +172,31 @@ enum Direction
 //车位分配路线(根据中跑车的路线来定)
 enum Parkspace_path
 {
+	UNKNOW_PATH = 0;
     OPTIMAL_PATH = 1;
     LEFT_PATH = 2;
     RIGHT_PATH = 3;
     TEMPORARY_CACHE_PATH = 4;
-
 }
+
 //车位类型
 enum Parkspace_type
 {
+    UNKNOW_PARKSPACE_TYPE = 0;
     MIN_PARKINGSPACE = 1;//小车位
     MID_PARKINGSPACE = 2;//中车位
     BIG_PARKINGSPACE = 3;//大车位
 }
 
+//汽车类型
+enum Car_type
+{
+    UNKNOW_CAR_TYPE = 0;
+    MIN_CAR = 1;//小车
+    MID_CAR = 2;//中车
+    BIG_CAR = 3;//大车
+}
+
 //单个车位基本信息与状态信息,车位信息以及车位上的车辆信息
 message Parkspace_info
 {
@@ -243,3 +257,23 @@ enum Step_statu
     eError=2;
     eFinished=3;
 }
+
+//调度设备的类型
+enum Dispatch_device_type
+{
+    ROBOT_1                                 = 101;      //一号出口的专用机器手(只能负责1号出口的取车)(目前没有安装,暂时不考虑)
+    ROBOT_2                                 = 102;      //中间的大型机器手   (可以负责1~6号出入口的停车和取车)
+
+    CARRIER_1                               = 200;      //左侧0号电梯井的搬运器(升降电梯 中跑车 小跑车 三合一为搬运器)
+    CARRIER_2                               = 207;      //右侧7号电梯井的搬运器(升降电梯 中跑车 小跑车 三合一为搬运器)
+    CARRIER_3                               = 203;      //中间3楼的搬运器(中跑车 小跑车 二合一为搬运器)(没有电梯, 只能在3楼活动)
+
+    PASSAGEWAY_0                            = 300;      //0号出口(在左侧电梯井, 只能取车)(暂时不存在)
+    PASSAGEWAY_1                            = 301;      //1号出入口
+    PASSAGEWAY_2                            = 302;      //2号出入口
+    PASSAGEWAY_3                            = 303;      //3号出入口
+    PASSAGEWAY_4                            = 304;      //4号出入口
+    PASSAGEWAY_5                            = 305;      //5号出入口
+    PASSAGEWAY_6                            = 306;      //6号出入口
+    PASSAGEWAY_7                            = 307;      //7号出口(在右侧电梯井, 只能取车)
+}

+ 20 - 20
parkspace_allocation/parkspace_operating_function.cpp

@@ -45,19 +45,19 @@ Error_manager Parkspace_operating_function::get_all_parkspace_info(message::Park
 				t_parkspace->set_parkingspace_floor_id(tp_result->getInt("parkingspace_floor_id"));
 				switch (tp_result->getInt("parkingspace_status"))
 				{
-					case 0:
+					case 1:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
 						break;
-					case 1:
+					case 2:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
 						break;
-					case 2:
+					case 3:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
 						break;
-					case 3:
+					case 4:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
 						break;
-					case 4:
+					case 5:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
 						break;
 					default:
@@ -132,19 +132,19 @@ Error_manager Parkspace_operating_function::get_specify_the_type_parkspace_info(
 				t_parkspace->set_parkingspace_floor_id(tp_result->getInt("parkingspace_floor_id"));
 				switch (tp_result->getInt("parkingspace_status"))
 				{
-					case 0:
+					case 1:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
 						break;
-					case 1:
+					case 2:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
 						break;
-					case 2:
+					case 3:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
 						break;
-					case 3:
+					case 4:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
 						break;
-					case 4:
+					case 5:
 						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
 						break;
 					default:
@@ -471,19 +471,19 @@ Error_manager Parkspace_operating_function::query_one_parkspace_with_parkspace_i
 			{
 				switch (tp_result->getInt("parkingspace_status"))
 				{
-				case 0:
+				case 1:
 					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
 					break;
-				case 1:
+				case 2:
 					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
 					break;
-				case 2:
+				case 3:
 					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
 					break;
-				case 3:
+				case 4:
 					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
 					break;
-				case 4:
+				case 5:
 					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
 					break;
 				default:
@@ -561,19 +561,19 @@ Error_manager Parkspace_operating_function::query_one_parkspace_with_license(std
 			{
 				switch (tp_result->getInt("parkingspace_status"))
 				{
-					case 0:
+					case 1:
 						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
 						break;
-					case 1:
+					case 2:
 						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
 						break;
-					case 2:
+					case 3:
 						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
 						break;
-					case 3:
+					case 4:
 						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
 						break;
-					case 4:
+					case 5:
 						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
 						break;
 					default: