20211103 添加手动更新车辆表

message/message_base.pb.cc

@@ -351,7 +351,7 @@ void AddDescriptorsImpl() {
       "message.Parkspace_path\022\032\n\022path_estimate_"
       "time\030\017 \001(\002\022:\n\027parkspace_status_target\030\020 "
       "\001(\0162\031.message.Parkspace_status\022#\n\010car_ty"
-      "pe\030\021 \001(\0162\021.message.Car_type*\255\014\n\014Message_"
+      "pe\030\021 \001(\0162\021.message.Car_type*\307\014\n\014Message_"
       "type\022\r\n\teBase_msg\020\000\022\020\n\014eCommand_msg\020\001\022\026\n"
       "\022eLocate_status_msg\020\021\022\027\n\023eLocate_request"
       "_msg\020\022\022\030\n\024eLocate_response_msg\020\023\022\034\n\030eLoc"
@@ -376,63 +376,64 @@ void AddDescriptorsImpl() {
       "nse_msg\020\?\022\036\n\032eStore_command_request_msg\020"
       "A\022\037\n\033eStore_command_response_msg\020B\022\037\n\033eP"
       "ickup_command_request_msg\020C\022 \n\034ePickup_c"
-      "ommand_response_msg\020D\022\037\n\032eStoring_proces"
-      "s_statu_msg\020\220\001\022\037\n\032ePicking_process_statu"
-      "_msg\020\221\001\022\"\n\035eCentral_controller_statu_msg"
-      "\020\240\001\022#\n\036eEntrance_manual_operation_msg\020\260\001"
-      "\022\"\n\035eProcess_manual_operation_msg\020\261\001\022\030\n\023"
-      "eNotify_request_msg\020\300\001\022\031\n\024eNotify_respon"
-      "se_msg\020\301\001\022\027\n\022eNotify_status_msg\020\302\001\022#\n\036eU"
-      "nNormalized_module_statu_msg\020\320\001\022\037\n\032eDisp"
-      "atch_plan_request_msg\020\340\001\022 \n\033eDispatch_pl"
-      "an_response_msg\020\341\001\022\"\n\035eDispatch_control_"
-      "request_msg\020\342\001\022#\n\036eDispatch_control_resp"
-      "onse_msg\020\343\001\022!\n\034eDispatch_manager_status_"
-      "msg\020\352\001\022\037\n\032eDispatch_manager_data_msg\020\353\001\022"
-      "\037\n\032eGround_detect_request_msg\020\360\001\022 \n\033eGro"
-      "und_detect_response_msg\020\361\001\022\027\n\022eGround_st"
-      "atus_msg\020\362\001*\307\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\neParkspac"
-      "e\020\200\004\022\016\n\teMeasurer\020\200\006\022\032\n\025eMeasurer_sift_s"
-      "erver\020\201\006\022\026\n\021eDispatch_manager\020\200\010\022\026\n\021eDis"
-      "patch_control\020\201\010\022\014\n\007eNotify\020\201\n\022\025\n\020eGroun"
-      "d_measurer\020\200\036**\n\014Process_type\022\014\n\010eStorin"
-      "g\020\001\022\014\n\010ePicking\020\002*e\n\013Error_level\022\n\n\006NORM"
-      "AL\020\000\022\024\n\020NEGLIGIBLE_ERROR\020\001\022\017\n\013MINOR_ERRO"
-      "R\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_stat"
-      "us_unknow\020\000\022\024\n\020eParkspace_empty\020\001\022\027\n\023ePa"
-      "rkspace_occupied\020\002\022\027\n\023eParkspace_reserve"
-      "d\020\003\022\025\n\021eParkspace_locked\020\004\022\024\n\020eParkspace"
-      "_error\020\005*\?\n\tDirection\022\025\n\021eDirection_unkn"
-      "ow\020\000\022\014\n\010eForward\020\001\022\r\n\teBackward\020\002*l\n\016Par"
-      "kspace_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_typ"
-      "e\022\031\n\025UNKNOW_PARKSPACE_TYPE\020\000\022\024\n\020MIN_PARK"
-      "INGSPACE\020\001\022\024\n\020MID_PARKINGSPACE\020\002\022\024\n\020BIG_"
-      "PARKINGSPACE\020\003*F\n\010Car_type\022\023\n\017UNKNOW_CAR"
-      "_TYPE\020\000\022\013\n\007MIN_CAR\020\001\022\013\n\007MID_CAR\020\002\022\013\n\007BIG"
-      "_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\016e"
-      "Dispatch_step\020\003\022\021\n\reConfirm_step\020\004\022\020\n\014eS"
-      "earch_step\020\005\022\016\n\neWait_step\020\006\022\021\n\reRelease"
-      "_step\020\007\022\r\n\teComplete\020\010\022\025\n\021eBackConfirm_s"
-      "tep\020\t\022\026\n\022eBack_compare_step\020\n\022\025\n\021eBackMe"
-      "asure_step\020\013\022\023\n\017eBackAlloc_step\020\014\022\022\n\016eBa"
-      "ckWait_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\024Dispatch"
-      "_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\tCARRIE"
-      "R_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"
+      "ommand_response_msg\020D\022\030\n\024eTerminal_statu"
+      "s_msg\020P\022\037\n\032eStoring_process_statu_msg\020\220\001"
+      "\022\037\n\032ePicking_process_statu_msg\020\221\001\022\"\n\035eCe"
+      "ntral_controller_statu_msg\020\240\001\022#\n\036eEntran"
+      "ce_manual_operation_msg\020\260\001\022\"\n\035eProcess_m"
+      "anual_operation_msg\020\261\001\022\030\n\023eNotify_reques"
+      "t_msg\020\300\001\022\031\n\024eNotify_response_msg\020\301\001\022\027\n\022e"
+      "Notify_status_msg\020\302\001\022#\n\036eUnNormalized_mo"
+      "dule_statu_msg\020\320\001\022\037\n\032eDispatch_plan_requ"
+      "est_msg\020\340\001\022 \n\033eDispatch_plan_response_ms"
+      "g\020\341\001\022\"\n\035eDispatch_control_request_msg\020\342\001"
+      "\022#\n\036eDispatch_control_response_msg\020\343\001\022!\n"
+      "\034eDispatch_manager_status_msg\020\352\001\022\037\n\032eDis"
+      "patch_manager_data_msg\020\353\001\022\037\n\032eGround_det"
+      "ect_request_msg\020\360\001\022 \n\033eGround_detect_res"
+      "ponse_msg\020\361\001\022\027\n\022eGround_status_msg\020\362\001*\307\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\teMeasu"
+      "rer\020\200\006\022\032\n\025eMeasurer_sift_server\020\201\006\022\026\n\021eD"
+      "ispatch_manager\020\200\010\022\026\n\021eDispatch_control\020"
+      "\201\010\022\014\n\007eNotify\020\201\n\022\025\n\020eGround_measurer\020\200\036*"
+      "*\n\014Process_type\022\014\n\010eStoring\020\001\022\014\n\010ePickin"
+      "g\020\002*e\n\013Error_level\022\n\n\006NORMAL\020\000\022\024\n\020NEGLIG"
+      "IBLE_ERROR\020\001\022\017\n\013MINOR_ERROR\020\002\022\017\n\013MAJOR_E"
+      "RROR\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\023eParkspace_occupi"
+      "ed\020\002\022\027\n\023eParkspace_reserved\020\003\022\025\n\021eParksp"
+      "ace_locked\020\004\022\024\n\020eParkspace_error\020\005*\?\n\tDi"
+      "rection\022\025\n\021eDirection_unknow\020\000\022\014\n\010eForwa"
+      "rd\020\001\022\r\n\teBackward\020\002*l\n\016Parkspace_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_CAC"
+      "HE_PATH\020\004*m\n\016Parkspace_type\022\031\n\025UNKNOW_PA"
+      "RKSPACE_TYPE\020\000\022\024\n\020MIN_PARKINGSPACE\020\001\022\024\n\020"
+      "MID_PARKINGSPACE\020\002\022\024\n\020BIG_PARKINGSPACE\020\003"
+      "*F\n\010Car_type\022\023\n\017UNKNOW_CAR_TYPE\020\000\022\013\n\007MIN"
+      "_CAR\020\001\022\013\n\007MID_CAR\020\002\022\013\n\007BIG_CAR\020\003*\335\002\n\tSte"
+      "p_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\016eDispatch_step\020"
+      "\003\022\021\n\reConfirm_step\020\004\022\020\n\014eSearch_step\020\005\022\016"
+      "\n\neWait_step\020\006\022\021\n\reRelease_step\020\007\022\r\n\teCo"
+      "mplete\020\010\022\025\n\021eBackConfirm_step\020\t\022\026\n\022eBack"
+      "_compare_step\020\n\022\025\n\021eBackMeasure_step\020\013\022\023"
+      "\n\017eBackAlloc_step\020\014\022\022\n\016eBackWait_step\020\r\022"
+      "\026\n\022eBackDispatch_step\020\016\022\024\n\020eBackSearch_s"
+      "tep\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\024Dispatch_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\tCARRIER_3\020\313\001\022\021\n\014PASS"
+      "AGEWAY_0\020\254\002\022\021\n\014PASSAGEWAY_1\020\255\002\022\021\n\014PASSAG"
+      "EWAY_2\020\256\002\022\021\n\014PASSAGEWAY_3\020\257\002\022\021\n\014PASSAGEW"
+      "AY_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, 4678);
+      descriptor, 4704);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "message_base.proto", &protobuf_RegisterTypes);
 }
