q 2 éve
szülő
commit
42f58d7429
3 módosított fájl, 8 hozzáadás és 4 törlés
  1. 4 2
      jf_belt_101.py
  2. 2 1
      jf_belt_102.py
  3. 2 1
      jf_belt_north.py

+ 4 - 2
jf_belt_101.py

@@ -14,6 +14,7 @@ class jf_belt_101():
 
 
     sys_key = 'jinfeng'
     sys_key = 'jinfeng'
     sys_name = 'belt_101'
     sys_name = 'belt_101'
+    sys_path = '1/1/9'
     point_dict = {}
     point_dict = {}
     jdata = None
     jdata = None
     cf = md.configInfoModel(sys_key, sys_name)
     cf = md.configInfoModel(sys_key, sys_name)
@@ -33,7 +34,7 @@ class jf_belt_101():
 
 
     def subscribe_update_topic(self):
     def subscribe_update_topic(self):
         self.client.connect(self.cf.ip, 1883, 600)    #连接到broker
         self.client.connect(self.cf.ip, 1883, 600)    #连接到broker
-        self.client.subscribe("1/1/10", 0)
+        self.client.subscribe(self.sys_path, 0)
         self.client.loop_forever()
         self.client.loop_forever()
 
 
     # 回调数据
     # 回调数据
@@ -65,7 +66,8 @@ class jf_belt_101():
     def data_handle(self, data):
     def data_handle(self, data):
         comm = data['common']
         comm = data['common']
         elec = data['electric_parameter']
         elec = data['electric_parameter']
-        data['state'] = self.point_dict[data['key']]
+        stat_key = data['key']
+        data['state'] = self.point_dict[stat_key]
 
 
         for i in range(len(comm)):
         for i in range(len(comm)):
             ck = comm[i]
             ck = comm[i]

+ 2 - 1
jf_belt_102.py

@@ -14,6 +14,7 @@ class jf_belt_102():
 
 
     sys_key = 'jinfeng'
     sys_key = 'jinfeng'
     sys_name = 'belt_102'
     sys_name = 'belt_102'
+    sys_path = '1/1/9'
     point_dict = {}
     point_dict = {}
     jdata = None
     jdata = None
     cf = md.configInfoModel(sys_key, sys_name)
     cf = md.configInfoModel(sys_key, sys_name)
@@ -33,7 +34,7 @@ class jf_belt_102():
 
 
     def subscribe_update_topic(self):
     def subscribe_update_topic(self):
         self.client.connect(self.cf.ip, 1883, 600)    #连接到broker
         self.client.connect(self.cf.ip, 1883, 600)    #连接到broker
-        self.client.subscribe("1/1/10", 0)
+        self.client.subscribe(self.sys_path, 0)
         self.client.loop_forever()
         self.client.loop_forever()
 
 
     # 回调数据
     # 回调数据

+ 2 - 1
jf_belt_north.py

@@ -14,6 +14,7 @@ class jf_belt_north():
 
 
     sys_key = 'jinfeng'
     sys_key = 'jinfeng'
     sys_name = 'belt_north'
     sys_name = 'belt_north'
+    sys_path = '1/1/9'
     point_dict = {}
     point_dict = {}
     jdata = None
     jdata = None
     cf = md.configInfoModel(sys_key, sys_name)
     cf = md.configInfoModel(sys_key, sys_name)
@@ -33,7 +34,7 @@ class jf_belt_north():
 
 
     def subscribe_update_topic(self):
     def subscribe_update_topic(self):
         self.client.connect(self.cf.ip, 1883, 600)    #连接到broker
         self.client.connect(self.cf.ip, 1883, 600)    #连接到broker
-        self.client.subscribe("1/1/10", 0)
+        self.client.subscribe(self.sys_path, 0)
         self.client.loop_forever()
         self.client.loop_forever()
 
 
     # 回调数据
     # 回调数据