|
@@ -4,6 +4,7 @@
|
|
|
name:data.py
|
|
|
author:rabin
|
|
|
"""
|
|
|
+from demeter.core import *
|
|
|
from .__load__ import *
|
|
|
import datetime
|
|
|
import calendar
|
|
@@ -20,9 +21,8 @@ class Data(Model):
|
|
|
self.setTable(data)
|
|
|
json = self.insert_json(data)
|
|
|
self.db.write_points(json)
|
|
|
- value = str(data['farm']) + '||' + str(data['device']) + '||' + str(data['hard']) + '||' + str(data['type']) + '||' + str(data['gateway']) + '||' + str(data['source']) + '||' + str(data['value'])
|
|
|
- print(value)
|
|
|
- Demeter.sync(self.table, value)
|
|
|
+ value = str(data['farm']) + '__' + str(data['device']) + '__' + str(data['hard']) + '__' + str(data['type']) + '__' + str(data['gateway']) + '__' + str(data['source']) + '__' + str(data['value'])
|
|
|
+ Demeter.service('core', 'zeus').rsync(self.table, value)
|
|
|
|
|
|
def insert_json(self, data):
|
|
|
json = [
|