Procházet zdrojové kódy

2021 0707, wangkang parkspace

wk před 4 roky
rodič
revize
5deaf003ee

+ 128 - 82
message/message_base.pb.cc

@@ -277,6 +277,7 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Parkspace_info, parkspace_path_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Parkspace_info, path_estimate_time_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Parkspace_info, parkspace_status_target_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Parkspace_info, car_type_),
   3,
   4,
   5,
@@ -292,6 +293,7 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   12,
   13,
   14,
+  15,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 9, sizeof(::message::Base_info)},
@@ -299,7 +301,7 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROT
   { 20, 28, sizeof(::message::Error_manager)},
   { 31, 46, sizeof(::message::Locate_information)},
   { 56, 67, sizeof(::message::Car_info)},
-  { 73, 93, sizeof(::message::Parkspace_info)},
+  { 73, 94, sizeof(::message::Parkspace_info)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -353,7 +355,7 @@ void AddDescriptorsImpl() {
       "Car_info\022\025\n\ncar_length\030\001 \001(\002:\0010\022\024\n\tcar_w"
       "idth\030\002 \001(\002:\0010\022\025\n\ncar_height\030\003 \001(\002:\0010\022\021\n\007"
       "license\030\004 \001(\t:\000\022\031\n\016car_wheel_base\030\005 \001(\002:"
-      "\0010\022\032\n\017car_wheel_width\030\006 \001(\002:\0010\"\271\004\n\016Parks"
+      "\0010\022\032\n\017car_wheel_width\030\006 \001(\002:\0010\"\336\004\n\016Parks"
       "pace_info\022\035\n\025parkingspace_index_id\030\001 \001(\005"
       "\0222\n\021parkingspace_type\030\002 \001(\0162\027.message.Pa"
       "rkspace_type\022\034\n\024parkingspace_unit_id\030\003 \001"
@@ -368,78 +370,79 @@ void AddDescriptorsImpl() {
       "ath\030\r \001(\0162\027.message.Parkspace_path\022\032\n\022pa"
       "th_estimate_time\030\016 \001(\002\022:\n\027parkspace_stat"
       "us_target\030\017 \001(\0162\031.message.Parkspace_stat"
-      "us*\334\t\n\014Message_type\022\r\n\teBase_msg\020\000\022\020\n\014eC"
-      "ommand_msg\020\001\022\026\n\022eLocate_status_msg\020\021\022\027\n\023"
-      "eLocate_request_msg\020\022\022\030\n\024eLocate_respons"
-      "e_msg\020\023\022\034\n\030eLocate_sift_request_msg\020\024\022\035\n"
-      "\031eLocate_sift_response_msg\020\025\022\030\n\024eDispatc"
-      "h_status_msg\020!\022\031\n\025eDispatch_request_msg\020"
-      "\"\022\032\n\026eDispatch_response_msg\020#\022$\n eParksp"
-      "ace_allocation_status_msg\0201\022%\n!eParkspac"
-      "e_allocation_request_msg\0202\022&\n\"eParkspace"
-      "_allocation_response_msg\0203\022!\n\035eParkspace"
-      "_search_request_msg\0204\022\"\n\036eParkspace_sear"
-      "ch_response_msg\0205\022\"\n\036eParkspace_release_"
-      "request_msg\0206\022#\n\037eParkspace_release_resp"
-      "onse_msg\0207\022\'\n#eParkspace_force_update_re"
-      "quest_msg\0208\022(\n$eParkspace_force_update_r"
-      "esponse_msg\0209\022(\n$eParkspace_confirm_allo"
-      "c_request_msg\020:\022)\n%eParkspace_confirm_al"
-      "loc_response_msg\020;\022\"\n\036eParkspace_allocat"
-      "ion_data_msg\020<\022\036\n\032eStore_command_request"
-      "_msg\020A\022\037\n\033eStore_command_response_msg\020B\022"
-      "\037\n\033ePickup_command_request_msg\020C\022 \n\034ePic"
-      "kup_command_response_msg\020D\022\037\n\032eStoring_p"
-      "rocess_statu_msg\020\220\001\022\037\n\032ePicking_process_"
-      "statu_msg\020\221\001\022\"\n\035eCentral_controller_stat"
-      "u_msg\020\240\001\022#\n\036eEntrance_manual_operation_m"
-      "sg\020\260\001\022\"\n\035eProcess_manual_operation_msg\020\261"
-      "\001\022\037\n\032eDispatch_plan_request_msg\020\340\001\022 \n\033eD"
-      "ispatch_plan_response_msg\020\341\001\022\"\n\035eDispatc"
-      "h_control_request_msg\020\342\001\022#\n\036eDispatch_co"
-      "ntrol_response_msg\020\343\001\022!\n\034eDispatch_manag"
-      "er_status_msg\020\352\001\022\037\n\032eDispatch_manager_da"
-      "ta_msg\020\353\001*\242\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_ser"
-      "ver\020\201\006\022\026\n\021eDispatch_manager\020\200\010\022\026\n\021eDispa"
-      "tch_control\020\201\010**\n\014Process_type\022\014\n\010eStori"
-      "ng\020\001\022\014\n\010ePicking\020\002*e\n\013Error_level\022\n\n\006NOR"
-      "MAL\020\000\022\024\n\020NEGLIGIBLE_ERROR\020\001\022\017\n\013MINOR_ERR"
-      "OR\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_sta"
-      "tus_unknow\020\000\022\024\n\020eParkspace_empty\020\001\022\027\n\023eP"
-      "arkspace_occupied\020\002\022\027\n\023eParkspace_reserv"
-      "ed\020\003\022\025\n\021eParkspace_locked\020\004\022\024\n\020eParkspac"
-      "e_error\020\005*\?\n\tDirection\022\025\n\021eDirection_unk"
-      "now\020\000\022\014\n\010eForward\020\001\022\r\n\teBackward\020\002*l\n\016Pa"
-      "rkspace_path\022\017\n\013UNKNOW_PATH\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_ty"
-      "pe\022\031\n\025UNKNOW_PARKSPACE_TYPE\020\000\022\024\n\020MIN_PAR"
-      "KINGSPACE\020\001\022\024\n\020MID_PARKINGSPACE\020\002\022\024\n\020BIG"
-      "_PARKINGSPACE\020\003*F\n\010Car_type\022\023\n\017UNKNOW_CA"
-      "R_TYPE\020\000\022\013\n\007MIN_CAR\020\001\022\013\n\007MID_CAR\020\002\022\013\n\007BI"
-      "G_CAR\020\003*\335\002\n\tStep_type\022\017\n\013eAlloc_step\020\000\022\021"
-      "\n\reMeasure_step\020\001\022\021\n\reCompare_step\020\002\022\022\n\016"
-      "eDispatch_step\020\003\022\021\n\reConfirm_step\020\004\022\020\n\014e"
-      "Search_step\020\005\022\016\n\neWait_step\020\006\022\021\n\reReleas"
-      "e_step\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\021eBackM"
-      "easure_step\020\013\022\023\n\017eBackAlloc_step\020\014\022\022\n\016eB"
-      "ackWait_step\020\r\022\026\n\022eBackDispatch_step\020\016\022\024"
-      "\n\020eBackSearch_step\020\017\022\021\n\reBackComplete\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\teFinished\020\003*\370\001\n\024Dispatc"
-      "h_device_type\022\013\n\007ROBOT_1\020e\022\013\n\007ROBOT_2\020f\022"
-      "\016\n\tCARRIER_1\020\310\001\022\016\n\tCARRIER_2\020\317\001\022\016\n\tCARRI"
-      "ER_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"
+      "us\022#\n\010car_type\030\020 \001(\0162\021.message.Car_type*"
+      "\334\t\n\014Message_type\022\r\n\teBase_msg\020\000\022\020\n\014eComm"
+      "and_msg\020\001\022\026\n\022eLocate_status_msg\020\021\022\027\n\023eLo"
+      "cate_request_msg\020\022\022\030\n\024eLocate_response_m"
+      "sg\020\023\022\034\n\030eLocate_sift_request_msg\020\024\022\035\n\031eL"
+      "ocate_sift_response_msg\020\025\022\030\n\024eDispatch_s"
+      "tatus_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_a"
+      "llocation_request_msg\0202\022&\n\"eParkspace_al"
+      "location_response_msg\0203\022!\n\035eParkspace_se"
+      "arch_request_msg\0204\022\"\n\036eParkspace_search_"
+      "response_msg\0205\022\"\n\036eParkspace_release_req"
+      "uest_msg\0206\022#\n\037eParkspace_release_respons"
+      "e_msg\0207\022\'\n#eParkspace_force_update_reque"
+      "st_msg\0208\022(\n$eParkspace_force_update_resp"
+      "onse_msg\0209\022(\n$eParkspace_confirm_alloc_r"
+      "equest_msg\020:\022)\n%eParkspace_confirm_alloc"
+      "_response_msg\020;\022\"\n\036eParkspace_allocation"
+      "_data_msg\020<\022\036\n\032eStore_command_request_ms"
+      "g\020A\022\037\n\033eStore_command_response_msg\020B\022\037\n\033"
+      "ePickup_command_request_msg\020C\022 \n\034ePickup"
+      "_command_response_msg\020D\022\037\n\032eStoring_proc"
+      "ess_statu_msg\020\220\001\022\037\n\032ePicking_process_sta"
+      "tu_msg\020\221\001\022\"\n\035eCentral_controller_statu_m"
+      "sg\020\240\001\022#\n\036eEntrance_manual_operation_msg\020"
+      "\260\001\022\"\n\035eProcess_manual_operation_msg\020\261\001\022\037"
+      "\n\032eDispatch_plan_request_msg\020\340\001\022 \n\033eDisp"
+      "atch_plan_response_msg\020\341\001\022\"\n\035eDispatch_c"
+      "ontrol_request_msg\020\342\001\022#\n\036eDispatch_contr"
+      "ol_response_msg\020\343\001\022!\n\034eDispatch_manager_"
+      "status_msg\020\352\001\022\037\n\032eDispatch_manager_data_"
+      "msg\020\353\001*\242\001\n\014Communicator\022\n\n\006eEmpty\020\000\022\t\n\005e"
+      "Main\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_server"
+      "\020\201\006\022\026\n\021eDispatch_manager\020\200\010\022\026\n\021eDispatch"
+      "_control\020\201\010**\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\023ePark"
+      "space_occupied\020\002\022\027\n\023eParkspace_reserved\020"
+      "\003\022\025\n\021eParkspace_locked\020\004\022\024\n\020eParkspace_e"
+      "rror\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\016Parks"
+      "pace_path\022\017\n\013UNKNOW_PATH\020\000\022\020\n\014OPTIMAL_PA"
+      "TH\020\001\022\r\n\tLEFT_PATH\020\002\022\016\n\nRIGHT_PATH\020\003\022\030\n\024T"
+      "EMPORARY_CACHE_PATH\020\004*m\n\016Parkspace_type\022"
+      "\031\n\025UNKNOW_PARKSPACE_TYPE\020\000\022\024\n\020MIN_PARKIN"
+      "GSPACE\020\001\022\024\n\020MID_PARKINGSPACE\020\002\022\024\n\020BIG_PA"
+      "RKINGSPACE\020\003*F\n\010Car_type\022\023\n\017UNKNOW_CAR_T"
+      "YPE\020\000\022\013\n\007MIN_CAR\020\001\022\013\n\007MID_CAR\020\002\022\013\n\007BIG_C"
+      "AR\020\003*\335\002\n\tStep_type\022\017\n\013eAlloc_step\020\000\022\021\n\re"
+      "Measure_step\020\001\022\021\n\reCompare_step\020\002\022\022\n\016eDi"
+      "spatch_step\020\003\022\021\n\reConfirm_step\020\004\022\020\n\014eSea"
+      "rch_step\020\005\022\016\n\neWait_step\020\006\022\021\n\reRelease_s"
+      "tep\020\007\022\r\n\teComplete\020\010\022\025\n\021eBackConfirm_ste"
+      "p\020\t\022\026\n\022eBack_compare_step\020\n\022\025\n\021eBackMeas"
+      "ure_step\020\013\022\023\n\017eBackAlloc_step\020\014\022\022\n\016eBack"
+      "Wait_step\020\r\022\026\n\022eBackDispatch_step\020\016\022\024\n\020e"
+      "BackSearch_step\020\017\022\021\n\reBackComplete\020\020*C\n\n"
+      "Step_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_d"
+      "evice_type\022\013\n\007ROBOT_1\020e\022\013\n\007ROBOT_2\020f\022\016\n\t"
+      "CARRIER_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, 4159);
+      descriptor, 4196);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "message_base.proto", &protobuf_RegisterTypes);
 }
