修改设备更新

Controller/ShadowController.py

@@ -17,19 +17,17 @@
 # shadow.dvema.com
 # 设备影子更新
 import logging
+import time
 
 import requests
+from django.http import JsonResponse
 
 from AnsjerPush.config import SERVER_TYPE
-from Object.LogUtil import LogUtil
-from Object.ResponseObject import ResponseObject
-from Object.ETkObject import ETkObject
-import time
 from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket, UidChannelSetModel, \
     AiService
+from Object.ETkObject import ETkObject
+from Object.ResponseObject import ResponseObject
 from Service.CommonService import CommonService
-from django.http import JsonResponse
-from Object.UidTokenObject import UidTokenObject
 
 
 def generate_utk(request):
@@ -68,15 +66,13 @@ def update_device_shadow(request):
         request_dict = request.GET
     else:
         return response.json(444)
-
+    logger = logging.getLogger('info')
     try:
         etk = request_dict.get('etk', None)
         eto = ETkObject(etk)
         uid = eto.uid
         if not uid:
             return JsonResponse(status=200, data={'code': 403, 'msg': 'error etk'})
-
-        logger = logging.getLogger('info')
         logger.info('使用配置: {}'.format(SERVER_TYPE))
         logger.info('data: {}'.format(request_dict.dict()))
 
@@ -96,7 +92,9 @@ def update_device_shadow(request):
             uid_channel_qs = UidChannelSetModel.objects.filter(uid__uid=uid)
             if uid_channel_qs.exists():
                 uid_channel_qs.update(voice_prompt_intelligent_mute=0, voice_prompt_status=0, voice_prompt_enter=0,
-                               voice_prompt_leave=0, voice_repeat_day=127,  voice_start_time=0, voice_end_time=0, voice_start_x=0, voice_start_y =18,voice_end_x=44, voice_end_y=18,voice_direction=0)
+                                      voice_prompt_leave=0, voice_repeat_day=127, voice_start_time=0, voice_end_time=0,
+                                      voice_start_x=0, voice_start_y=18, voice_end_x=44, voice_end_y=18,
+                                      voice_direction=0)
 
             # 购买云存套餐的设备isExist置为2
             uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=nowTime).values('id', 'has_unused').order_by(
@@ -137,6 +135,7 @@ def update_device_shadow(request):
         is_human = request_dict.get('is_human', None)
         is_custom_voice = request_dict.get('is_custom', None)
         double_wifi = request_dict.get('double_wifi', None)
+        mobile_4g = request_dict.get('mobile4G', None)
         is_ptz = request_dict.get('is_ptz', None)
         is_ai = request_dict.get('is_ai', None)
 
@@ -170,6 +169,8 @@ def update_device_shadow(request):
             qs_dict['is_custom_voice'] = is_custom_voice
         if double_wifi:
             qs_dict['double_wifi'] = double_wifi
+        if mobile_4g:
+            qs_dict['mobile_4g'] = int(mobile_4g)
         if is_ptz:
             qs_dict['is_ptz'] = is_ptz
         if is_ai:

Model/models.py

@@ -1160,6 +1160,7 @@ class UidSetModel(models.Model):
     is_human = models.IntegerField(default=0, verbose_name='是否支持人形追踪。0：不支持，1：支持')
     is_custom_voice = models.IntegerField(default=0, verbose_name='是否支持自定义语音。0：不支持，1：支持')
     double_wifi = models.IntegerField(default=0, verbose_name='是否支持双频wifi。0：不支持，1：支持')
+    mobile_4g = models.IntegerField(default=0, verbose_name='是否支持4g。0：不支持，1：支持')
     is_ptz = models.IntegerField(default=0, verbose_name='是否支持云台。0：不支持，1：支持')
     is_ai = models.IntegerField(default=2, verbose_name='是否支持ai')  # 0,关闭，1开启，2,不支持
     is_notification = models.IntegerField(blank=True, default=1, verbose_name='新加-消息提醒开关')  # 0：关闭，1：开启