修改数据结构

config/jinfeng/power_center.json

@@ -71,6 +71,117 @@
           "value": ""
         }
       ],
+      "power_parameter_new": [
+        {
+          "label": "*",
+          "keys": [],
+          "data": [
+            "1-5", "1-4", "1-3", "1-2", "1-1", "1#", "2#", "2-1", "2-2", "2-3", "2-4"
+          ]
+        },
+        {
+          "label": "Ua(V)",
+          "keys": [
+            "JF.Device1.BDZY.BDZY_K1_5_Ua",
+            "JF.Device1.BDZY.BDZY_K1_4_Ua",
+            "JF.Device1.BDZY.BDZY_K1_3_Ua",
+            "JF.Device1.BDZY.BDZY_K1_2_Ua",
+            "JF.Device1.BDZY.BDZY_K1_1_Ua",
+            "JF.Device1.BDZY.BDZY_K1JX_Ua",
+            "JF.Device1.BDZY.BDZY_K2JX_Ua",
+            "JF.Device1.BDZY.BDZY_K2_1_Ua",
+            "JF.Device1.BDZY.BDZY_K2_2_Ua",
+            "JF.Device1.BDZY.BDZY_K2_3_Ua",
+            "JF.Device1.BDZY.BDZY_K2_4_Ua"
+          ],
+          "data": []
+        },
+        {
+          "label": "Uc(V)",
+          "keys": [
+            "JF.Device1.BDZY.BDZY_K1_5_Uc",
+            "JF.Device1.BDZY.BDZY_K1_4_Uc",
+            "JF.Device1.BDZY.BDZY_K1_3_Uc",
+            "JF.Device1.BDZY.BDZY_K1_2_Uc",
+            "JF.Device1.BDZY.BDZY_K1_1_Uc",
+            "JF.Device1.BDZY.BDZY_K1JX_Uc",
+            "JF.Device1.BDZY.BDZY_K2JX_Uc",
+            "JF.Device1.BDZY.BDZY_K2_1_Uc",
+            "JF.Device1.BDZY.BDZY_K2_2_Uc",
+            "JF.Device1.BDZY.BDZY_K2_3_Uc",
+            "JF.Device1.BDZY.BDZY_K2_4_Uc"
+          ],
+          "data": []
+        },
+        {
+          "label": "Ia(A)",
+          "keys": [
+            "JF.Device1.BDZY.BDZY_K1_5_Ia",
+            "JF.Device1.BDZY.BDZY_K1_4_Ia",
+            "JF.Device1.BDZY.BDZY_K1_3_Ia",
+            "JF.Device1.BDZY.BDZY_K1_2_Ia",
+            "JF.Device1.BDZY.BDZY_K1_1_Ia",
+            "JF.Device1.BDZY.BDZY_K1JX_Ia",
+            "JF.Device1.BDZY.BDZY_K2JX_Ia",
+            "JF.Device1.BDZY.BDZY_K2_1_Ia",
+            "JF.Device1.BDZY.BDZY_K2_2_Ia",
+            "JF.Device1.BDZY.BDZY_K2_3_Ia",
+            "JF.Device1.BDZY.BDZY_K2_4_Ia"
+          ],
+          "data": []
+        },
+        {
+          "label": "Ic(A)",
+          "keys": [
+            "JF.Device1.BDZY.BDZY_K1_5_Ic",
+            "JF.Device1.BDZY.BDZY_K1_4_Ic",
+            "JF.Device1.BDZY.BDZY_K1_3_Ic",
+            "JF.Device1.BDZY.BDZY_K1_2_Ic",
+            "JF.Device1.BDZY.BDZY_K1_1_Ic",
+            "JF.Device1.BDZY.BDZY_K1JX_Ic",
+            "JF.Device1.BDZY.BDZY_K2JX_Ic",
+            "JF.Device1.BDZY.BDZY_K2_1_Ic",
+            "JF.Device1.BDZY.BDZY_K2_2_Ic",
+            "JF.Device1.BDZY.BDZY_K2_3_Ic",
+            "JF.Device1.BDZY.BDZY_K2_4_Ic"
+          ],
+          "data": []
+        },
+        {
+          "label": "P(kW)",
+          "keys": [
+            "JF.Device1.BDZY.BDZY_K1_5_P",
+            "JF.Device1.BDZY.BDZY_K1_4_P",
+            "JF.Device1.BDZY.BDZY_K1_3_P",
+            "JF.Device1.BDZY.BDZY_K1_2_P",
+            "JF.Device1.BDZY.BDZY_K1_1_P",
+            "JF.Device1.BDZY.BDZY_K1JX_P",
+            "JF.Device1.BDZY.BDZY_K2JX_P",
+            "JF.Device1.BDZY.BDZY_K2_1_P",
+            "JF.Device1.BDZY.BDZY_K2_2_P",
+            "JF.Device1.BDZY.BDZY_K2_3_P",
+            "JF.Device1.BDZY.BDZY_K2_4_P"
+          ],
+          "data": []
+        },
+        {
+          "label": "Q(kvar)",
+          "keys": [
+            "JF.Device1.BDZY.BDZY_K1_5_Q",
+            "JF.Device1.BDZY.BDZY_K1_4_Q",
+            "JF.Device1.BDZY.BDZY_K1_3_Q",
+            "JF.Device1.BDZY.BDZY_K1_2_Q",
+            "JF.Device1.BDZY.BDZY_K1_1_Q",
+            "JF.Device1.BDZY.BDZY_K1JX_Q",
+            "JF.Device1.BDZY.BDZY_K2JX_Q",
+            "JF.Device1.BDZY.BDZY_K2_1_Q",
+            "JF.Device1.BDZY.BDZY_K2_2_Q",
+            "JF.Device1.BDZY.BDZY_K2_3_Q",
+            "JF.Device1.BDZY.BDZY_K2_4_Q"
+          ],
+          "data": []
+        }
+      ],
       "power_parameter": [
         {
           "key":"JF.Device1.BDZY.BDZY_K1_5_HZ",
@@ -535,6 +646,6 @@
             }
           ]
         }