@@ -2780,6 +2783,7 @@ const int Parkspace_info::kLeaveTimeFieldNumber;
 const int Parkspace_info::kParkspacePathFieldNumber;
 const int Parkspace_info::kPathEstimateTimeFieldNumber;
 const int Parkspace_info::kParkspaceStatusTargetFieldNumber;
+const int Parkspace_info::kCarTypeFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Parkspace_info::Parkspace_info()
@@ -2810,8 +2814,8 @@ Parkspace_info::Parkspace_info(const Parkspace_info& from)
     car_info_ = NULL;
   }
   ::memcpy(&parkingspace_index_id_, &from.parkingspace_index_id_,
-    static_cast<size_t>(reinterpret_cast<char*>(&parkspace_status_target_) -
-    reinterpret_cast<char*>(&parkingspace_index_id_)) + sizeof(parkspace_status_target_));
+    static_cast<size_t>(reinterpret_cast<char*>(&car_type_) -
+    reinterpret_cast<char*>(&parkingspace_index_id_)) + sizeof(car_type_));
   // @@protoc_insertion_point(copy_constructor:message.Parkspace_info)
 }
 
@@ -2820,8 +2824,8 @@ void Parkspace_info::SharedCtor() {
   entry_time_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   leave_time_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&car_info_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&parkspace_status_target_) -
-      reinterpret_cast<char*>(&car_info_)) + sizeof(parkspace_status_target_));
+      reinterpret_cast<char*>(&car_type_) -
+      reinterpret_cast<char*>(&car_info_)) + sizeof(car_type_));
 }
 
 Parkspace_info::~Parkspace_info() {
@@ -2884,10 +2888,10 @@ void Parkspace_info::Clear() {
         reinterpret_cast<char*>(&parkingspace_direction_) -
         reinterpret_cast<char*>(&parkingspace_index_id_)) + sizeof(parkingspace_direction_));
   }
-  if (cached_has_bits & 32512u) {
+  if (cached_has_bits & 65280u) {
     ::memset(&parkingspace_floor_id_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&parkspace_status_target_) -
-        reinterpret_cast<char*>(&parkingspace_floor_id_)) + sizeof(parkspace_status_target_));
+        reinterpret_cast<char*>(&car_type_) -
+        reinterpret_cast<char*>(&parkingspace_floor_id_)) + sizeof(car_type_));
   }
   _has_bits_.Clear();
   _internal_metadata_.Clear();
@@ -2899,7 +2903,7 @@ bool Parkspace_info::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   // @@protoc_insertion_point(parse_start:message.Parkspace_info)
   for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
+    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
@@ -3145,6 +3149,26 @@ bool Parkspace_info::MergePartialFromCodedStream(
         break;
       }
 
+      // optional .message.Car_type car_type = 16;
+      case 16: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(128u /* 128 & 0xFF */)) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::message::Car_type_IsValid(value)) {
+            set_car_type(static_cast< ::message::Car_type >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(
+                16, static_cast< ::google::protobuf::uint64>(value));
+          }
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
       default: {
       handle_unusual:
         if (tag == 0) {
@@ -3263,6 +3287,12 @@ void Parkspace_info::SerializeWithCachedSizes(
       15, this->parkspace_status_target(), output);
   }
 
+  // optional .message.Car_type car_type = 16;
+  if (cached_has_bits & 0x00008000u) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      16, this->car_type(), output);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
@@ -3372,6 +3402,12 @@ void Parkspace_info::SerializeWithCachedSizes(
       15, this->parkspace_status_target(), target);
   }
 
+  // optional .message.Car_type car_type = 16;
+  if (cached_has_bits & 0x00008000u) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      16, this->car_type(), target);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
@@ -3445,7 +3481,7 @@ size_t Parkspace_info::ByteSizeLong() const {
     }
 
   }
-  if (_has_bits_[8 / 32] & 32512u) {
+  if (_has_bits_[8 / 32] & 65280u) {
     // optional int32 parkingspace_floor_id = 6;
     if (has_parkingspace_floor_id()) {
       total_size += 1 +
@@ -3486,6 +3522,12 @@ size_t Parkspace_info::ByteSizeLong() const {
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->parkspace_status_target());
     }
 
+    // optional .message.Car_type car_type = 16;
+    if (has_car_type()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->car_type());
+    }
+
   }
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
@@ -3546,7 +3588,7 @@ void Parkspace_info::MergeFrom(const Parkspace_info& from) {
     }
     _has_bits_[0] |= cached_has_bits;
   }
