新增根据规格码定时更新算法类型、个性语音默认值&修改shadow接口V2版本

Ansjer/urls.py

@@ -312,7 +312,7 @@ urlpatterns = [
     path('sales', SalesController.SalesView.as_view()),
     path('device/online', SalesController.DeviceOnlineView.as_view()),
     re_path('serialNumber/(?P<operation>.*)', SerialNumberController.SerialNumberView.as_view()),
-    path('deviceShadow/update', ShadowController.update_device_shadow),
+    re_path('deviceShadow/updateV2', ShadowController.update_device_shadow),
     re_path('company/(?P<operation>.*)', CompanyController.CompanyView.as_view()),
     re_path('region/(?P<operation>.*)', RegionController.RegionView.as_view()),
     re_path('vpg/(?P<operation>.*)', VPGController.VPGView.as_view()),

Controller/Cron/CronTaskController.py

@@ -87,6 +87,20 @@ class CronDelDataView(View):
                           '72V201254AA']
             UidSetModel.objects.filter(ucode__in=ucode_list, is_human=0).update(is_human=1)
             UidSetModel.objects.filter(ucode='72V201254AA', mobile_4g=0).update(mobile_4g=1)
+            # 根据设备规格码定时更新默认算法类型类型
+            ucode_list = ['823C01552AA', '823C01550AA', '823C01550XA', 'C18201550KA',
+                          '823C01550TA', '823C01550VA', '823C01850XA', 'C18201850KA',
+                          '823C01850TA', '823C01850VA']
+            UidSetModel.objects.filter(ucode__in=ucode_list, ai_type=0).update(ai_type=47)
+            ucode_list = ['730201350AA', '730201450AA', '730201450MA', '730201450NA']
+            UidSetModel.objects.filter(ucode__in=ucode_list, ai_type=0).update(ai_type=7)
+
+            # 根据设备规格码更新默认个性化语音值
+            ucode_list = ['823C01552AA', '823C01550XA', 'C18201550KA', '823C01550TA',
+                          '823C01550VA', '823C01850XA', 'C18201850KA', '823C01850TA', '823C01850VA',
+                          '730201450AA', '730201450MA', '730201450NA', '72V201252AA', '72V201253AA',
+                          '72V201353AA', '72V201354AA', '72V201355AA', '72V201254AA']
+            UidSetModel.objects.filter(ucode__in=ucode_list, is_custom_voice=0).update(is_custom_voice=1)
             return response.json(0)
         except Exception as e:
             return response.json(500, repr(e))

Controller/ShadowController.py

@@ -1,9 +1,9 @@
-import logging
+import json
 import time
 
 from django.http import JsonResponse
 
-from Ansjer.config import SERVER_TYPE
+from Ansjer.config import SERVER_TYPE, LOGGER
 from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket, UidChannelSetModel, \
     AiService, CountryModel
 from Object.ETkObject import ETkObject
@@ -19,16 +19,16 @@ def update_device_shadow(request):
         request_dict = request.GET
     else:
         return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
-
-    logger = logging.getLogger('info')
-    logger.info('---更新设备影子---, 使用配置:{}, 参数:{}'.format(SERVER_TYPE, request_dict.dict()))
+    LOGGER.info('---更新设备影子---,使用配置:{}, 参数:{}'.format(SERVER_TYPE,
+                                                     json.dumps(request_dict.dict())))
 
     try:
         etk = request_dict.get('etk', None)
         eto = ETkObject(etk)
         uid = eto.uid
         if not uid:
-            return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
+            return JsonResponse(status=200, data={'code': 400001, 'msg': 'The UID length or format is incorrect.',
+                                                  'data': {}})
 
         nowTime = int(time.time())
 
@@ -36,7 +36,7 @@ def update_device_shadow(request):
         is_reset = request_dict.get('is_reset', None)
         # 传1则重置设备信息
         if is_reset == '1':
-            logger.info('设备重置: {}'.format(uid))
+            LOGGER.info('设备重置: {}'.format(uid))
 
             # 重置语音提示
             uid_channel_qs = UidChannelSetModel.objects.filter(uid__uid=uid)
@@ -50,7 +50,7 @@ def update_device_shadow(request):
             uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=nowTime).values('id', 'has_unused').order_by(
                 'addTime')
             if not uid_bucket.exists():
-                Device_Info.objects.filter(UID=uid).update(isExist=2)
+                Device_Info.objects.filter(UID=uid).update(isExist=2, vodPrimaryUserID='', vodPrimaryMaster='')
             # 删除预览图
             uid_pre_qs = UID_Preview.objects.filter(uid=uid)
             if uid_pre_qs.exists():
@@ -61,12 +61,13 @@ def update_device_shadow(request):
             if voice_qs.exists():
                 voice_qs.delete()
 
-            # 关闭移动侦测的消息提醒
+            # 关闭移动侦测推送
+            UidSetModel.objects.filter(uid=uid).update(detect_status=0)
             Device_Info.objects.filter(UID=uid).update(NotificationMode=0)
 
             # 关闭AI
             AiService.objects.filter(uid=uid, use_status=1).update(detect_status=0, detect_group='')
-            logger.info('{}重置成功'.format(uid))
+            LOGGER.info('{}重置成功'.format(uid))
 
         ucode = request_dict.get('ucode', None)
         version = request_dict.get('version', None)
@@ -133,7 +134,7 @@ def update_device_shadow(request):
         if country_qs.exists():
             country = country_qs[0]['id']
             qs_dict['tb_country'] = country
-        logger.info('{} qs_dict: {}'.format(uid, qs_dict))
+        LOGGER.info('{} qs_dict: {}'.format(uid, qs_dict))
 
         us_qs = UidSetModel.objects.filter(uid=uid)
         if us_qs.exists():
@@ -147,8 +148,8 @@ def update_device_shadow(request):
             qs_dict['uid'] = uid
             qs_dict['addTime'] = nowTime
             UidSetModel.objects.create(**qs_dict)
-        logger.info('***设备影子保存成功{}'.format(uid))
+        LOGGER.info('***设备影子保存成功{}'.format(uid))
         return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
     except Exception as e:
-        logger.info('更新设备影子异常: {}'.format(repr(e)))
-        return JsonResponse(status=200, data={'code': 0, 'update_shadow_error': repr(e)})
+        LOGGER.info('更新设备影子异常: {}'.format(repr(e)))
+        return JsonResponse(status=200, data={'code': 1000001, 'update_shadow_error': repr(e)})