|
|
@@ -401,7 +401,7 @@ class SmartSocketView(View):
|
|
|
'power',
|
|
|
'created_time')
|
|
|
if not socket_power_qs.exists():
|
|
|
- return response.json(173)
|
|
|
+ return response.json(0, [])
|
|
|
try:
|
|
|
data = {}
|
|
|
# 设备累计电量
|
|
|
@@ -472,7 +472,7 @@ class SmartSocketView(View):
|
|
|
'id').order_by(
|
|
|
'-created_time')[(page - 1) * size:page * size]
|
|
|
if not socket_schedule_qs.exists():
|
|
|
- return response.json(173)
|
|
|
+ return response.json(0, [])
|
|
|
try:
|
|
|
schedule_list = []
|
|
|
for socket_schedule in socket_schedule_qs:
|
|
|
@@ -521,7 +521,7 @@ class SmartSocketView(View):
|
|
|
'created_time').order_by(
|
|
|
'-created_time')[(page - 1) * size:page * size]
|
|
|
if not scene_log_qs.exists():
|
|
|
- return response.json(173)
|
|
|
+ return response.json(0, [])
|
|
|
else:
|
|
|
scene_log_qs = SceneLog.objects.filter(device_id=serial_number, created_time__gte=startTime,
|
|
|
created_time__lt=endTime).values('tasks', 'status',
|
|
|
@@ -570,9 +570,7 @@ class SmartSocketView(View):
|
|
|
else:
|
|
|
startMonth += 1
|
|
|
# 计算（开始月，结束月）
|
|
|
- startYear = str(startYear)
|
|
|
- startMonth = str(startMonth)
|
|
|
- startTime = parse('%s-%s-01 00:00:00' % (startYear, startMonth))
|
|
|
+ startTime = parse('%s-%s-01 00:00:00' % (str(startYear), str(startMonth)))
|
|
|
# 获取上个月最后一天
|
|
|
if endMonth == 1:
|
|
|
endYear -= 1
|
|
|
@@ -582,7 +580,9 @@ class SmartSocketView(View):
|
|
|
endDay = calendar.monthrange(endYear, endMonth)[1]
|
|
|
endTime = parse('%s-%s-%s 23:59:59' % (str(endYear), str(endMonth), endDay))
|
|
|
time_list = CommonService.cutting_time(startTime, endTime, time_unit='month')
|
|
|
+ # 开始月的时间区间
|
|
|
startMonth_time = CommonService.str_to_timestamp(str(startTime))
|
|
|
+ # 结束月的时间区间
|
|
|
endMonth_time = CommonService.str_to_timestamp(str(endTime))
|
|
|
diction['startMonth_time'] = startMonth_time
|
|
|
diction['endMonth_time'] = endMonth_time
|
|
|
@@ -647,7 +647,7 @@ class SmartSocketView(View):
|
|
|
socket_power_qs = SocketPowerStatistics.objects.filter(serial_number=serial_number). \
|
|
|
values('electricity', 'accumulated_time', 'power', 'created_time')
|
|
|
if not socket_power_qs.exists():
|
|
|
- return response.json(173)
|
|
|
+ return response.json(0, [])
|
|
|
# 时间和功耗
|
|
|
data = {}
|
|
|
new_list = []
|
