|
|
@@ -38,6 +38,7 @@ def device():
|
|
|
def control():
|
|
|
while 1:
|
|
|
model = Demeter.model('device_info')
|
|
|
+ type_model = Demeter.model('device_type')
|
|
|
cur = Demeter.time() - 10
|
|
|
model.cdate.assgin(cur, '<=')
|
|
|
model.hardware_type = 3
|
|
|
@@ -45,27 +46,27 @@ def control():
|
|
|
data = model.select()
|
|
|
for v in data:
|
|
|
model.id = v['id']
|
|
|
- type_model = Demeter.model('device_type')
|
|
|
type_model.id = v['type_id']
|
|
|
type_info = type_model.select(type='fetchone')
|
|
|
+ oper = ''
|
|
|
if type_info['unit'] == 'button':
|
|
|
- if v['cxtype'] == 1:
|
|
|
+ if v['cxnum'] == 1:
|
|
|
oper = '升起'
|
|
|
- elif v['cxtype'] == 2:
|
|
|
+ elif v['cxnum'] == 2:
|
|
|
oper = '降下'
|
|
|
- elif v['cxtype'] == 5:
|
|
|
+ elif v['cxnum'] == 5:
|
|
|
oper = '停止'
|
|
|
else:
|
|
|
- if v['cxtype'] == 1:
|
|
|
+ if v['cxnum'] == 1:
|
|
|
oper = '开启'
|
|
|
else:
|
|
|
oper = '关闭'
|
|
|
if v['exp'] == '-1':
|
|
|
msg = service.notice('timeout')
|
|
|
- service.mul(v['id'], v['name'], v['cxtype'], '失败:' + msg, False, oper=oper)
|
|
|
+ service.mul(v['id'], v['name'], v['cxnum'], '失败:' + msg, False, oper=oper)
|
|
|
else:
|
|
|
msg = '1'
|
|
|
- service.mul(v['id'], v['name'], v['cxtype'], '', True)
|
|
|
+ service.mul(v['id'], v['name'], v['cxnum'], '', True)
|
|
|
model.update(exp=msg)
|
|
|
|
|
|
gevent.sleep(timeSleep)
|
rabin