数据库迁移

Controller/AliPayOrder.py

@@ -1,13 +0,0 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/2/22 14:37
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: AliPayOrder.py
-@Contact: chanjunkai@163.com
-"""

Controller/EquipmentManager.py

@@ -3,8 +3,6 @@ import time
 import traceback
 
 import simplejson as json
-from django.views.decorators.csrf import csrf_exempt
-
 from Model.models import Device_Info, UID_Bucket
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -13,7 +11,6 @@ from Service.ModelService import ModelService
 
 
 #     查询用户设备
-@csrf_exempt
 def queryUserEquipmentInterface(request):
     request.encoding = 'utf-8'
     response = ResponseObject()
@@ -53,7 +50,6 @@ def queryUserEquipmentInterface(request):
     return response.json(0, {'datas': res})
 
 
-@csrf_exempt
 def addNewUserEquipmentInterface(request):
     request.encoding = 'utf-8'
     response = ResponseObject()
@@ -120,7 +116,6 @@ def addNewUserEquipmentInterface(request):
         return response.json(0, sqlDict)
 
 
-@csrf_exempt
 def addInterface(request):
     request.encoding = 'utf-8'
     response = ResponseObject()
@@ -170,7 +165,6 @@ def addInterface(request):
         return response.json(0, sqlDict)
 
 
-@csrf_exempt
 def delUserEquipmentInterface(request):
     '''
     删除用户设备
@@ -205,54 +199,6 @@ def delUserEquipmentInterface(request):
         return response.json(0)
 
 
-@csrf_exempt
-def deleteInterface(request):
-    '''
-    删除用户设备
-    :param request:
-    :return:
-    '''
-    response = ResponseObject()
-    request.encoding = 'utf-8'
-    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)
-    id = request_dict.get('id', None)
-    if not id:
-        return response.json(444, 'id')
-    tko = TokenObject(token)
-    response.lang = tko.lang
-    if tko.code != 0:
-        return response.json(tko.code)
-    userID = tko.userID
-    # 主用户删除设备全部删除
-    if not userID:
-        return response.json(309)
-    try:
-        dv_qs = Device_Info.objects.filter(userID_id=userID, id=id)
-        uid = dv_qs[0].UID
-        if dv_qs[0].isShare:
-            dv_qs.delete()
-        else:
-            # 主用户删除设备
-            dv_qs.delete()
-            # 分享获得用户假删除
-            ud_dv_qs = Device_Info.objects.filter(UID=uid, isShare=True)
-            if ud_dv_qs.exists():
-                ud_dv_qs.update(isExist=0)
-    except Exception as e:
-        errorInfo = traceback.format_exc()
-        print('删除数据库记录错误: %s' % errorInfo)
-        return response.json(176, repr(e))
-    else:
-        return response.json(0)
-
-
-@csrf_exempt
 def modifyUserEquipmentInterface(request):
     '''
     修改用户设备
@@ -291,7 +237,6 @@ def modifyUserEquipmentInterface(request):
         return response.json(0, res)
 
 
-@csrf_exempt
 def showAllUserEquipmentInterface(request, *callback_args, **callback_kwargs):
     request.encoding = 'utf-8'
     response = ResponseObject()
@@ -328,7 +273,6 @@ def showAllUserEquipmentInterface(request, *callback_args, **callback_kwargs):
         return response.json(0, res)
 
 
-@csrf_exempt
 def findEquipmentInfoInterface(request, *callback_args, **callback_kwargs):
     request.encoding = 'utf-8'
     response = ResponseObject()
@@ -383,3 +327,138 @@ def findEquipmentInfoInterface(request, *callback_args, **callback_kwargs):
                     send_dict["datas"][k]['fields']['primaryusername'] = primary
         send_dict['count'] = count
         return response.json(0, send_dict)
+
+
+def deleteInterface(request):
+    '''
+    删除用户设备
+    :param request:
+    :return:
+    '''
+    response = ResponseObject()
+    request.encoding = 'utf-8'
+    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)
+    id = request_dict.get('id', None)
+    if not id:
+        return response.json(444, 'id')
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
+    # 主用户删除设备全部删除
+    if not userID:
+        return response.json(309)
+    try:
+        dv_qs = Device_Info.objects.filter(userID_id=userID, id=id)
+        uid = dv_qs[0].UID
+        if dv_qs[0].isShare:
+            dv_qs.delete()
+        else:
+            # 主用户删除设备
+            dv_qs.delete()
+            # 分享获得用户假删除
+            ud_dv_qs = Device_Info.objects.filter(UID=uid, isShare=True)
+            if ud_dv_qs.exists():
+                ud_dv_qs.update(isExist=0)
+    except Exception as e:
+        errorInfo = traceback.format_exc()
+        print('删除数据库记录错误: %s' % errorInfo)
+        return response.json(176, repr(e))
+    else:
+        return response.json(0)
+
+
+def queryInterface(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)
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code == 0:
+        userID = tko.userID
+        dvqs = Device_Info.objects.filter(userID_id=userID)
+
+    else:
+        return response.json(tko.code)
+    ######################
+    ######################
+    if not userID:
+        return response.json(309)
+    dvqs = Device_Info.objects.filter(userID_id=userID)
+    dvdict = CommonService.qs_to_dict(dvqs)
+    uid_list = Device_Info.objects.filter(userID_id=userID, isShare=False). \
+        values_list('UID', flat=True)
+    ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
+        values('bucket__content', 'status', 'channel', 'endTime', 'uid')
+    res = []
+    nowTime = int(time.time())
+    for p in dvdict['datas']:
+        p['fields']['vod'] = []
+        for dm in ubqs:
+            if p['fields']['UID'] == dm['uid']:
+                if dm['endTime'] > nowTime:
+                    p['fields']['vod'].append(dm)
+                    # dm['valid'] = 1
+                # else:
+                #     dm['valid'] = 0
+        # p['fields']['primaryUserID'] = ''
+        res.append(p)
+    return response.json(0, {'datas': res})
+
+def queryInterfacexxx(request):
+    '''
+    删除用户设备
+    :param request:
+    :return:
+    '''
+    response = ResponseObject()
+    request.encoding = 'utf-8'
+    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)
+    id = request_dict.get('id', None)
+    if not id:
+        return response.json(444, 'id')
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
+    # 主用户删除设备全部删除
+    if not userID:
+        return response.json(309)
+    try:
+        dv_qs = Device_Info.objects.filter(userID_id=userID, id=id)
+        uid = dv_qs[0].UID
+        if dv_qs[0].isShare:
+            dv_qs.delete()
+        else:
+            # 主用户删除设备
+            dv_qs.delete()
+            # 分享获得用户假删除
+            ud_dv_qs = Device_Info.objects.filter(UID=uid, isShare=True)
+            if ud_dv_qs.exists():
+                ud_dv_qs.update(isExist=0)
+    except Exception as e:
+        errorInfo = traceback.format_exc()
+        print('删除数据库记录错误: %s' % errorInfo)
+        return response.json(176, repr(e))
+    else:
+        return response.json(0)

Controller/OrderContrller.py

@@ -80,7 +80,7 @@ class OrderView(View):
         count = omqs.count()
         order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price", "currency",
                                                               "addTime",
-                                                              "updTime", "endTime", "paypal", "rank__day","payType",
+                                                              "updTime", "endTime", "paypal", "rank__day", "payType",
                                                               "rank__price", "status",
                                                               "rank__content", "rank__title", "rank__currency",
                                                               "rank_id")
@@ -135,9 +135,8 @@ class OrderView(View):
                 return response.json(0, [])
             count = omqs.count()
             order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price",
-                                                                  "currency",
-                                                                  "addTime",
-                                                                  "updTime", "endTime", "paypal","payType",
+                                                                  "currency", "addTime", "updTime", "endTime", "paypal",
+                                                                  "payType",
                                                                   "rank__day",
                                                                   "rank__price", "status",
                                                                   "rank__content", "rank__title", "rank__currency",

Model/models.py

@@ -211,13 +211,13 @@ class Device_Info(models.Model):
     View_Account = models.CharField(blank=True, max_length=32, verbose_name=u'设备用户名称')
     View_Password = models.CharField(blank=True, max_length=32, verbose_name=u'设备密码')
     AudioFormat = models.IntegerField(blank=True, default=1, verbose_name=u'初始化影像')
-    EventNotification = models.IntegerField(blank=True, verbose_name=u'报警类型')
+    EventNotification = models.IntegerField(blank=True, verbose_name=u'报警类型',default=0)
     ChannelIndex = models.IntegerField(blank=True, verbose_name=u'通道号')
     Online = models.BooleanField(blank=True, default=False, verbose_name=u'设备是否在线')
     mMonitorIndex = models.IntegerField(blank=True, default=-1)
-    Type = models.IntegerField(blank=True)
+    Type = models.IntegerField(blank=True,verbose_name='设备类型')
     DebugMode = models.IntegerField(blank=True, verbose_name=u'调试模式')
-    NotificationMode = models.IntegerField(blank=True, verbose_name=u'是否报警')
+    NotificationMode = models.IntegerField(blank=True, verbose_name=u'是否报警',default=0)
     qvgaLevel = models.BooleanField(blank=True, verbose_name=u'SD与HD画面', default=0,
                                     help_text=u'0代表：SD、1代表：HD')
     isShare = models.BooleanField(blank=True, verbose_name=u'共享设备',

Service/CommonService.py

@@ -15,18 +15,6 @@ from Ansjer.config import BASE_DIR
 # 复用性且公用较高封装代码在这
 class CommonService:
 
-    # 返回数据格式化
-    @staticmethod
-    def response_formal(data={'code': '', 'reason': '', 'result': {}}):
-        resJSON = json.dumps(
-            {
-                "result_code": data['code'],
-                "reason": data['reason'],
-                "result": data['result'],
-                "error_code": data['code'],
-            }, ensure_ascii=False)
-        return resJSON
-
     # 添加模糊搜索
     @staticmethod
     def get_kwargs(data={}):