增加自主推送统计1

Controller/DetectController.py

@@ -23,7 +23,7 @@ from pyfcm import FCMNotification
 from AnsjerPush.config import SERVER_TYPE
 from AnsjerPush.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN, JPUSH_CONFIG, FCM_CONFIG, \
     APNS_CONFIG, BASE_DIR, APNS_MODE
-from Model.models import Equipment_Info, UidPushModel, SysMsgModel, EquipmentInfoExModel
+from Model.models import Equipment_Info, UidPushModel, SysMsgModel
 from Object.ETkObject import ETkObject
 from Object.LogUtil import LogUtil
 from Object.RedisObject import RedisObject
@@ -231,6 +231,9 @@ class NotificationView(View):
                     alarm='Motion \tChannel:{channel}'.format(channel=channel),
                     is_st=int_is_st,
                     receiveTime=n_time,
+                    message_id='',
+                    push_type=push_type,
+                    push_server_status=200,
                     addTime=now_time
                 ))
                 if is_sys_msg:
@@ -243,23 +246,10 @@ class NotificationView(View):
                         updTime=now_time,
                         uid=uid,
                         eventType=event_type))
-                if detect_med_type == 2 or detect_med_type == 0:
-                    eq_ex_list.append(EquipmentInfoExModel(
-                        add_time=now_time,
-                        user_id=userID_id,
-                        message_id='',
-                        push_type=push_type,
-                        push_server_status=200,
-                    ))
                 userID_ids.append(userID_id)
         if is_sys_msg:
             SysMsgModel.objects.bulk_create(sys_msg_list)
         Equipment_Info.objects.bulk_create(eq_list)
-        if len(eq_ex_list) > 0:
-            try:
-                EquipmentInfoExModel.objects.bulk_create(eq_ex_list)
-            except Exception as e:
-                print(repr(e))
 
         if is_st == '0' or is_st == '2':
             print("is_st=0or2")

Model/models.py

@@ -271,6 +271,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):
@@ -365,18 +369,4 @@ class UidPushModel(models.Model):
         ordering = ('-id',)
 
 
-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
-