|
@@ -158,7 +158,7 @@ class GatewaySubDeviceView(View):
|
|
try:
|
|
try:
|
|
gateway_sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).\
|
|
gateway_sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).\
|
|
values('manufacturer', 'device_model', 'mac', 'sensor_serial', 'device_type', 'is_tampered',
|
|
values('manufacturer', 'device_model', 'mac', 'sensor_serial', 'device_type', 'is_tampered',
|
|
- 'firmware_version', 'hardware_version')
|
|
|
|
|
|
+ 'firmware_version', 'hardware_version', 'ieee_addr')
|
|
if not gateway_sub_device_qs.exists():
|
|
if not gateway_sub_device_qs.exists():
|
|
return response.json(173)
|
|
return response.json(173)
|
|
res = {
|
|
res = {
|
|
@@ -168,6 +168,7 @@ class GatewaySubDeviceView(View):
|
|
'sensor_serial': gateway_sub_device_qs[0]['sensor_serial'],
|
|
'sensor_serial': gateway_sub_device_qs[0]['sensor_serial'],
|
|
'firmware_version': gateway_sub_device_qs[0]['firmware_version'],
|
|
'firmware_version': gateway_sub_device_qs[0]['firmware_version'],
|
|
'hardware_version': gateway_sub_device_qs[0]['hardware_version'],
|
|
'hardware_version': gateway_sub_device_qs[0]['hardware_version'],
|
|
|
|
+ 'ieee_addr': gateway_sub_device_qs[0]['ieee_addr'],
|
|
}
|
|
}
|
|
if gateway_sub_device_qs[0]['device_type'] == SENSOR_TYPE['smart_button']: # 智能按钮返回紧急开关状态
|
|
if gateway_sub_device_qs[0]['device_type'] == SENSOR_TYPE['smart_button']: # 智能按钮返回紧急开关状态
|
|
res['emergency_status'] = gateway_sub_device_qs[0]['is_tampered']
|
|
res['emergency_status'] = gateway_sub_device_qs[0]['is_tampered']
|