恢复表

controller/index.py

@@ -10,7 +10,7 @@ from django.shortcuts import render
 from django.views.generic import TemplateView
 
 from azoauth.config import *
-from model.models import UserModel, UidRtspModel, AlexaAuthModel, SwitchModel
+from model.models import UserModel, UidRtspModel, AlexaAuthModel, UserCountModel, SwitchModel
 from object.RedisObject import RedisObject
 from object.ResObject import ResObject
 from object.ResponseObject import ResponseObject
@@ -168,13 +168,13 @@ class loginHandleView(TemplateView):
             UserModel.objects.create(userID=userID, region_code=region_code, code=code, addTime=nowTime,
                                      updTime=nowTime)
             year_month = str(time.strftime('%Y%m', time.localtime(nowTime)))  # 获取当前年月
-            # user_count_qs = UserCountModel.objects.filter(skill_name=skill_name, year_month=year_month).values('amount')
-            # if not user_count_qs.exists():
-            #     UserCountModel.objects.create(skill_name=skill_name, year_month=year_month, amount=1)
-            # else:
-            #     # 用户数量+1
-            #     amount = user_count_qs[0]['amount'] + 1
-            #     user_count_qs.update(amount=amount)
+            user_count_qs = UserCountModel.objects.filter(skill_name=skill_name, year_month=year_month).values('amount')
+            if not user_count_qs.exists():
+                UserCountModel.objects.create(skill_name=skill_name, year_month=year_month, amount=1)
+            else:
+                # 用户数量+1
+                amount = user_count_qs[0]['amount'] + 1
+                user_count_qs.update(amount=amount)
 
         redirect_uri += '?code=' + code + '&state=' + state
         logger.info('------认证登录响应------:{}'.format(redirect_uri))

model/models.py

@@ -25,19 +25,19 @@ class UserModel(models.Model):
         return self.userID
 
 
-# class UserCountModel(models.Model):
-#     id = models.AutoField(primary_key=True)
-#     skill_name = models.CharField(max_length=32, default='', verbose_name=u'skill名称')
-#     year_month = models.CharField(max_length=32, default='', verbose_name=u'统计时间/每月')
-#     amount = models.IntegerField(default=0, verbose_name=u'用户数量')
-#
-#     class Meta:
-#         ordering = ('-id',)
-#         verbose_name = '用户数量统计表'
-#         db_table = 'user_count'
-#
-#     def __str__(self):
-#         return self.userID
+class UserCountModel(models.Model):
+    id = models.AutoField(primary_key=True)
+    skill_name = models.CharField(max_length=32, default='', verbose_name=u'skill名称')
+    year_month = models.CharField(max_length=32, default='', verbose_name=u'统计时间/每月')
+    amount = models.IntegerField(default=0, verbose_name=u'用户数量')
+
+    class Meta:
+        ordering = ('-id',)
+        verbose_name = '用户数量统计表'
+        db_table = 'user_count'
+
+    def __str__(self):
+        return self.userID
 
 
 class UidRtspModel(models.Model):
@@ -80,7 +80,7 @@ class SwitchModel(models.Model):
 
 class AlexaAuthModel(models.Model):
     id = models.AutoField(primary_key=True)
-    # skill_name = models.CharField(max_length=32, default='', verbose_name=u'skill名称')
+    skill_name = models.CharField(max_length=32, default='', verbose_name=u'skill名称')
     userID = models.CharField(blank=True, max_length=32, verbose_name=u'用户ID', default='', unique=False)
     access_token = models.CharField(max_length=150, unique=False, default='', verbose_name='访问令牌')
     refresh_token = models.CharField(max_length=150, unique=False, default='', verbose_name='刷新令牌')