|
|
@@ -18,7 +18,7 @@ from django.http import QueryDict
|
|
|
from django.views import View
|
|
|
from decimal import Decimal
|
|
|
|
|
|
-from Model.models import SocketInfo, SocketSchedule, Device_Info, SocketPowerStatistics, SceneLog
|
|
|
+from Model.models import SocketInfo, SocketSchedule, Device_Info, SocketPowerStatistics, SceneLog, FamilyRoomDevice
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.utils import LocalDateTimeUtil
|
|
|
from Service.CommonService import CommonService
|
|
|
@@ -87,7 +87,6 @@ class SmartSocketView(View):
|
|
|
"""
|
|
|
智能插座复位删除数据
|
|
|
"""
|
|
|
- LOGGER = logging.getLogger('info')
|
|
|
try:
|
|
|
with transaction.atomic():
|
|
|
serial_number = request_dict.get('serialNumber', None)
|
|
|
@@ -107,6 +106,10 @@ class SmartSocketView(View):
|
|
|
SocketSchedule.objects.filter(device_id=device_id).delete()
|
|
|
# 删除插座开关日志
|
|
|
SceneLog.objects.filter(device_id=serial_number).delete()
|
|
|
+ # 删除设备管理家庭接口
|
|
|
+ FamilyRoomDevice.objects.filter(device_id=device_id).delete()
|
|
|
+ # 删除设备
|
|
|
+ Device_Info.objects.filter(id=device_id).delete()
|
|
|
LOGGER.info('智能插座{}设备已复位'.format(serial_number))
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
@@ -457,9 +460,9 @@ class SmartSocketView(View):
|
|
|
today_start_time = int(time.mktime(time.strptime(str(today), '%Y-%m-%d')))
|
|
|
today_socket_power_qs = all_socket_power_qs.filter(created_time__gte=today_start_time,
|
|
|
created_time__lt=nowTime).values('electricity',
|
|
|
- 'accumulated_time',
|
|
|
- 'power',
|
|
|
- 'created_time')
|
|
|
+ 'accumulated_time',
|
|
|
+ 'power',
|
|
|
+ 'created_time')
|
|
|
# 当天使用电量
|
|
|
data['electricityToday'] = today_socket_power_qs[0]['electricity'].quantize(
|
|
|
Decimal("0.00")) if today_socket_power_qs.exists() else 0
|
