|
@@ -414,7 +414,7 @@ class EquipmentFamilyView(View):
|
|
|
uid_set_qs = UidSetModel.objects.filter(uid__in=uid_list) \
|
|
uid_set_qs = UidSetModel.objects.filter(uid__in=uid_list) \
|
|
|
.values('id', 'uid', 'version', 'nickname', 'ucode',
|
|
.values('id', 'uid', 'version', 'nickname', 'ucode',
|
|
|
'detect_status', 'detect_group',
|
|
'detect_status', 'detect_group',
|
|
|
- 'detect_interval',
|
|
|
|
|
|
|
+ 'detect_interval', 'ai_type',
|
|
|
'region_alexa', 'is_alexa', 'deviceModel',
|
|
'region_alexa', 'is_alexa', 'deviceModel',
|
|
|
'TimeZone', 'TimeStatus', 'SpaceUsable',
|
|
'TimeZone', 'TimeStatus', 'SpaceUsable',
|
|
|
'SpaceSum', 'MirrorType', 'RecordType',
|
|
'SpaceSum', 'MirrorType', 'RecordType',
|
|
@@ -447,7 +447,8 @@ class EquipmentFamilyView(View):
|
|
|
'is_custom_voice': us['is_custom_voice'],
|
|
'is_custom_voice': us['is_custom_voice'],
|
|
|
'is_ptz': us['is_ptz'],
|
|
'is_ptz': us['is_ptz'],
|
|
|
'double_wifi': us['double_wifi'],
|
|
'double_wifi': us['double_wifi'],
|
|
|
- 'is_ai': us['is_ai']
|
|
|
|
|
|
|
+ 'is_ai': us['is_ai'],
|
|
|
|
|
+ 'ai_type': us['ai_type']
|
|
|
}
|
|
}
|
|
|
# 从uid_channel里面取出通道配置信息
|
|
# 从uid_channel里面取出通道配置信息
|
|
|
uid_channel_set_qs = UidChannelSetModel.objects.filter(uid__id=us['id']) \
|
|
uid_channel_set_qs = UidChannelSetModel.objects.filter(uid__id=us['id']) \
|
|
@@ -566,6 +567,7 @@ class EquipmentFamilyView(View):
|
|
|
p['channels'] = uid_set_dict[p_uid]['channels']
|
|
p['channels'] = uid_set_dict[p_uid]['channels']
|
|
|
p['double_wifi'] = uid_set_dict[p_uid]['double_wifi']
|
|
p['double_wifi'] = uid_set_dict[p_uid]['double_wifi']
|
|
|
p['is_ai'] = uid_set_dict[p_uid]['is_ai']
|
|
p['is_ai'] = uid_set_dict[p_uid]['is_ai']
|
|
|
|
|
+ p['ai_type'] = uid_set_dict[p_uid]['ai_type']
|
|
|
# 设备昵称 调用影子信息昵称，先阶段不可
|
|
# 设备昵称 调用影子信息昵称，先阶段不可
|
|
|
if uid_set_dict[p_uid]['nickname']:
|
|
if uid_set_dict[p_uid]['nickname']:
|
|
|
p['NickName'] = uid_set_dict[p_uid]['nickname']
|
|
p['NickName'] = uid_set_dict[p_uid]['nickname']
|
