设备影子更新添加异常捕获和重置成功信息打印

Controller/ShadowController.py

@@ -67,117 +67,118 @@ def update_device_shadow(request):
         request_dict = request.GET
     else:
         return response.json(444)
-    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()))
-    if SERVER_TYPE != 'Ansjer.cn_formal_settings':
-        requests.post(url='http://shadow.zositechc.cn/deviceShadow/update', data=request_dict.dict(), timeout=2)
-    nowTime = int(time.time())
-
-    # 重置按钮
-    is_reset = request_dict.get('is_reset', None)
-    # 传1则重置设备信息
-    if is_reset == '1':
-        logger.info('设备重置: {}'.format(uid))
-
-        # 重置语音提示
-        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)
-
-        # 删除uid_set数据
-        UidSetModel.objects.filter(uid=uid).delete()
-
-        # 购买云存套餐的设备isExist置为2
-        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)
-        # 删除预览图
-        uid_pre_qs = UID_Preview.objects.filter(uid=uid)
-        if uid_pre_qs.exists():
-            uid_pre_qs.delete()
-
-        # 删除语音提示
-        voice_qs = VoicePromptModel.objects.filter(uid=uid)
-        if voice_qs.exists():
-            voice_qs.delete()
-
-        # 关闭移动侦测的消息提醒
-        Device_Info.objects.filter(UID=uid).update(NotificationMode=0)
-
-    # return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
-    ucode = request_dict.get('ucode', None)
-    version = request_dict.get('version', None)
-    p2p_region = request_dict.get('p2p_region', None)
-    tz = request_dict.get('tz', None)
-    video_code = request_dict.get('video_code', None)
-    ip = CommonService.get_ip_address(request)
-    channel = request_dict.get('channel', None)
-    cloud_vod = request_dict.get('cloud_vod', None)
-    push_status = request_dict.get('push_status', None)
-    pwd = request_dict.get('pwd', None)
-    resetTime = request_dict.get('resetTime', None)
-    is_alexa = request_dict.get('is_alexa', None)
-    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)
-    is_ptz = request_dict.get('is_ptz', None)
-    # 更新
-    qs_dict = {
-        'updTime': nowTime,
-        'ip': ip
-    }
-    if channel:
-        qs_dict['channel'] = channel
-    if p2p_region:
-        qs_dict['p2p_region'] = p2p_region
-    if ucode:
-        qs_dict['ucode'] = ucode
-    if version:
-        qs_dict['version'] = version
-    if tz:
-        qs_dict['tz'] = tz
-    if video_code:
-        qs_dict['video_code'] = video_code
-    if cloud_vod:
-        qs_dict['cloud_vod'] = cloud_vod
-    if push_status:
-        # 复位重置推送消息提醒
-        qs_dict['detect_status'] = 0 if is_reset == '1' else push_status
-    if pwd:
-        qs_dict['pwd'] = pwd
-    if is_human:
-        qs_dict['is_human'] = is_human
-    if is_custom_voice:
-        qs_dict['is_custom_voice'] = is_custom_voice
-    if double_wifi:
-        qs_dict['double_wifi'] = double_wifi
-    if is_ptz:
-        qs_dict['is_ptz'] = is_ptz
-    logger.info('{} qs_dict: {}'.format(uid, qs_dict))
-
-    us_qs = UidSetModel.objects.filter(uid=uid)
-    if us_qs.exists():
-        if is_alexa and us_qs[0].is_alexa == 0:
-            qs_dict['is_alexa'] = is_alexa
-        us_qs.update(**qs_dict)
-        # 如果推送状态开启，返回推送url
-        return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
-    # 新增
-    else:
-        if is_alexa:
-            qs_dict['is_alexa'] = is_alexa
-        qs_dict['uid'] = uid
-        qs_dict['addTime'] = nowTime
-        UidSetModel.objects.create(**qs_dict)
-        # 如果推送状态开启，返回推送url
-        return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
 
+    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()))
+        if SERVER_TYPE != 'Ansjer.cn_formal_settings':
+            requests.post(url='http://shadow.zositechc.cn/deviceShadow/update', data=request_dict.dict(), timeout=2)
+        nowTime = int(time.time())
+
+        # 重置按钮
+        is_reset = request_dict.get('is_reset', None)
+        # 传1则重置设备信息
+        if is_reset == '1':
+            logger.info('设备重置: {}'.format(uid))
+
+            # 重置语音提示
+            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)
+
+            # 购买云存套餐的设备isExist置为2
+            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)
+            # 删除预览图
+            uid_pre_qs = UID_Preview.objects.filter(uid=uid)
+            if uid_pre_qs.exists():
+                uid_pre_qs.delete()
+
+            # 删除语音提示
+            voice_qs = VoicePromptModel.objects.filter(uid=uid)
+            if voice_qs.exists():
+                voice_qs.delete()
+
+            # 关闭移动侦测的消息提醒
+            Device_Info.objects.filter(UID=uid).update(NotificationMode=0)
+            logger.info('{}重置成功'.format(uid))
+
+        # return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
+        ucode = request_dict.get('ucode', None)
+        version = request_dict.get('version', None)
+        p2p_region = request_dict.get('p2p_region', None)
+        tz = request_dict.get('tz', None)
+        video_code = request_dict.get('video_code', None)
+        ip = CommonService.get_ip_address(request)
+        channel = request_dict.get('channel', None)
+        cloud_vod = request_dict.get('cloud_vod', None)
+        push_status = request_dict.get('push_status', None)
+        pwd = request_dict.get('pwd', None)
+        resetTime = request_dict.get('resetTime', None)
+        is_alexa = request_dict.get('is_alexa', None)
+        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)
+        is_ptz = request_dict.get('is_ptz', None)
+        # 更新
+        qs_dict = {
+            'updTime': nowTime,
+            'ip': ip
+        }
+        if channel:
+            qs_dict['channel'] = channel
+        if p2p_region:
+            qs_dict['p2p_region'] = p2p_region
+        if ucode:
+            qs_dict['ucode'] = ucode
+        if version:
+            qs_dict['version'] = version
+        if tz:
+            qs_dict['tz'] = tz
+        if video_code:
+            qs_dict['video_code'] = video_code
+        if cloud_vod:
+            qs_dict['cloud_vod'] = cloud_vod
+        if push_status:
+            # 复位重置推送消息提醒
+            qs_dict['detect_status'] = 0 if is_reset == '1' else push_status
+        if pwd:
+            qs_dict['pwd'] = pwd
+        if is_human:
+            qs_dict['is_human'] = is_human
+        if is_custom_voice:
+            qs_dict['is_custom_voice'] = is_custom_voice
+        if double_wifi:
+            qs_dict['double_wifi'] = double_wifi
+        if is_ptz:
+            qs_dict['is_ptz'] = is_ptz
+        logger.info('{} qs_dict: {}'.format(uid, qs_dict))
+
+        us_qs = UidSetModel.objects.filter(uid=uid)
+        if us_qs.exists():
+            if is_alexa and us_qs[0].is_alexa == 0:
+                qs_dict['is_alexa'] = is_alexa
+            us_qs.update(**qs_dict)
+            # 如果推送状态开启，返回推送url
+            return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
+        # 新增
+        else:
+            if is_alexa:
+                qs_dict['is_alexa'] = is_alexa
+            qs_dict['uid'] = uid
+            qs_dict['addTime'] = nowTime
+            UidSetModel.objects.create(**qs_dict)
+            # 如果推送状态开启，返回推送url
+            return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
+    except Exception as e:
+        return JsonResponse(status=500, data={'update_shadow_error': repr(e)})