浏览代码

20210922,修改terminal id的逻辑

huli 3 年之前
父节点
当前提交
4c14b15ba1
共有 3 个文件被更改,包括 6 次插入3 次删除
  1. 5 1
      dispatch/dispatch_manager.cpp
  2. 0 1
      main.cpp
  3. 1 1
      setting/communication.prototxt

+ 5 - 1
dispatch/dispatch_manager.cpp

@@ -274,9 +274,11 @@ Error_manager Dispatch_manager::encapsulate_send_dispatch_manager_status()
 
 	t_msg1 = t_dispatch_terminal_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg1);
+//	std::cout << " huli test :::: " << " t_dispatch_terminal_status_msg = " << t_dispatch_terminal_status_msg.DebugString() << std::endl;
 	t_dispatch_terminal_status_msg.set_terminal_id(t_dispatch_manager_id*2+1);
 	t_msg1 = t_dispatch_terminal_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg1);
+//	std::cout << " huli test :::: " << " t_dispatch_terminal_status_msg = " << t_dispatch_terminal_status_msg.DebugString() << std::endl;
 
 
 	std::string t_msg2;
@@ -293,10 +295,12 @@ Error_manager Dispatch_manager::encapsulate_send_dispatch_manager_status()
 
 	t_msg2 = t_dispatch_manager_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg2);
+//	std::cout << " huli test :::: " << " t_dispatch_manager_status_msg = " << t_dispatch_manager_status_msg.DebugString() << std::endl;
 	t_dispatch_manager_status_msg.set_dispatch_id(t_dispatch_manager_id*2+1);
 	t_msg2 = t_dispatch_manager_status_msg.SerializeAsString();
 	System_communication::get_instance_references().encapsulate_msg(t_msg2);
-
+//	std::cout << " huli test :::: " << " t_dispatch_manager_status_msg = " << t_dispatch_manager_status_msg.DebugString() << std::endl;
+//std::cout << " huli test :::: " << " ------------------------------------------------- = " << 1 << std::endl;
 	return Error_code::SUCCESS;
 }
 

+ 0 - 1
main.cpp

@@ -122,7 +122,6 @@ int main(int argc,char* argv[])
 
 	while (1)
 	{
-
 		std::this_thread::sleep_for(std::chrono::seconds(1));
 	}
 	return 0;

+ 1 - 1
setting/communication.prototxt

@@ -22,7 +22,7 @@ communication_parameters
  #  connect_string_vector:"tcp://192.168.2.183:30000"
 
 
-    connect_string_vector:"tcp://192.168.2.127:30000"
+    connect_string_vector:"tcp://192.168.2.233:30000"
 
  #   connect_string_vector:"tcp://192.168.2.165:30000"
  #   bind_string:"tcp://192.168.2.177:30009"