修改停车回退

message/process_message.pb.cc

@@ -25,11 +25,11 @@ class Alloc_space_step_statuDefaultTypeInternal {
   ::google::protobuf::internal::ExplicitlyConstructed<Alloc_space_step_statu>
       _instance;
 } _Alloc_space_step_statu_default_instance_;
-class Check_space_step_statuDefaultTypeInternal {
+class Search_space_step_statuDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Check_space_step_statu>
+  ::google::protobuf::internal::ExplicitlyConstructed<Search_space_step_statu>
       _instance;
-} _Check_space_step_statu_default_instance_;
+} _Search_space_step_statu_default_instance_;
 class Confirm_space_step_statuDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed<Confirm_space_step_statu>
@@ -94,7 +94,7 @@ void InitDefaultsAlloc_space_step_statu() {
   ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsAlloc_space_step_statuImpl);
 }
 
-void InitDefaultsCheck_space_step_statuImpl() {
+void InitDefaultsSearch_space_step_statuImpl() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
 #ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
@@ -104,16 +104,16 @@ void InitDefaultsCheck_space_step_statuImpl() {
 #endif  // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
   protobuf_message_5fbase_2eproto::InitDefaultsParkspace_info();
   {
-    void* ptr = &::message::_Check_space_step_statu_default_instance_;
-    new (ptr) ::message::Check_space_step_statu();
+    void* ptr = &::message::_Search_space_step_statu_default_instance_;
+    new (ptr) ::message::Search_space_step_statu();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::message::Check_space_step_statu::InitAsDefaultInstance();
+  ::message::Search_space_step_statu::InitAsDefaultInstance();
 }
 
-void InitDefaultsCheck_space_step_statu() {
+void InitDefaultsSearch_space_step_statu() {
   static GOOGLE_PROTOBUF_DECLARE_ONCE(once);
-  ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsCheck_space_step_statuImpl);
+  ::google::protobuf::GoogleOnceInit(&once, &InitDefaultsSearch_space_step_statuImpl);
 }
 
 void InitDefaultsConfirm_space_step_statuImpl() {
@@ -285,7 +285,7 @@ void InitDefaultsPicking_process_statu_msgImpl() {
   ::google::protobuf::internal::InitProtobufDefaults();
 #endif  // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
   protobuf_message_5fbase_2eproto::InitDefaultsBase_info();
-  protobuf_process_5fmessage_2eproto::InitDefaultsCheck_space_step_statu();
+  protobuf_process_5fmessage_2eproto::InitDefaultsSearch_space_step_statu();
   protobuf_process_5fmessage_2eproto::InitDefaultsDispatch_pick_step_statu();
   protobuf_process_5fmessage_2eproto::InitDefaultsRelease_space_step_statu();
   protobuf_process_5fmessage_2eproto::InitDefaultsWaitfor_leave_step_statu();
@@ -317,14 +317,14 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   2,
   1,
   0,
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Check_space_step_statu, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Check_space_step_statu, _internal_metadata_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Search_space_step_statu, _has_bits_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Search_space_step_statu, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Check_space_step_statu, step_statu_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Check_space_step_statu, space_info_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Check_space_step_statu, description_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Search_space_step_statu, step_statu_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Search_space_step_statu, space_info_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Search_space_step_statu, description_),
   2,
   1,
   0,
@@ -425,7 +425,7 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, base_info_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, terminal_id_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, license_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, check_space_step_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, search_space_step_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, dispatch_step_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, release_space_step_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Picking_process_statu_msg, waitfor_leave_),
@@ -439,7 +439,7 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 8, sizeof(::message::Alloc_space_step_statu)},
-  { 11, 19, sizeof(::message::Check_space_step_statu)},
+  { 11, 19, sizeof(::message::Search_space_step_statu)},
   { 22, 30, sizeof(::message::Confirm_space_step_statu)},
   { 33, 41, sizeof(::message::Release_space_step_statu)},
   { 44, 52, sizeof(::message::Measure_step_statu)},
@@ -452,7 +452,7 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROT
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
   reinterpret_cast<const ::google::protobuf::Message*>(&::message::_Alloc_space_step_statu_default_instance_),
-  reinterpret_cast<const ::google::protobuf::Message*>(&::message::_Check_space_step_statu_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::message::_Search_space_step_statu_default_instance_),
   reinterpret_cast<const ::google::protobuf::Message*>(&::message::_Confirm_space_step_statu_default_instance_),
   reinterpret_cast<const ::google::protobuf::Message*>(&::message::_Release_space_step_statu_default_instance_),
   reinterpret_cast<const ::google::protobuf::Message*>(&::message::_Measure_step_statu_default_instance_),
@@ -489,55 +489,55 @@ void AddDescriptorsImpl() {
       "e_base.proto\"{\n\026Alloc_space_step_statu\022\'"
       "\n\nstep_statu\030\001 \002(\0162\023.message.Step_statu\022"
       "#\n\010car_info\030\002 \001(\0132\021.message.Car_info\022\023\n\013"
-      "description\030\003 \001(\t\"\203\001\n\026Check_space_step_s"
-      "tatu\022\'\n\nstep_statu\030\001 \002(\0162\023.message.Step_"
-      "statu\022+\n\nspace_info\030\002 \001(\0132\027.message.Park"
-      "space_info\022\023\n\013description\030\003 \001(\t\"\205\001\n\030Conf"
-      "irm_space_step_statu\022\'\n\nstep_statu\030\001 \002(\016"
-      "2\023.message.Step_statu\022+\n\nspace_info\030\002 \001("
-      "\0132\027.message.Parkspace_info\022\023\n\013descriptio"
-      "n\030\003 \001(\t\"\205\001\n\030Release_space_step_statu\022\'\n\n"
-      "step_statu\030\001 \002(\0162\023.message.Step_statu\022+\n"
-      "\nspace_info\030\002 \001(\0132\027.message.Parkspace_in"
-      "fo\022\023\n\013description\030\003 \001(\t\"\204\001\n\022Measure_step"
-      "_statu\022\'\n\nstep_statu\030\001 \002(\0162\023.message.Ste"
-      "p_statu\0220\n\013locate_info\030\002 \001(\0132\033.message.L"
-      "ocate_information\022\023\n\013description\030\003 \001(\t\"\270"
-      "\001\n\031Dispatch_store_step_statu\022\'\n\nstep_sta"
-      "tu\030\001 \002(\0162\023.message.Step_statu\0220\n\013locate_"
-      "info\030\002 \001(\0132\033.message.Locate_information\022"
-      "+\n\nspace_info\030\003 \001(\0132\027.message.Parkspace_"
-      "info\022\023\n\013description\030\004 \001(\t\"\205\001\n\030Dispatch_p"
-      "ick_step_statu\022\'\n\nstep_statu\030\001 \002(\0162\023.mes"
-      "sage.Step_statu\022+\n\nspace_info\030\002 \001(\0132\027.me"
-      "ssage.Parkspace_info\022\023\n\013description\030\003 \001("
-      "\t\"}\n\030Waitfor_leave_step_statu\022\'\n\nstep_st"
-      "atu\030\001 \002(\0162\023.message.Step_statu\022#\n\010car_in"
-      "fo\030\002 \001(\0132\021.message.Car_info\022\023\n\013descripti"
-      "on\030\003 \001(\t\"\226\003\n\031Storing_process_statu_msg\022%"
-      "\n\tbase_info\030\001 \002(\0132\022.message.Base_info\022\023\n"
-      "\013terminal_id\030\002 \002(\005\022\017\n\007license\030\003 \002(\t\0229\n\020a"
-      "lloc_space_step\030\004 \002(\0132\037.message.Alloc_sp"
-      "ace_step_statu\0221\n\014measure_step\030\005 \002(\0132\033.m"
-      "essage.Measure_step_statu\0229\n\rdispatch_st"
-      "ep\030\006 \002(\0132\".message.Dispatch_store_step_s"
-      "tatu\022=\n\022confirm_space_step\030\007 \002(\0132!.messa"
-      "ge.Confirm_space_step_statu\022D\n\031failed_re"
-      "lease_space_step\030\010 \001(\0132!.message.Release"
-      "_space_step_statu\"\326\002\n\031Picking_process_st"
-      "atu_msg\022%\n\tbase_info\030\001 \002(\0132\022.message.Bas"
-      "e_info\022\023\n\013terminal_id\030\002 \002(\005\022\017\n\007license\030\003"
-      " \002(\t\0229\n\020check_space_step\030\004 \002(\0132\037.message"
-      ".Check_space_step_statu\0228\n\rdispatch_step"
-      "\030\005 \002(\0132!.message.Dispatch_pick_step_stat"
-      "u\022=\n\022release_space_step\030\006 \002(\0132!.message."
-      "Release_space_step_statu\0228\n\rwaitfor_leav"
-      "e\030\007 \002(\0132!.message.Waitfor_leave_step_sta"
-      "tu*C\n\nStep_statu\022\014\n\010eWaiting\020\000\022\014\n\010eWorki"
-      "ng\020\001\022\n\n\006eError\020\002\022\r\n\teComplete\020\003"
+      "description\030\003 \001(\t\"\204\001\n\027Search_space_step_"
+      "statu\022\'\n\nstep_statu\030\001 \002(\0162\023.message.Step"
+      "_statu\022+\n\nspace_info\030\002 \001(\0132\027.message.Par"
+      "kspace_info\022\023\n\013description\030\003 \001(\t\"\205\001\n\030Con"
+      "firm_space_step_statu\022\'\n\nstep_statu\030\001 \002("
+      "\0162\023.message.Step_statu\022+\n\nspace_info\030\002 \001"
+      "(\0132\027.message.Parkspace_info\022\023\n\013descripti"
+      "on\030\003 \001(\t\"\205\001\n\030Release_space_step_statu\022\'\n"
+      "\nstep_statu\030\001 \002(\0162\023.message.Step_statu\022+"
+      "\n\nspace_info\030\002 \001(\0132\027.message.Parkspace_i"
+      "nfo\022\023\n\013description\030\003 \001(\t\"\204\001\n\022Measure_ste"
+      "p_statu\022\'\n\nstep_statu\030\001 \002(\0162\023.message.St"
+      "ep_statu\0220\n\013locate_info\030\002 \001(\0132\033.message."
+      "Locate_information\022\023\n\013description\030\003 \001(\t\""
+      "\270\001\n\031Dispatch_store_step_statu\022\'\n\nstep_st"
+      "atu\030\001 \002(\0162\023.message.Step_statu\0220\n\013locate"
+      "_info\030\002 \001(\0132\033.message.Locate_information"
+      "\022+\n\nspace_info\030\003 \001(\0132\027.message.Parkspace"
+      "_info\022\023\n\013description\030\004 \001(\t\"\205\001\n\030Dispatch_"
+      "pick_step_statu\022\'\n\nstep_statu\030\001 \002(\0162\023.me"
+      "ssage.Step_statu\022+\n\nspace_info\030\002 \001(\0132\027.m"
+      "essage.Parkspace_info\022\023\n\013description\030\003 \001"
+      "(\t\"}\n\030Waitfor_leave_step_statu\022\'\n\nstep_s"
+      "tatu\030\001 \002(\0162\023.message.Step_statu\022#\n\010car_i"
+      "nfo\030\002 \001(\0132\021.message.Car_info\022\023\n\013descript"
+      "ion\030\003 \001(\t\"\226\003\n\031Storing_process_statu_msg\022"
+      "%\n\tbase_info\030\001 \002(\0132\022.message.Base_info\022\023"
+      "\n\013terminal_id\030\002 \002(\005\022\017\n\007license\030\003 \002(\t\0229\n\020"
+      "alloc_space_step\030\004 \002(\0132\037.message.Alloc_s"
+      "pace_step_statu\0221\n\014measure_step\030\005 \002(\0132\033."
+      "message.Measure_step_statu\0229\n\rdispatch_s"
+      "tep\030\006 \002(\0132\".message.Dispatch_store_step_"
+      "statu\022=\n\022confirm_space_step\030\007 \002(\0132!.mess"
+      "age.Confirm_space_step_statu\022D\n\031failed_r"
+      "elease_space_step\030\010 \001(\0132!.message.Releas"
+      "e_space_step_statu\"\330\002\n\031Picking_process_s"
+      "tatu_msg\022%\n\tbase_info\030\001 \002(\0132\022.message.Ba"
+      "se_info\022\023\n\013terminal_id\030\002 \002(\005\022\017\n\007license\030"
+      "\003 \002(\t\022;\n\021search_space_step\030\004 \002(\0132 .messa"
+      "ge.Search_space_step_statu\0228\n\rdispatch_s"
+      "tep\030\005 \002(\0132!.message.Dispatch_pick_step_s"
+      "tatu\022=\n\022release_space_step\030\006 \002(\0132!.messa"
+      "ge.Release_space_step_statu\0228\n\rwaitfor_l"
+      "eave\030\007 \002(\0132!.message.Waitfor_leave_step_"
+      "statu*C\n\nStep_statu\022\014\n\010eWaiting\020\000\022\014\n\010eWo"
+      "rking\020\001\022\n\n\006eError\020\002\022\r\n\teComplete\020\003"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 1991);
+      descriptor, 1994);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "process_message.proto", &protobuf_RegisterTypes);
   ::protobuf_message_5fbase_2eproto::AddDescriptors();
