修改设备影子信息，以及优化代码

Controller/ComboCron/ComboCronPushController.py

@@ -158,7 +158,7 @@ class ComboCronPushView(View):
                 total = cls.flow_split(item.flow_total)
                 usable = cls.flow_split(item.flow_total - item.flow_total_usage)
                 msg = False
-                if item.type != 0 and item != 1:
+                if item.type != 0 and item.type != 1:
                     unicom_order_qs = UnicomComboOrderInfo.objects.filter(id=item.combo_order_id) \
                         .values('combo__combo_name')
                     combo_name = unicom_order_qs.first()['combo__combo_name'] if unicom_order_qs.exists() else ''

Controller/ShadowController.py

@@ -17,11 +17,11 @@
 # shadow.dvema.com
 # 设备影子更新
 import logging
-import threading
 import time
-from ratelimit.decorators import ratelimit
+
 import requests
 from django.http import JsonResponse
+from ratelimit.decorators import ratelimit
 
 from AnsjerPush.config import SERVER_TYPE
 from Model.models import Device_Info, UidSetModel, UID_Preview, VoicePromptModel, UID_Bucket, UidChannelSetModel, \
@@ -60,28 +60,19 @@ def generate_utk(request):
 # 设备影子更新
 def update_device_shadow(request):
     request.encoding = 'utf-8'
-    response = ResponseObject()
     if request.method == 'POST':
         request_dict = request.POST
     elif request.method == 'GET':
         request_dict = request.GET
     else:
-        return response.json(444)
-    logger = logging.getLogger('info')
-    try:
         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)})
-
-def async_device_shadow(request_dict, request):
+    logger = logging.getLogger('info')
     try:
-        logger = logging.getLogger('info')
         etk = request_dict.get('etk', None)
         eto = ETkObject(etk)
         uid = eto.uid
         if not uid:
-            return False
+            return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
         logger.info('使用配置: {}'.format(SERVER_TYPE))
         logger.info('data: {}'.format(request_dict.dict()))
 
@@ -144,6 +135,7 @@ def async_device_shadow(request_dict, request):
         mobile_4g = request_dict.get('mobile4G', None)
         is_ptz = request_dict.get('is_ptz', None)
         is_ai = request_dict.get('is_ai', None)
+        isSupportFourPoint = request_dict.get('isSupportFourPoint', None)
 
         # 更新
         qs_dict = {
@@ -181,6 +173,8 @@ def async_device_shadow(request_dict, request):
             qs_dict['is_ptz'] = is_ptz
         if is_ai:
             qs_dict['is_ai'] = is_ai
+        if isSupportFourPoint:
+            qs_dict['isSupportFourPoint'] = isSupportFourPoint
         logger.info('{} qs_dict: {}'.format(uid, qs_dict))
 
         us_qs = UidSetModel.objects.filter(uid=uid)
@@ -196,6 +190,8 @@ def async_device_shadow(request_dict, request):
             qs_dict['addTime'] = nowTime
             UidSetModel.objects.create(**qs_dict)
         logger.info('***设备影子保存成功{}'.format(uid))
+        return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
     except Exception as e:
-        print(repr(e))
         print('异步保存设备影子信息报错,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+        logger.info('更新设备影子异常: {}'.format(repr(e)))
+        return JsonResponse(status=200, data={'code': 0, 'update_shadow_error': repr(e)})