自主推送统计接口3

Controller/AdminManage.py

@@ -7,7 +7,7 @@ from django.views.generic import TemplateView
 from django.utils.decorators import method_decorator
 from django.contrib.auth.hashers import make_password  # 对密码加密模块
 from Model.models import Device_Info, Role, UserExModel, User_Brand, UidSetModel, AppFrequencyYearStatisticsModel, \
-    AppFrequencyStatisticsModel, EquipmentInfoExStatisticsModel, EquipmentInfoExModel
+    AppFrequencyStatisticsModel, EquipmentInfoExStatisticsModel, Equipment_Info
 from Service.ModelService import ModelService
 from django.utils import timezone
 from Model.models import Access_Log, Device_User
@@ -44,12 +44,12 @@ class AdminManage(TemplateView):
 
     def validation(self, request_dict, *args, **kwargs):
         response = ResponseObject()
-        # token = request_dict.get('token', None)
-        # tko = TokenObject(token)
-        # response.lang = tko.lang
-        # if tko.code != 0:
-        #     return response.json(tko.code)
-        # userID = tko.userID
+        token = request_dict.get('token', None)
+        tko = TokenObject(token)
+        response.lang = tko.lang
+        if tko.code != 0:
+            return response.json(tko.code)
+        userID = tko.userID
         userID = 1
         operation = request_dict.get('operation', None)
         if userID is None or operation is None:
@@ -502,7 +502,7 @@ class AdminManage(TemplateView):
         # 取出当前的推送数据
         start_time = current_time
         current_time = int(time.time())
-        eq_qs = EquipmentInfoExModel.objects.filter(add_time__gte=start_time, add_time__lte=current_time)
+        eq_qs = Equipment_Info.objects.filter(addTime__gte=start_time, addTime__lte=current_time)
         print(eq_qs.values())
         # 0：APNS推送，1：谷歌推送，2：极光推送
         tmp = {

Controller/StatisticsController.py

@@ -7,7 +7,7 @@ from django.db.models import Count
 from django.views.decorators.csrf import csrf_exempt
 
 from Model.models import UserAppFrequencyModel, AppFrequencyStatisticsModel, Device_User, \
-    AppFrequencyYearStatisticsModel, EquipmentInfoExModel, EquipmentInfoExStatisticsModel
+    AppFrequencyYearStatisticsModel, Equipment_Info, EquipmentInfoExStatisticsModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 
@@ -164,7 +164,7 @@ def statistcsPushDay(request):
     end_time = int(time.mktime(tuple(time_struct)))
     print(end_time)
 
-    eq_qs = EquipmentInfoExModel.objects.filter(add_time__gte=start_time, add_time__lte=end_time)
+    eq_qs = Equipment_Info.objects.filter(addTime__gte=start_time, addTime__lte=end_time)
     print(eq_qs.values())
     # 0：APNS推送，1：谷歌推送，2：极光推送
     now_time = int(time.time())
@@ -239,7 +239,7 @@ def statistcsPushMonth(request):
     return response.json(0)
 
 
-def do_sum(eq: EquipmentInfoExModel, target: EquipmentInfoExStatisticsModel):
+def do_sum(eq: Equipment_Info, target: EquipmentInfoExStatisticsModel):
     if eq.push_server_status == 200:
         target.number_of_successes += 1
     else:

Model/models.py

@@ -290,6 +290,10 @@ class Equipment_Info(models.Model):
     receiveTime = models.CharField(blank=True, default='', max_length=16, verbose_name=u'接收到报警时间')
     userID = models.ForeignKey(Device_User, null=True, blank=True, to_field='userID', on_delete=models.CASCADE)
     is_st = models.SmallIntegerField(default=0, verbose_name='是否截图')  # 0 否,1 是图，2,视频
+    message_id = models.CharField(max_length=32, default='', verbose_name='第三方推送服务器返回的id')
+    push_type = models.SmallIntegerField(default=0, verbose_name='第三方推送服务器标志。0：APNS推送，1：谷歌推送，2：极光推送')
+    push_server_status = models.IntegerField(default=200, verbose_name='是否成功推送到第三方服务器。200：成功，other：失败')
+    push_device_status = models.SmallIntegerField(default=1, verbose_name='是否成功推送到目标设备。0：失败，1：成功')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
 
     def __str__(self):
@@ -990,21 +994,6 @@ class AppLogModel(models.Model):
         verbose_name_plural = verbose_name
 
 
-class EquipmentInfoExModel(models.Model):
-    id = models.AutoField(primary_key=True)
-    message_id = models.CharField(max_length=32, default='', verbose_name='第三方推送服务器返回的id')
-    push_type = models.SmallIntegerField(default=0, verbose_name='第三方推送服务器标志。0：APNS推送，1：谷歌推送，2：极光推送')
-    push_server_status = models.SmallIntegerField(default=1, verbose_name='是否成功推送到第三方服务器。1：成功，other：失败')
-    push_device_status = models.SmallIntegerField(default=0, verbose_name='是否成功推送到目标设备。0：失败，1：成功')
-    user = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE, verbose_name='关联用户表')
-    add_time = models.IntegerField(default=0, verbose_name='添加时间')
-
-    class Meta:
-        db_table = 'equipment_info_ex'
-        verbose_name = '推送消息扩展表'
-        verbose_name_plural = verbose_name
-
-
 class EquipmentInfoExStatisticsModel(models.Model):
     id = models.AutoField(primary_key=True)
     push_type = models.SmallIntegerField(default=0, verbose_name='第三方推送服务器标志。0：APNS推送，1：谷歌推送，2：极光推送')
@@ -1016,7 +1005,7 @@ class EquipmentInfoExStatisticsModel(models.Model):
     add_time = models.IntegerField(default=0, verbose_name='添加时间')
 
     class Meta:
-        db_table = 'equipment_info_ex_day_statistics'
+        db_table = 'equipment_info_ex_statistics'
         verbose_name = '推送消息统计表'
         verbose_name_plural = verbose_name