瀏覽代碼

rabbitmq need further test

yct 2 年之前
父節點
當前提交
8534754f07
共有 4 個文件被更改,包括 26 次插入10 次删除
  1. 7 5
      CMakeLists.txt
  2. 11 0
      main.cpp
  3. 3 3
      setting/rabbitmq.prototxt
  4. 5 2
      system/system_executor.cpp

+ 7 - 5
CMakeLists.txt

@@ -91,9 +91,9 @@ add_executable(measure_wj
 target_link_libraries(measure_wj
         # /usr/local/lib/libglog.a
         # /usr/local/lib/libgflags.a
-        /usr/lib/x86_64-linux-gnu/libglog.a
-        /usr/lib/x86_64-linux-gnu/libgflags.a
-        /usr/local/lib/librabbitmq.a
+        /usr/lib/x86_64-linux-gnu/libglog.so
+        /usr/lib/x86_64-linux-gnu/libgflags.so
+        /usr/local/lib/librabbitmq.so
         nnxx
         nanomsg
 
@@ -120,6 +120,7 @@ ${TASK_MANAGER_SRC}
 ${TOOL_SRC}
 ${COMMUNICATION_SRC}
 ${SYSTEM_SRC}
+${RABBIT_MQ}
 ${VERIFY_SRC}
 
 ${VELODYNE_LIDAR_COMMON}
@@ -130,8 +131,8 @@ ${VELODYNE_LIDAR}
 target_link_libraries(vlp16 
         # /usr/local/lib/libglog.a
         # /usr/local/lib/libgflags.a
-        /usr/lib/x86_64-linux-gnu/libglog.a
-        /usr/lib/x86_64-linux-gnu/libgflags.a
+        /usr/lib/x86_64-linux-gnu/libglog.so
+        /usr/lib/x86_64-linux-gnu/libgflags.so
 nnxx
 nanomsg
 
@@ -141,6 +142,7 @@ ${GLOG_LIBRARIES}
 ${PCL_LIBRARIES}
 ${CERES_LIBRARIES}
 ${YAML_CPP_LIBRARIES}
+/usr/local/lib/librabbitmq.so
 )
 
 add_executable(lidar_calib_tool ./tests/lidar_calib_tools.cpp ./tool/point_tool.cpp)

+ 11 - 0
main.cpp

@@ -132,6 +132,14 @@ int main(int argc,char* argv[])
 	}
 	System_communication::get_instance_references().set_encapsulate_cycle_time(110);
 
+
+	ec = System_communication_mq::get_instance_references().rabbitmq_init();
+	if(ec != SUCCESS)
+	{
+		LOG(ERROR) << "system communication mq init failed: " << ec.to_string();
+		return -1;
+	}
+
 	// prev_test_pred_task();
 	// test_whole_process();
 //    usleep(1000*5000);
@@ -163,6 +171,9 @@ int main(int argc,char* argv[])
 
 	// 反初始化
 	System_communication::get_instance_references().communication_uninit();
+	System_communication_mq::get_instance_references().rabbitmq_uninit();
+
+
 	System_executor::get_instance_references().system_executor_uninit();
 	if(WJ_VELO == 0 || WJ_VELO == 2)
 		Wanji_manager::get_instance_references().wanji_manager_uninit();

+ 3 - 3
setting/rabbitmq.prototxt

@@ -45,9 +45,9 @@ rabbitmq_parameters
 
     rabbitmq_sender_request_vector
     {
-        channel:403
-        exchange_name:"command_ex"
-        routing_key:"request_command_port"
+        channel:411
+        exchange_name:"statu_ex"
+        routing_key:"measure_5_statu_port"
         timeout_ms:0
     }
 }

+ 5 - 2
system/system_executor.cpp

@@ -622,8 +622,11 @@ Error_manager System_executor::encapsulate_send_mq_status()
 
 		update_measure_info(t_multi_status_msg, t_car_wheel_information, t_region_cloud->size());
 
-		std::string t_msg = t_multi_status_msg.SerializeAsString();
-		System_communication_mq::get_instance_references().encapsulate_status_msg(t_msg, 0);
+		std::string t_msg = t_multi_status_msg.DebugString();
+		if(t_multi_status_msg.id_struct().terminal_id() == 4)
+		{
+			System_communication_mq::get_instance_references().encapsulate_status_msg(t_msg, 0);
+		}
 		if (t_multi_status_msg.id_struct().terminal_id() == DISP_TERM_ID)
 			std::cout << t_multi_status_msg.DebugString() << std::endl
 						<< std::endl;