Casper hace 4 meses
padre
commit
5858bb5de3

+ 5 - 10
sri-server-bg02/hub.py

@@ -13,17 +13,12 @@ class Global(object):
     save_dir = r'C:\logs'  # sri内网测试环境
     # save_dir = r'E:\logs'  # 湛江现场环境(容量为512G)
 
-    # --- 中间件服务器 --- for test
-    emqx_MessageListenerC001 = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
-    emqx_MessageListenerV001 = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
-
-    # --- 中间件服务器 --- for 湛江项目现场 todo 需要实现实例化emqx | 只能是哪里用到哪里实例化
-    emqx_Veh0533 = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
-    emqx_Veh0534 = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
-    emqx_Veh0535 = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
-    emqx_Veh0537 = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
-    emqx_Veh0538 = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
+    # --- 中间件服务器 ---
+    emqx_factory = importlib.import_module(f"xclient.xmqtt")
+    emqx_host = '127.0.0.1'
+    emqx_port = 41883
 
+    # --- 定时执行组件 ---
     aps = importlib.import_module(f"xpip.xapscheduler").APS(db_type='mongo',
                                                             db_host='127.0.0.1',
                                                             db_port=47017,

+ 2 - 1
sri-server-bg02/lib/MessageListenerC001.py

@@ -156,7 +156,8 @@ def method_c001(client, userdata, message):
 
 def subscribe_c001():
     """"""
-    Global.emqx_MessageListenerC001.start_subscribe_loop(
+    client = Global.emqx_factory.Client(host=Global.emqx_host, port=Global.emqx_port)
+    client.start_subscribe_loop(
         decorate_method=method_c001,
         subscribe_topic='Cockpit/CanBus/CanId001/Cop001'
     )

+ 2 - 1
sri-server-bg02/lib/MessageListenerV001.py

@@ -114,7 +114,8 @@ def method_v001(client, userdata, message):
 
 def subscribe_v001():
     """"""
-    Global.emqx_MessageListenerV001.start_subscribe_loop(
+    client = Global.emqx_factory.Client(host=Global.emqx_host, port=Global.emqx_port)
+    client.start_subscribe_loop(
         decorate_method=method_v001,
         subscribe_topic='Vehicle/ControlVehicle/Veh001'
     )

+ 2 - 1
sri-server-bg02/lib/MessageListenerZJV1.py

@@ -114,7 +114,8 @@ def method_v001(client, userdata, message):
 
 def subscribe_Veh0533():
     """"""
-    Global.emqx_Veh0533.start_subscribe_loop(
+    client = Global.emqx_factory.Client(host=Global.emqx_host, port=Global.emqx_port)
+    client.start_subscribe_loop(
         decorate_method=method_v001,
         subscribe_topic='Vehicle/ControlVehicle/Veh0533'
     )

+ 2 - 1
sri-server-bg02/lib/MessageListenerZJV2.py

@@ -114,7 +114,8 @@ def method_v001(client, userdata, message):
 
 def subscribe_Veh0534():
     """"""
-    Global.emqx_Veh0534.start_subscribe_loop(
+    client = Global.emqx_factory.Client(host=Global.emqx_host, port=Global.emqx_port)
+    client.start_subscribe_loop(
         decorate_method=method_v001,
         subscribe_topic='Vehicle/ControlVehicle/Veh0534'
     )

+ 2 - 1
sri-server-bg02/lib/MessageListenerZJV3.py

@@ -114,7 +114,8 @@ def method_v001(client, userdata, message):
 
 def subscribe_Veh0535():
     """"""
-    Global.emqx_Veh0535.start_subscribe_loop(
+    client = Global.emqx_factory.Client(host=Global.emqx_host, port=Global.emqx_port)
+    client.start_subscribe_loop(
         decorate_method=method_v001,
         subscribe_topic='Vehicle/ControlVehicle/Veh0535'
     )

+ 2 - 1
sri-server-bg02/lib/MessageListenerZJV4.py

@@ -114,7 +114,8 @@ def method_v001(client, userdata, message):
 
 def subscribe_Veh0537():
     """"""
-    Global.emqx_Veh0537.start_subscribe_loop(
+    client = Global.emqx_factory.Client(host=Global.emqx_host, port=Global.emqx_port)
+    client.start_subscribe_loop(
         decorate_method=method_v001,
         subscribe_topic='Vehicle/ControlVehicle/Veh0537'
     )

+ 2 - 1
sri-server-bg02/lib/MessageListenerZJV5.py

@@ -114,7 +114,8 @@ def method_v001(client, userdata, message):
 
 def subscribe_Veh0538():
     """"""
-    Global.emqx_Veh0538.start_subscribe_loop(
+    client = Global.emqx_factory.Client(host=Global.emqx_host, port=Global.emqx_port)
+    client.start_subscribe_loop(
         decorate_method=method_v001,
         subscribe_topic='Vehicle/ControlVehicle/Veh0538'
     )