20230213, huli add plc car wheel base

plc调度节点/dispatch/dispatch_command.cpp

@@ -1030,20 +1030,40 @@ Error_manager Dispatch_command::insert_vehicle_for_car_number_ex()
 	//20230213 huli  add plc car_wheel_base
 	measure_info t_plc_measure_info_msg = m_dispatch_command_map[m_car_number_optimal].m_measure_info_msg;
 	t_plc_measure_info_msg.set_wheelbase( Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_car_wheel_base);
+	if (  Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_car_wheel_base ==0 )
+	{
+		char insert_vehicle_sql[1024];
+		memset(insert_vehicle_sql, 0, 1024);
+		sprintf(insert_vehicle_sql, "INSERT INTO vehicle (car_number,primary_key,actually_measure_info, plc_clamp_lidar_deviation_1, plc_clamp_lidar_deviation_2, plc_clamp_lidar_deviation_3, plc_clamp_lidar_deviation_4) values ('%s','%s','%s', %f, %f, %f, %f)",
+				m_car_number_optimal.c_str(), m_dispatch_command_map[m_car_number_optimal].m_primary_key.c_str(),
+				m_dispatch_command_map[m_car_number_optimal].m_measure_info.c_str() ,
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_1,
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_2,
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_3,
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_4
+		);
+		Error_manager ec = Database_controller::get_instance_pointer()->sql_insert(insert_vehicle_sql);
+		return ec;
+	}
+	else
+	{
+		char insert_vehicle_sql[1024];
+		memset(insert_vehicle_sql, 0, 1024);
+		sprintf(insert_vehicle_sql, "INSERT INTO vehicle (car_number,primary_key,actually_measure_info, plc_measure_info, plc_clamp_lidar_deviation_1, plc_clamp_lidar_deviation_2, plc_clamp_lidar_deviation_3, plc_clamp_lidar_deviation_4) values ('%s','%s','%s', '%s', %f, %f, %f, %f)",
+				m_car_number_optimal.c_str(), m_dispatch_command_map[m_car_number_optimal].m_primary_key.c_str(),
+				m_dispatch_command_map[m_car_number_optimal].m_measure_info.c_str() ,
+				t_plc_measure_info_msg.DebugString().c_str(),
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_1,
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_2,
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_3,
+				Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_4
+		);
+		Error_manager ec = Database_controller::get_instance_pointer()->sql_insert(insert_vehicle_sql);
+		return ec;
+	}
+
+	return Error_code::SUCCESS;
 
-	char insert_vehicle_sql[1024];
-	memset(insert_vehicle_sql, 0, 1024);
-	sprintf(insert_vehicle_sql, "INSERT INTO vehicle (car_number,primary_key,actually_measure_info, plc_measure_info, plc_clamp_lidar_deviation_1, plc_clamp_lidar_deviation_2, plc_clamp_lidar_deviation_3, plc_clamp_lidar_deviation_4) values ('%s','%s','%s', '%s', %f, %f, %f, %f)",
-			m_car_number_optimal.c_str(), m_dispatch_command_map[m_car_number_optimal].m_primary_key.c_str(),
-			m_dispatch_command_map[m_car_number_optimal].m_measure_info.c_str() ,
-			t_plc_measure_info_msg.DebugString().c_str(),
-			Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_1,
-			Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_2,
-			Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_3,
-			Dispatch_manager::get_instance_references().m_dispatch_plc.m_plc_clamp_lidar_deviation_4
-			);
-	Error_manager ec = Database_controller::get_instance_pointer()->sql_insert(insert_vehicle_sql);
-	return ec;
 }
 //删除 车辆表, 取车指令 完成后删除车辆信息
 Error_manager Dispatch_command::delete_vehicle_for_car_number()

plc调度节点/network_communication/network_base.cpp

@@ -281,6 +281,7 @@ Error_manager Network_base::check_and_reconnect(int socket_id)
 {
 	int t_socket_fd = m_network_socket_map[socket_id].m_socket_fd;
 	if ( is_connected(t_socket_fd) == false )
+//	if ( true )
 	{
 		//关闭连接
 		close(t_socket_fd);