|
@@ -10,13 +10,13 @@ import calendar
|
|
|
import datetime
|
|
import datetime
|
|
|
import logging
|
|
import logging
|
|
|
import time
|
|
import time
|
|
|
|
|
+from decimal import Decimal
|
|
|
|
|
|
|
|
from dateutil.parser import parse
|
|
from dateutil.parser import parse
|
|
|
from django.db import transaction
|
|
from django.db import transaction
|
|
|
from django.db.models import Sum, Count
|
|
from django.db.models import Sum, Count
|
|
|
from django.http import QueryDict
|
|
from django.http import QueryDict
|
|
|
from django.views import View
|
|
from django.views import View
|
|
|
-from decimal import Decimal
|
|
|
|
|
|
|
|
|
|
from Model.models import SocketInfo, SocketSchedule, Device_Info, SocketPowerStatistics, SceneLog, FamilyRoomDevice
|
|
from Model.models import SocketInfo, SocketSchedule, Device_Info, SocketPowerStatistics, SceneLog, FamilyRoomDevice
|
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
@@ -221,6 +221,7 @@ class SmartSocketView(View):
|
|
|
if not device_id:
|
|
if not device_id:
|
|
|
return False
|
|
return False
|
|
|
socket_info_qs = SocketInfo.objects.filter(device_id=device_id, type_switch=type_switch)
|
|
socket_info_qs = SocketInfo.objects.filter(device_id=device_id, type_switch=type_switch)
|
|
|
|
|
+ LOGGER.info('进入插座电源开关OR倒计时，类型：{}'.format(type_switch))
|
|
|
now_time = int(time.time())
|
|
now_time = int(time.time())
|
|
|
try:
|
|
try:
|
|
|
with transaction.atomic():
|
|
with transaction.atomic():
|