-  if (cached_has_bits & 32512u) {
+  if (cached_has_bits & 65280u) {
     if (cached_has_bits & 0x00000100u) {
       parkingspace_floor_id_ = from.parkingspace_floor_id_;
     }
@@ -3568,6 +3610,9 @@ void Parkspace_info::MergeFrom(const Parkspace_info& from) {
     if (cached_has_bits & 0x00004000u) {
       parkspace_status_target_ = from.parkspace_status_target_;
     }
+    if (cached_has_bits & 0x00008000u) {
+      car_type_ = from.car_type_;
+    }
     _has_bits_[0] |= cached_has_bits;
   }
 }
@@ -3611,6 +3656,7 @@ void Parkspace_info::InternalSwap(Parkspace_info* other) {
   swap(parkspace_path_, other->parkspace_path_);
   swap(path_estimate_time_, other->path_estimate_time_);
   swap(parkspace_status_target_, other->parkspace_status_target_);
+  swap(car_type_, other->car_type_);
   swap(_has_bits_[0], other->_has_bits_[0]);
   _internal_metadata_.Swap(&other->_internal_metadata_);
   swap(_cached_size_, other->_cached_size_);

+ 35 - 0
message/message_base.pb.h

@@ -1373,6 +1373,13 @@ 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.Car_type car_type = 16;
+  bool has_car_type() const;
+  void clear_car_type();
+  static const int kCarTypeFieldNumber = 16;
+  ::message::Car_type car_type() const;
+  void set_car_type(::message::Car_type value);
+
   // @@protoc_insertion_point(class_scope:message.Parkspace_info)
  private:
   void set_has_parkingspace_index_id();
@@ -1405,6 +1412,8 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
   void clear_has_path_estimate_time();
   void set_has_parkspace_status_target();
   void clear_has_parkspace_status_target();
+  void set_has_car_type();
+  void clear_has_car_type();
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::HasBits<1> _has_bits_;
@@ -1424,6 +1433,7 @@ class Parkspace_info : public ::google::protobuf::Message /* @@protoc_insertion_
   int parkspace_path_;
   float path_estimate_time_;
   int parkspace_status_target_;
+  int car_type_;
   friend struct ::protobuf_message_5fbase_2eproto::TableStruct;
   friend void ::protobuf_message_5fbase_2eproto::InitDefaultsParkspace_infoImpl();
 };
@@ -2619,6 +2629,31 @@ inline void Parkspace_info::set_parkspace_status_target(::message::Parkspace_sta
   // @@protoc_insertion_point(field_set:message.Parkspace_info.parkspace_status_target)
 }
 
+// optional .message.Car_type car_type = 16;
+inline bool Parkspace_info::has_car_type() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void Parkspace_info::set_has_car_type() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void Parkspace_info::clear_has_car_type() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void Parkspace_info::clear_car_type() {
+  car_type_ = 0;
+  clear_has_car_type();
+}
+inline ::message::Car_type Parkspace_info::car_type() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_info.car_type)
+  return static_cast< ::message::Car_type >(car_type_);
+}
+inline void Parkspace_info::set_car_type(::message::Car_type value) {
+  assert(::message::Car_type_IsValid(value));
+  set_has_car_type();
+  car_type_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_info.car_type)
+}
+
 #ifdef __GNUC__
   #pragma GCC diagnostic pop
 #endif  // __GNUC__

+ 5 - 3
message/message_base.proto

@@ -209,15 +209,17 @@ message Parkspace_info
     optional float              parkingspace_width = 7;               //车位宽
     optional float              parkingspace_height = 8;              //车位高
     optional Parkspace_status   parkingspace_status = 9;              //车位当前状态
-    optional Car_info           car_info = 10;                        //当前车位存入车辆的凭证号
+    optional Car_info           car_info = 10;                        //车辆信息
     optional string             entry_time = 11;                      //入场时间
     optional string             leave_time = 12;                      //离场时间
 
 
-
     optional Parkspace_path     parkspace_path = 13;            // 车位分配路线
     optional float              path_estimate_time = 14;        //车位分配路线 time(s)
-    optional Parkspace_status   parkspace_status_target=15;     //车位目标状态
+    optional Parkspace_status   parkspace_status_target = 15;     //车位目标状态
+
+    optional Car_type           car_type = 16;                        //车辆类型
+
 
 }
 

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 446 - 691
message/parkspace_allocation_message.pb.cc


+ 242 - 376
message/parkspace_allocation_message.pb.h

@@ -38,7 +38,7 @@ namespace protobuf_parkspace_5fallocation_5fmessage_2eproto {
 struct TableStruct {
   static const ::google::protobuf::internal::ParseTableField entries[];
   static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[14];
+  static const ::google::protobuf::internal::ParseTable schema[13];
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
@@ -70,8 +70,6 @@ void InitDefaultsParkspace_refresh_request_msgImpl();
 void InitDefaultsParkspace_refresh_request_msg();
 void InitDefaultsParkspace_allocation_data_msgImpl();
 void InitDefaultsParkspace_allocation_data_msg();
-void InitDefaultsParkspace_remaining_number_msgImpl();
-void InitDefaultsParkspace_remaining_number_msg();
 inline void InitDefaults() {
   InitDefaultsParkspace_allocation_request_msg();
   InitDefaultsParkspace_allocation_response_msg();
@@ -86,7 +84,6 @@ inline void InitDefaults() {
   InitDefaultsParkspace_allocation_status_msg();
   InitDefaultsParkspace_refresh_request_msg();
   InitDefaultsParkspace_allocation_data_msg();
-  InitDefaultsParkspace_remaining_number_msg();
 }
 }  // namespace protobuf_parkspace_5fallocation_5fmessage_2eproto
 namespace message {
@@ -123,9 +120,6 @@ extern Parkspace_release_request_msgDefaultTypeInternal _Parkspace_release_reque
 class Parkspace_release_response_msg;
 class Parkspace_release_response_msgDefaultTypeInternal;
 extern Parkspace_release_response_msgDefaultTypeInternal _Parkspace_release_response_msg_default_instance_;
-class Parkspace_remaining_number_msg;
-class Parkspace_remaining_number_msgDefaultTypeInternal;
-extern Parkspace_remaining_number_msgDefaultTypeInternal _Parkspace_remaining_number_msg_default_instance_;
 class Parkspace_search_request_msg;
 class Parkspace_search_request_msgDefaultTypeInternal;
 extern Parkspace_search_request_msgDefaultTypeInternal _Parkspace_search_request_msg_default_instance_;
@@ -499,6 +493,13 @@ class Parkspace_allocation_response_msg : public ::google::protobuf::Message /*
   ::message::Parkspace_info* mutable_allocated_parkspace_info();
   void set_allocated_allocated_parkspace_info(::message::Parkspace_info* allocated_parkspace_info);
 
+  // optional .message.Car_type car_type = 6;
+  bool has_car_type() const;
+  void clear_car_type();
+  static const int kCarTypeFieldNumber = 6;
+  ::message::Car_type car_type() const;
+  void set_car_type(::message::Car_type value);
+
   // @@protoc_insertion_point(class_scope:message.Parkspace_allocation_response_msg)
  private:
   void set_has_base_info();
@@ -509,6 +510,8 @@ class Parkspace_allocation_response_msg : public ::google::protobuf::Message /*
   void clear_has_error_manager();
   void set_has_allocated_parkspace_info();
   void clear_has_allocated_parkspace_info();
+  void set_has_car_type();
+  void clear_has_car_type();
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -521,6 +524,7 @@ class Parkspace_allocation_response_msg : public ::google::protobuf::Message /*
   ::message::Base_info* base_info_;
   ::message::Error_manager* error_manager_;
   ::message::Parkspace_info* allocated_parkspace_info_;
+  int car_type_;
   friend struct ::protobuf_parkspace_5fallocation_5fmessage_2eproto::TableStruct;
   friend void ::protobuf_parkspace_5fallocation_5fmessage_2eproto::InitDefaultsParkspace_allocation_response_msgImpl();
 };
@@ -1566,6 +1570,13 @@ class Parkspace_confirm_alloc_request_msg : public ::google::protobuf::Message /
   ::message::Parkspace_info* mutable_confirm_parkspace_info();
   void set_allocated_confirm_parkspace_info(::message::Parkspace_info* confirm_parkspace_info);
 
+  // optional .message.Car_type car_type = 5;
+  bool has_car_type() const;
+  void clear_car_type();
+  static const int kCarTypeFieldNumber = 5;
+  ::message::Car_type car_type() const;
+  void set_car_type(::message::Car_type value);
+
   // @@protoc_insertion_point(class_scope:message.Parkspace_confirm_alloc_request_msg)
  private:
   void set_has_base_info();
@@ -1574,6 +1585,8 @@ class Parkspace_confirm_alloc_request_msg : public ::google::protobuf::Message /
   void clear_has_command_key();
   void set_has_confirm_parkspace_info();
   void clear_has_confirm_parkspace_info();
+  void set_has_car_type();
+  void clear_has_car_type();
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -1585,6 +1598,7 @@ class Parkspace_confirm_alloc_request_msg : public ::google::protobuf::Message /
   ::google::protobuf::internal::ArenaStringPtr command_key_;
   ::message::Base_info* base_info_;
   ::message::Parkspace_info* confirm_parkspace_info_;
+  int car_type_;
   friend struct ::protobuf_parkspace_5fallocation_5fmessage_2eproto::TableStruct;
   friend void ::protobuf_parkspace_5fallocation_5fmessage_2eproto::InitDefaultsParkspace_confirm_alloc_request_msgImpl();
 };
@@ -1733,6 +1747,13 @@ class Parkspace_confirm_alloc_response_msg : public ::google::protobuf::Message
   ::message::Parkspace_info* mutable_confirm_alloc_parkspace_info();
   void set_allocated_confirm_alloc_parkspace_info(::message::Parkspace_info* confirm_alloc_parkspace_info);
 
+  // optional .message.Car_type car_type = 6;
+  bool has_car_type() const;
+  void clear_car_type();
+  static const int kCarTypeFieldNumber = 6;
+  ::message::Car_type car_type() const;
+  void set_car_type(::message::Car_type value);
+
   // @@protoc_insertion_point(class_scope:message.Parkspace_confirm_alloc_response_msg)
  private:
   void set_has_base_info();
@@ -1743,6 +1764,8 @@ class Parkspace_confirm_alloc_response_msg : public ::google::protobuf::Message
   void clear_has_error_manager();
   void set_has_confirm_alloc_parkspace_info();
   void clear_has_confirm_alloc_parkspace_info();
+  void set_has_car_type();
+  void clear_has_car_type();
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -1755,6 +1778,7 @@ class Parkspace_confirm_alloc_response_msg : public ::google::protobuf::Message
   ::message::Base_info* base_info_;
   ::message::Error_manager* error_manager_;
   ::message::Parkspace_info* confirm_alloc_parkspace_info_;
+  int car_type_;
   friend struct ::protobuf_parkspace_5fallocation_5fmessage_2eproto::TableStruct;
   friend void ::protobuf_parkspace_5fallocation_5fmessage_2eproto::InitDefaultsParkspace_confirm_alloc_response_msgImpl();
 };
@@ -1881,6 +1905,34 @@ class Parkspace_allocation_status_msg : public ::google::protobuf::Message /* @@
   ::message::Parkspace_manager_satus parkspace_manager_satus() const;
   void set_parkspace_manager_satus(::message::Parkspace_manager_satus value);
 
+  // required int32 small_parkspace_remaining_number = 5;
+  bool has_small_parkspace_remaining_number() const;
+  void clear_small_parkspace_remaining_number();
+  static const int kSmallParkspaceRemainingNumberFieldNumber = 5;
+  ::google::protobuf::int32 small_parkspace_remaining_number() const;
+  void set_small_parkspace_remaining_number(::google::protobuf::int32 value);
+
+  // required int32 medium_parkspace_remaining_number = 6;
+  bool has_medium_parkspace_remaining_number() const;
+  void clear_medium_parkspace_remaining_number();
+  static const int kMediumParkspaceRemainingNumberFieldNumber = 6;
+  ::google::protobuf::int32 medium_parkspace_remaining_number() const;
+  void set_medium_parkspace_remaining_number(::google::protobuf::int32 value);
+
+  // required int32 large_parkspace_remaining_number = 7;
+  bool has_large_parkspace_remaining_number() const;
+  void clear_large_parkspace_remaining_number();
+  static const int kLargeParkspaceRemainingNumberFieldNumber = 7;
+  ::google::protobuf::int32 large_parkspace_remaining_number() const;
+  void set_large_parkspace_remaining_number(::google::protobuf::int32 value);
+
+  // required int32 total_parkspace_remaining_number = 8;
+  bool has_total_parkspace_remaining_number() const;
+  void clear_total_parkspace_remaining_number();
+  static const int kTotalParkspaceRemainingNumberFieldNumber = 8;
+  ::google::protobuf::int32 total_parkspace_remaining_number() const;
+  void set_total_parkspace_remaining_number(::google::protobuf::int32 value);
+
   // @@protoc_insertion_point(class_scope:message.Parkspace_allocation_status_msg)
  private:
   void set_has_base_info();
@@ -1891,6 +1943,14 @@ class Parkspace_allocation_status_msg : public ::google::protobuf::Message /* @@
   void clear_has_database_controller_status();
   void set_has_parkspace_manager_satus();
   void clear_has_parkspace_manager_satus();
+  void set_has_small_parkspace_remaining_number();
+  void clear_has_small_parkspace_remaining_number();
+  void set_has_medium_parkspace_remaining_number();
+  void clear_has_medium_parkspace_remaining_number();
+  void set_has_large_parkspace_remaining_number();
+  void clear_has_large_parkspace_remaining_number();
+  void set_has_total_parkspace_remaining_number();
+  void clear_has_total_parkspace_remaining_number();
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -1902,6 +1962,10 @@ class Parkspace_allocation_status_msg : public ::google::protobuf::Message /* @@
   ::message::Error_manager* error_manager_;
   int database_controller_status_;
   int parkspace_manager_satus_;
+  ::google::protobuf::int32 small_parkspace_remaining_number_;
+  ::google::protobuf::int32 medium_parkspace_remaining_number_;
+  ::google::protobuf::int32 large_parkspace_remaining_number_;
+  ::google::protobuf::int32 total_parkspace_remaining_number_;
   friend struct ::protobuf_parkspace_5fallocation_5fmessage_2eproto::TableStruct;
   friend void ::protobuf_parkspace_5fallocation_5fmessage_2eproto::InitDefaultsParkspace_allocation_status_msgImpl();
 };
@@ -2157,173 +2221,6 @@ class Parkspace_allocation_data_msg : public ::google::protobuf::Message /* @@pr
   friend struct ::protobuf_parkspace_5fallocation_5fmessage_2eproto::TableStruct;
   friend void ::protobuf_parkspace_5fallocation_5fmessage_2eproto::InitDefaultsParkspace_allocation_data_msgImpl();
 };
-// -------------------------------------------------------------------
-
-class Parkspace_remaining_number_msg : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:message.Parkspace_remaining_number_msg) */ {
- public:
-  Parkspace_remaining_number_msg();
-  virtual ~Parkspace_remaining_number_msg();
-
-  Parkspace_remaining_number_msg(const Parkspace_remaining_number_msg& from);
-
-  inline Parkspace_remaining_number_msg& operator=(const Parkspace_remaining_number_msg& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  #if LANG_CXX11
-  Parkspace_remaining_number_msg(Parkspace_remaining_number_msg&& from) noexcept
-    : Parkspace_remaining_number_msg() {
-    *this = ::std::move(from);
-  }
-
-  inline Parkspace_remaining_number_msg& operator=(Parkspace_remaining_number_msg&& from) noexcept {
-    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
-      if (this != &from) InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-  #endif
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields();
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Parkspace_remaining_number_msg& default_instance();
-
-  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
-  static inline const Parkspace_remaining_number_msg* internal_default_instance() {
-    return reinterpret_cast<const Parkspace_remaining_number_msg*>(
-               &_Parkspace_remaining_number_msg_default_instance_);
-  }
-  static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
-    13;
-
-  void Swap(Parkspace_remaining_number_msg* other);
-  friend void swap(Parkspace_remaining_number_msg& a, Parkspace_remaining_number_msg& b) {
-    a.Swap(&b);
-  }
-
-  // implements Message ----------------------------------------------
-
-  inline Parkspace_remaining_number_msg* New() const PROTOBUF_FINAL { return New(NULL); }
-
-  Parkspace_remaining_number_msg* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
-  void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL;
-  void CopyFrom(const Parkspace_remaining_number_msg& from);
-  void MergeFrom(const Parkspace_remaining_number_msg& from);
-  void Clear() PROTOBUF_FINAL;
-  bool IsInitialized() const PROTOBUF_FINAL;
-
-  size_t ByteSizeLong() const PROTOBUF_FINAL;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL;
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL;
-  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL;
-  int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Parkspace_remaining_number_msg* other);
-  private:
-  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
-  }
-  inline void* MaybeArenaPtr() const {
-    return NULL;
-  }
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // required .message.Base_info base_info = 1;
-  bool has_base_info() const;
-  void clear_base_info();
-  static const int kBaseInfoFieldNumber = 1;
-  const ::message::Base_info& base_info() const;
-  ::message::Base_info* release_base_info();
-  ::message::Base_info* mutable_base_info();
-  void set_allocated_base_info(::message::Base_info* base_info);
-
-  // required .message.Error_manager error_manager = 2;
-  bool has_error_manager() const;
-  void clear_error_manager();
-  static const int kErrorManagerFieldNumber = 2;
-  const ::message::Error_manager& error_manager() const;
-  ::message::Error_manager* release_error_manager();
-  ::message::Error_manager* mutable_error_manager();
-  void set_allocated_error_manager(::message::Error_manager* error_manager);
-
-  // required int32 small_parkspace_remaining_number = 3;
-  bool has_small_parkspace_remaining_number() const;
-  void clear_small_parkspace_remaining_number();
-  static const int kSmallParkspaceRemainingNumberFieldNumber = 3;
-  ::google::protobuf::int32 small_parkspace_remaining_number() const;
-  void set_small_parkspace_remaining_number(::google::protobuf::int32 value);
-
-  // required int32 medium_parkspace_remaining_number = 4;
-  bool has_medium_parkspace_remaining_number() const;
-  void clear_medium_parkspace_remaining_number();
-  static const int kMediumParkspaceRemainingNumberFieldNumber = 4;
-  ::google::protobuf::int32 medium_parkspace_remaining_number() const;
-  void set_medium_parkspace_remaining_number(::google::protobuf::int32 value);
-
-  // required int32 large_parkspace_remaining_number = 5;
-  bool has_large_parkspace_remaining_number() const;
-  void clear_large_parkspace_remaining_number();
-  static const int kLargeParkspaceRemainingNumberFieldNumber = 5;
-  ::google::protobuf::int32 large_parkspace_remaining_number() const;
-  void set_large_parkspace_remaining_number(::google::protobuf::int32 value);
-
-  // required int32 total_parkspace_remaining_number = 6;
-  bool has_total_parkspace_remaining_number() const;
-  void clear_total_parkspace_remaining_number();
-  static const int kTotalParkspaceRemainingNumberFieldNumber = 6;
-  ::google::protobuf::int32 total_parkspace_remaining_number() const;
-  void set_total_parkspace_remaining_number(::google::protobuf::int32 value);
-
-  // @@protoc_insertion_point(class_scope:message.Parkspace_remaining_number_msg)
- private:
-  void set_has_base_info();
-  void clear_has_base_info();
-  void set_has_error_manager();
-  void clear_has_error_manager();
-  void set_has_small_parkspace_remaining_number();
-  void clear_has_small_parkspace_remaining_number();
-  void set_has_medium_parkspace_remaining_number();
-  void clear_has_medium_parkspace_remaining_number();
-  void set_has_large_parkspace_remaining_number();
-  void clear_has_large_parkspace_remaining_number();
-  void set_has_total_parkspace_remaining_number();
-  void clear_has_total_parkspace_remaining_number();
-
-  // helper for ByteSizeLong()
-  size_t RequiredFieldsByteSizeFallback() const;
-
-  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::internal::HasBits<1> _has_bits_;
-  mutable int _cached_size_;
-  ::message::Base_info* base_info_;
-  ::message::Error_manager* error_manager_;
-  ::google::protobuf::int32 small_parkspace_remaining_number_;
-  ::google::protobuf::int32 medium_parkspace_remaining_number_;
-  ::google::protobuf::int32 large_parkspace_remaining_number_;
-  ::google::protobuf::int32 total_parkspace_remaining_number_;
-  friend struct ::protobuf_parkspace_5fallocation_5fmessage_2eproto::TableStruct;
-  friend void ::protobuf_parkspace_5fallocation_5fmessage_2eproto::InitDefaultsParkspace_remaining_number_msgImpl();
-};
 // ===================================================================
 
 
@@ -2766,6 +2663,31 @@ Parkspace_allocation_response_msg::allocated_parkspace_info_ex() const {
   return allocated_parkspace_info_ex_;
 }
 
+// optional .message.Car_type car_type = 6;
+inline bool Parkspace_allocation_response_msg::has_car_type() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void Parkspace_allocation_response_msg::set_has_car_type() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void Parkspace_allocation_response_msg::clear_has_car_type() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void Parkspace_allocation_response_msg::clear_car_type() {
+  car_type_ = 0;
+  clear_has_car_type();
+}
+inline ::message::Car_type Parkspace_allocation_response_msg::car_type() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_allocation_response_msg.car_type)
+  return static_cast< ::message::Car_type >(car_type_);
+}
+inline void Parkspace_allocation_response_msg::set_car_type(::message::Car_type value) {
+  assert(::message::Car_type_IsValid(value));
+  set_has_car_type();
+  car_type_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_allocation_response_msg.car_type)
+}
+
 // -------------------------------------------------------------------
 
 // Parkspace_search_request_msg
