a

Ansjer/urls.py

@@ -185,6 +185,8 @@ urlpatterns = [
     url(r'^grant/code/(?P<operation>.*)$', ApplicationController.GrantCodeView.as_view()),
     url(r'^user/ex/(?P<operation>.*)$', UserExController.UserExView.as_view()),
 
+    # url(r'^cloudstorage/query'),
+
 
     # app 设备消息模板
     # 路由加参数参考

Controller/CloudStorage.py

@@ -0,0 +1,43 @@
+#!/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: 2020/4/7 10:29
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+@file: CloudStroage.py
+@Contact: chanjunkai@163.com
+"""
+from Object.ResponseObject import ResponseObject
+from Object.TokenObject import TokenObject
+from Model.models import Store_Meal
+from Service.CommonService import CommonService
+
+
+def query_cloud_storage(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:
+        # qs = Store_Meal.objects.filter(bu)
+        # qs = Store_Meal.objects.filter()
+        # qs = Store_Meal.objects.filter(buckettyp)
+        qs = Store_Meal.objects.values("id", "title", "price", "content", "day",
+                                       "add_time", "update_time", "currency",
+                                       "type", "bucket_id", "bucket__bucket",
+                                       "bucket__storeDay")
+        res = CommonService.qs_to_list(qs)
+        return response.json(0, res)
+    else:
+        return response.json(tko.code)

Model/models.py

@@ -358,7 +358,7 @@ class FeedBackModel(models.Model):
 
 class User_Brand(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
-    # 关联用户 
+    # 关联用户
     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
     deviceSupplier = models.CharField(max_length=32, default='', verbose_name='（必填）设备供应商 string  （例：华为、小米...）')
     deviceModel = models.CharField(max_length=32, default='', verbose_name='（必填）设备型号 string @mock=HM NOTE 1TD')
@@ -394,13 +394,16 @@ class VodBucketModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键')
     bucket = models.CharField(max_length=30, verbose_name='设备UID')
     storeDay = models.IntegerField(default=0, verbose_name='存储生命周期(天)')
-    content = models.TextField(verbose_name='描述')
+    content = models.TextField(verbose_name='描述',default='')
     endpoint = models.CharField(max_length=125, default='', verbose_name='存储节点')
     area = models.CharField(max_length=16, default='', verbose_name='区域')
     region = models.CharField(max_length=16, default='', verbose_name='regionID')
+
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
 
+
+
     def __str__(self):
         return self.id
 
@@ -421,8 +424,9 @@ class Store_Meal(models.Model):
     add_time = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间', auto_now_add=True)
     type = models.SmallIntegerField(default=0, verbose_name='付款类型')  # 0 是paypal,1为支付宝
     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
-    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,
-                               verbose_name='存储空间')
+    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE,
+                               default=1, verbose_name='存储空间')
+    vod_type = models.SmallIntegerField(default=0, verbose_name='云存储套餐类型')  # 0：事件型 1：连续型
 
     def __str__(self):
         return self.id
@@ -586,11 +590,26 @@ class UID_Bucket(models.Model):
     endTime = models.IntegerField(verbose_name='结束时间', default=0)
 
     class Meta:
-        db_table = 'vod_uid_bucket'
+        db_table = 'uid_bucket'
         verbose_name = u'设备关联套餐表'
         verbose_name_plural = verbose_name
         ordering = ('id',)
 
+class VOD_UID_Bucket(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
+    uid = models.CharField(max_length=20, verbose_name='设备UID')
+    channel = models.SmallIntegerField(default=0, verbose_name='通道')
+    bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, verbose_name='存储空间')
+    status = models.SmallIntegerField(default=0, verbose_name='状态[0:开启,1:关闭]')
+    endTime = models.IntegerField(verbose_name='结束时间', default=0)
+    order = models.ForeignKey(Order_Model,blank=True,to_field='orderID', on_delete=models.CASCADE,verbose_name='订单')
+
+    class Meta:
+        db_table = 'vod_uid_bucket'
+        verbose_name = u'设备关联套餐订单表'
+        verbose_name_plural = verbose_name
+        ordering = ('id',)
+
 
 class UID_Preview(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
@@ -848,110 +867,4 @@ class GrantCodeModel(models.Model):
     class Meta:
         ordering = ('-add_time',)
         verbose_name = u'授权码表'
-        db_table = 'oauth_grant_code'
-
-
-'''
-    参数	            类型	    必有	描述
-    commodityName	String	是	云存储套餐名称
-    commodityCode	String	是	云存储套餐code
-    specification	String	是	云存储套餐规格
-    type	        int	    是	云存储套餐类型：1表示连续型；2表示事件型
-    price	        String	是	云存储套餐价格，单位元
-    lifecycle	    int	    是	存储周期，单位天
-    months	        int	    是	服务周期，单位月
-    description	    String	否	云存储套餐描述
-    icon	        String	否	云存储套餐图标url
-'''
-
-
-# class CloudStorageModel(models.Model):
-#     id = models.AutoField(primary_key=True, verbose_name=u'自增ID')
-#     commodityName = models.CharField(blank=True, max_length=32, verbose_name=u'云存储套餐名称')
-#     commodityCode = models.CharField(blank=True, max_length=32, verbose_name=u'云存储套餐code')
-#     specification = models.CharField(blank=True, max_length=32, verbose_name=u'云存储套餐规格')
-#     type = models.IntegerField(default=1, verbose_name='云存储套餐类型')  # 1表示连续型；2表示事件型
-#     currency = models.CharField(default='USD', max_length=8, verbose_name=u'货币')
-#     price = models.CharField(default=0, max_length=32, verbose_name=u'价格')
-#     lifecycle = models.IntegerField(default=0, verbose_name='存储周期')
-#     description = models.CharField(default='', max_length=128, verbose_name='云存储套餐描述')
-#     add_time = models.IntegerField(verbose_name='添加时间', default=0)
-#     update_time = models.IntegerField(verbose_name='更新时间', default=0)
-#
-#     def __str__(self):
-#         return self.id
-#
-#     class Meta:
-#         db_table = 'cloud_storage'
-#         verbose_name = u'aws云存储套餐'
-#         verbose_name_plural = verbose_name
-#         ordering = ('id',)
-#
-#
-# '''
-# 参数	            类型	   必有	 描述
-# orderId	        String	是	订单id
-# commodityCode	String	是	云存储套餐code
-# specification	String	是	云存储套餐规格
-# copies	        int	    是	购买数量
-# startTime	    String	是	开始时间，格式yyyy-MM-dd HH:mm:ss
-# endTime	        String	是	结束时间，格式yyyy-MM-dd HH:mm:ss
-# expired	        int	    是	是否到期
-# paymentStatus	int	    是	支付状态1：已支付 0：未支付
-# price	        String	是	订单价格
-# commodityType	int	    是	云存储套餐类型1：连续型 2：事件型
-# startTimeUTC	String	是	开始时间（UTC），格式yyyy-MM-ddTHH:mm:ssZ
-# endTimeUTC	    String	是	结束时间（UTC），格式yyyy-MM-ddTHH:mm:ssZ
-# '''
-#
-#
-# class OrderModel(models.Model):
-#     orderID = models.CharField(max_length=20, primary_key=True, verbose_name="订单id")  # 主键
-#     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
-#     specification = models.CharField(max_length=32, default='', verbose_name='云存储套餐规格')
-#     copies = models.IntegerField(verbose_name='购买数量')
-#
-#     paymentStatus = models.SmallIntegerField(default=0, verbose_name='支付状态')  # 1已支付，0未支付
-#     price = models.CharField(max_length=32, default='', verbose_name='订单价格')
-#     currency = models.CharField(blank=True, default='USD', max_length=32, verbose_name=u'货币')
-#     commodityType = models.SmallIntegerField(default=1, verbose_name='云存储套餐类型')
-#     UID = models.CharField(max_length=20, verbose_name='设备UID')
-#     add_time = models.IntegerField(verbose_name='添加时间', default=0)
-#     update_time = models.IntegerField(verbose_name='更新时间', default=0)
-#
-#     def __str__(self):
-#         return self.orderID
-#
-#     class Meta:
-#         db_table = 'orders'
-#         verbose_name = u'订单信息表'
-#         verbose_name_plural = verbose_name
-#         ordering = ('-orderID',)
-#
-#
-# class Order_Model(models.Model):
-#     orderID = models.CharField(blank=True, max_length=20, primary_key=True, verbose_name=u'订单id')
-#     # 订单关联用户
-#     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
-#     UID = models.CharField(max_length=20, verbose_name='设备UID')
-#     channel = models.SmallIntegerField(default=0, verbose_name=u'通道数')
-#     desc = models.CharField(max_length=50, default='', verbose_name='商品描述')
-#     price = models.CharField(default='', max_length=16, verbose_name='价格')
-#     currency = models.CharField(blank=True, default='USD', max_length=32, verbose_name=u'货币')
-#     addTime = models.IntegerField(verbose_name='添加时间', default=0)
-#     updTime = models.IntegerField(verbose_name='更新时间', default=0)
-#     endTime = models.IntegerField(verbose_name='结束时间', default=0)
-#     status = models.SmallIntegerField(default=0, verbose_name='付款状态')  # 0:否，1：成功
-#     # 订单关联套餐
-#     rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
-#     paypal = models.CharField(max_length=150, default='', verbose_name='paypal付款url')
-#     payType = models.SmallIntegerField(default=0, verbose_name='付款类型0:paypal,1:alipay')
-#
-#     def __str__(self):
-#         return self.orderID
-#
-#     class Meta:
-#         db_table = 'orders'
-#         verbose_name = u'订单信息表'
-#         verbose_name_plural = verbose_name
-#         ordering = ('-orderID',)
+        db_table = 'oauth_grant_code'

manage.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    # import socket
+    #
+    # addrs = socket.getaddrinfo(socket.gethostname(), None)
+    # for index, item in enumerate(addrs):
+    #     if index == 5:
+    #         ip = item[4][0]
+    #
+    #         print('当前局域网ip地址为:' + ip)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Ansjer.local_settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+