|
|
@@ -158,10 +158,10 @@ class EquipmentManagerV2(View):
|
|
|
nowTime = int(time.time())
|
|
|
data = []
|
|
|
# 设备拓展信息表
|
|
|
- us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname','ucode')
|
|
|
+ us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname', 'ucode','detect_interval')
|
|
|
uv_dict = {}
|
|
|
for us in us_qs:
|
|
|
- uv_dict[us['uid']] = {'version': us['version'], 'nickname': us['nickname'],'ucode':us['ucode']}
|
|
|
+ uv_dict[us['uid']] = {'version': us['version'], 'nickname': us['nickname'], 'ucode': us['ucode'],'detect_interval':us['detect_interval']}
|
|
|
for p in dvls:
|
|
|
p['vod'] = []
|
|
|
for dm in ubqs:
|
|
|
@@ -179,6 +179,7 @@ class EquipmentManagerV2(View):
|
|
|
# 设备版本号
|
|
|
p['uid_version'] = uv_dict[p_uid]['version']
|
|
|
p['ucode'] = uv_dict[p_uid]['ucode']
|
|
|
+ p['detect_interval'] = uv_dict[p_uid]['detect_interval']
|
|
|
# 设备昵称 调用影子信息昵称，先阶段不可
|
|
|
if uv_dict[p_uid]['nickname']:
|
|
|
p['NickName'] = uv_dict[p_uid]['nickname']
|
|
|
@@ -186,6 +187,7 @@ class EquipmentManagerV2(View):
|
|
|
# 设备版本号
|
|
|
p['uid_version'] = ''
|
|
|
p['ucode'] = ''
|
|
|
+ p['detect_interval'] = ''
|
|
|
data.append(p)
|
|
|
return response.json(0, data)
|
|
|
else:
|
|
|
@@ -195,7 +197,7 @@ class EquipmentManagerV2(View):
|
|
|
|
|
|
def do_query_reset(self, userID, request_dict, response):
|
|
|
dvqs = Device_Info.objects.filter(userID_id=userID, isExist=2)
|
|
|
- dvql = dvqs.values\
|
|
|
+ dvql = dvqs.values \
|
|
|
('id', 'NickName', 'UID', 'ChannelIndex', 'Type', 'isShare')
|
|
|
res = CommonService.qs_to_list(dvql)
|
|
|
return response.json(0, res)
|
chanjunkai