|
|
@@ -168,10 +168,17 @@ class EquipmentManagerV2(View):
|
|
|
nowTime = int(time.time())
|
|
|
data = []
|
|
|
# 设备拓展信息表
|
|
|
- us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname', 'ucode','detect_interval')
|
|
|
+ us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname', 'ucode','detect_interval', 'is_human', 'is_custom_voice')
|
|
|
uv_dict = {}
|
|
|
for us in us_qs:
|
|
|
- uv_dict[us['uid']] = {'version': us['version'], 'nickname': us['nickname'], 'ucode': us['ucode'],'detect_interval':us['detect_interval']}
|
|
|
+ uv_dict[us['uid']] = {
|
|
|
+ 'version': us['version'],
|
|
|
+ 'nickname': us['nickname'],
|
|
|
+ 'ucode': us['ucode'],
|
|
|
+ 'detect_interval': us['detect_interval'],
|
|
|
+ 'is_human': us['is_human'],
|
|
|
+ 'is_custom_voice': us['is_custom_voice'],
|
|
|
+ }
|
|
|
for p in dvls:
|
|
|
p['vod'] = []
|
|
|
for dm in ubqs:
|
|
|
@@ -190,6 +197,8 @@ 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']
|
|
|
+ p['is_human'] = uv_dict[p_uid]['is_human']
|
|
|
+ p['is_custom_voice'] = uv_dict[p_uid]['is_custom_voice']
|
|
|
# 设备昵称 调用影子信息昵称，先阶段不可
|
|
|
if uv_dict[p_uid]['nickname']:
|
|
|
p['NickName'] = uv_dict[p_uid]['nickname']
|
tanghongbin