瀏覽代碼

临时版本

zjz 4 年之前
父節點
當前提交
4ea5021598
共有 4 個文件被更改,包括 15 次插入5 次删除
  1. 1 1
      Ansjer/local_settings.py
  2. 1 1
      Ansjer/urls.py
  3. 11 2
      Controller/Cloudsum.py
  4. 2 1
      Controller/VoicePromptController.py

+ 1 - 1
Ansjer/local_settings.py

@@ -76,7 +76,7 @@ WSGI_APPLICATION = 'Ansjer.local_wsgi.application'
 DATABASE_DATA = 'ansjertest'
 SERVER_HOST = '127.0.0.1'
 DATABASES_USER = 'root'
-DATABASES_PASS = '123456'
+DATABASES_PASS = 'mysqlfyzs9wl'
 
 DATABASE_DATA2 = 'ansjerpush'
 SERVER_HOST2 = '127.0.0.1'

+ 1 - 1
Ansjer/urls.py

@@ -264,7 +264,7 @@ urlpatterns = [
 
     #云存服务统计
     #url(r'^test/(?P<operation>.*)$', Cloudsum.Cloudsum.as_view()),
-    url(r'^Cloudsum$', Cloudsum.Cloudsum.as_view()),
+    url(r'^Cloudsum/$', Cloudsum.Cloudsum.as_view()),
 
 
 

+ 11 - 2
Controller/Cloudsum.py

@@ -1,4 +1,4 @@
-from Model.models import Order_Model,UID_Bucket,UserExModel,App_Info
+from Model.models import Order_Model, UID_Bucket, UserExModel, App_Info, Device_User
 from django.http import JsonResponse
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -38,6 +38,8 @@ class Cloudsum(TemplateView):
             return self.cloudservicesum(userID, response)
         if operation == 'userappversion':
             return self.userappversion(userID, response)
+        if operation == 'usercount':
+            return self.usercount(userID, response)
 
     # 类型:用户手机
     # 统计用户手机型号  已有
@@ -80,7 +82,14 @@ class Cloudsum(TemplateView):
         }
         return response.json(0, data_dict)
 
-
+    def usercount(self, userID, response):
+        from django.db.models import Count
+        # own_permission = ModelService.check_perm(userID=userID, permID=30)
+        # if own_permission is not True:
+        #     return response.json(404)
+        count1 = Device_User.objects.extra(select={'year': 'year(data_joined)', 'month': 'month(data_joined)'}).values('year','month').annotate(用户合计=Count('data_joined')).order_by()
+        #print(count1)
+        return response.json(0, list(count1))
 
 
 

+ 2 - 1
Controller/VoicePromptController.py

@@ -29,9 +29,9 @@ class VoicePromptView(View):
 
     def validate(self, request_dict, operation):
         token = request_dict.get('token', None)
+        print(token)
         lang = request_dict.get('lang', None)
         response = ResponseObject(lang=lang)
-
         token = TokenObject(token)
         if token.code != 0:
             return response.json(token.code)
@@ -308,6 +308,7 @@ class VoicePromptView(View):
             return response.json(444)
 
         voice_qs = VoicePromptModel.objects.filter(classification=0, type=type)
+        print(voice_qs)
         res = {
             'count': 0
         }