@@ -4112,6 +4034,31 @@ Parkspace_confirm_alloc_request_msg::confirm_parkspace_info_ex() const {
   return confirm_parkspace_info_ex_;
 }
 
+// optional .message.Car_type car_type = 5;
+inline bool Parkspace_confirm_alloc_request_msg::has_car_type() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void Parkspace_confirm_alloc_request_msg::set_has_car_type() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void Parkspace_confirm_alloc_request_msg::clear_has_car_type() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void Parkspace_confirm_alloc_request_msg::clear_car_type() {
+  car_type_ = 0;
+  clear_has_car_type();
+}
+inline ::message::Car_type Parkspace_confirm_alloc_request_msg::car_type() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_confirm_alloc_request_msg.car_type)
+  return static_cast< ::message::Car_type >(car_type_);
+}
+inline void Parkspace_confirm_alloc_request_msg::set_car_type(::message::Car_type value) {
+  assert(::message::Car_type_IsValid(value));
+  set_has_car_type();
+  car_type_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_confirm_alloc_request_msg.car_type)
+}
+
 // -------------------------------------------------------------------
 
 // Parkspace_confirm_alloc_response_msg
@@ -4356,6 +4303,31 @@ Parkspace_confirm_alloc_response_msg::confirm_parkspace_info_ex() const {
   return confirm_parkspace_info_ex_;
 }
 
+// optional .message.Car_type car_type = 6;
+inline bool Parkspace_confirm_alloc_response_msg::has_car_type() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void Parkspace_confirm_alloc_response_msg::set_has_car_type() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void Parkspace_confirm_alloc_response_msg::clear_has_car_type() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void Parkspace_confirm_alloc_response_msg::clear_car_type() {
+  car_type_ = 0;
+  clear_has_car_type();
+}
+inline ::message::Car_type Parkspace_confirm_alloc_response_msg::car_type() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_confirm_alloc_response_msg.car_type)
+  return static_cast< ::message::Car_type >(car_type_);
+}
+inline void Parkspace_confirm_alloc_response_msg::set_car_type(::message::Car_type value) {
+  assert(::message::Car_type_IsValid(value));
+  set_has_car_type();
+  car_type_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_confirm_alloc_response_msg.car_type)
+}
+
 // -------------------------------------------------------------------
 
 // Parkspace_allocation_status_msg
@@ -4510,6 +4482,102 @@ inline void Parkspace_allocation_status_msg::set_parkspace_manager_satus(::messa
   // @@protoc_insertion_point(field_set:message.Parkspace_allocation_status_msg.parkspace_manager_satus)
 }
 
+// required int32 small_parkspace_remaining_number = 5;
+inline bool Parkspace_allocation_status_msg::has_small_parkspace_remaining_number() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void Parkspace_allocation_status_msg::set_has_small_parkspace_remaining_number() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void Parkspace_allocation_status_msg::clear_has_small_parkspace_remaining_number() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void Parkspace_allocation_status_msg::clear_small_parkspace_remaining_number() {
+  small_parkspace_remaining_number_ = 0;
+  clear_has_small_parkspace_remaining_number();
+}
+inline ::google::protobuf::int32 Parkspace_allocation_status_msg::small_parkspace_remaining_number() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_allocation_status_msg.small_parkspace_remaining_number)
+  return small_parkspace_remaining_number_;
+}
+inline void Parkspace_allocation_status_msg::set_small_parkspace_remaining_number(::google::protobuf::int32 value) {
+  set_has_small_parkspace_remaining_number();
+  small_parkspace_remaining_number_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_allocation_status_msg.small_parkspace_remaining_number)
+}
+
+// required int32 medium_parkspace_remaining_number = 6;
+inline bool Parkspace_allocation_status_msg::has_medium_parkspace_remaining_number() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void Parkspace_allocation_status_msg::set_has_medium_parkspace_remaining_number() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void Parkspace_allocation_status_msg::clear_has_medium_parkspace_remaining_number() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void Parkspace_allocation_status_msg::clear_medium_parkspace_remaining_number() {
+  medium_parkspace_remaining_number_ = 0;
+  clear_has_medium_parkspace_remaining_number();
+}
+inline ::google::protobuf::int32 Parkspace_allocation_status_msg::medium_parkspace_remaining_number() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_allocation_status_msg.medium_parkspace_remaining_number)
+  return medium_parkspace_remaining_number_;
+}
+inline void Parkspace_allocation_status_msg::set_medium_parkspace_remaining_number(::google::protobuf::int32 value) {
+  set_has_medium_parkspace_remaining_number();
+  medium_parkspace_remaining_number_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_allocation_status_msg.medium_parkspace_remaining_number)
+}
+
+// required int32 large_parkspace_remaining_number = 7;
+inline bool Parkspace_allocation_status_msg::has_large_parkspace_remaining_number() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void Parkspace_allocation_status_msg::set_has_large_parkspace_remaining_number() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void Parkspace_allocation_status_msg::clear_has_large_parkspace_remaining_number() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void Parkspace_allocation_status_msg::clear_large_parkspace_remaining_number() {
+  large_parkspace_remaining_number_ = 0;
+  clear_has_large_parkspace_remaining_number();
+}
+inline ::google::protobuf::int32 Parkspace_allocation_status_msg::large_parkspace_remaining_number() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_allocation_status_msg.large_parkspace_remaining_number)
+  return large_parkspace_remaining_number_;
+}
+inline void Parkspace_allocation_status_msg::set_large_parkspace_remaining_number(::google::protobuf::int32 value) {
+  set_has_large_parkspace_remaining_number();
+  large_parkspace_remaining_number_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_allocation_status_msg.large_parkspace_remaining_number)
+}
+
+// required int32 total_parkspace_remaining_number = 8;
+inline bool Parkspace_allocation_status_msg::has_total_parkspace_remaining_number() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void Parkspace_allocation_status_msg::set_has_total_parkspace_remaining_number() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void Parkspace_allocation_status_msg::clear_has_total_parkspace_remaining_number() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void Parkspace_allocation_status_msg::clear_total_parkspace_remaining_number() {
+  total_parkspace_remaining_number_ = 0;
+  clear_has_total_parkspace_remaining_number();
+}
+inline ::google::protobuf::int32 Parkspace_allocation_status_msg::total_parkspace_remaining_number() const {
+  // @@protoc_insertion_point(field_get:message.Parkspace_allocation_status_msg.total_parkspace_remaining_number)
+  return total_parkspace_remaining_number_;
+}
+inline void Parkspace_allocation_status_msg::set_total_parkspace_remaining_number(::google::protobuf::int32 value) {
+  set_has_total_parkspace_remaining_number();
+  total_parkspace_remaining_number_ = value;
+  // @@protoc_insertion_point(field_set:message.Parkspace_allocation_status_msg.total_parkspace_remaining_number)
+}
+
 // -------------------------------------------------------------------
 
 // Parkspace_refresh_request_msg
@@ -4695,206 +4763,6 @@ Parkspace_allocation_data_msg::parkspace_info() const {
   return parkspace_info_;
 }
 
-// -------------------------------------------------------------------
-
-// Parkspace_remaining_number_msg
-
-// required .message.Base_info base_info = 1;
-inline bool Parkspace_remaining_number_msg::has_base_info() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void Parkspace_remaining_number_msg::set_has_base_info() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Parkspace_remaining_number_msg::clear_has_base_info() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline const ::message::Base_info& Parkspace_remaining_number_msg::base_info() const {
-  const ::message::Base_info* p = base_info_;
-  // @@protoc_insertion_point(field_get:message.Parkspace_remaining_number_msg.base_info)
-  return p != NULL ? *p : *reinterpret_cast<const ::message::Base_info*>(
-      &::message::_Base_info_default_instance_);
-}
-inline ::message::Base_info* Parkspace_remaining_number_msg::release_base_info() {
-  // @@protoc_insertion_point(field_release:message.Parkspace_remaining_number_msg.base_info)
-  clear_has_base_info();
-  ::message::Base_info* temp = base_info_;
-  base_info_ = NULL;
-  return temp;
-}
-inline ::message::Base_info* Parkspace_remaining_number_msg::mutable_base_info() {
-  set_has_base_info();
-  if (base_info_ == NULL) {
-    base_info_ = new ::message::Base_info;
-  }
-  // @@protoc_insertion_point(field_mutable:message.Parkspace_remaining_number_msg.base_info)
-  return base_info_;
-}
-inline void Parkspace_remaining_number_msg::set_allocated_base_info(::message::Base_info* base_info) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete reinterpret_cast< ::google::protobuf::MessageLite*>(base_info_);
-  }
-  if (base_info) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
-    if (message_arena != submessage_arena) {
-      base_info = ::google::protobuf::internal::GetOwnedMessage(
-          message_arena, base_info, submessage_arena);
-    }
-    set_has_base_info();
-  } else {
-    clear_has_base_info();
-  }
-  base_info_ = base_info;
-  // @@protoc_insertion_point(field_set_allocated:message.Parkspace_remaining_number_msg.base_info)
-}
-
-// required .message.Error_manager error_manager = 2;
-inline bool Parkspace_remaining_number_msg::has_error_manager() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void Parkspace_remaining_number_msg::set_has_error_manager() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Parkspace_remaining_number_msg::clear_has_error_manager() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline const ::message::Error_manager& Parkspace_remaining_number_msg::error_manager() const {
-  const ::message::Error_manager* p = error_manager_;
-  // @@protoc_insertion_point(field_get:message.Parkspace_remaining_number_msg.error_manager)
-  return p != NULL ? *p : *reinterpret_cast<const ::message::Error_manager*>(
-      &::message::_Error_manager_default_instance_);
-}
-inline ::message::Error_manager* Parkspace_remaining_number_msg::release_error_manager() {
-  // @@protoc_insertion_point(field_release:message.Parkspace_remaining_number_msg.error_manager)
-  clear_has_error_manager();
-  ::message::Error_manager* temp = error_manager_;
-  error_manager_ = NULL;
-  return temp;
-}
-inline ::message::Error_manager* Parkspace_remaining_number_msg::mutable_error_manager() {
-  set_has_error_manager();
-  if (error_manager_ == NULL) {
-    error_manager_ = new ::message::Error_manager;
-  }
-  // @@protoc_insertion_point(field_mutable:message.Parkspace_remaining_number_msg.error_manager)
-  return error_manager_;
-}
-inline void Parkspace_remaining_number_msg::set_allocated_error_manager(::message::Error_manager* error_manager) {
-  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
-    delete reinterpret_cast< ::google::protobuf::MessageLite*>(error_manager_);
-  }
-  if (error_manager) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
-    if (message_arena != submessage_arena) {
-      error_manager = ::google::protobuf::internal::GetOwnedMessage(
-          message_arena, error_manager, submessage_arena);
-    }
-    set_has_error_manager();
-  } else {
-    clear_has_error_manager();
-  }
-  error_manager_ = error_manager;
-  // @@protoc_insertion_point(field_set_allocated:message.Parkspace_remaining_number_msg.error_manager)
-}
-
-// required int32 small_parkspace_remaining_number = 3;
-inline bool Parkspace_remaining_number_msg::has_small_parkspace_remaining_number() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void Parkspace_remaining_number_msg::set_has_small_parkspace_remaining_number() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Parkspace_remaining_number_msg::clear_has_small_parkspace_remaining_number() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void Parkspace_remaining_number_msg::clear_small_parkspace_remaining_number() {
-  small_parkspace_remaining_number_ = 0;
-  clear_has_small_parkspace_remaining_number();
-}
-inline ::google::protobuf::int32 Parkspace_remaining_number_msg::small_parkspace_remaining_number() const {
-  // @@protoc_insertion_point(field_get:message.Parkspace_remaining_number_msg.small_parkspace_remaining_number)
-  return small_parkspace_remaining_number_;
-}
-inline void Parkspace_remaining_number_msg::set_small_parkspace_remaining_number(::google::protobuf::int32 value) {
-  set_has_small_parkspace_remaining_number();
-  small_parkspace_remaining_number_ = value;
-  // @@protoc_insertion_point(field_set:message.Parkspace_remaining_number_msg.small_parkspace_remaining_number)
-}
-
-// required int32 medium_parkspace_remaining_number = 4;
-inline bool Parkspace_remaining_number_msg::has_medium_parkspace_remaining_number() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void Parkspace_remaining_number_msg::set_has_medium_parkspace_remaining_number() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void Parkspace_remaining_number_msg::clear_has_medium_parkspace_remaining_number() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void Parkspace_remaining_number_msg::clear_medium_parkspace_remaining_number() {
-  medium_parkspace_remaining_number_ = 0;
-  clear_has_medium_parkspace_remaining_number();
-}
-inline ::google::protobuf::int32 Parkspace_remaining_number_msg::medium_parkspace_remaining_number() const {
-  // @@protoc_insertion_point(field_get:message.Parkspace_remaining_number_msg.medium_parkspace_remaining_number)
-  return medium_parkspace_remaining_number_;
-}
-inline void Parkspace_remaining_number_msg::set_medium_parkspace_remaining_number(::google::protobuf::int32 value) {
-  set_has_medium_parkspace_remaining_number();
-  medium_parkspace_remaining_number_ = value;
-  // @@protoc_insertion_point(field_set:message.Parkspace_remaining_number_msg.medium_parkspace_remaining_number)
-}
-
-// required int32 large_parkspace_remaining_number = 5;
-inline bool Parkspace_remaining_number_msg::has_large_parkspace_remaining_number() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
-}
-inline void Parkspace_remaining_number_msg::set_has_large_parkspace_remaining_number() {
-  _has_bits_[0] |= 0x00000010u;
-}
-inline void Parkspace_remaining_number_msg::clear_has_large_parkspace_remaining_number() {
-  _has_bits_[0] &= ~0x00000010u;
-}
-inline void Parkspace_remaining_number_msg::clear_large_parkspace_remaining_number() {
-  large_parkspace_remaining_number_ = 0;
-  clear_has_large_parkspace_remaining_number();
-}
-inline ::google::protobuf::int32 Parkspace_remaining_number_msg::large_parkspace_remaining_number() const {
-  // @@protoc_insertion_point(field_get:message.Parkspace_remaining_number_msg.large_parkspace_remaining_number)
-  return large_parkspace_remaining_number_;
-}
-inline void Parkspace_remaining_number_msg::set_large_parkspace_remaining_number(::google::protobuf::int32 value) {
-  set_has_large_parkspace_remaining_number();
-  large_parkspace_remaining_number_ = value;
-  // @@protoc_insertion_point(field_set:message.Parkspace_remaining_number_msg.large_parkspace_remaining_number)
-}
-
-// required int32 total_parkspace_remaining_number = 6;
-inline bool Parkspace_remaining_number_msg::has_total_parkspace_remaining_number() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
-}
-inline void Parkspace_remaining_number_msg::set_has_total_parkspace_remaining_number() {
-  _has_bits_[0] |= 0x00000020u;
-}
-inline void Parkspace_remaining_number_msg::clear_has_total_parkspace_remaining_number() {
-  _has_bits_[0] &= ~0x00000020u;
-}
-inline void Parkspace_remaining_number_msg::clear_total_parkspace_remaining_number() {
-  total_parkspace_remaining_number_ = 0;
-  clear_has_total_parkspace_remaining_number();
-}
-inline ::google::protobuf::int32 Parkspace_remaining_number_msg::total_parkspace_remaining_number() const {
-  // @@protoc_insertion_point(field_get:message.Parkspace_remaining_number_msg.total_parkspace_remaining_number)
-  return total_parkspace_remaining_number_;
-}
-inline void Parkspace_remaining_number_msg::set_total_parkspace_remaining_number(::google::protobuf::int32 value) {
-  set_has_total_parkspace_remaining_number();
-  total_parkspace_remaining_number_ = value;
-  // @@protoc_insertion_point(field_set:message.Parkspace_remaining_number_msg.total_parkspace_remaining_number)
-}
-
 #ifdef __GNUC__
   #pragma GCC diagnostic pop
 #endif  // __GNUC__
