通风

config/jinfeng/wind_center.json

@@ -8,6 +8,20 @@
         "label":"1号通风机",
         "value":"",
         "state":"",
+        "state_list": [
+          {
+            "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
+            "label":"1号电机运行状态",
+            "unit":"",
+            "value":""
+          },
+          {
+            "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
+            "label":"2号电机运行状态",
+            "unit":"",
+            "value":""
+          }
+        ],
         "run_parameter":[
           {
             "key":"JF.Device1.TFZB2.TFZB_F1_M1FY",
@@ -48,12 +62,6 @@
         ],
         "electric_parameter_1":[
           {
-            "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
-          },
-          {
             "key":"JF.Device1.TFZB1.TFZB_F1_B1SDT",
             "label":"当前上电时间",
             "unit":"min",
@@ -80,12 +88,6 @@
         ],
         "electric_parameter_2":[
           {
-            "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
-          },
-          {
             "key":"JF.Device1.TFZB1.TFZB_F1_B2SDT",
             "label":"当前上电时间",
             "unit":"min",
@@ -116,6 +118,20 @@
         "label":"2号通风机",
         "value":"",
         "state":"",
+        "state_list": [
+          {
+            "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
+            "label":"1号电机运行状态",
+            "unit":"",
+            "value":""
+          },
+          {
+            "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
+            "label":"2号电机运行状态",
+            "unit":"",
+            "value":""
+          }
+        ],
         "run_parameter":[
           {
             "key":"JF.Device1.TFZB2.TFZB_F2_M1FY",
@@ -156,12 +172,6 @@
         ],
         "electric_parameter_1":[
           {
-            "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
-          },
-          {
             "key":"JF.Device1.TFZB1.TFZB_F2_B1SDT",
             "label":"当前上电时间",
             "unit":"min",
@@ -188,12 +198,6 @@
         ],
         "electric_parameter_2":[
           {
-            "key":"JF.Device1.TFZB1.TFZB_F2_B1YXFK",
-            "label":"运行状态",
-            "unit":"",
-            "value":""
-          },
-          {
             "key":"JF.Device1.TFZB1.TFZB_F2_B2SDT",
             "label":"当前上电时间",
             "unit":"min",

config/jinfeng/wind_north.json

@@ -6,7 +6,22 @@
       {
         "key":"JF.Device1.TFBB.TFBB_YHJZYX",
         "name":"1号通风机",
-        "val":"",
+        "state":"",
+        "value":"",
+        "state_list": [
+          {
+            "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
+            "label":"1号电机运行状态",
+            "unit":"",
+            "value":""
+          },
+          {
+            "key":"JF.Device1.TFZB1.TFZB_F1_B1YXFK",
+            "label":"2号电机运行状态",
+            "unit":"",
+            "value":""
+          }
+        ],
         "run_parameter":[
           {
             "key":"JF.Device1.TFBB.TFBB_F1_FY",
@@ -197,7 +212,8 @@
       {
         "key":"JF.Device1.TFBB.TFBB_EHJZYX",
         "name":"2号通风机",
-        "val":"",
+        "state":"",
+        "value":"",
         "run_parameter":[
           {
             "key":"JF.Device1.TFBB.TFBB_F2_FY",

jf_wind_center.py

@@ -66,39 +66,42 @@ class jf_wind_center():
     def data_handle(self, data):
 
         for i in range(len(data)):
-            val = data[i]
-            sl = val['run_parameter']
             is_run = False
+            val = data[i]
+            sl = val['state_list']
             for j in range(len(sl)):
-                ck = sl[j]['key']
-                name = sl[j]['label']
-                value = self.point_dict[ck]
-                if ck in self.point_dict.keys():
-                    data[i]['run_parameter'][j]['value'] = value
+                sk = sl[j]['key']
+                sv = self.point_dict[sk]
+                # 逻辑值处理
+                if sv == True:
+                    sv = 1
+                    is_run = True
+                elif sv == False:
+                    sv = 2
+                else:
+                    sv = None
+                data[i]['state_list'][j]['value'] = sv
+
+            data[i]['value'] = is_run
+            data[i]['state'] = is_run
+
+            rp = val['run_parameter']
+            for j in range(len(rp)):
+                rk = rp[j]['key']
+                rv = self.point_dict[rk]
+                data[i]['run_parameter'][j]['value'] = rv
 
             ep1 = val['electric_parameter_1']
             for j in range(len(ep1)):
-                ck = ep1[j]['key']
-                name = sl[j]['label']
-                value = self.point_dict[ck]
-                if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_1'][j]['value'] = value
-                if name == '运行状态' and value == True:
-                    data[i]['state'] = 1
-                elif name == '运行状态' and value == False:
-                    data[i]['state'] = 2
+                ek = ep1[j]['key']
+                ev = self.point_dict[ck]
+                data[i]['electric_parameter_1'][j]['value'] = rv
 
             ep2 = val['electric_parameter_2']
-            for j in range(len(ep2)):
-                ck = ep2[j]['key']
-                name = sl[j]['label']
-                value = self.point_dict[ck]
-                if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_2'][j]['value'] = value
-                if name == '运行状态' and value == True:
-                    data[i]['state'] = 1
-                elif name == '运行状态' and value == False:
-                    data[i]['state'] = 2
+            for j in range(len(ep1)):
+                ek = ep1[j]['key']
+                ev = self.point_dict[ck]
+                data[i]['electric_parameter_2'][j]['value'] = rv
 
         self.jdata['sys_point'] = data
 

jf_wind_north.py

@@ -64,23 +64,44 @@ class jf_wind_north():
 
     # 数据处理
     def data_handle(self, data):
+
         for i in range(len(data)):
             val = data[i]
-            sl = val['run_parameter']
+            data[i]['value'] = self.point_dict[data[i]['key']]
+            data[i]['state'] = self.point_dict[data[i]['key']]
+
+            sl = val['state_list']
             for j in range(len(sl)):
-                ck = sl[j]['key']
-                if ck in self.point_dict.keys():
-                    data[i]['run_parameter'][j]['value'] = self.point_dict[ck]
+                sk = sl[j]['key']
+                sv = self.point_dict[sk]
+                # 逻辑值处理
+                if sv == True:
+                    sv = 1
+                elif sv == False:
+                    sv = 2
+                else:
+                    sv = None
+                data[i]['state_list'][j]['value'] = sv
+
+            rp = val['run_parameter']
+            p_is_run = False
+            for j in range(len(rp)):
+                rk = rp[j]['key']
+                rv = self.point_dict[rk]
+                data[i]['run_parameter'][j]['value'] = rv
+
             ep1 = val['electric_parameter_1']
             for j in range(len(ep1)):
-                ck = ep1[j]['key']
-                if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_1'][j]['value'] = self.point_dict[ck]
+                ek = ep1[j]['key']
+                ev = self.point_dict[ck]
+                data[i]['electric_parameter_1'][j]['value'] = rv
+
             ep2 = val['electric_parameter_2']
-            for j in range(len(ep2)):
-                ck = ep2[j]['key']
-                if ck in self.point_dict.keys():
-                    data[i]['electric_parameter_2'][j]['value'] = self.point_dict[ck]
+            for j in range(len(ep1)):
+                ek = ep1[j]['key']
+                ev = self.point_dict[ck]
+                data[i]['electric_parameter_2'][j]['value'] = rv
+
         self.jdata['sys_point'] = data