rabin пре 7 година
родитељ
комит
ce6145f6d4
3 измењених фајлова са 4 додато и 3 уклоњено
  1. 2 0
      service/record.py
  2. 1 2
      service/record_control.py
  3. 1 1
      service/record_status.py

+ 2 - 0
service/record.py

@@ -40,6 +40,8 @@ class Record(object):
 		if gateway and value:
 			#更新网关状态
 			self.gateway(config['parent'], gateway['farm_id'], gateway['id'])
+			if config['method'] == 'control' and (value == '0' or value == 0):
+				return
 			model_type = Demeter.model('hardware_type')
 			model_type.key = config['method']
 			hard = model_type.select(type='fetchone')

+ 1 - 2
service/record_control.py

@@ -12,5 +12,4 @@ class Record_control(object):
 
 	def handle(self, record, config, value):
 		sensor = Record_sensor()
-		if value and value != '0' and value != 0:
-			sensor.handle(record, config, value)
+		sensor.handle(record, config, value)

+ 1 - 1
service/record_status.py

@@ -14,7 +14,7 @@ class Record_status(object):
 		model.hardware_id = config['child']
 		model.hardware_type = 3
 		device = model.select(type='fetchone')
-		if device and value and value != '0' and value != 0:
+		if device:
 			param = {}
 			param['info'] = device
 			Demeter.service('device').switchAction(param, False, False, False, msg=value)