@@ -4922,8 +4790,6 @@ inline void Parkspace_remaining_number_msg::set_total_parkspace_remaining_number
 
 // -------------------------------------------------------------------
 
-// -------------------------------------------------------------------
-
 
 // @@protoc_insertion_point(namespace_scope)
 

+ 13 - 15
message/parkspace_allocation_message.proto

@@ -56,6 +56,8 @@ message Parkspace_allocation_response_msg
     optional Parkspace_info             allocated_parkspace_info=4; //分配车位信息
 
     repeated Parkspace_info             allocated_parkspace_info_ex = 5;    //分配车位信息
+
+    optional Car_type                   car_type = 6;//汽车类型
 }
 
 //2.查询车辆位置请求
@@ -117,6 +119,8 @@ message Parkspace_confirm_alloc_request_msg
     optional Parkspace_info             confirm_parkspace_info=3;    //已修改后的车位信息
 
     repeated Parkspace_info             confirm_parkspace_info_ex = 4;    //分配车位信息
+    optional Car_type                   car_type = 5;//汽车类型
+
 }
 
 message Parkspace_confirm_alloc_response_msg
@@ -127,17 +131,21 @@ message Parkspace_confirm_alloc_response_msg
     optional Parkspace_info             confirm_alloc_parkspace_info=4;    //已修改后的车位信息
 
     repeated Parkspace_info             confirm_parkspace_info_ex = 5;    //已修改后的车位信息
+    optional Car_type                   car_type = 6;//汽车类型
 
 }
 
 // 车位心跳状态信息
 message Parkspace_allocation_status_msg
 {
-    required Base_info                  base_info=1;            //消息类型
-    required Error_manager              error_manager=2;
-    required Database_controller_status     database_controller_status=3;//数据库的状态
-    required Parkspace_manager_satus    parkspace_manager_satus=4;//车位管理状态
-
+    required Base_info                      base_info=1;            //消息类型
+    required Error_manager                  error_manager=2;
+    required Database_controller_status     database_controller_status=3;           //数据库的状态
+    required Parkspace_manager_satus        parkspace_manager_satus=4;              //车位管理状态
+    required int32                          small_parkspace_remaining_number=5;    //小型车位剩余数量
+    required int32                          medium_parkspace_remaining_number=6;   //中型车位剩余数量
+    required int32                          large_parkspace_remaining_number=7;    //大型车位剩余数量
+    required int32                          total_parkspace_remaining_number=8;    //所有车位剩余数量
 }
 
 //更新车位数据请求
@@ -152,13 +160,3 @@ message Parkspace_allocation_data_msg
     required Error_manager              error_manager=2;
     repeated Parkspace_info             parkspace_info=3;
 }
-//各种车位空闲数量
-message Parkspace_remaining_number_msg
-{
-    required Base_info                  base_info=1;                         //消息类型
-    required Error_manager              error_manager=2;
-    required int32                      small_parkspace_remaining_number=3;    //小型车位剩余数量
-    required int32                      medium_parkspace_remaining_number=4;   //中型车位剩余数量
-    required int32                      large_parkspace_remaining_number=5;    //大型车位剩余数量
-    required int32                      total_parkspace_remaining_number=6;    //所有车位剩余数量
-}

+ 31 - 1
parkspace_allocation/parkspace_manager.cpp

@@ -173,6 +173,19 @@ Error_manager Parkspace_manager::encapsulating_heartbeat_messages()
 	t_parkspace_status_msg.set_database_controller_status((message::Database_controller_status)t_database_controller_status);
 	t_parkspace_status_msg.set_parkspace_manager_satus((message::Parkspace_manager_satus)t_parkspace_manager_satus);
 
+	message::Parkspace_allocation_data_msg parkspaceAllocationDataMsg;
+	m_parkspace_operating_function.get_specify_the_type_parkspace_info(parkspaceAllocationDataMsg,message::Parkspace_type::MIN_PARKINGSPACE);
+	t_parkspace_status_msg.set_small_parkspace_remaining_number(parkspaceAllocationDataMsg.parkspace_info_size());
+	parkspaceAllocationDataMsg.clear_parkspace_info();
+
+	m_parkspace_operating_function.get_specify_the_type_parkspace_info(parkspaceAllocationDataMsg,message::Parkspace_type::MID_PARKINGSPACE);
+	t_parkspace_status_msg.set_small_parkspace_remaining_number(parkspaceAllocationDataMsg.parkspace_info_size());
+	parkspaceAllocationDataMsg.clear_parkspace_info();
+
+	m_parkspace_operating_function.get_specify_the_type_parkspace_info(parkspaceAllocationDataMsg,message::Parkspace_type::BIG_PARKINGSPACE);
+	t_parkspace_status_msg.set_small_parkspace_remaining_number(parkspaceAllocationDataMsg.parkspace_info_size());
+	parkspaceAllocationDataMsg.clear_parkspace_info();
+
 	return Parkspace_communicator::get_instance_references().encapsulate_msg(t_parkspace_status_msg.SerializeAsString());
 
 