@@ -484,6 +485,7 @@ bool Message_type_IsValid(int value) {
     case 66:
     case 67:
     case 68:
+    case 80:
     case 144:
     case 145:
     case 160:

message/message_base.pb.h

@@ -108,6 +108,7 @@ enum Message_type {
   eStore_command_response_msg = 66,
   ePickup_command_request_msg = 67,
   ePickup_command_response_msg = 68,
+  eTerminal_status_msg = 80,
   eStoring_process_statu_msg = 144,
   ePicking_process_statu_msg = 145,
   eCentral_controller_statu_msg = 160,

message/message_base.proto

@@ -40,7 +40,7 @@ enum Message_type
     ePickup_command_request_msg=0x43;       //取车请求消息
     ePickup_command_response_msg=0x44;       //取车请求反馈消息
 
-
+    eTerminal_status_msg = 0x50;	 //终端状态消息
 
     eStoring_process_statu_msg=0x90;        //停车指令进度条消息
     ePicking_process_statu_msg=0x91;        //取车指令进度消息

parkspace_allocation/parkspace_operating_function.cpp

@@ -888,6 +888,7 @@ Error_manager Parkspace_operating_function::query_one_specified_unit_and_type_em
 	memset(query_parkspace_sql, 0, 1024);
 
 	sprintf(query_parkspace_sql,"select * from parkingspace where parkingspace_status=%d and parkingspace_type=%d and parkingspace_unit_id=%d",message::Parkspace_status::eParkspace_empty,parkspace_type,unit_id);
+	std::cout<<"query_parkspace_sql = "<<query_parkspace_sql<<std::endl;
 	boost::shared_ptr<sql::ResultSet>  tp_result = nullptr;
 	Error_manager ec = Database_controller::get_instance_pointer()->sql_query(query_parkspace_sql, tp_result);
 	if(ec == SUCCESS)

setting/database_communication.prototxt

@@ -5,7 +5,7 @@
   #  db_port:3306,
    # db_username:"wk",
    # db_passwd:"123456",
-   # db_name:"chutian_parkspace",
+   # db_name:"chutian_parkingspace",
    # db_conn_pool_size:5
 #}
 database_communication_configurations
@@ -14,7 +14,7 @@ database_communication_configurations
     db_port:3306,
     db_username:"zx",
    db_passwd:"zx123456",
-    db_name:"chutian_parkspace",
+    db_name:"chutian_parkingspace",
     db_conn_pool_size:5
 }