@@ -948,29 +948,29 @@ void Alloc_space_step_statu::InternalSwap(Alloc_space_step_statu* other) {
 
 // ===================================================================
 
-void Check_space_step_statu::InitAsDefaultInstance() {
-  ::message::_Check_space_step_statu_default_instance_._instance.get_mutable()->space_info_ = const_cast< ::message::Parkspace_info*>(
+void Search_space_step_statu::InitAsDefaultInstance() {
+  ::message::_Search_space_step_statu_default_instance_._instance.get_mutable()->space_info_ = const_cast< ::message::Parkspace_info*>(
       ::message::Parkspace_info::internal_default_instance());
 }
-void Check_space_step_statu::clear_space_info() {
+void Search_space_step_statu::clear_space_info() {
   if (space_info_ != NULL) space_info_->Clear();
   clear_has_space_info();
 }
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Check_space_step_statu::kStepStatuFieldNumber;
-const int Check_space_step_statu::kSpaceInfoFieldNumber;
-const int Check_space_step_statu::kDescriptionFieldNumber;
+const int Search_space_step_statu::kStepStatuFieldNumber;
+const int Search_space_step_statu::kSpaceInfoFieldNumber;
+const int Search_space_step_statu::kDescriptionFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
-Check_space_step_statu::Check_space_step_statu()
+Search_space_step_statu::Search_space_step_statu()
   : ::google::protobuf::Message(), _internal_metadata_(NULL) {
   if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) {
-    ::protobuf_process_5fmessage_2eproto::InitDefaultsCheck_space_step_statu();
+    ::protobuf_process_5fmessage_2eproto::InitDefaultsSearch_space_step_statu();
   }
   SharedCtor();
-  // @@protoc_insertion_point(constructor:message.Check_space_step_statu)
+  // @@protoc_insertion_point(constructor:message.Search_space_step_statu)
 }
-Check_space_step_statu::Check_space_step_statu(const Check_space_step_statu& from)
+Search_space_step_statu::Search_space_step_statu(const Search_space_step_statu& from)
   : ::google::protobuf::Message(),
       _internal_metadata_(NULL),
       _has_bits_(from._has_bits_),
@@ -986,10 +986,10 @@ Check_space_step_statu::Check_space_step_statu(const Check_space_step_statu& fro
     space_info_ = NULL;
   }
   step_statu_ = from.step_statu_;
-  // @@protoc_insertion_point(copy_constructor:message.Check_space_step_statu)
+  // @@protoc_insertion_point(copy_constructor:message.Search_space_step_statu)
 }
 
-void Check_space_step_statu::SharedCtor() {
+void Search_space_step_statu::SharedCtor() {
   _cached_size_ = 0;
   description_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&space_info_, 0, static_cast<size_t>(
@@ -997,41 +997,41 @@ void Check_space_step_statu::SharedCtor() {
       reinterpret_cast<char*>(&space_info_)) + sizeof(step_statu_));
 }
 
-Check_space_step_statu::~Check_space_step_statu() {
-  // @@protoc_insertion_point(destructor:message.Check_space_step_statu)
+Search_space_step_statu::~Search_space_step_statu() {
+  // @@protoc_insertion_point(destructor:message.Search_space_step_statu)
   SharedDtor();
 }
 
-void Check_space_step_statu::SharedDtor() {
+void Search_space_step_statu::SharedDtor() {
   description_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (this != internal_default_instance()) delete space_info_;
 }
 
-void Check_space_step_statu::SetCachedSize(int size) const {
+void Search_space_step_statu::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* Check_space_step_statu::descriptor() {
+const ::google::protobuf::Descriptor* Search_space_step_statu::descriptor() {
   ::protobuf_process_5fmessage_2eproto::protobuf_AssignDescriptorsOnce();
   return ::protobuf_process_5fmessage_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
 }
 
-const Check_space_step_statu& Check_space_step_statu::default_instance() {
-  ::protobuf_process_5fmessage_2eproto::InitDefaultsCheck_space_step_statu();
+const Search_space_step_statu& Search_space_step_statu::default_instance() {
+  ::protobuf_process_5fmessage_2eproto::InitDefaultsSearch_space_step_statu();
   return *internal_default_instance();
 }
 
-Check_space_step_statu* Check_space_step_statu::New(::google::protobuf::Arena* arena) const {
-  Check_space_step_statu* n = new Check_space_step_statu;
+Search_space_step_statu* Search_space_step_statu::New(::google::protobuf::Arena* arena) const {
+  Search_space_step_statu* n = new Search_space_step_statu;
   if (arena != NULL) {
     arena->Own(n);
   }
   return n;
 }
 
-void Check_space_step_statu::Clear() {
-// @@protoc_insertion_point(message_clear_start:message.Check_space_step_statu)
+void Search_space_step_statu::Clear() {
+// @@protoc_insertion_point(message_clear_start:message.Search_space_step_statu)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -1052,11 +1052,11 @@ void Check_space_step_statu::Clear() {
   _internal_metadata_.Clear();
 }
 
-bool Check_space_step_statu::MergePartialFromCodedStream(
+bool Search_space_step_statu::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:message.Check_space_step_statu)
+  // @@protoc_insertion_point(parse_start:message.Search_space_step_statu)
   for (;;) {
     ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
@@ -1103,7 +1103,7 @@ bool Check_space_step_statu::MergePartialFromCodedStream(
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->description().data(), static_cast<int>(this->description().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "message.Check_space_step_statu.description");
+            "message.Search_space_step_statu.description");
         } else {
           goto handle_unusual;
         }
@@ -1122,17 +1122,17 @@ bool Check_space_step_statu::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:message.Check_space_step_statu)
+  // @@protoc_insertion_point(parse_success:message.Search_space_step_statu)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:message.Check_space_step_statu)
+  // @@protoc_insertion_point(parse_failure:message.Search_space_step_statu)
   return false;
 #undef DO_
 }
 
-void Check_space_step_statu::SerializeWithCachedSizes(
+void Search_space_step_statu::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:message.Check_space_step_statu)
+  // @@protoc_insertion_point(serialize_start:message.Search_space_step_statu)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -1154,7 +1154,7 @@ void Check_space_step_statu::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "message.Check_space_step_statu.description");
+      "message.Search_space_step_statu.description");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       3, this->description(), output);
   }
@@ -1163,13 +1163,13 @@ void Check_space_step_statu::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:message.Check_space_step_statu)
+  // @@protoc_insertion_point(serialize_end:message.Search_space_step_statu)
 }
 
-::google::protobuf::uint8* Check_space_step_statu::InternalSerializeWithCachedSizesToArray(
+::google::protobuf::uint8* Search_space_step_statu::InternalSerializeWithCachedSizesToArray(
     bool deterministic, ::google::protobuf::uint8* target) const {
   (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:message.Check_space_step_statu)
+  // @@protoc_insertion_point(serialize_to_array_start:message.Search_space_step_statu)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
@@ -1192,7 +1192,7 @@ void Check_space_step_statu::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->description().data(), static_cast<int>(this->description().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "message.Check_space_step_statu.description");
+      "message.Search_space_step_statu.description");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         3, this->description(), target);
@@ -1202,12 +1202,12 @@ void Check_space_step_statu::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:message.Check_space_step_statu)
+  // @@protoc_insertion_point(serialize_to_array_end:message.Search_space_step_statu)
   return target;
 }
 
-size_t Check_space_step_statu::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:message.Check_space_step_statu)
+size_t Search_space_step_statu::ByteSizeLong() const {
+// @@protoc_insertion_point(message_byte_size_start:message.Search_space_step_statu)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -1243,23 +1243,23 @@ size_t Check_space_step_statu::ByteSizeLong() const {
   return total_size;
 }
 
