|
|
@@ -267,14 +267,15 @@ class GatewayDeviceView(View):
|
|
|
'deviceNickName': device_info_qs['NickName'],
|
|
|
'UID': device_info_qs['UID'],
|
|
|
'serialNumber': device_info_qs['serial_number'][:6] if device_info_qs['serial_number'][:6] else '',
|
|
|
- 'power': '',
|
|
|
- 'electricity': '',
|
|
|
- 'accumulatedTime': '',
|
|
|
+ 'power': 0,
|
|
|
+ 'electricity': 0,
|
|
|
+ 'countDownTime': 0,
|
|
|
'socketStatus': False,
|
|
|
'online': False,
|
|
|
- 'countDownTime': '',
|
|
|
+ 'accumulatedTime': 0,
|
|
|
+ 'start': False,
|
|
|
'roomName': '',
|
|
|
- 'iot': {},
|
|
|
+ 'iot_data': {},
|
|
|
'roomId': '',
|
|
|
'familyId': ''
|
|
|
}
|
|
|
@@ -298,29 +299,30 @@ class GatewayDeviceView(View):
|
|
|
serial_number=device_qs['device__serial_number'][0:6])
|
|
|
if iot_device_info_qs.exists():
|
|
|
iot_device_Info = iot_device_info_qs.values('endpoint', 'token_iot_number')
|
|
|
- gateway['iot'] = {
|
|
|
+ gateway['iot_data'] = {
|
|
|
'endpoint': iot_device_Info[0]['endpoint'],
|
|
|
'token_iot_number': iot_device_Info[0]['token_iot_number']
|
|
|
}
|
|
|
else:
|
|
|
socket_info_qs = SocketInfo.objects.filter(device_id=device_id).values('online', 'type_switch',
|
|
|
'status',
|
|
|
- 'count_down_time')
|
|
|
+ 'count_down_time', 'start')
|
|
|
socket_power_qs = SocketPowerStatistics.objects.filter(device_id=device_id).values('accumulated_time',
|
|
|
'power',
|
|
|
'electricity')
|
|
|
if not socket_info_qs.exists():
|
|
|
return response.json(173)
|
|
|
# 插座电量统计
|
|
|
- gateway['power'] = socket_power_qs[0]['power'] if socket_power_qs.exists() else 0.00
|
|
|
- gateway['electricity'] = socket_power_qs[0]['electricity'] if socket_power_qs.exists() else 0.00
|
|
|
+ gateway['power'] = socket_power_qs[0]['power'] if socket_power_qs.exists() else 0
|
|
|
+ gateway['electricity'] = socket_power_qs[0]['electricity'] if socket_power_qs.exists() else 0
|
|
|
gateway['accumulatedTime'] = socket_power_qs[0][
|
|
|
- 'accumulated_time'] if socket_power_qs.exists() else '0:00'
|
|
|
+ 'accumulated_time'] if socket_power_qs.exists() else 0
|
|
|
# 插座信息
|
|
|
+ gateway['start'] = socket_info_qs[0]['start'] if socket_info_qs.exists() else False
|
|
|
gateway['socketStatus'] = socket_info_qs[0]['status'] if socket_info_qs[0]['status'] else False
|
|
|
gateway['online'] = socket_info_qs[0]['online'] if socket_info_qs[0]['online'] else False
|
|
|
- gateway['accumulatedTime'] = socket_info_qs[0]['count_down_time'] if socket_info_qs[0][
|
|
|
- 'count_down_time'] else '00:00:00'
|
|
|
+ gateway['countDownTime'] = socket_info_qs[0]['count_down_time'] if socket_info_qs[0][
|
|
|
+ 'count_down_time'] else 0
|
|
|
# 查詢iot
|
|
|
iot_device_info_qs = iotdeviceInfoModel.objects.filter(
|
|
|
serial_number=device_info_qs['serial_number'][0:6])
|
