Selaa lähdekoodia

添加一键通话日志信息

linhaohong 1 vuosi sitten
vanhempi
commit
17899e3805
2 muutettua tiedostoa jossa 22 lisäystä ja 2 poistoa
  1. 15 0
      Model/models.py
  2. 7 2
      Service/DevicePushService.py

+ 15 - 0
Model/models.py

@@ -3467,3 +3467,18 @@ class UserAudioVideoPush(models.Model):
     class Meta:
         db_table = 'user_audio_video_push'
         verbose_name = '用户音视频推送表'
+
+
+class PushLog(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='自增标记ID')
+    uid = models.CharField(max_length=32, default='', db_index=True, verbose_name='设备UID')
+    event_type = models.CharField(default='', max_length=100, verbose_name='事件类型')
+    push_type = models.SmallIntegerField(default=0, verbose_name='推送类型')
+    push_result = models.BooleanField(default=False, verbose_name='推送结果')
+    content = models.TextField(default='', verbose_name='推送字段值')
+    created_time = models.IntegerField(default=0, verbose_name='触发时间')
+
+    class Meta:
+        db_table = 'push_log'
+        verbose_name = '推送日志'
+        app_label = 'db2'

+ 7 - 2
Service/DevicePushService.py

@@ -22,7 +22,7 @@ from AnsjerPush.config import CONFIG_INFO, CONFIG_CN, MULTI_CHANNEL_TYPE_LIST, S
     AWS_SECRET_ACCESS_KEY, EVENT_DICT, EVENT_DICT_CN, CONFIG_TEST
 from AnsjerPush.config import XMPUSH_CONFIG, OPPOPUSH_CONFIG, XM_PUSH_CHANNEL_ID
 from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
-    DeviceChannelUserPermission, UidSetModel, Device_Info, UserAudioVideoPush
+    DeviceChannelUserPermission, UidSetModel, Device_Info, UserAudioVideoPush, PushLog
 from Object.ETkObject import ETkObject
 from Object.OCIObjectStorage import OCIObjectStorage
 from Object.RedisObject import RedisObject
@@ -373,7 +373,7 @@ class DevicePushService:
             push_type = kwargs['push_type']
             push_kwargs = kwargs['push_kwargs']
             push_result = False
-
+            uid = kwargs['uid']
             # is_st为1或3,且推送类型为apns,gcm,华为,异步推送图片
             if (kwargs['is_st'] == 1 or kwargs['is_st'] == 3) and \
                     (push_type == 0 or push_type == 1 or push_type == 3):
@@ -433,6 +433,11 @@ class DevicePushService:
                     push_result = PushObject.android_meizupush(**push_kwargs)
                 elif push_type == 8:  # android honorpush
                     push_result = PushObject.android_honorpush(**push_kwargs)
+
+            if kwargs['event_type'] in [606, 607]:
+                # 写入日志表
+                PushLog.objects.create(uid=uid, event_type=kwargs['event_type'], created_time=int(time.time()),
+                                       content=push_kwargs, push_result=push_result, push_type=push_type)
             return push_result
         except Exception as e:
             LOGGING.error('发送推送异常,error_line:{},error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))