-void Check_space_step_statu::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:message.Check_space_step_statu)
+void Search_space_step_statu::MergeFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_merge_from_start:message.Search_space_step_statu)
   GOOGLE_DCHECK_NE(&from, this);
-  const Check_space_step_statu* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Check_space_step_statu>(
+  const Search_space_step_statu* source =
+      ::google::protobuf::internal::DynamicCastToGenerated<const Search_space_step_statu>(
           &from);
   if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:message.Check_space_step_statu)
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:message.Search_space_step_statu)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:message.Check_space_step_statu)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:message.Search_space_step_statu)
     MergeFrom(*source);
   }
 }
 
-void Check_space_step_statu::MergeFrom(const Check_space_step_statu& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:message.Check_space_step_statu)
+void Search_space_step_statu::MergeFrom(const Search_space_step_statu& from) {
+// @@protoc_insertion_point(class_specific_merge_from_start:message.Search_space_step_statu)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
@@ -1281,30 +1281,30 @@ void Check_space_step_statu::MergeFrom(const Check_space_step_statu& from) {
   }
 }
 
-void Check_space_step_statu::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:message.Check_space_step_statu)
+void Search_space_step_statu::CopyFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:message.Search_space_step_statu)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void Check_space_step_statu::CopyFrom(const Check_space_step_statu& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:message.Check_space_step_statu)
+void Search_space_step_statu::CopyFrom(const Search_space_step_statu& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:message.Search_space_step_statu)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool Check_space_step_statu::IsInitialized() const {
+bool Search_space_step_statu::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000004) != 0x00000004) return false;
   return true;
 }
 
-void Check_space_step_statu::Swap(Check_space_step_statu* other) {
+void Search_space_step_statu::Swap(Search_space_step_statu* other) {
   if (other == this) return;
   InternalSwap(other);
 }
-void Check_space_step_statu::InternalSwap(Check_space_step_statu* other) {
+void Search_space_step_statu::InternalSwap(Search_space_step_statu* other) {
   using std::swap;
   description_.Swap(&other->description_);
   swap(space_info_, other->space_info_);
@@ -1314,7 +1314,7 @@ void Check_space_step_statu::InternalSwap(Check_space_step_statu* other) {
   swap(_cached_size_, other->_cached_size_);
 }
 
-::google::protobuf::Metadata Check_space_step_statu::GetMetadata() const {
+::google::protobuf::Metadata Search_space_step_statu::GetMetadata() const {
   protobuf_process_5fmessage_2eproto::protobuf_AssignDescriptorsOnce();
   return ::protobuf_process_5fmessage_2eproto::file_level_metadata[kIndexInFileMessages];
 }
@@ -4296,8 +4296,8 @@ void Storing_process_statu_msg::InternalSwap(Storing_process_statu_msg* other) {
 void Picking_process_statu_msg::InitAsDefaultInstance() {
   ::message::_Picking_process_statu_msg_default_instance_._instance.get_mutable()->base_info_ = const_cast< ::message::Base_info*>(
       ::message::Base_info::internal_default_instance());
-  ::message::_Picking_process_statu_msg_default_instance_._instance.get_mutable()->check_space_step_ = const_cast< ::message::Check_space_step_statu*>(
-      ::message::Check_space_step_statu::internal_default_instance());
+  ::message::_Picking_process_statu_msg_default_instance_._instance.get_mutable()->search_space_step_ = const_cast< ::message::Search_space_step_statu*>(
+      ::message::Search_space_step_statu::internal_default_instance());
   ::message::_Picking_process_statu_msg_default_instance_._instance.get_mutable()->dispatch_step_ = const_cast< ::message::Dispatch_pick_step_statu*>(
       ::message::Dispatch_pick_step_statu::internal_default_instance());
   ::message::_Picking_process_statu_msg_default_instance_._instance.get_mutable()->release_space_step_ = const_cast< ::message::Release_space_step_statu*>(
@@ -4313,7 +4313,7 @@ void Picking_process_statu_msg::clear_base_info() {
 const int Picking_process_statu_msg::kBaseInfoFieldNumber;
 const int Picking_process_statu_msg::kTerminalIdFieldNumber;
 const int Picking_process_statu_msg::kLicenseFieldNumber;
-const int Picking_process_statu_msg::kCheckSpaceStepFieldNumber;
+const int Picking_process_statu_msg::kSearchSpaceStepFieldNumber;
 const int Picking_process_statu_msg::kDispatchStepFieldNumber;
 const int Picking_process_statu_msg::kReleaseSpaceStepFieldNumber;
 const int Picking_process_statu_msg::kWaitforLeaveFieldNumber;
@@ -4342,10 +4342,10 @@ Picking_process_statu_msg::Picking_process_statu_msg(const Picking_process_statu
   } else {
     base_info_ = NULL;
   }
-  if (from.has_check_space_step()) {
-    check_space_step_ = new ::message::Check_space_step_statu(*from.check_space_step_);
+  if (from.has_search_space_step()) {
+    search_space_step_ = new ::message::Search_space_step_statu(*from.search_space_step_);
   } else {
-    check_space_step_ = NULL;
+    search_space_step_ = NULL;
   }
   if (from.has_dispatch_step()) {
     dispatch_step_ = new ::message::Dispatch_pick_step_statu(*from.dispatch_step_);
@@ -4382,7 +4382,7 @@ Picking_process_statu_msg::~Picking_process_statu_msg() {
 void Picking_process_statu_msg::SharedDtor() {
   license_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (this != internal_default_instance()) delete base_info_;
-  if (this != internal_default_instance()) delete check_space_step_;
+  if (this != internal_default_instance()) delete search_space_step_;
   if (this != internal_default_instance()) delete dispatch_step_;
   if (this != internal_default_instance()) delete release_space_step_;
   if (this != internal_default_instance()) delete waitfor_leave_;
@@ -4428,8 +4428,8 @@ void Picking_process_statu_msg::Clear() {
       base_info_->Clear();
     }
     if (cached_has_bits & 0x00000004u) {
-      GOOGLE_DCHECK(check_space_step_ != NULL);
-      check_space_step_->Clear();
+      GOOGLE_DCHECK(search_space_step_ != NULL);
+      search_space_step_->Clear();
     }
     if (cached_has_bits & 0x00000008u) {
       GOOGLE_DCHECK(dispatch_step_ != NULL);
@@ -4501,12 +4501,12 @@ bool Picking_process_statu_msg::MergePartialFromCodedStream(
         break;
       }
 
-      // required .message.Check_space_step_statu check_space_step = 4;
+      // required .message.Search_space_step_statu search_space_step = 4;
       case 4: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_check_space_step()));
+               input, mutable_search_space_step()));
         } else {
           goto handle_unusual;
         }
@@ -4597,10 +4597,10 @@ void Picking_process_statu_msg::SerializeWithCachedSizes(
       3, this->license(), output);
   }
 
-  // required .message.Check_space_step_statu check_space_step = 4;
+  // required .message.Search_space_step_statu search_space_step = 4;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, *this->check_space_step_, output);
+      4, *this->search_space_step_, output);
   }
 
   // required .message.Dispatch_pick_step_statu dispatch_step = 5;
@@ -4659,11 +4659,11 @@ void Picking_process_statu_msg::SerializeWithCachedSizes(
         3, this->license(), target);
   }
 
-  // required .message.Check_space_step_statu check_space_step = 4;
+  // required .message.Search_space_step_statu search_space_step = 4;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        4, *this->check_space_step_, deterministic, target);
+        4, *this->search_space_step_, deterministic, target);
   }
 
   // required .message.Dispatch_pick_step_statu dispatch_step = 5;
@@ -4713,11 +4713,11 @@ size_t Picking_process_statu_msg::RequiredFieldsByteSizeFallback() const {
         *this->base_info_);
   }
 
-  if (has_check_space_step()) {
-    // required .message.Check_space_step_statu check_space_step = 4;
+  if (has_search_space_step()) {
+    // required .message.Search_space_step_statu search_space_step = 4;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *this->check_space_step_);
+        *this->search_space_step_);
   }
 
   if (has_dispatch_step()) {
@@ -4770,10 +4770,10 @@ size_t Picking_process_statu_msg::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *this->base_info_);
 
-    // required .message.Check_space_step_statu check_space_step = 4;
+    // required .message.Search_space_step_statu search_space_step = 4;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *this->check_space_step_);
+        *this->search_space_step_);
 
     // required .message.Dispatch_pick_step_statu dispatch_step = 5;
     total_size += 1 +
