|
|
@@ -195,27 +195,28 @@ class EquipmentInfoService:
|
|
|
|
|
|
equipment_info_qs = equipment_info_qs.order_by('-event_time')
|
|
|
qs_page = equipment_info_qs[(page - 1) * size:page * size]
|
|
|
- if qs_page and len(qs_page) > 0:
|
|
|
- for item in qs_page:
|
|
|
- # 星期表值
|
|
|
- tab_val = item['tab_val']
|
|
|
- # id = 星期表值+id
|
|
|
- item['id'] = int(tab_val + str(item['id']))
|
|
|
- item['devUid'] = item['device_uid']
|
|
|
- item['devNickName'] = item['device_nick_name']
|
|
|
- item['Channel'] = item['channel']
|
|
|
- item['eventType'] = item['event_type']
|
|
|
- item['eventTime'] = item['event_time']
|
|
|
- item['receiveTime'] = item['receive_time']
|
|
|
- item['addTime'] = item['add_time']
|
|
|
- item['borderCoords'] = item['border_coords']
|
|
|
- item.pop('device_uid')
|
|
|
- item.pop('device_nick_name')
|
|
|
- item.pop('channel')
|
|
|
- item.pop('event_type')
|
|
|
- item.pop('event_time')
|
|
|
- item.pop('receive_time')
|
|
|
- item.pop('add_time')
|
|
|
- item.pop('border_coords')
|
|
|
- item.pop('tab_val')
|
|
|
+ if not qs_page or not qs_page.exists() or qs_page.count == 0:
|
|
|
+ return qs_page
|
|
|
+ for item in qs_page:
|
|
|
+ # 星期表值
|
|
|
+ tab_val = item['tab_val']
|
|
|
+ # id = 星期表值+id
|
|
|
+ item['id'] = int(tab_val + str(item['id']))
|
|
|
+ item['devUid'] = item['device_uid']
|
|
|
+ item['devNickName'] = item['device_nick_name']
|
|
|
+ item['Channel'] = item['channel']
|
|
|
+ item['eventType'] = item['event_type']
|
|
|
+ item['eventTime'] = item['event_time']
|
|
|
+ item['receiveTime'] = item['receive_time']
|
|
|
+ item['addTime'] = item['add_time']
|
|
|
+ item['borderCoords'] = item['border_coords']
|
|
|
+ item.pop('device_uid')
|
|
|
+ item.pop('device_nick_name')
|
|
|
+ item.pop('channel')
|
|
|
+ item.pop('event_type')
|
|
|
+ item.pop('event_time')
|
|
|
+ item.pop('receive_time')
|
|
|
+ item.pop('add_time')
|
|
|
+ item.pop('border_coords')
|
|
|
+ item.pop('tab_val')
|
|
|
return qs_page
|
