Merge branch 'dev' into test

Controller/EquipmentManager.py

@@ -771,14 +771,28 @@ def uid_status(request):
     if tko.code != 0:
         return response.json(tko.code)
     userID = tko.userID
+
+    # 调试
+    logger = logging.getLogger('django')
+    debugOne = int(time.time())
+
     # 判断用户是否绑定设备
     qs = UidSetModel.objects.filter(uid=uid).values('uid', 'detect_status', 'detect_interval', 'version', 'ucode',
                                                     'p2p_region', 'tz', 'video_code', 'channel', 'cloud_vod', 'id',
                                                     'detect_group', 'is_alexa', 'region_alexa')
+
+    # 调试
+    debugOnes = int(time.time())
+    logger.error('————————debugOne_sec：', debugOnes - debugOne)
+
     # 判断uid配置表信息是否存在
     if qs.exists():
         # 获取uid推送是否添加过
         us_id = qs[0]['id']
+
+        # 调试
+        debugTwo = int(time.time())
+
         if UidPushModel.objects.filter(uid_set_id=us_id, userID_id=userID).exists():
             detect_status = qs[0]['detect_status']
         else:
@@ -797,9 +811,22 @@ def uid_status(request):
             'is_alexa': qs[0]['is_alexa'],  # 推送组
             'region_alexa': qs[0]['region_alexa'],  # 推送组
         }
+
+        # 调试
+        debugTwos = int(time.time())
+        logger.error('————————debugTwo_sec：', debugTwos - debugTwo)
+
+        # 调试
+        debugThere = int(time.time())
+
         # 查询云存储相关信息
         ubqs = UID_Bucket.objects.filter(uid=uid). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
+
+        # 调试
+        debugTheres = int(time.time())
+        logger.error('————————debugTheres_sec：', debugTheres - debugThere)
+
         nowTime = int(time.time())
         if ubqs.exists():
             if ubqs[0]['endTime'] > nowTime:
@@ -825,7 +852,7 @@ def uid_status_test(request):
         return response.json(tko.code)
     userID = tko.userID
     # 判断用户是否绑定设备
-    print(000000000000000)
+    print(100000000000)
     qs = UidSetModel.objects.filter(uid=uid).values('uid', 'detect_status', 'detect_interval', 'version', 'ucode',
                                                     'p2p_region', 'tz', 'video_code', 'channel', 'cloud_vod', 'id',
                                                     'detect_group', 'is_alexa', 'region_alexa')
@@ -860,6 +887,7 @@ def uid_status_test(request):
         if ubqs.exists():
             if ubqs[0]['endTime'] > nowTime:
                 data['vod'] = list(ubqs)
+        print(3333333333333)
         return response.json(0, data)
     else:
         return response.json(0)