@@ -1347,6 +1360,20 @@ void Parkspace_manager:: execute_for_allocate(message::Car_info car_info, int te
 	Error_manager error_B1;
 	Error_manager error_B2;
 	Error_manager error_B3;
+
+	message::Car_type t_cartype;
+	if ( car_info.car_height() <= message::Car_type::MIN_CAR )
+	{
+		t_cartype = message::Car_type::MIN_CAR;
+	}
+	else if ( car_info.car_height() <= message::Car_type::MID_CAR )
+	{
+		t_cartype = message::Car_type::MID_CAR;
+	}
+	else
+	{
+		t_cartype = message::Car_type::BIG_CAR;
+	}
 	//分配之前查询车辆是否已经存在
 	if (check_car_existence(car_info.license()))
 	{
@@ -1489,6 +1516,9 @@ void Parkspace_manager:: execute_for_allocate(message::Car_info car_info, int te
 		response_msg.mutable_base_info()->CopyFrom(t_response_header);
 		response_msg.set_command_key(command_key);
 		response_msg.mutable_error_manager()->CopyFrom(t_error);
+		response_msg.set_car_type(t_cartype);
+
+
 		Communication_message response = Communication_message();
 		response.reset(t_response_header, response_msg.SerializeAsString());
 		Parkspace_communicator::get_instance_references().send_response(&response);
@@ -1510,7 +1540,6 @@ void Parkspace_manager::execute_for_confirm_alloc(message::Parkspace_confirm_all
 	t_error.set_error_code(Error_code::SUCCESS);
 	t_error.set_error_level(message::Error_level::NORMAL);
 
-
 	//确认分配车位
 	message::Parkspace_info confirm_alloc_parkspace_info;
 
@@ -1593,6 +1622,7 @@ void Parkspace_manager::execute_for_confirm_alloc(message::Parkspace_confirm_all
 	response_msg.mutable_base_info()->CopyFrom(t_response_header);
 	response_msg.set_command_key(request.command_key());
 	response_msg.mutable_error_manager()->CopyFrom(t_error);
+	response_msg.set_car_type(request.car_type());
 
 	Communication_message response=Communication_message();
 	response.reset(t_response_header, response_msg.SerializeAsString());

+ 3 - 3
parkspace_allocation/parkspace_manager.h

@@ -33,8 +33,8 @@ public:
     };
 	//小型车高判断标准 默认1550mm
 #define MIN_CAR_HIGH			1.55
-//中型车高判断标准 (暂时未定)   手写1.75
-#define MID_CAR_HIGH			1.75
+//中型车高判断标准 (暂时未定)
+#define MID_CAR_HIGH			1.65
 //大型车高判断标准 (暂时未定)
 #define BIG_CAR_HIGH			1.95
 //中跑车速度 米每秒
@@ -50,7 +50,7 @@ public:
 //电梯运动时间
 #define ELEVATOR_MOVEMENT_TIME	1
 //方案选择  为0时选择A方案停车  为非0时选择B方案停车
-#define PLAN 0
+#define PLAN 1
 private:
     // 父类的构造函数必须保护,子类的构造函数必须私有。
     Parkspace_manager();

+ 134 - 109
parkspace_allocation/parkspace_operating_function.cpp

@@ -43,35 +43,40 @@ Error_manager Parkspace_operating_function::get_all_parkspace_info(message::Park
 					t_parkspace->set_parkingspace_direction(message::Direction::eBackward);
 				}
 				t_parkspace->set_parkingspace_floor_id(tp_result->getInt("parkingspace_floor_id"));
-				switch (tp_result->getInt("parkingspace_status"))
-				{
-					case 1:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
-						break;
-					case 2:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
-						break;
-					case 3:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
-						break;
-					case 4:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
-						break;
-					case 5:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-						break;
-					default:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-						break;
-				}
+				t_parkspace->set_parkingspace_status((message::Parkspace_status)tp_result->getInt("parkingspace_status"));
+//
+//				switch (tp_result->getInt("parkingspace_status"))
+//				{
+//					case 1:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
+//						break;
+//					case 2:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
+//						break;
+//					case 3:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
+//						break;
+//					case 4:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
+//						break;
+//					case 5:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//						break;
+//					default:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//						break;
+//				}
+
 				t_parkspace->set_parkingspace_width(tp_result->getDouble("parkingspace_width"));
 				t_parkspace->set_parkingspace_height(tp_result->getDouble("parkingspace_height"));
 				t_parkspace->mutable_car_info()->set_license(tp_result->getString("parkSpaceCarLicense"));
 				t_parkspace->mutable_car_info()->set_car_length(tp_result->getDouble("parkSpaceCarLength"));
 				t_parkspace->mutable_car_info()->set_car_width(tp_result->getDouble("parkSpaceCarWidth"));
 				t_parkspace->mutable_car_info()->set_car_height(tp_result->getDouble("parkSpaceCarHeight"));
+
 				t_parkspace->mutable_car_info()->set_car_wheel_base(tp_result->getDouble("parkSpaceCarWheelBase"));
 				t_parkspace->mutable_car_info()->set_car_wheel_width(tp_result->getDouble("parkSpaceCarWheelWidth"));
+				t_parkspace->set_car_type((message::Car_type)tp_result->getInt("parkSpaceCarType"));
 				t_parkspace->set_entry_time(tp_result->getString("entryTime"));
 				t_parkspace->set_leave_time(tp_result->getString("leaveTime"));
 			}
@@ -101,7 +106,7 @@ Error_manager Parkspace_operating_function::get_specify_the_type_parkspace_info(
 	//执行sql操作
 	char all_specify_the_type_sql[1024];
 	memset(all_specify_the_type_sql, 0, 1024);
-	sprintf(all_specify_the_type_sql,"select * from parkingspace where parkingspace_type= %d and parkingspace_status = 0",parkspace_type);
+	sprintf(all_specify_the_type_sql,"select * from parkingspace where parkingspace_type= %d and parkingspace_status = 1",parkspace_type);
 	boost::shared_ptr<sql::ResultSet>  tp_result = nullptr;
 	Error_manager ec = Database_controller::get_instance_pointer()->sql_query(all_specify_the_type_sql, tp_result);
 	if(ec == SUCCESS)
@@ -130,33 +135,37 @@ Error_manager Parkspace_operating_function::get_specify_the_type_parkspace_info(
 					t_parkspace->set_parkingspace_direction(message::Direction::eBackward);
 				}
 				t_parkspace->set_parkingspace_floor_id(tp_result->getInt("parkingspace_floor_id"));
-				switch (tp_result->getInt("parkingspace_status"))
-				{
-					case 1:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
-						break;
-					case 2:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
-						break;
-					case 3:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
-						break;
-					case 4:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
-						break;
-					case 5:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-						break;
-					default:
-						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-						break;
-				}
+				t_parkspace->set_parkingspace_status((message::Parkspace_status)tp_result->getInt("parkingspace_status"));
+
+//				switch (tp_result->getInt("parkingspace_status"))
+//				{
+//					case 1:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
+//						break;
+//					case 2:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
+//						break;
+//					case 3:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
+//						break;
+//					case 4:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
+//						break;
+//					case 5:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//						break;
+//					default:
+//						t_parkspace->set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//						break;
+//				}
 				t_parkspace->set_parkingspace_width(tp_result->getDouble("parkingspace_width"));
 				t_parkspace->set_parkingspace_height(tp_result->getDouble("parkingspace_height"));
 				t_parkspace->mutable_car_info()->set_license(tp_result->getString("parkSpaceCarLicense"));
 				t_parkspace->mutable_car_info()->set_car_length(tp_result->getDouble("parkSpaceCarLength"));
 				t_parkspace->mutable_car_info()->set_car_width(tp_result->getDouble("parkSpaceCarWidth"));
 				t_parkspace->mutable_car_info()->set_car_height(tp_result->getDouble("parkSpaceCarHeight"));
+				t_parkspace->set_car_type((message::Car_type)tp_result->getInt("parkSpaceCarType"));
+
 				t_parkspace->mutable_car_info()->set_car_wheel_base(tp_result->getDouble("parkSpaceCarWheelBase"));
 				t_parkspace->mutable_car_info()->set_car_wheel_width(tp_result->getDouble("parkSpaceCarWheelWidth"));
 				t_parkspace->set_entry_time(tp_result->getString("entryTime"));
@@ -189,7 +198,7 @@ Error_manager Parkspace_operating_function::clear_all_parkspace_info()
 	//执行sql操作
 	char update_space_sql[1024];
 	memset(update_space_sql, 0, 1024);
-	sprintf(update_space_sql, "update parkingspace set parkingspace_status = 0,parkSpaceCarLicense = NULL,parkSpaceCarLength = 0,parkSpaceCarWidth = 0,parkSpaceCarHeight = 0,parkSpaceCarWheelBase = 0,parkSpaceCarWheelWidth = 0,entryTime = NULL,leaveTime = NULL");
+	sprintf(update_space_sql, "update parkingspace set parkingspace_status = 1,parkSpaceCarLicense = NULL,parkSpaceCarLength = 0,parkSpaceCarWidth = 0,parkSpaceCarHeight = 0,parkSpaceCarType = 0,parkSpaceCarWheelBase = 0,parkSpaceCarWheelWidth = 0,entryTime = NULL,leaveTime = NULL");
 	Error_manager ec = Database_controller::get_instance_pointer()->sql_update(update_space_sql);
 	return ec;
 }
@@ -200,37 +209,44 @@ Error_manager Parkspace_operating_function::update_parkspace_data(message::Parks
 	//执行sql操作
 	char update_space_sql[1024];
 	memset(update_space_sql, 0, 1024);
-	int status = -1;
-	switch (parkspace_info.parkingspace_status())
+	int status = parkspace_info.parkingspace_status();
+	if ( status < 0 || status >5 )
 	{
-	case message::Parkspace_status::eParkspace_empty:
-		status = 0;
-		break;
-	case message::Parkspace_status::eParkspace_occupied:
-		status = 1;
-		break;
-	case message::Parkspace_status::eParkspace_reserved:
-		status = 2;
-		break;
-	case message::Parkspace_status::eParkspace_locked:
-		status = 3;
-		break;
-	case message::Parkspace_status::eParkspace_error:
-		status = 4;
-		break;
-	default:
-		return Error_manager(Error_code::PARAMETER_ERROR, Error_level::MINOR_ERROR,
-							 "参数错误 Parkspace_operating_function::update_parkspace_data error ");
-		break;
+			return Error_manager(Error_code::PARAMETER_ERROR, Error_level::MINOR_ERROR,
+						 "参数错误 Parkspace_operating_function::update_parkspace_data error ");
 	}
+
+//	switch (parkspace_info.parkingspace_status())
+//	{
+//	case message::Parkspace_status::eParkspace_empty:
+//		status = 0;
+//		break;
+//	case message::Parkspace_status::eParkspace_occupied:
+//		status = 1;
+//		break;
+//	case message::Parkspace_status::eParkspace_reserved:
+//		status = 2;
+//		break;
+//	case message::Parkspace_status::eParkspace_locked:
+//		status = 3;
+//		break;
+//	case message::Parkspace_status::eParkspace_error:
+//		status = 4;
+//		break;
+//	default:
+//		return Error_manager(Error_code::PARAMETER_ERROR, Error_level::MINOR_ERROR,
+//							 "参数错误 Parkspace_operating_function::update_parkspace_data error ");
+//		break;
+//	}
 	if(parkspace_info.has_car_info() && status!=message::Parkspace_status::eParkspace_empty)
 	{
-		sprintf(update_space_sql, "update parkingspace set parkingspace_status = %d,parkSpaceCarLicense = '%s',parkSpaceCarLength = %.3f,parkSpaceCarWidth = %.3f,parkSpaceCarHeight = %.3f,parkSpaceCarWheelBase = %.3f,parkSpaceCarWheelWidth = %.3f,entryTime = '%s',leaveTime = '%s' where parkingSpaceID = %d",
+		sprintf(update_space_sql, "update parkingspace set parkingspace_status = %d,parkSpaceCarLicense = '%s',parkSpaceCarLength = %.3f,parkSpaceCarWidth = %.3f,parkSpaceCarHeight = %.3f,parkSpaceCarType = %d,parkSpaceCarWheelBase = %.3f,parkSpaceCarWheelWidth = %.3f,entryTime = '%s',leaveTime = '%s' where parkingSpaceID = %d",
 				status,
 				parkspace_info.car_info().license().c_str(),
 				parkspace_info.car_info().has_car_length()?parkspace_info.car_info().car_length():0.0f,
 				parkspace_info.car_info().car_width(),
 				parkspace_info.car_info().car_height(),
+				parkspace_info.car_type(),
 				parkspace_info.car_info().car_wheel_base(),
 				parkspace_info.car_info().car_wheel_width(),
 				parkspace_info.entry_time().c_str(),
@@ -238,7 +254,7 @@ Error_manager Parkspace_operating_function::update_parkspace_data(message::Parks
 				parkspace_info.parkingspace_index_id());
 	}else
 	{
-		sprintf(update_space_sql, "update parkingspace set parkingspace_status = %d,parkSpaceCarLicense = NULL,parkSpaceCarLength = 0,parkSpaceCarWidth = 0,parkSpaceCarHeight = 0,parkSpaceCarWheelBase = 0,parkSpaceCarWheelWidth = 0,entryTime = NULL,leaveTime = NULL where parkingSpaceID = %d", status, parkspace_info.parkingspace_index_id());
+		sprintf(update_space_sql, "update parkingspace set parkingspace_status = %d,parkSpaceCarLicense = NULL,parkSpaceCarLength = 0,parkSpaceCarWidth = 0,parkSpaceCarHeight = 0,parkSpaceCarType = 0,parkSpaceCarWheelBase = 0,parkSpaceCarWheelWidth = 0,entryTime = NULL,leaveTime = NULL where parkingSpaceID = %d", status, parkspace_info.parkingspace_index_id());
 	}
 	//boost::shared_ptr<sql::ResultSet>  tp_result = nullptr;
 	Error_manager ec = Database_controller::get_instance_pointer()->sql_update(update_space_sql);
@@ -469,27 +485,29 @@ Error_manager Parkspace_operating_function::query_one_parkspace_with_parkspace_i
 			memset(buf, 0, 1024);
 			try
 			{
-				switch (tp_result->getInt("parkingspace_status"))
-				{
-				case 1:
-					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
-					break;
-				case 2:
-					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
-					break;
-				case 3:
-					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
-					break;
-				case 4:
-					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
-					break;
-				case 5:
-					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-					break;
-				default:
-					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-					break;
-				}
+				parkspace_info.set_parkingspace_status((message::Parkspace_status)tp_result->getInt("parkingspace_status"));
+
+//				switch (tp_result->getInt("parkingspace_status"))
+//				{
+//				case 1:
+//					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
+//					break;
+//				case 2:
+//					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
+//					break;
+//				case 3:
+//					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
+//					break;
+//				case 4:
+//					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
+//					break;
+//				case 5:
+//					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//					break;
+//				default:
+//					parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//					break;
+//				}
 				parkspace_info.set_parkingspace_index_id(tp_result->getInt("parkingSpaceID"));
 				parkspace_info.set_parkingspace_unit_id(tp_result->getInt("parkingspace_unit_id"));
 				parkspace_info.set_parkingspace_room_id(tp_result->getInt("parkingspace_room_id"));
@@ -502,6 +520,7 @@ Error_manager Parkspace_operating_function::query_one_parkspace_with_parkspace_i
 				parkspace_info.mutable_car_info()->set_car_length(tp_result->getDouble("parkSpaceCarLength"));
 				parkspace_info.mutable_car_info()->set_car_width(tp_result->getDouble("parkSpaceCarWidth"));
 				parkspace_info.mutable_car_info()->set_car_height(tp_result->getDouble("parkSpaceCarHeight"));
+				parkspace_info.set_car_type((message::Car_type)tp_result->getInt("parkSpaceCarType"));
 				parkspace_info.mutable_car_info()->set_car_wheel_base(tp_result->getDouble("parkSpaceCarWheelBase"));
 				parkspace_info.mutable_car_info()->set_car_wheel_width(tp_result->getDouble("parkSpaceCarWheelWidth"));
 				parkspace_info.set_entry_time(tp_result->getString("entryTime"));
@@ -559,27 +578,30 @@ Error_manager Parkspace_operating_function::query_one_parkspace_with_license(std
 			memset(buf, 0, 1024);
 			try
 			{
-				switch (tp_result->getInt("parkingspace_status"))
-				{
-					case 1:
-						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
-						break;
-					case 2:
-						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
-						break;
-					case 3:
-						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
-						break;
-					case 4:
-						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
-						break;
-					case 5:
-						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-						break;
-					default:
-						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
-						break;
-				}
+
+				parkspace_info.set_parkingspace_status((message::Parkspace_status)tp_result->getInt("parkingspace_status"));
+
+//				switch (tp_result->getInt("parkingspace_status"))
+//				{
+//					case 1:
+//						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_empty);
+//						break;
+//					case 2:
+//						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_occupied);
+//						break;
+//					case 3:
+//						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_reserved);
+//						break;
+//					case 4:
+//						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_locked);
+//						break;
+//					case 5:
+//						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//						break;
+//					default:
+//						parkspace_info.set_parkingspace_status(message::Parkspace_status::eParkspace_error);
+//						break;
+//				}
 				parkspace_info.set_parkingspace_index_id(tp_result->getInt("parkingSpaceID"));
 				parkspace_info.set_parkingspace_unit_id(tp_result->getInt("parkingspace_unit_id"));
 				parkspace_info.set_parkingspace_room_id(tp_result->getInt("parkingspace_room_id"));
@@ -592,6 +614,7 @@ Error_manager Parkspace_operating_function::query_one_parkspace_with_license(std
 				parkspace_info.mutable_car_info()->set_car_length(tp_result->getDouble("parkSpaceCarLength"));
 				parkspace_info.mutable_car_info()->set_car_width(tp_result->getDouble("parkSpaceCarWidth"));
 				parkspace_info.mutable_car_info()->set_car_height(tp_result->getDouble("parkSpaceCarHeight"));
+				parkspace_info.set_car_type((message::Car_type)tp_result->getInt("parkSpaceCarType"));
 				parkspace_info.mutable_car_info()->set_car_wheel_base(tp_result->getDouble("parkSpaceCarWheelBase"));
 				parkspace_info.mutable_car_info()->set_car_wheel_width(tp_result->getDouble("parkSpaceCarWheelWidth"));
 				parkspace_info.set_entry_time(tp_result->getString("entryTime"));
@@ -664,6 +687,8 @@ Error_manager Parkspace_operating_function::query_one_empty_parkspace(message::P
 				parkspace_info.mutable_car_info()->set_car_length(tp_result->getDouble("parkSpaceCarLength"));
 				parkspace_info.mutable_car_info()->set_car_width(tp_result->getDouble("parkSpaceCarWidth"));
 				parkspace_info.mutable_car_info()->set_car_height(tp_result->getDouble("parkSpaceCarHeight"));
+				parkspace_info.set_car_type((message::Car_type)tp_result->getInt("parkSpaceCarType"));
+
 				parkspace_info.mutable_car_info()->set_car_wheel_base(tp_result->getDouble("parkSpaceCarWheelBase"));
 				parkspace_info.mutable_car_info()->set_car_wheel_width(tp_result->getDouble("parkSpaceCarWheelWidth"));
 				parkspace_info.set_entry_time(tp_result->getString("entryTime"));

+ 2 - 2
setting/communication.prototxt

@@ -8,7 +8,7 @@ communication_parameters
 #   connect_string_vector:"tcp://192.168.2.125:9876"
 #   connect_string_vector:"tcp://192.168.2.166:1234"
 
-    bind_string:"tcp://192.168.2.165:30008"
-    connect_string_vector:"tcp://192.168.2.127:30000"
+    bind_string:"tcp://192.168.2.174:30008"
+ #   connect_string_vector:"tcp://192.168.2.127:30000"
 }
 

+ 13 - 2
test/test_parkspace_sample.cpp

@@ -49,10 +49,21 @@ int main()
 //  p_parkspace_allocation_communicater->communication_run();
 //
 //
+	message::Parkspace_allocation_data_msg parkspaceAllocationDataMsg;
+	Parkspace_operating_function parkspaceOperatingFunction;
+	parkspaceOperatingFunction.get_specify_the_type_parkspace_info(parkspaceAllocationDataMsg,message::Parkspace_type::MIN_PARKINGSPACE);
+    std::cout << " min = " << parkspaceAllocationDataMsg.parkspace_info_size()<< std::endl;
+	parkspaceAllocationDataMsg.clear_parkspace_info();
 
+	parkspaceOperatingFunction.get_specify_the_type_parkspace_info(parkspaceAllocationDataMsg,message::Parkspace_type::MID_PARKINGSPACE);
+	std::cout << " mid = " << parkspaceAllocationDataMsg.parkspace_info_size() << std::endl;
+	parkspaceAllocationDataMsg.clear_parkspace_info();
 
-    // // 初始化车位,创建三个车位
-    // message::Parkspace_allocation_status_msg parkspace_status;
+	parkspaceOperatingFunction.get_specify_the_type_parkspace_info(parkspaceAllocationDataMsg,message::Parkspace_type::BIG_PARKINGSPACE);
+	std::cout << " max = " << parkspaceAllocationDataMsg.parkspace_info_size() << std::endl;
+	parkspaceAllocationDataMsg.clear_parkspace_info();
+
+	// message::Parkspace_allocation_status_msg parkspace_status;
     // for (size_t i = 1; i < 1000; i++)
     // {
     //     message::Parkspace_info* space = parkspace_status.add_parkspace_info();