20240202, apply

plc调度节点/dispatch/dispatch_command.cpp

@@ -3196,7 +3196,7 @@ Error_manager Dispatch_command::query_record_for_level(std::string car_number, i
 	//从command_queue获取所有排队的指令,
 	char query_record_sql[DB_SQL_SIZE];
 	memset(query_record_sql, 0, DB_SQL_SIZE);
-	sprintf(query_record_sql,"select * from record where (car_number = '%s' and unit >30) order by count_id DESC limit 1",car_number.c_str());
+	sprintf(query_record_sql,"select * from record where (car_number = '%s' and unit_id >30) order by count_id DESC limit 1",car_number.c_str());
 	boost::shared_ptr<sql::ResultSet>  tp_result = nullptr;
 	Error_manager t_error = Database_controller::get_instance_pointer()->sql_query(query_record_sql, tp_result);
 

plc调度节点/dispatch/dispatch_manager.cpp

@@ -564,6 +564,9 @@ Error_manager Dispatch_manager::execute_rabbitmq_message_new(Rabbitmq_message* p
 				{
 					t_wheel_base_level = 9;
 				}
+				
+				LOG(INFO) << " t_height_level = " << t_height_level;
+				LOG(INFO) << " t_wheel_base_level = " << t_wheel_base_level;
 
 
 				Dispatch_command::Dispatch_space_info t_dispatch_space_info;
@@ -1764,9 +1767,13 @@ void Dispatch_manager::process_sql_shanggujie()
 				std::cout << " huli test :::: " << " jsghvvvtfhderhthfdvht  get_outlet_for_ready() = " << get_outlet_for_ready() << std::endl;
 				std::cout << " huli test :::: " << " qweqweqweqweqweqwefsd  safe_lock = " << m_dispatch_plc.park_safe_lock[0] << " " << m_dispatch_plc.park_safe_lock[1] << std::endl;
 
-				std::string t_now_time = Time_tool::get_instance_references().get_current_time_seconds();
-				//周期性删除 预约超时的车位
-				m_dispatch_command.update_parkspace_clear_apply_end_time(t_now_time, 0);
+				if ( m_dispatch_manager_id > 30 )
+				{
+					std::string t_now_time = Time_tool::get_instance_references().get_current_time_seconds();
+					//周期性删除 预约超时的车位
+					m_dispatch_command.update_parkspace_clear_apply_end_time(t_now_time, 0);
+				}
+
 
 				//获取调度指令, 与数据库同步所有的指令信息，注意了：内部加锁，
 				m_dispatch_command.query_all_dispatch_command_ex();

plc调度节点/setting_shanggujie/database_communication.prototxt

@@ -1,10 +1,11 @@
 
 database_communication_configurations
 {
- #   db_ip:"192.168.3.200",
+  #  db_ip:"192.168.2.57",
     db_ip:"127.0.0.1",
     db_port:3306,
     db_username:"zx",
+  #  db_username:"root",
     db_passwd:"123456",
     db_name:"xm_project",
     db_conn_pool_size:5

plc调度节点/setting_shanggujie/rabbitmq_c1.prototxt

@@ -2,7 +2,7 @@
 
 rabbitmq_parameters
 {
- #   ip:"10.211.31.200"
+  #  ip:"192.168.2.57"
     ip:"127.0.0.1"
     port:5672
     user:"zx"

plc调度节点/setting_shanggujie/rabbitmq_c2.prototxt

@@ -2,7 +2,7 @@
 
 rabbitmq_parameters
 {
- #   ip:"10.211.32.200"
+ #  ip:"192.168.2.57"
     ip:"127.0.0.1"
     port:5672
     user:"zx"