dever 4 years ago
parent
commit
ad859f65a9
2 changed files with 18 additions and 6 deletions
  1. 9 3
      service/mqtt/record_control.py
  2. 9 3
      service/mqtt/record_power.py

+ 9 - 3
service/mqtt/record_control.py

@@ -6,10 +6,16 @@
     author:rabin
     key:control/type/gateway/device
 """
+import time
+import json
 from demeter.core import *
-from record_sensor import Record_sensor
 class Record_control(object):
 
 	def handle(self, record, config, value):
-		sensor = Record_sensor()
-		sensor.handle(record, config, value)
+		self.record = record
+		model = Demeter.model('setting_device_type')
+		model.key = config['type']
+		device_type = model.select(type='fetchone')
+		if device_type:
+			name = device_type['name'] + '#' + str(config['child'])
+			self.record.save(config, value, name, device_type)

+ 9 - 3
service/mqtt/record_power.py

@@ -6,10 +6,16 @@
     author:rabin
     key:power/type/gateway/device
 """
+import time
+import json
 from demeter.core import *
-from record_sensor import Record_sensor
 class Record_power(object):
 
 	def handle(self, record, config, value):
-		sensor = Record_sensor()
-		sensor.handle(record, config, value)
+		self.record = record
+		model = Demeter.model('setting_device_type')
+		model.key = config['type']
+		device_type = model.select(type='fetchone')
+		if device_type:
+			name = device_type['name'] + '#' + str(config['child'])
+			self.record.save(config, value, name, device_type)