Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into pzb

# Conflicts:
#	Object/TokenObject.py

Ansjer/urls.py

@@ -41,8 +41,8 @@ urlpatterns = [
     url(r'^equipment/admin_add', EquipmentManager.admin_addInterface),
     url(r'^equipment/admin_modify', EquipmentManager.admin_modifyInterface),
 
-
     url(r'^equipment/query', EquipmentManager.queryInterface),
+    url(r'^equipment/flow', EquipmentManager.uid_status),
 
     url(r'^OTA/uploads$', OTAEquipment.getUploadFiletoDirView.as_view()),
     url(r'^OTA/download$', OTAEquipment.downloadUpdataFileUrl),

Controller/EquipmentManager.py

@@ -4,7 +4,7 @@ import traceback
 
 import simplejson as json
 from django.utils import timezone
-from Model.models import Device_User,Device_Info, UID_Bucket
+from Model.models import Device_User,Device_Info, UID_Bucket,UID_App
 from django.db.models import Q
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -596,3 +596,31 @@ def queryInterface(request):
         return response.json(0, {'data': data, 'count': count})
     else:
         return response.json(tko.code)
+def uid_status(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)
+    if not uid:
+        qs = UID_App.objects.filter(userID_id=tko.userID)
+    else :
+        qs = UID_App.objects.filter(uid=uid)
+    res = CommonService.qs_to_dict(qs)
+    print (res)
+    data=[]
+    for uid_app_list in res["datas"]:
+         print (uid_app_list.get('fields').get('status'))
+         status = uid_app_list.get('fields').get('status')
+         uid = uid_app_list.get('fields').get('uid')
+         data.append({uid:{ 'status':status ,'cloudVod':{} }})
+    return response.json(0, data)

Object/TokenObject.py

@@ -37,8 +37,7 @@ class TokenObject:
             return
         try:
             res = jwt.decode(self.token, OAUTH_ACCESS_TOKEN_SECRET, algorithms='HS256')
-            # print(res)
-            self.userID = res.get('userID', None)
+           	self.userID = res.get('userID', None)
             self.lang = res.get('lang', None)
             self.user = res.get('user', '')
             # 刷新登录时间