|
@@ -243,7 +243,7 @@ class GatewaySubDeviceView(View):
|
|
|
created_time__range=(start_time, now_time)). \
|
|
created_time__range=(start_time, now_time)). \
|
|
|
values('alarm', 'created_time').order_by('created_time')
|
|
values('alarm', 'created_time').order_by('created_time')
|
|
|
if not sensor_record_qs.exists():
|
|
if not sensor_record_qs.exists():
|
|
|
- return []
|
|
|
|
|
|
|
+ return record_dict
|
|
|
|
|
|
|
|
for sensor_record in sensor_record_qs:
|
|
for sensor_record in sensor_record_qs:
|
|
|
created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
|
|
created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
|
|
@@ -265,7 +265,7 @@ class GatewaySubDeviceView(View):
|
|
|
created_time__range=(start_time, now_time)). \
|
|
created_time__range=(start_time, now_time)). \
|
|
|
values('alarm', 'created_time').order_by('created_time')
|
|
values('alarm', 'created_time').order_by('created_time')
|
|
|
if not sensor_record_qs.exists():
|
|
if not sensor_record_qs.exists():
|
|
|
- return []
|
|
|
|
|
|
|
+ return record_dict
|
|
|
|
|
|
|
|
for sensor_record in sensor_record_qs:
|
|
for sensor_record in sensor_record_qs:
|
|
|
created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
|
|
created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
|
|
@@ -284,7 +284,7 @@ class GatewaySubDeviceView(View):
|
|
|
created_time__range=(start_time, now_time)). \
|
|
created_time__range=(start_time, now_time)). \
|
|
|
values('alarm', 'created_time').order_by('created_time')
|
|
values('alarm', 'created_time').order_by('created_time')
|
|
|
if not sensor_record_qs.exists():
|
|
if not sensor_record_qs.exists():
|
|
|
- return []
|
|
|
|
|
|
|
+ return record_dict
|
|
|
|
|
|
|
|
for sensor_record in sensor_record_qs:
|
|
for sensor_record in sensor_record_qs:
|
|
|
created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
|
|
created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
|
|
@@ -292,7 +292,7 @@ class GatewaySubDeviceView(View):
|
|
|
day = int(created_time[3:5])
|
|
day = int(created_time[3:5])
|
|
|
date = str(month) + '/' + str(day)
|
|
date = str(month) + '/' + str(day)
|
|
|
alarm = float(sensor_record['alarm'])
|
|
alarm = float(sensor_record['alarm'])
|
|
|
- # 组织数据,record_dict:{"0": [1.0, 2.0, 3.0], "1": [1.0, 2.0, 3.0]...}
|
|
|
|
|
|
|
+ # 组织数据,record_dict:{"1/1": [1.0, 2.0, 3.0], "1/2": [1.0, 2.0, 3.0]...}
|
|
|
if date in record_dict:
|
|
if date in record_dict:
|
|
|
record_dict[date].append(alarm)
|
|
record_dict[date].append(alarm)
|
|
|
else:
|
|
else:
|
