增加查询设备关联套餐信息

Ansjer/test/util/mongodb.py

@@ -1,2 +1,21 @@
-urlstr = 'https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=EC-2RX05631SG795054S'
-print(len(urlstr))
+# from celery import Celery
+# from django.core.mail import send_mail
+# from django.conf import settings
+#
+# # 创建celery应用对象
+# app = Celery('celery_tasks.tasks', broker='redis://192.168.243.191:6379/4')
+#
+#
+# @app.task
+# def send_active_email(to_email, user_name, token):
+#     """发送激活邮件"""
+#
+#     subject = "天天生鲜用户激活"  # 标题
+#     body = ""  # 文本邮件体
+#     sender = settings.EMAIL_FROM  # 发件人
+#     receiver = [to_email]  # 接收人
+#     html_body = '<h1>尊敬的用户 %s, 感谢您注册天天生鲜！</h1>' \
+#                 '<br/><p>请点击此链接激活您的帐号<a href="http://127.0.0.1:8000/users/active/%s">' \
+#                 'http://127.0.0.1:8000/users/active/%s</a></p>' % (user_name, token, token)
+#     send_mail(subject, body, sender, receiver, html_message=html_body)
+#

Ansjer/test/util/util_jk.py

@@ -1,37 +0,0 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: Ansjer
-@software: PyCharm
-@DATE: 2018/6/14 14:46
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: util_jk.py
-@Contact: chanjunkai@163.com
-"""
-'''---------------------------------------------------'''
-# 简化for语句
-def getFor():
-    data = {'a': 1, 'b': 2, 'c': 3, 'd': 4}
-    ss = [z for z in data if not data['a'] == 1]
-    print(ss)
-
-'''---------------------------------------------------'''
-# lamdba
-def getLamdba():
-    b = lambda a,y: a + 1+y
-    print(b(a=1,y=2))
-
-'''-----------判断系统版本------------------------'''
-def UsePlatform():
-    import platform
-    sysstr = platform.system()
-    if (sysstr == "Windows"):
-        print("Call Windows tasks")
-    elif (sysstr == "Linux"):
-        print("Call Linux tasks")
-    else:
-        print("Other System tasks")
-

Controller/EquipmentManager.py

@@ -1,15 +1,12 @@
 from django.views.decorators.csrf import csrf_exempt
-from django.core import serializers
 import traceback
 from Service.ModelService import ModelService
-from Model.models import Device_User, Device_Info
+from Model.models import Device_User, Device_Info,Device_Meal
 from Service.CommonService import CommonService
 import simplejson as json
 from Object.TokenObject import TokenObject
 from Object.ResponseObject import ResponseObject
 import re
-from Ansjer.config import UID_TOKEN_KEY
-import jwt
 
 
 def addNewUserEquipment(userID, deviceContent, response):
@@ -214,35 +211,35 @@ def queryUserEquipmentInterface(request, *callback_args,
         token = request.GET.get('token', None)
     else:
         return response.json(801)
-    if token is not None:
-        tko = TokenObject(token)
-        tko.valid()
-        response.lang = tko.lang
-        if tko.code == 0:
-            userID = tko.userID
-            if userID is not None:
-                try:
-                    deviceValid = Device_Info.objects.filter(userID_id=userID)
-                except Exception as e:
-                    errorInfo = traceback.format_exc()
-                    print('查询数据库错误: %s' % errorInfo)
-                    return response.json(500, repr(e))
-                else:
-                    if deviceValid.exists():
-                        res = CommonService.qs_to_dict(deviceValid)
-                        return response.json(0, res)
-                    else:
-                        UserValid = Device_User.objects.filter(userID=userID)
-                        if UserValid.exists():
-                            return response.json(172)
-                        else:
-                            return response.json(113)
-            else:
-                return response.json(309)
-        else:
-            return response.json(tko.code)
+    tko = TokenObject(token)
+    tko.valid()
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
+    if userID is not None:
+        deviceValid = Device_Info.objects.filter(userID_id=userID)
+        # print(deviceValid)
+        res = CommonService.qs_to_dict(deviceValid)
+        datas = res['datas']
+        uid_list = []
+        for q in datas:
+            uid_list.append(q['fields']['UID'])
+        dmqs = Device_Meal.objects.filter(uid__in=uid_list).\
+            values('rank', 'status', 'channel', 'end_time', 'rank__title','uid')
+        dmlt = CommonService.qs_to_list(dmqs)
+        # print(uid_list)
+        res = []
+        for p in datas:
+            p['fields']['vod'] = []
+            for dm in dmlt:
+                if p['fields']['UID'] == dm['uid']:
+                    p['fields']['vod'].append(dm)
+            res.append(p)
+        print(res)
+        return response.json(0, {'datas':res})
     else:
-        return response.json(800)
+        return response.json(309)
 
 
 @csrf_exempt