456

Ansjer/urls.py

@@ -8,7 +8,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     UserManger, CheckUserData, \
     UserController, CloudVod, OrderContrller, VodBucket, DetectController, DeviceShare, UserBrandController, \
     StsOssController, UIDPreview, OssCrd, SysMsg, UidUser, EquipmentManagerV2, PushDeploy, AppSetController,\
-    ApplicationController, UserExController
+    ApplicationController, UserExController, CloudStorage
 
 urlpatterns = [
     url(r'^account/authcode$', UserController.authCodeView.as_view()),
@@ -186,7 +186,9 @@ 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'),
+    url(r'^cloudstorage/query', CloudStorage.query_cloud_storage),
+    url(r'^cloudstorage/query', CloudStorage.query_cloud_storage),
+    url(r'^cloudstorage/query', CloudStorage.query_cloud_storage),
 
 
     # app 设备消息模板

Controller/CloudStorage.py

@@ -33,10 +33,11 @@ def query_cloud_storage(request):
         # 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")
+        qs = Store_Meal.objects.filter(bucket__mold=1)
+        qs = qs.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:

Model/models.py

@@ -401,6 +401,7 @@ class VodBucketModel(models.Model):
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
 
+    mold = models.SmallIntegerField(default=0,verbose_name='存储区域类型')  # 0：国内阿里 1：国外aws
 
 
     def __str__(self):