-      ]
+      ],
     }
   }

jf_power_center.py

@@ -64,19 +64,44 @@ class jf_power_center():
 
     # 数据处理
     def data_handle(self, data):
-        
-        for key, val in data.items():
-            for i in range(len(val)):
-                ck = val[i]['key']
-                if ck in self.point_dict.keys():
-                    data[key][i]['value'] = self.point_dict[ck]
-                if 'data' in val[i].keys():
-                    p = val[i]['data']
-                    for j in range(len(p)):
-                        kk = p[j]['key']
-                        if kk in self.point_dict.keys():
-                            data[key][i]['data'][j]['value'] = self.point_dict[kk]
-            data[key] = val
+
+        switch_arr = data['switch']
+        for i in range(len(switch_arr)):
+            # 取每一个值的key
+            sk = switch_arr[i]['key']
+            # 根据key取值赋值
+            if sk in self.point_dict.keys():
+                data['switch'][i]['value'] = self.point_dict[sk]
+
+        power_parameter_arr = data['power_parameter_new']
+        for i in range(len(power_parameter_arr)):
+            keys_arr = power_parameter_arr[i]['keys']
+            for j in range(leng(keys_arr)):
+                k = keys_arr[j]
+                v = self.point_dict[k]
+                data['power_parameter_new'][i]['data'][j] = v
+
+        power_parameter = data['power_parameter']
+        for i in range(leng(power_parameter)):
+            if 'data' in power_parameter[i].keys():
+                p = val[i]['data']
+                for j in range(len(p)):
+                    kk = p[j]['key']
+                    if kk in self.point_dict.keys():
+                        data['power_parameter'][i]['data'][j]['value'] = self.point_dict[kk]
+
+        # for key, val in data.items():
+        #     for i in range(len(val)):
+        #         ck = val[i]['key']
+        #         if ck in self.point_dict.keys():
+        #             data[key][i]['value'] = self.point_dict[ck]
+        #         if 'data' in val[i].keys():
+        #             p = val[i]['data']
+        #             for j in range(len(p)):
+        #                 kk = p[j]['key']
+        #                 if kk in self.point_dict.keys():
+        #                     data[key][i]['data'][j]['value'] = self.point_dict[kk]
+        #     data[key] = val
         self.jdata['sys_point'] = data
 
     # 存入redis