|
@@ -26,7 +26,6 @@ def get_data_time(zillionUtil,hbase_database, hbase_table, building,meters,funci
|
|
|
},
|
|
|
"funcid": funcid
|
|
|
}
|
|
|
- print(Criteria)
|
|
|
datas = zillionUtil.select(hbase_database, hbase_table, Criteria)
|
|
|
return datas
|
|
|
|
|
@@ -45,13 +44,13 @@ points = {'1202': 'B2南新风机房浸水报警传感器',
|
|
|
'1101': '制冷机房浸水报警传感器',
|
|
|
'9002': '楼顶南新风机房浸水报警传感器',
|
|
|
'9001': '楼顶北新风机房浸水报警传感器'}
|
|
|
-
|
|
|
+funcid = 11701
|
|
|
|
|
|
hbase_database = os.getenv("hbase_database")
|
|
|
url = os.getenv("url")
|
|
|
building = os.getenv("building")
|
|
|
dingding = os.getenv("dingding")
|
|
|
-funcid = os.getenv("funcid")
|
|
|
+# funcid = os.getenv("funcid")
|
|
|
# points = os.getenv("points")
|
|
|
|
|
|
#存报警
|