增加AI开关状态

AdminController/DeviceManagementController.py

@@ -167,7 +167,7 @@ class DeviceManagement(View):
                         if device_type_qs.exists():
                             device_info_list["datas"][k]['fields']['Type'] = device_type_qs[0]['name']
                         uid_set_qs = UidSetModel.objects.filter(
-                            uid=device_info_list["datas"][k]['fields']['UID']).\
+                            uid=device_info_list["datas"][k]['fields']['UID']). \
                             values('detect_status', 'is_alexa', 'ip', 'version', 'is_ai', 'is_human', 'cloud_vod',
                                    'ucode', 'device_type')
                         if uid_set_qs.exists():
@@ -184,10 +184,8 @@ class DeviceManagement(View):
                                 cloud_vod = '不支持'
                             if uid_set_qs[0]['is_ai'] == 2:
                                 isAI = '不支持'
-                            elif uid_set_qs[0]['is_ai'] == 1:
-                                isAI = '开启'
                             else:
-                                isAI = '关闭'
+                                isAI = '支持'
                             device_info_list["datas"][k]['fields']['isHuman'] = isHuman
                             device_info_list["datas"][k]['fields']['isAI'] = isAI
                             device_info_list["datas"][k]['fields']['isAlexa'] = isAlexa
@@ -208,6 +206,16 @@ class DeviceManagement(View):
                                 device_info_list["datas"][k]['fields']['status'] = 0
                         else:
                             device_info_list["datas"][k]['fields']['status'] = 0
+                        # AI开关状态
+                        ai_service = AiService.objects.filter(uid=device_info_list["datas"][k]['fields']['UID']).values(
+                            'detect_status')
+                        if ai_service.exists():
+                            if ai_service[0]['detect_status']:
+                                device_info_list["datas"][k]['fields']['ai_status'] = 1
+                            else:
+                                device_info_list["datas"][k]['fields']['ai_status'] = 0
+                        else:
+                            device_info_list["datas"][k]['fields']['ai_status'] = 0
             return response.json(0, {'list': device_info_list, 'total': total})
         except Exception as e:
             print(e)
@@ -538,7 +546,7 @@ class DeviceManagement(View):
     @staticmethod
     def batch_edit_app_device_type(request_dict, request, response):
         # app_device_type表数据
-        app_device_type_id = request_dict.get('app_device_type__id',None)
+        app_device_type_id = request_dict.get('app_device_type__id', None)
         model = request_dict.get('model', None)
         type = request_dict.get('type', None)
         icon = request.FILES.get('icon', None)
@@ -546,10 +554,10 @@ class DeviceManagement(View):
         device_name_language_id = request_dict.get('app_device_type__devicenamelanguage__id', None)
         sort = request_dict.get('sort', None)
         version_number = request_dict.get('version_number', None)
-        if not all([app_device_type_id,device_name_language_id, model, type, sort,version_number]):
-             return response.json(444)
+        if not all([app_device_type_id, device_name_language_id, model, type, sort, version_number]):
+            return response.json(444)
 
-        #强制类型转换
+        # 强制类型转换
         list_app_device_type_id = [int(item) for item in eval(app_device_type_id)]
         list_device_name_language_id = [int(item) for item in eval(device_name_language_id)]
 
@@ -597,7 +605,7 @@ class DeviceManagement(View):
             with transaction.atomic():
                 if icon:
                     icon_path = 'https://ansjerfilemanager.s3.amazonaws.com/app/device_type_images/{}'.format(icon)
-                    AppDeviceType.objects.filter(id=app_device_type_id)\
+                    AppDeviceType.objects.filter(id=app_device_type_id) \
                         .update(model=model, type=type, icon=icon_path, app_version_number_id=version_number)
                     bucket_name = 'ansjerfilemanager'
                     file_key = 'app/device_type_images/{}'.format(icon)
@@ -609,7 +617,7 @@ class DeviceManagement(View):
                         icon,
                         {'ContentType': icon.content_type, 'ACL': 'public-read'})
                 else:
-                    AppDeviceType.objects.filter(id=app_device_type_id)\
+                    AppDeviceType.objects.filter(id=app_device_type_id) \
                         .update(model=model, type=type, app_version_number_id=version_number)
                 DeviceNameLanguage.objects.filter(id=device_name_language_id).update(lang=lang, name=name, sort=sort)
             return response.json(0)
@@ -841,11 +849,3 @@ class DeviceManagement(View):
         except Exception as e:
             print(e)
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
-
-
-
-
-
-
-
-