Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Ansjer/urls.py

@@ -202,6 +202,7 @@ urlpatterns = [
     # 判断节假日接口
     url(r'^date/(?P<operation>.*)$', DateController.DateConView.as_view()),
 
+    url(r'^equipment/flow_test$', EquipmentManager.uid_status_test),
     # app 设备消息模板
     # 路由加参数参考
     # url(r'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),

Controller/DetectController.py

@@ -170,6 +170,10 @@ class DetectControllerView(View):
         lang = request_dict.get('lang', 'en')
         tz = request_dict.get('tz', '0')
         # 消息提醒功能新增
+
+        # 如果传空上来，就默认为0
+        if tz=='':
+            tz=0
         detect_group = request_dict.get('detect_group', None)
         interval = request_dict.get('interval', None)
         if not status:

Controller/EquipmentManager.py

@@ -835,6 +835,64 @@ def uid_status(request):
     else:
         return response.json(0)
 
+def uid_status_test(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)
+    token = request_dict.get('token', None)
+    uid = request_dict.get('uid', None)
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
+    # 判断用户是否绑定设备
+    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')
+    # 判断uid配置表信息是否存在
+    if qs.exists():
+        # 获取uid推送是否添加过
+        print(1111111111111)
+        us_id = qs[0]['id']
+        if UidPushModel.objects.filter(uid_set_id=us_id, userID_id=userID).exists():
+            detect_status = qs[0]['detect_status']
+        else:
+            detect_status = 0
+        data = {
+            'push_status': detect_status,  # 推送状态
+            'push_interval': qs[0]['detect_interval'],  # 推送间隔
+            'ucode': qs[0]['ucode'],
+            'version': qs[0]['version'],
+            'p2p_region': qs[0]['p2p_region'],
+            'tz': qs[0]['tz'],
+            'video_code': qs[0]['video_code'],
+            'channel': qs[0]['channel'],
+            'cloud_vod': qs[0]['cloud_vod'],
+            'detect_group': qs[0]['detect_group'],  # 推送组
+            'is_alexa': qs[0]['is_alexa'],  # 推送组
+            'region_alexa': qs[0]['region_alexa'],  # 推送组
+        }
+        print(22222222222)
+        # 查询云存储相关信息
+        ubqs = UID_Bucket.objects.filter(uid=uid). \
+            values('bucket__content', 'status', 'channel', 'endTime', 'uid')
+        nowTime = int(time.time())
+        if ubqs.exists():
+            if ubqs[0]['endTime'] > nowTime:
+                data['vod'] = list(ubqs)
+        print(3333333333333)
+        return response.json(0, data)
+    else:
+        return response.json(0)
+
+
 
 def update_uid_set(request):
     request.encoding = 'utf-8'