20211101

parkspace_allocation/parkspace_manager.cpp

@@ -592,7 +592,7 @@ void Parkspace_manager::execute_for_force_update(message::Parkspace_force_update
 	t_response_header.set_receiver(message::eMain);
 	t_response_header.set_timeout_ms(1000);
 	message::Error_manager t_error;
-	message::Parkspace_info t_update_space;
+	message::Parkspace_info t_update_space = space_info.manual_parkspace_info_ex(0);
 	Error_manager error;
 	// id 9999为特殊情况，复位所有车位状态
 	if (space_info.manual_parkspace_info_ex(0).parkingspace_index_id() == 9999)
@@ -609,6 +609,7 @@ void Parkspace_manager::execute_for_force_update(message::Parkspace_force_update
 		{
 			t_error.set_error_code(SUCCESS);
 			t_error.set_error_level(message::Error_level::NORMAL);
+
 			LOG(INFO) << "所有车位已手动更新 ";
 		}
 	}
@@ -626,7 +627,26 @@ void Parkspace_manager::execute_for_force_update(message::Parkspace_force_update
 		{
 			t_error.set_error_code(SUCCESS);
 			t_error.set_error_level(message::Error_level::NORMAL);
-			LOG(INFO) << "第" << t_update_space.parkingspace_index_id() << "号位已手动更新";
+            if(t_update_space.has_car_info() && t_update_space.car_info().has_license())
+            {
+                message::Vehicle_status  t_vehicle_status=message::eVehicle_idle;
+                error = m_parkspace_operating_function.update_vehicle_with_parkspace(t_update_space, t_vehicle_status);
+                if (error != SUCCESS)
+                {
+                    t_error.set_error_code(error.get_error_code());
+                    t_error.set_error_level((message::Error_level)error.get_error_level());
+                    LOG(ERROR) << "手动  数据库更新车辆失败  "<<error.to_string();
+                }
+                else
+                {
+                    LOG(INFO) << "第" << t_update_space.parkingspace_index_id() << "号位已手动更新,"<<t_update_space.car_info().license()<<"车辆状态已手动更新";
+                }
+
+            }
+            else
+            {
+                LOG(INFO) << "第" << t_update_space.parkingspace_index_id() << "号位已手动更新";
+            }
 		}
 	}
 

parkspace_allocation/parkspace_operating_function.cpp

@@ -171,8 +171,8 @@ Error_manager Parkspace_operating_function::update_parkspace_data(message::Parks
 	int status = parkspace_info.parkingspace_status();
 	if ( status < 1 || status >5 )
 	{
-			return Error_manager(Error_code::PARAMETER_ERROR, Error_level::MINOR_ERROR,
-						 "参数错误 Parkspace_operating_function::update_parkspace_data error ");
+		return Error_manager(Error_code::PARAMETER_ERROR, Error_level::MINOR_ERROR,
+			"参数错误 Parkspace_operating_function::update_parkspace_data error ");
 	}
 
 //	switch (parkspace_info.parkingspace_status())