@@ -4837,7 +4837,7 @@ void Picking_process_statu_msg::MergeFrom(const Picking_process_statu_msg& from)
       mutable_base_info()->::message::Base_info::MergeFrom(from.base_info());
     }
     if (cached_has_bits & 0x00000004u) {
-      mutable_check_space_step()->::message::Check_space_step_statu::MergeFrom(from.check_space_step());
+      mutable_search_space_step()->::message::Search_space_step_statu::MergeFrom(from.search_space_step());
     }
     if (cached_has_bits & 0x00000008u) {
       mutable_dispatch_step()->::message::Dispatch_pick_step_statu::MergeFrom(from.dispatch_step());
@@ -4874,8 +4874,8 @@ bool Picking_process_statu_msg::IsInitialized() const {
   if (has_base_info()) {
     if (!this->base_info_->IsInitialized()) return false;
   }
-  if (has_check_space_step()) {
-    if (!this->check_space_step_->IsInitialized()) return false;
+  if (has_search_space_step()) {
+    if (!this->search_space_step_->IsInitialized()) return false;
   }
   if (has_dispatch_step()) {
     if (!this->dispatch_step_->IsInitialized()) return false;
@@ -4897,7 +4897,7 @@ void Picking_process_statu_msg::InternalSwap(Picking_process_statu_msg* other) {
   using std::swap;
   license_.Swap(&other->license_);
   swap(base_info_, other->base_info_);
-  swap(check_space_step_, other->check_space_step_);
+  swap(search_space_step_, other->search_space_step_);
   swap(dispatch_step_, other->dispatch_step_);
   swap(release_space_step_, other->release_space_step_);
   swap(waitfor_leave_, other->waitfor_leave_);

message/process_message.pb.h

@@ -46,8 +46,8 @@ struct TableStruct {
 void AddDescriptors();
 void InitDefaultsAlloc_space_step_statuImpl();
 void InitDefaultsAlloc_space_step_statu();
-void InitDefaultsCheck_space_step_statuImpl();
-void InitDefaultsCheck_space_step_statu();
+void InitDefaultsSearch_space_step_statuImpl();
+void InitDefaultsSearch_space_step_statu();
 void InitDefaultsConfirm_space_step_statuImpl();
 void InitDefaultsConfirm_space_step_statu();
 void InitDefaultsRelease_space_step_statuImpl();
@@ -66,7 +66,7 @@ void InitDefaultsPicking_process_statu_msgImpl();
 void InitDefaultsPicking_process_statu_msg();
 inline void InitDefaults() {
   InitDefaultsAlloc_space_step_statu();
-  InitDefaultsCheck_space_step_statu();
+  InitDefaultsSearch_space_step_statu();
   InitDefaultsConfirm_space_step_statu();
   InitDefaultsRelease_space_step_statu();
   InitDefaultsMeasure_step_statu();
@@ -81,9 +81,6 @@ namespace message {
 class Alloc_space_step_statu;
 class Alloc_space_step_statuDefaultTypeInternal;
 extern Alloc_space_step_statuDefaultTypeInternal _Alloc_space_step_statu_default_instance_;
-class Check_space_step_statu;
-class Check_space_step_statuDefaultTypeInternal;
-extern Check_space_step_statuDefaultTypeInternal _Check_space_step_statu_default_instance_;
 class Confirm_space_step_statu;
 class Confirm_space_step_statuDefaultTypeInternal;
 extern Confirm_space_step_statuDefaultTypeInternal _Confirm_space_step_statu_default_instance_;
@@ -102,6 +99,9 @@ extern Picking_process_statu_msgDefaultTypeInternal _Picking_process_statu_msg_d
 class Release_space_step_statu;
 class Release_space_step_statuDefaultTypeInternal;
 extern Release_space_step_statuDefaultTypeInternal _Release_space_step_statu_default_instance_;
+class Search_space_step_statu;
+class Search_space_step_statuDefaultTypeInternal;
+extern Search_space_step_statuDefaultTypeInternal _Search_space_step_statu_default_instance_;
 class Storing_process_statu_msg;
 class Storing_process_statu_msgDefaultTypeInternal;
 extern Storing_process_statu_msgDefaultTypeInternal _Storing_process_statu_msg_default_instance_;
@@ -274,24 +274,24 @@ class Alloc_space_step_statu : public ::google::protobuf::Message /* @@protoc_in
 };
 // -------------------------------------------------------------------
 
-class Check_space_step_statu : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:message.Check_space_step_statu) */ {
+class Search_space_step_statu : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:message.Search_space_step_statu) */ {
  public:
-  Check_space_step_statu();
-  virtual ~Check_space_step_statu();
+  Search_space_step_statu();
+  virtual ~Search_space_step_statu();
 
-  Check_space_step_statu(const Check_space_step_statu& from);
+  Search_space_step_statu(const Search_space_step_statu& from);
 
-  inline Check_space_step_statu& operator=(const Check_space_step_statu& from) {
+  inline Search_space_step_statu& operator=(const Search_space_step_statu& from) {
     CopyFrom(from);
     return *this;
   }
   #if LANG_CXX11
-  Check_space_step_statu(Check_space_step_statu&& from) noexcept
-    : Check_space_step_statu() {
+  Search_space_step_statu(Search_space_step_statu&& from) noexcept
+    : Search_space_step_statu() {
     *this = ::std::move(from);
   }
 
-  inline Check_space_step_statu& operator=(Check_space_step_statu&& from) noexcept {
+  inline Search_space_step_statu& operator=(Search_space_step_statu&& from) noexcept {
     if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
       if (this != &from) InternalSwap(&from);
     } else {
@@ -308,30 +308,30 @@ class Check_space_step_statu : public ::google::protobuf::Message /* @@protoc_in
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const Check_space_step_statu& default_instance();
+  static const Search_space_step_statu& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
-  static inline const Check_space_step_statu* internal_default_instance() {
-    return reinterpret_cast<const Check_space_step_statu*>(
-               &_Check_space_step_statu_default_instance_);
+  static inline const Search_space_step_statu* internal_default_instance() {
+    return reinterpret_cast<const Search_space_step_statu*>(
+               &_Search_space_step_statu_default_instance_);
   }
   static PROTOBUF_CONSTEXPR int const kIndexInFileMessages =
     1;
 
-  void Swap(Check_space_step_statu* other);
-  friend void swap(Check_space_step_statu& a, Check_space_step_statu& b) {
+  void Swap(Search_space_step_statu* other);
+  friend void swap(Search_space_step_statu& a, Search_space_step_statu& b) {
     a.Swap(&b);
   }
 
   // implements Message ----------------------------------------------
 
-  inline Check_space_step_statu* New() const PROTOBUF_FINAL { return New(NULL); }
+  inline Search_space_step_statu* New() const PROTOBUF_FINAL { return New(NULL); }
 
-  Check_space_step_statu* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL;
+  Search_space_step_statu* 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 Check_space_step_statu& from);
-  void MergeFrom(const Check_space_step_statu& from);
+  void CopyFrom(const Search_space_step_statu& from);
+  void MergeFrom(const Search_space_step_statu& from);
   void Clear() PROTOBUF_FINAL;
   bool IsInitialized() const PROTOBUF_FINAL;
 
@@ -347,7 +347,7 @@ class Check_space_step_statu : public ::google::protobuf::Message /* @@protoc_in
   void SharedCtor();
   void SharedDtor();
   void SetCachedSize(int size) const PROTOBUF_FINAL;
-  void InternalSwap(Check_space_step_statu* other);
+  void InternalSwap(Search_space_step_statu* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
     return NULL;
@@ -394,7 +394,7 @@ class Check_space_step_statu : public ::google::protobuf::Message /* @@protoc_in
   ::message::Step_statu step_statu() const;
   void set_step_statu(::message::Step_statu value);
 
-  // @@protoc_insertion_point(class_scope:message.Check_space_step_statu)
+  // @@protoc_insertion_point(class_scope:message.Search_space_step_statu)
  private:
   void set_has_step_statu();
   void clear_has_step_statu();
@@ -410,7 +410,7 @@ class Check_space_step_statu : public ::google::protobuf::Message /* @@protoc_in
   ::message::Parkspace_info* space_info_;
   int step_statu_;
   friend struct ::protobuf_process_5fmessage_2eproto::TableStruct;
-  friend void ::protobuf_process_5fmessage_2eproto::InitDefaultsCheck_space_step_statuImpl();
+  friend void ::protobuf_process_5fmessage_2eproto::InitDefaultsSearch_space_step_statuImpl();
 };
 // -------------------------------------------------------------------
 
@@ -1582,14 +1582,14 @@ class Picking_process_statu_msg : public ::google::protobuf::Message /* @@protoc
   ::message::Base_info* mutable_base_info();
   void set_allocated_base_info(::message::Base_info* base_info);
 
-  // required .message.Check_space_step_statu check_space_step = 4;
-  bool has_check_space_step() const;
-  void clear_check_space_step();
-  static const int kCheckSpaceStepFieldNumber = 4;
-  const ::message::Check_space_step_statu& check_space_step() const;
-  ::message::Check_space_step_statu* release_check_space_step();
-  ::message::Check_space_step_statu* mutable_check_space_step();
-  void set_allocated_check_space_step(::message::Check_space_step_statu* check_space_step);
+  // required .message.Search_space_step_statu search_space_step = 4;
+  bool has_search_space_step() const;
+  void clear_search_space_step();
+  static const int kSearchSpaceStepFieldNumber = 4;
+  const ::message::Search_space_step_statu& search_space_step() const;
+  ::message::Search_space_step_statu* release_search_space_step();
+  ::message::Search_space_step_statu* mutable_search_space_step();
+  void set_allocated_search_space_step(::message::Search_space_step_statu* search_space_step);
 
   // required .message.Dispatch_pick_step_statu dispatch_step = 5;
   bool has_dispatch_step() const;
@@ -1633,8 +1633,8 @@ class Picking_process_statu_msg : public ::google::protobuf::Message /* @@protoc
   void clear_has_terminal_id();
   void set_has_license();
   void clear_has_license();
-  void set_has_check_space_step();
-  void clear_has_check_space_step();
+  void set_has_search_space_step();
+  void clear_has_search_space_step();
   void set_has_dispatch_step();
   void clear_has_dispatch_step();
   void set_has_release_space_step();
@@ -1650,7 +1650,7 @@ class Picking_process_statu_msg : public ::google::protobuf::Message /* @@protoc
   mutable int _cached_size_;
   ::google::protobuf::internal::ArenaStringPtr license_;
   ::message::Base_info* base_info_;
-  ::message::Check_space_step_statu* check_space_step_;
+  ::message::Search_space_step_statu* search_space_step_;
   ::message::Dispatch_pick_step_statu* dispatch_step_;
   ::message::Release_space_step_statu* release_space_step_;
   ::message::Waitfor_leave_step_statu* waitfor_leave_;
@@ -1809,65 +1809,65 @@ inline void Alloc_space_step_statu::set_allocated_description(::std::string* des
 
 // -------------------------------------------------------------------
 
-// Check_space_step_statu
+// Search_space_step_statu
 
 // required .message.Step_statu step_statu = 1;
-inline bool Check_space_step_statu::has_step_statu() const {
+inline bool Search_space_step_statu::has_step_statu() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Check_space_step_statu::set_has_step_statu() {
+inline void Search_space_step_statu::set_has_step_statu() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void Check_space_step_statu::clear_has_step_statu() {
+inline void Search_space_step_statu::clear_has_step_statu() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void Check_space_step_statu::clear_step_statu() {
+inline void Search_space_step_statu::clear_step_statu() {
   step_statu_ = 0;
   clear_has_step_statu();
 }
-inline ::message::Step_statu Check_space_step_statu::step_statu() const {
-  // @@protoc_insertion_point(field_get:message.Check_space_step_statu.step_statu)
+inline ::message::Step_statu Search_space_step_statu::step_statu() const {
+  // @@protoc_insertion_point(field_get:message.Search_space_step_statu.step_statu)
   return static_cast< ::message::Step_statu >(step_statu_);
 }
-inline void Check_space_step_statu::set_step_statu(::message::Step_statu value) {
+inline void Search_space_step_statu::set_step_statu(::message::Step_statu value) {
   assert(::message::Step_statu_IsValid(value));
   set_has_step_statu();
   step_statu_ = value;
-  // @@protoc_insertion_point(field_set:message.Check_space_step_statu.step_statu)
+  // @@protoc_insertion_point(field_set:message.Search_space_step_statu.step_statu)
 }
 
 // optional .message.Parkspace_info space_info = 2;
-inline bool Check_space_step_statu::has_space_info() const {
+inline bool Search_space_step_statu::has_space_info() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Check_space_step_statu::set_has_space_info() {
+inline void Search_space_step_statu::set_has_space_info() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void Check_space_step_statu::clear_has_space_info() {
+inline void Search_space_step_statu::clear_has_space_info() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline const ::message::Parkspace_info& Check_space_step_statu::space_info() const {
+inline const ::message::Parkspace_info& Search_space_step_statu::space_info() const {
   const ::message::Parkspace_info* p = space_info_;
-  // @@protoc_insertion_point(field_get:message.Check_space_step_statu.space_info)
+  // @@protoc_insertion_point(field_get:message.Search_space_step_statu.space_info)
   return p != NULL ? *p : *reinterpret_cast<const ::message::Parkspace_info*>(
       &::message::_Parkspace_info_default_instance_);
 }
-inline ::message::Parkspace_info* Check_space_step_statu::release_space_info() {
-  // @@protoc_insertion_point(field_release:message.Check_space_step_statu.space_info)
+inline ::message::Parkspace_info* Search_space_step_statu::release_space_info() {
+  // @@protoc_insertion_point(field_release:message.Search_space_step_statu.space_info)
   clear_has_space_info();
   ::message::Parkspace_info* temp = space_info_;
   space_info_ = NULL;
   return temp;
 }
-inline ::message::Parkspace_info* Check_space_step_statu::mutable_space_info() {
+inline ::message::Parkspace_info* Search_space_step_statu::mutable_space_info() {
   set_has_space_info();
   if (space_info_ == NULL) {
     space_info_ = new ::message::Parkspace_info;
   }
-  // @@protoc_insertion_point(field_mutable:message.Check_space_step_statu.space_info)
+  // @@protoc_insertion_point(field_mutable:message.Search_space_step_statu.space_info)
   return space_info_;
 }
-inline void Check_space_step_statu::set_allocated_space_info(::message::Parkspace_info* space_info) {
+inline void Search_space_step_statu::set_allocated_space_info(::message::Parkspace_info* space_info) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(space_info_);
@@ -1883,70 +1883,70 @@ inline void Check_space_step_statu::set_allocated_space_info(::message::Parkspac
     clear_has_space_info();
   }
   space_info_ = space_info;
-  // @@protoc_insertion_point(field_set_allocated:message.Check_space_step_statu.space_info)
+  // @@protoc_insertion_point(field_set_allocated:message.Search_space_step_statu.space_info)
 }
 
 // optional string description = 3;
-inline bool Check_space_step_statu::has_description() const {
+inline bool Search_space_step_statu::has_description() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Check_space_step_statu::set_has_description() {
+inline void Search_space_step_statu::set_has_description() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void Check_space_step_statu::clear_has_description() {
+inline void Search_space_step_statu::clear_has_description() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void Check_space_step_statu::clear_description() {
+inline void Search_space_step_statu::clear_description() {
   description_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   clear_has_description();
 }
-inline const ::std::string& Check_space_step_statu::description() const {
-  // @@protoc_insertion_point(field_get:message.Check_space_step_statu.description)
+inline const ::std::string& Search_space_step_statu::description() const {
+  // @@protoc_insertion_point(field_get:message.Search_space_step_statu.description)
   return description_.GetNoArena();
 }
-inline void Check_space_step_statu::set_description(const ::std::string& value) {
+inline void Search_space_step_statu::set_description(const ::std::string& value) {
   set_has_description();
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:message.Check_space_step_statu.description)
+  // @@protoc_insertion_point(field_set:message.Search_space_step_statu.description)
 }
 #if LANG_CXX11
-inline void Check_space_step_statu::set_description(::std::string&& value) {
+inline void Search_space_step_statu::set_description(::std::string&& value) {
   set_has_description();
   description_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:message.Check_space_step_statu.description)
+  // @@protoc_insertion_point(field_set_rvalue:message.Search_space_step_statu.description)
 }
 #endif
-inline void Check_space_step_statu::set_description(const char* value) {
+inline void Search_space_step_statu::set_description(const char* value) {
   GOOGLE_DCHECK(value != NULL);
   set_has_description();
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:message.Check_space_step_statu.description)
+  // @@protoc_insertion_point(field_set_char:message.Search_space_step_statu.description)
 }
-inline void Check_space_step_statu::set_description(const char* value, size_t size) {
+inline void Search_space_step_statu::set_description(const char* value, size_t size) {
   set_has_description();
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:message.Check_space_step_statu.description)
+  // @@protoc_insertion_point(field_set_pointer:message.Search_space_step_statu.description)
 }
-inline ::std::string* Check_space_step_statu::mutable_description() {
+inline ::std::string* Search_space_step_statu::mutable_description() {
   set_has_description();
-  // @@protoc_insertion_point(field_mutable:message.Check_space_step_statu.description)
+  // @@protoc_insertion_point(field_mutable:message.Search_space_step_statu.description)
   return description_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
-inline ::std::string* Check_space_step_statu::release_description() {
-  // @@protoc_insertion_point(field_release:message.Check_space_step_statu.description)
+inline ::std::string* Search_space_step_statu::release_description() {
+  // @@protoc_insertion_point(field_release:message.Search_space_step_statu.description)
   clear_has_description();
   return description_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
-inline void Check_space_step_statu::set_allocated_description(::std::string* description) {
+inline void Search_space_step_statu::set_allocated_description(::std::string* description) {
   if (description != NULL) {
     set_has_description();
   } else {
     clear_has_description();
   }
   description_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), description);
-  // @@protoc_insertion_point(field_set_allocated:message.Check_space_step_statu.description)
+  // @@protoc_insertion_point(field_set_allocated:message.Search_space_step_statu.description)
 }
 
 // -------------------------------------------------------------------
@@ -3403,58 +3403,58 @@ inline void Picking_process_statu_msg::set_allocated_license(::std::string* lice
   // @@protoc_insertion_point(field_set_allocated:message.Picking_process_statu_msg.license)
 }
 
-// required .message.Check_space_step_statu check_space_step = 4;
-inline bool Picking_process_statu_msg::has_check_space_step() const {
+// required .message.Search_space_step_statu search_space_step = 4;
+inline bool Picking_process_statu_msg::has_search_space_step() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Picking_process_statu_msg::set_has_check_space_step() {
+inline void Picking_process_statu_msg::set_has_search_space_step() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void Picking_process_statu_msg::clear_has_check_space_step() {
+inline void Picking_process_statu_msg::clear_has_search_space_step() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void Picking_process_statu_msg::clear_check_space_step() {
-  if (check_space_step_ != NULL) check_space_step_->Clear();
-  clear_has_check_space_step();
-}
-inline const ::message::Check_space_step_statu& Picking_process_statu_msg::check_space_step() const {
-  const ::message::Check_space_step_statu* p = check_space_step_;
-  // @@protoc_insertion_point(field_get:message.Picking_process_statu_msg.check_space_step)
-  return p != NULL ? *p : *reinterpret_cast<const ::message::Check_space_step_statu*>(
-      &::message::_Check_space_step_statu_default_instance_);
-}
-inline ::message::Check_space_step_statu* Picking_process_statu_msg::release_check_space_step() {
-  // @@protoc_insertion_point(field_release:message.Picking_process_statu_msg.check_space_step)
-  clear_has_check_space_step();
-  ::message::Check_space_step_statu* temp = check_space_step_;
-  check_space_step_ = NULL;
+inline void Picking_process_statu_msg::clear_search_space_step() {
+  if (search_space_step_ != NULL) search_space_step_->Clear();
+  clear_has_search_space_step();
+}
+inline const ::message::Search_space_step_statu& Picking_process_statu_msg::search_space_step() const {
+  const ::message::Search_space_step_statu* p = search_space_step_;
+  // @@protoc_insertion_point(field_get:message.Picking_process_statu_msg.search_space_step)
+  return p != NULL ? *p : *reinterpret_cast<const ::message::Search_space_step_statu*>(
+      &::message::_Search_space_step_statu_default_instance_);
+}
+inline ::message::Search_space_step_statu* Picking_process_statu_msg::release_search_space_step() {
+  // @@protoc_insertion_point(field_release:message.Picking_process_statu_msg.search_space_step)
+  clear_has_search_space_step();
+  ::message::Search_space_step_statu* temp = search_space_step_;
+  search_space_step_ = NULL;
   return temp;
 }
-inline ::message::Check_space_step_statu* Picking_process_statu_msg::mutable_check_space_step() {
-  set_has_check_space_step();
-  if (check_space_step_ == NULL) {
-    check_space_step_ = new ::message::Check_space_step_statu;
+inline ::message::Search_space_step_statu* Picking_process_statu_msg::mutable_search_space_step() {
+  set_has_search_space_step();
+  if (search_space_step_ == NULL) {
+    search_space_step_ = new ::message::Search_space_step_statu;
   }
-  // @@protoc_insertion_point(field_mutable:message.Picking_process_statu_msg.check_space_step)
-  return check_space_step_;
+  // @@protoc_insertion_point(field_mutable:message.Picking_process_statu_msg.search_space_step)
+  return search_space_step_;
 }
-inline void Picking_process_statu_msg::set_allocated_check_space_step(::message::Check_space_step_statu* check_space_step) {
+inline void Picking_process_statu_msg::set_allocated_search_space_step(::message::Search_space_step_statu* search_space_step) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
   if (message_arena == NULL) {
-    delete check_space_step_;
+    delete search_space_step_;
   }
-  if (check_space_step) {
+  if (search_space_step) {
     ::google::protobuf::Arena* submessage_arena = NULL;
     if (message_arena != submessage_arena) {
-      check_space_step = ::google::protobuf::internal::GetOwnedMessage(
-          message_arena, check_space_step, submessage_arena);
+      search_space_step = ::google::protobuf::internal::GetOwnedMessage(
+          message_arena, search_space_step, submessage_arena);
     }
-    set_has_check_space_step();
+    set_has_search_space_step();
   } else {
-    clear_has_check_space_step();
+    clear_has_search_space_step();
   }
-  check_space_step_ = check_space_step;
-  // @@protoc_insertion_point(field_set_allocated:message.Picking_process_statu_msg.check_space_step)
+  search_space_step_ = search_space_step;
+  // @@protoc_insertion_point(field_set_allocated:message.Picking_process_statu_msg.search_space_step)
 }
 
 // required .message.Dispatch_pick_step_statu dispatch_step = 5;

message/process_message.proto

@@ -19,7 +19,7 @@ message Alloc_space_step_statu
 }
 
 //查询车位步骤状态
-message Check_space_step_statu
+message Search_space_step_statu
 {
     required Step_statu                 step_statu=1;       //状态
     optional Parkspace_info             space_info=2;       //当前状态附带信息
@@ -94,7 +94,7 @@ message Picking_process_statu_msg
     required Base_info                  base_info=1;
     required int32                      terminal_id=2;              //终端id
     required string                     license=3;
-    required Check_space_step_statu     check_space_step=4;
+    required Search_space_step_statu    search_space_step=4;
     required Dispatch_pick_step_statu   dispatch_step=5;
     required Release_space_step_statu   release_space_step=6;
     required Waitfor_leave_step_statu   waitfor_leave=7;

system/PickupProcessTask.cpp

@@ -14,14 +14,6 @@ PickupProcessTask::PickupProcessTask(unsigned int terminal_id)
         :m_publish_statu_thread(nullptr)
 {
     m_terminor_id=terminal_id;
-
-    message::Base_info base_info;
-    base_info.set_msg_type(message::ePicking_process_statu_msg);
-    base_info.set_sender(message::eMain);
-    base_info.set_receiver(message::eEmpty);
-    m_picking_process_statu_msg.mutable_base_info()->CopyFrom(base_info);
-    m_picking_process_statu_msg.set_terminal_id(terminal_id);
-    reset_process_statu();
 }
 PickupProcessTask::~PickupProcessTask()
 {
@@ -43,9 +35,7 @@ Error_manager PickupProcessTask::init_task(message::Car_info car_info)
 
     m_car_info=car_info;
 
-
-    reset_process_statu();
-
+    m_step_statu=eSearch_step;
     ///创建状态发布线程
     if(m_publish_statu_thread== nullptr)
     {
@@ -59,35 +49,12 @@ Error_manager PickupProcessTask::init_task(message::Car_info car_info)
 
 void PickupProcessTask::reset_recv_msg()
 {
-    m_parcspace_search_response_msg=message::Parkspace_search_response_msg();
+    m_search_request_msg=message::Parkspace_search_request_msg();
+    m_search_response_msg=message::Parkspace_search_response_msg();
+    m_dispatch_request_msg=message::Dispatch_request_msg();
     m_dispatch_response_msg=message::Dispatch_response_msg();
 }
 
-/*
-     * reset 进度信息
-     */
-void PickupProcessTask::reset_process_statu()
-{
-    message::Check_space_step_statu check_step;
-    check_step.set_step_statu(message::eWaiting);
-
-    message::Dispatch_pick_step_statu  pick_step;
-    pick_step.set_step_statu(message::eWaiting);
-
-    message::Release_space_step_statu   release_step;
-    release_step.set_step_statu(message::eWaiting);
-
-    message::Waitfor_leave_step_statu   waitfor_leave_step;
-    waitfor_leave_step.set_step_statu(message::eWaiting);
-
-    std::lock_guard<std::mutex> lock(m_picking_statu_lock);
-    m_picking_process_statu_msg.mutable_check_space_step()->CopyFrom(check_step);
-    m_picking_process_statu_msg.mutable_dispatch_step()->CopyFrom(pick_step);
-    m_picking_process_statu_msg.mutable_release_space_step()->CopyFrom(release_step);
-    m_picking_process_statu_msg.mutable_waitfor_leave()->CopyFrom(waitfor_leave_step);
-    m_picking_process_statu_msg.set_license(m_car_info.license());
-
-}
 
 
 /*
@@ -95,21 +62,12 @@ void PickupProcessTask::reset_process_statu()
  */
 Error_manager PickupProcessTask::search_space()
 {
-    //更新状态
-    {
-        std::lock_guard<std::mutex> lock(m_picking_statu_lock);
-        m_picking_process_statu_msg.mutable_check_space_step()->set_step_statu(message::eWorking);
-    }
-
     /*
      * 检验汽车信息是否正常
      */
     if(m_car_info.has_car_width()==false||m_car_info.has_car_height()== false
         ||m_car_info.has_license()==false)
     {
-        std::lock_guard<std::mutex> lock(m_picking_statu_lock);
-        m_picking_process_statu_msg.mutable_check_space_step()->set_step_statu(message::eError);
-        m_picking_process_statu_msg.mutable_check_space_step()->set_description("查询车位请求汽车信息错误");
         return Error_manager(INVALID_MESSAGE,CRITICAL_ERROR,"查询车位请求汽车信息错误");
     }
 
@@ -117,11 +75,8 @@ Error_manager PickupProcessTask::search_space()
      * 检查车位管理模块是否正常
      */
     Error_manager code=Parkspace_communicator::get_instance_pointer()->check_statu();
-    std::lock_guard<std::mutex> lock(m_picking_statu_lock);
     if(code!=SUCCESS)
     {
-        m_picking_process_statu_msg.mutable_check_space_step()->set_description(code.get_error_description());
-        m_picking_process_statu_msg.mutable_check_space_step()->set_step_statu(message::eError);
         return code;
     }
 
@@ -136,117 +91,134 @@ Error_manager PickupProcessTask::search_space()
     request.mutable_base_info()->CopyFrom(base_info);
     request.mutable_car_info()->CopyFrom(m_car_info);
 
-
-    code = Parkspace_communicator::get_instance_pointer()->search_request(request,m_parcspace_search_response_msg);
-    if(code==SUCCESS)
-    {
-        m_picking_process_statu_msg.mutable_check_space_step()->mutable_space_info()->CopyFrom(m_parcspace_search_response_msg.car_position());
-        m_picking_process_statu_msg.mutable_check_space_step()->set_step_statu(message::eComplete);
-    }
-    else {
-        m_picking_process_statu_msg.mutable_check_space_step()->set_step_statu(message::eError);
-        m_picking_process_statu_msg.mutable_check_space_step()->set_description(code.get_error_description());
-    }
+    code = Parkspace_communicator::get_instance_pointer()->search_request(request,m_search_response_msg);
     return code;
 }
+
+/*
+ * 回退查询车位
+ */
+Error_manager PickupProcessTask::back_search_space_step()
+{
+    return SUCCESS;
+}
+
 void PickupProcessTask::Main()
 {
     Error_manager code;
     //进入取车流程
-    switch (0)
+
+    while(1)
     {
-        //第一步,执行取车动作
-        case 0:
+        if(m_step_statu==ePicking_step::eDispatch_step)
         {
-            //更新状态
-            {
-                std::lock_guard<std::mutex> lock(m_picking_statu_lock);
-                m_picking_process_statu_msg.mutable_dispatch_step()->set_step_statu(message::eWorking);
-                m_picking_process_statu_msg.mutable_dispatch_step()->mutable_space_info()->CopyFrom(
-                        m_parcspace_search_response_msg.car_position());
-            }
-            //开始工作
-            code=pickup_step();
+            code=dispatch_step();
             usleep(1000*1000*(rand()%3));
-            std::lock_guard<std::mutex> lock(m_picking_statu_lock);
+            LOG_IF(ERROR, code != SUCCESS) << "取车调度失败,取车终端:"<<m_terminor_id
+                                           <<", 车位id:"<<m_search_response_msg.car_position().parkspace_id()
+                                           <<", 车位楼层:"<<m_search_response_msg.car_position().floor()
+                                           <<", 车位序号:"<<m_search_response_msg.car_position().index()
+                                           <<", 车牌号:"<<m_car_info.license()
+                                           <<", 库内车牌号:"<<m_search_response_msg.car_position().car_info().license();
+            m_step_statu = (code != SUCCESS) ? ePicking_step::eBackDispatch_step : ePicking_step::eWait_step;
+        }
+        if(m_step_statu==ePicking_step::eWait_step)
+        {
+            code=wait_for_leave_step();
+            LOG_IF(ERROR, code != SUCCESS) << "等待车辆离开失败,取车终端:"<<m_terminor_id
+                                           <<", 车牌号:"<<m_car_info.license();
+            m_step_statu = (code != SUCCESS) ? ePicking_step::eBackWait_step : ePicking_step::eRelease_step;
+        }
+        if(m_step_statu==ePicking_step::eRelease_step)
+        {
+            code=release_space_step();
+            LOG_IF(ERROR, code != SUCCESS) << "取车释放车位失败,取车终端:"<<m_terminor_id
+                                           <<", 车牌号:"<<m_car_info.license();
             if(code!=SUCCESS)
             {
-                LOG(ERROR)<<"取车调度失败,取车终端:"<<m_terminor_id
-                            <<", 车位id:"<<m_parcspace_search_response_msg.car_position().parkspace_id()
-                            <<", 车位楼层:"<<m_parcspace_search_response_msg.car_position().floor()
-                            <<", 车位序号:"<<m_parcspace_search_response_msg.car_position().index()
-                            <<", 车牌号:"<<m_car_info.license()
-                            <<", 库内车牌号:"<<m_parcspace_search_response_msg.car_position().car_info().license();
-                m_picking_process_statu_msg.mutable_dispatch_step()->set_step_statu(message::eError);
-                m_picking_process_statu_msg.mutable_dispatch_step()->set_description(code.get_error_description());
+                //升级故障,急停
                 break;
             }
-            m_picking_process_statu_msg.mutable_dispatch_step()->set_step_statu(message::eComplete);
-
-        }
-        //第二步,清除车位
-        case 1:
-        {
-            //更新状态
+            else
             {
-                std::lock_guard<std::mutex> lock(m_picking_statu_lock);
-                m_picking_process_statu_msg.mutable_release_space_step()->set_step_statu(message::eWorking);
-                m_picking_process_statu_msg.mutable_release_space_step()->mutable_space_info()->CopyFrom(
-                        m_parcspace_search_response_msg.car_position());
+                m_step_statu=ePicking_step::eComplete;
             }
-            code=release_space_step();
-            std::lock_guard<std::mutex> lock(m_picking_statu_lock);
+        }
+        if(m_step_statu==eComplete)
+            break;
+        if(m_step_statu==ePicking_step::eBackWait_step)
+        {
+            code=back_wait_for_leave_step();
             if(code!=SUCCESS)
             {
-                m_picking_process_statu_msg.mutable_release_space_step()->set_step_statu(message::eError);
-                m_picking_process_statu_msg.mutable_release_space_step()->set_description(code.get_error_description());
-                LOG(ERROR)<<"取车释放车位失败:"<<code.get_error_description();
+                //提升错误等级为四级
                 break;
             }
-            m_picking_process_statu_msg.mutable_release_space_step()->set_step_statu(message::eComplete);
+            else
+            {
+                m_step_statu=ePicking_step::eBackDispatch_step;
+            }
         }
-        //第三步,等待车辆离开
-        case 2:
+        if(m_step_statu==ePicking_step::eBackDispatch_step)
         {
-            //更新状态
+            code=back_dispatch_step();
+            if(code!=SUCCESS)
             {
-                std::lock_guard<std::mutex> lock(m_picking_statu_lock);
-                m_picking_process_statu_msg.mutable_waitfor_leave()->set_step_statu(message::eWorking);
-                m_picking_process_statu_msg.mutable_waitfor_leave()->mutable_car_info()->CopyFrom(m_car_info);
+                //提升错误等级为四级
+                break;
             }
-            //等待离开
-
-            code=wait_for_leave_step();
-            std::lock_guard<std::mutex> lock(m_picking_statu_lock);
+            else
+            {
+                m_step_statu=ePicking_step::eBackSearch_step;
+            }
+        }
+        if(m_step_statu==ePicking_step::eBackSearch_step)
+        {
+            code=back_search_space_step();
             if(code!=SUCCESS)
             {
-                m_picking_process_statu_msg.mutable_waitfor_leave()->set_step_statu(message::eError);
-                m_picking_process_statu_msg.mutable_waitfor_leave()->set_description(code.get_error_description());
+                //提升错误等级为四级,急停
                 break;
             }
-            m_picking_process_statu_msg.mutable_waitfor_leave()->set_step_statu(message::eComplete);
-            LOG(WARNING)<<"取车完成-----------------------------"<<m_car_info.license();
-            usleep(1000*1000);
-            return ;
+            else
+            {
+                m_step_statu=ePicking_step::eBackComplete;
+            }
         }
-        default:break;
+        if(m_step_statu==ePicking_step::eBackComplete)
+            break;
+
     }
+
     /*
-     *
-     */
-    usleep(1000*1000);
+      * 跳出循环后,判断状态,是否正常结束, 循环跳出状态只有可能是 eBackComplete(异常结束),eComplete(正常结束)
+      */
+    if(m_step_statu==ePicking_step::eBackComplete)
+    {
+        //异常结束
+        usleep(1000*5000);
+        LOG(ERROR)<<"异常停车,回退结束"<<"车牌号:"<<m_car_info.license()
+                  <<",xxxxxxxxxxxxxx  终端:"<<m_terminor_id<<"  xxxxxxxxxxxxxx";
+    }
+    if(m_step_statu==ePicking_step::eComplete)
+    {
+        //正常结束
+        usleep(1000*1000);
+        LOG(WARNING)<<"停车结束,"<<"车牌号:"<<m_car_info.license()
+                 <<",--------------  终端:"<<m_terminor_id<<"  --------------";
+    }
 
 }
 
 /*
  * 执行取车动作请求,并等待执行完成
  */
-Error_manager PickupProcessTask::pickup_step()
+Error_manager PickupProcessTask::dispatch_step()
 {
     /*
   * 检查是否曾经分配过车位
   */
-    if(m_parcspace_search_response_msg.has_car_position()==false)
+    if(m_search_response_msg.has_car_position()==false)
     {
         return Error_manager(FAILED,MINOR_ERROR," 取车流程释放车位请求缺少车位信息");
     }
@@ -264,7 +236,7 @@ Error_manager PickupProcessTask::pickup_step()
     base_info.set_timeout_ms(1000*300); //测量超时300s
     request.mutable_base_info()->CopyFrom(base_info);
 
-    message::Parkspace_info space_info=m_parcspace_search_response_msg.car_position();
+    message::Parkspace_info space_info=m_search_response_msg.car_position();
     request.set_dispatch_motion_direction(message::E_PICKUP_CAR);
     request.set_parkspace_id(space_info.parkspace_id());
     request.set_terminal_id(m_terminor_id);
@@ -284,6 +256,16 @@ Error_manager PickupProcessTask::pickup_step()
         return Error_manager(FAILED,MINOR_ERROR,"取车流程调度反馈错误码");
 
 }
+/*
+ * 回退取车调度
+ */
+Error_manager PickupProcessTask::back_dispatch_step()
+{
+    /*
+     * 关门,调度将车从出口抓回去
+     */
+    return SUCCESS;
+}
 
 /*
  * 等待车辆离开
@@ -292,6 +274,13 @@ Error_manager PickupProcessTask::wait_for_leave_step()
 {
     return SUCCESS;
 }
+/*
+ * 回退等待车辆离开
+ */
+Error_manager PickupProcessTask::back_wait_for_leave_step()
+{
+    return SUCCESS;
+}
 
 /*
      * 清除车位表中对应的车位
@@ -301,7 +290,7 @@ Error_manager PickupProcessTask::release_space_step()
     /*
    * 检查是否曾经分配过车位
    */
-    if(m_parcspace_search_response_msg.has_car_position()==false)
+    if(m_search_response_msg.has_car_position()==false)
     {
         return Error_manager(FAILED,MINOR_ERROR," 取车流程释放车位请求缺少车位信息");
     }
@@ -320,7 +309,7 @@ Error_manager PickupProcessTask::release_space_step()
     base_info.set_timeout_ms(1000); //测量超时1s
     request.mutable_base_info()->CopyFrom(base_info);
 
-    message::Parkspace_info space_info=m_parcspace_search_response_msg.car_position();
+    message::Parkspace_info space_info=m_search_response_msg.car_position();
     request.mutable_release_space_info()->CopyFrom(space_info);
 
     request.set_command_key(create_key());
@@ -358,13 +347,99 @@ void PickupProcessTask::publish_step_status()
          */
         if(System_communicator::get_instance_pointer())
         {
-            if(m_picking_process_statu_msg.has_base_info()==true)
+            message::Picking_process_statu_msg msg;
+            if(create_step_statu_msg(msg)==SUCCESS)
             {
-                std::lock_guard<std::mutex> lock(m_picking_statu_lock);
-                System_communicator::get_instance_pointer()->post_entrance_statu(m_picking_process_statu_msg);
+                System_communicator::get_instance_pointer()->post_entrance_statu(msg);
             }
 
         }
 
     }
+}
+
+/*
+     * 根据当前流程状态,生成状态消息
+     */
+Error_manager PickupProcessTask::create_step_statu_msg(message::Picking_process_statu_msg& msg)
+{
+    message::Base_info base_info;
+    base_info.set_msg_type(message::ePicking_process_statu_msg);
+    base_info.set_sender(message::eMain);
+    base_info.set_receiver(message::eEmpty);
+    msg.mutable_base_info()->CopyFrom(base_info);
+    msg.set_terminal_id(m_terminor_id);
+    msg.set_license(m_car_info.license());
+
+    message::Search_space_step_statu            search_step_statu;
+    message::Dispatch_pick_step_statu           dispatch_step_statu;
+    message::Waitfor_leave_step_statu           wait_step_statu;
+    message::Release_space_step_statu           release_step_statu;
+    search_step_statu.set_step_statu(message::eWaiting);
+    dispatch_step_statu.set_step_statu(message::eWaiting);
+    wait_step_statu.set_step_statu(message::eWaiting);
+    release_step_statu.set_step_statu(message::eWaiting);
+
+    switch (m_step_statu) {
+        case ePicking_step::eSearch_step: {
+            search_step_statu.set_step_statu(message::eWorking);
+            if(m_step_statu==eSearch_step)
+                break;
+        }
+        case ePicking_step::eDispatch_step: {
+            search_step_statu.set_step_statu(message::eComplete);
+            dispatch_step_statu.set_step_statu(message::eWorking);
+            dispatch_step_statu.mutable_space_info()->CopyFrom(m_search_response_msg.car_position());
+            if(m_step_statu==eDispatch_step)
+                break;
+        }
+        case ePicking_step::eWait_step: {
+            dispatch_step_statu.set_step_statu(message::eComplete);
+            wait_step_statu.set_step_statu(message::eWorking);
+            wait_step_statu.mutable_car_info()->CopyFrom(m_car_info);
+            if(m_step_statu==ePicking_step::eWait_step)
+                break;
+        }
+        case ePicking_step::eRelease_step:
+        {
+            wait_step_statu.set_step_statu(message::eComplete);
+            release_step_statu.set_step_statu(message::eWorking);
+            release_step_statu.mutable_space_info()->CopyFrom(m_search_response_msg.car_position());
+            if(m_step_statu==ePicking_step::eRelease_step)
+                break;
+        }
+        case ePicking_step::eComplete: {
+            release_step_statu.set_step_statu(message::eComplete);
+            if(m_step_statu==eComplete)
+                break;
+        }
+        case ePicking_step::eBackWait_step :{
+            wait_step_statu.set_step_statu(message::eError);
+            if(m_step_statu==ePicking_step::eBackWait_step)
+                break;
+        }
+        case eBackDispatch_step: {
+            dispatch_step_statu.set_step_statu(message::eError);
+            if(m_step_statu==eBackDispatch_step)
+                break;
+        }
+        case eBackSearch_step: {
+            search_step_statu.set_step_statu(message::eError);
+            if(m_step_statu==eBackSearch_step)
+                break;
+        }
+        case eBackComplete: {
+            release_step_statu.set_step_statu(message::eComplete);
+            if(m_step_statu==eBackComplete)
+                break;
+        }
+        default:
+            break;
+    }
+    msg.mutable_search_space_step()->CopyFrom(search_step_statu);
+    msg.mutable_dispatch_step()->CopyFrom(dispatch_step_statu);
+    msg.mutable_waitfor_leave()->CopyFrom(wait_step_statu);
+    msg.mutable_release_space_step()->CopyFrom(release_step_statu);
+
+    return SUCCESS;
 }

system/PickupProcessTask.h

@@ -11,6 +11,19 @@
 #include "dispatch_communicator.h"
 
 class PickupProcessTask :public tq::BaseTask{
+    enum ePicking_step
+    {
+        eSearch_step=0,         //查询数据库
+        eDispatch_step,         //调度
+        eWait_step,             //等待车辆离开
+        eRelease_step,          //释放车位
+        eComplete,              //完成
+
+        eBackWait_step,
+        eBackDispatch_step,
+        eBackSearch_step,
+        eBackComplete
+    };
 public:
     PickupProcessTask(unsigned int terminal_id);
     virtual  ~PickupProcessTask();
@@ -25,34 +38,50 @@ public:
      * 查询车位
      */
     Error_manager search_space();
+    /*
+     * 回退查询车位
+     */
+    Error_manager back_search_space_step();
 protected:
     virtual void Main();
 
     /*
      * 执行取车动作请求,并等待执行完成
      */
-    Error_manager pickup_step();
+    Error_manager dispatch_step();
+    /*
+     * 回退执行取车动作请求,并等待执行完成
+     */
+    Error_manager back_dispatch_step();
 
     /*
      * 等待车辆离开
      */
     Error_manager wait_for_leave_step();
+    /*
+     * 回退等待车辆离开
+     */
+    Error_manager back_wait_for_leave_step();
 
     /*
      * 清除车位表中对应的车位
      */
     Error_manager release_space_step();
-
     /*
-     * reset 进度信息
+     * 回退清除车位表中对应的车位
      */
-    void reset_process_statu();
+    Error_manager back_release_space_step();
+
 
     /*
      * 发布进度
      */
     static void publish_thread_func(PickupProcessTask* p_commander);
     void publish_step_status();
+    /*
+     * 根据当前流程状态,生成状态消息
+     */
+    Error_manager create_step_statu_msg(message::Picking_process_statu_msg& msg);
 
     void reset_recv_msg();
 protected:
@@ -63,13 +92,14 @@ protected:
     Thread_condition				m_publish_exit_condition;			//发送的条件变量
 private:
     //查询到的车位信息
-    message::Parkspace_search_response_msg                  m_parcspace_search_response_msg;
+    message::Parkspace_search_request_msg                   m_search_request_msg;
+    message::Parkspace_search_response_msg                  m_search_response_msg;
     //取车调度反馈信息
+    message::Dispatch_request_msg                           m_dispatch_request_msg;
     message::Dispatch_response_msg                          m_dispatch_response_msg;
 
-    //取车车位的进度状态
-    std::mutex                                              m_picking_statu_lock;
-    message::Picking_process_statu_msg                      m_picking_process_statu_msg;
+    ePicking_step                                           m_step_statu;
+
 
 };
 

system/StoreProcessTask.cpp

@@ -320,79 +320,90 @@ void StoreProcessTask::Main()
     while(1)
     {
         //第一步,测量
-        if (m_step_statu == eMeasure_step)
+        if (m_step_statu == eStoring_step::eMeasure_step)
         {
             //开始定位
             code = locate_step();
             usleep(1000 * 1000 * (rand() % 5 + 1));
 
             LOG_IF(ERROR, code != SUCCESS) << "测量失败:" << code.get_error_description();
-            m_step_statu = (code != SUCCESS) ? eBackMeasure_step : eDispatch_step;
+            m_step_statu = (code != SUCCESS) ? eStoring_step::eBackMeasure_step : eStoring_step::eDispatch_step;
         }
         //第二步,调度
-        if (m_step_statu == eDispatch_step)
+        if (m_step_statu == eStoring_step::eDispatch_step)
         {
             //开始调度
             code = dispatch_step();
             usleep(1000 * 1000 * (rand() % 3));
 
             LOG_IF(ERROR, code != SUCCESS) << "调度失败:" << code.get_error_description();
-            m_step_statu = (code != SUCCESS) ? eBackDispatch_step : eConfirm_step;
+            m_step_statu = (code != SUCCESS) ? eStoring_step::eBackDispatch_step : eStoring_step::eConfirm_step;
         }
         //第三步,占据车位
-        if (m_step_statu == eConfirm_step)
+        if (m_step_statu == eStoring_step::eConfirm_step)
         {
             code = confirm_space_step();
             LOG_IF(ERROR, code != SUCCESS) << "终端号:" << m_terminor_id << "停车流程:" << code.get_error_description() <<
                                            " 车位id :"
                                            << m_parcspace_alloc_response_msg.allocated_space_info().parkspace_id()
-                                           << ",车牌:" << m_car_info.license();
-            m_step_statu = (code != SUCCESS) ? eBackConfirm_step : eComplete;
+                                           << ",车牌:" << m_car_info.license()<<code.to_string();
+            //最后一步故障,提升故障等级,急停
+            if(code!=SUCCESS)
+            {
+                break;
+            }
+            else
+            {
+                m_step_statu==eStoring_step::eComplete;
+            }
         }
         //第四步,完成,退出循环
-        if (m_step_statu == eComplete)
+        if (m_step_statu == eStoring_step::eComplete)
         {
             break;
         }
         //回退confirm  ------------------------------------华丽的分割线------------------------------------------
-        if (m_step_statu == eBackConfirm_step)
+        if (m_step_statu == eStoring_step::eBackConfirm_step)
         {
-            m_step_statu=eBackDispatch_step;
+            m_step_statu=eStoring_step::eBackDispatch_step;
         }
-        if(m_step_statu==eBackDispatch_step)
+        if(m_step_statu==eStoring_step::eBackDispatch_step)
         {
             code=back_dispatch_step();
             if(code!=SUCCESS)
             {
                 //提升错误等级为四级
+                break;
             }
             else
             {
-                m_step_statu=eBackMeasure_step;
+                m_step_statu=eStoring_step::eBackMeasure_step;
             }
         }
-        if(m_step_statu==eBackMeasure_step)
+        if(m_step_statu==eStoring_step::eBackMeasure_step)
         {
             code=back_locate_step();
             if(code!=SUCCESS)
             {
                 //提升错误等级为四级
+                break;
             }
             else
             {
-                m_step_statu=eBackAlloc_step;
+                m_step_statu=eStoring_step::eBackAlloc_step;
             }
         }
-        if(m_step_statu==eBackAlloc_step)
+        if(m_step_statu==eStoring_step::eBackAlloc_step)
         {
             code=back_alloc_space_step();
             if(code!=SUCCESS)
             {
                 //提升错误等级为四级
+                break;
             }
             else
             {
-                m_step_statu=eBackComplete;
+                m_step_statu=eStoring_step::eBackComplete;
                 break;
             }
         }
@@ -401,14 +412,14 @@ void StoreProcessTask::Main()
     /*
      * 跳出循环后,判断状态,是否正常结束, 循环跳出状态只有可能是 eBackComplete(异常结束),eComplete(正常结束)
      */
-    if(m_step_statu==eBackComplete)
+    if(m_step_statu==eStoring_step::eBackComplete)
     {
         //异常结束
         usleep(1000*10000);
         LOG(ERROR)<<"异常停车,回退结束"<<"车牌号:"<<m_car_info.license()
             <<",xxxxxxxxxxxxxx  终端:"<<m_terminor_id<<"  xxxxxxxxxxxxxx";
     }
-    if(m_step_statu==eComplete)
+    if(m_step_statu==eStoring_step::eComplete)
     {
         //正常结束
         usleep(1000*2000);

system/StoreProcessTask.h

@@ -97,7 +97,6 @@ protected:
     message::Parkspace_confirm_alloc_request_msg    m_confirm_request_msg;
 
     //停车请求发送过来的测量数据,终端位置的测量数据
-
     message::Measure_response_msg                   m_measure_response_msg;         //测量模块的测量数据
     message::Parkspace_allocation_response_msg      m_parcspace_alloc_response_msg; //分配的车位数据
     message::Dispatch_response_msg                  m_dispatch_response_msg;        //调度模块的反馈数据

test/terminal_client.cpp

@@ -109,7 +109,7 @@ int main() {
     bool run = true;
     Error_manager code;
     char c=0;
-    int license_id = 11100;
+    int license_id = 11700;
     while (c!='q') {