|
@@ -79,9 +79,13 @@ class jf_compressed_air():
|
|
|
rp = data[key][i]['warn_state']
|
|
rp = data[key][i]['warn_state']
|
|
|
for j in range(len(rp)):
|
|
for j in range(len(rp)):
|
|
|
kk = rp[j]['key']
|
|
kk = rp[j]['key']
|
|
|
|
|
+ vv = self.point_dict[kk]
|
|
|
if kk in self.point_dict.keys():
|
|
if kk in self.point_dict.keys():
|
|
|
# data[key][i]['warn_state'][j]['val'] = self.point_dict[kk]
|
|
# data[key][i]['warn_state'][j]['val'] = self.point_dict[kk]
|
|
|
- data[key][i]['warn_state'][j]['state'] = self.point_dict[kk]
|
|
|
|
|
|
|
+ if vv == True:
|
|
|
|
|
+ data[key][i]['warn_state'][j]['state'] = 1
|
|
|
|
|
+ else:
|
|
|
|
|
+ data[key][i]['warn_state'][j]['state'] = 2
|
|
|
self.jdata['sys_point'] = data
|
|
self.jdata['sys_point'] = data
|
|
|
|
|
|
|
|
# 存入redis
|
|
# 存入redis
|
