瀏覽代碼

getDeviceInfoList接口添加获取字段isAI,isHuman,iSNotification

guanhailong 2 年之前
父節點
當前提交
1420365273
共有 1 個文件被更改,包括 9 次插入1 次删除
  1. 9 1
      AdminController/DeviceManagementController.py

+ 9 - 1
AdminController/DeviceManagementController.py

@@ -216,15 +216,23 @@ class DeviceManagement(View):
                         device_info_list["datas"][k]['fields']['username'] = username
                         device_info_list["datas"][k]['fields']['username'] = username
                         device_info_list["datas"][k]['fields']['vodPrimaryMaster'] = \
                         device_info_list["datas"][k]['fields']['vodPrimaryMaster'] = \
                             device_info_list["datas"][k]['fields']['vodPrimaryMaster']
                             device_info_list["datas"][k]['fields']['vodPrimaryMaster']
+                        # 是否支持移动侦测
+                        iSNotification = '开' if device_info_list["datas"][k]['fields']['iSNotification'] == 1  else '关'
+                        device_info_list["datas"][k]['fields']['iSNotification'] = iSNotification
                         # 设备类型,是否支持Alexa和ip
                         # 设备类型,是否支持Alexa和ip
                         type = device_info_list["datas"][k]['fields']['Type']
                         type = device_info_list["datas"][k]['fields']['Type']
                         device_type_qs = DeviceTypeModel.objects.filter(type=type).values('name')
                         device_type_qs = DeviceTypeModel.objects.filter(type=type).values('name')
                         if device_type_qs.exists():
                         if device_type_qs.exists():
                             device_info_list["datas"][k]['fields']['Type'] = device_type_qs[0]['name']
                             device_info_list["datas"][k]['fields']['Type'] = device_type_qs[0]['name']
                         uid_set_qs = UidSetModel.objects.filter(
                         uid_set_qs = UidSetModel.objects.filter(
-                            uid=device_info_list["datas"][k]['fields']['UID']).values('is_alexa', 'ip', 'version')
+                            uid=device_info_list["datas"][k]['fields']['UID']).values('is_alexa', 'ip', 'version',
+                                                                                      'is_ai', 'is_human')
                         if uid_set_qs.exists():
                         if uid_set_qs.exists():
                             isAlexa = '是' if uid_set_qs[0]['is_alexa'] else '否'
                             isAlexa = '是' if uid_set_qs[0]['is_alexa'] else '否'
+                            isAI = '否' if uid_set_qs[0]['is_ai']==2 else '是'
+                            isHuman = '是' if uid_set_qs[0]['is_human'] else '否'
+                            device_info_list["datas"][k]['fields']['isHuman'] = isHuman
+                            device_info_list["datas"][k]['fields']['isAI'] = isAI
                             device_info_list["datas"][k]['fields']['isAlexa'] = isAlexa
                             device_info_list["datas"][k]['fields']['isAlexa'] = isAlexa
                             device_info_list["datas"][k]['fields']['ip'] = uid_set_qs[0]['ip']
                             device_info_list["datas"][k]['fields']['ip'] = uid_set_qs[0]['ip']
                             device_info_list["datas"][k]['fields']['version'] = uid_set_qs[0]['version']
                             device_info_list["datas"][k]['fields']['version'] = uid_set_qs[0]['version']