dever 5 سال پیش
والد
کامیت
694c226876
2فایلهای تغییر یافته به همراه7 افزوده شده و 5 حذف شده
  1. 6 4
      service/mqtt/record.py
  2. 1 1
      service/mqtt/record_sensor.py

+ 6 - 4
service/mqtt/record.py

@@ -13,15 +13,17 @@ class Record(object):
 	def topic(self, key):
 		array = key.split('/')
 		slen = len(array)
-		if len >= 4:
+		if slen >= 4:
 			return {'method':array[0], 'type':array[1], 'parent':array[2], 'child':array[3]}
 		else:
 			return {'method':array[0], 'type':array[1], 'parent':array[2], 'child':array[2]}
 
 	def push(self, key, value):
+		value = value.replace("b'", '')
+		value = value.replace("'", '')
 		config = self.topic(key)
 		method = 'record_' + config['method']
-		cls = Demeter.getClass(method, 'service.')
+		cls = Demeter.service(method, 'mqtt')
 		state = False
 		if config['method'] != 'pic':
 			if '{' in value:
@@ -30,9 +32,9 @@ class Record(object):
 					state = True
 					for k,v in value.items():
 						config['child'] = k
-						cls().handle(self, config, v)
+						cls.handle(self, config, v)
 		if state == False:
-			cls().handle(self, config, value)
+			cls.handle(self, config, value)
 
 	def save(self, config, value, name='', device_type=None):
 		Demeter.service('device').save(config,value, name, device_type)

+ 1 - 1
service/mqtt/record_sensor.py

@@ -13,7 +13,7 @@ class Record_sensor(object):
 
 	def handle(self, record, config, value):
 		self.record = record
-		model = Demeter.model('device_type')
+		model = Demeter.model('setting_device_type')
 		model.key = config['type']
 		device_type = model.select(type='fetchone')
 		if device_type: