Browse Source

add platform on table sysmasspush

chenjunkai 5 years ago
parent
commit
1642c09fc5
2 changed files with 6 additions and 2 deletions
  1. 4 2
      Controller/SysMsg.py
  2. 2 0
      Model/models.py

+ 4 - 2
Controller/SysMsg.py

@@ -69,7 +69,7 @@ class SysMsgView(View):
             if sender:
                 smss_qs.filter(sender__username=sender)
             count = smss_qs.count()
-            smss_qs = smss_qs.values('id', 'sender__username', 'addTime', 'updTime', 'lang', 'recever', 'msg')
+            smss_qs = smss_qs.values('id', 'sender__username', 'addTime', 'updTime', 'lang', 'recever', 'msg','platform')
             smss_qs = smss_qs[(page - 1) * line:page * line]
             return response.json(0, {'count':count,'datas':list(smss_qs)})
         else:
@@ -81,6 +81,7 @@ class SysMsgView(View):
             app_str = request_dict.get('app_list', None)
             msg = request_dict.get('msg', None)
             region_str = request_dict.get('region', None)
+            platform = request_dict.get('platform', None)
             app_list = app_str.split(',')
             region = region_str.split(',')
             nowTime = int(time.time())
@@ -97,7 +98,8 @@ class SysMsgView(View):
                 recever=app_str,
                 msg=msg,
                 addTime=nowTime,
-                updTime=nowTime
+                updTime=nowTime,
+                platform=platform
             )
             for i in range(range_count):
                 querysetlist = []

+ 2 - 0
Model/models.py

@@ -715,6 +715,7 @@ class UserExtendModel(models.Model):
     region = models.CharField(default='', max_length=16, verbose_name='区域语言')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
+
     # {'cn': '简体中文', 'tc': '繁体中文', 'fr': '法文', 'ru': '俄文', 'es': '西班牙文', 'pl': '波兰文', 'ja': '日文', 'de': '德文', 'en': '英文'}
 
     class Meta:
@@ -727,6 +728,7 @@ class UserExtendModel(models.Model):
 class SysMassModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键自增id')
     sender = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)  # 发送人
+    platform = models.CharField(default='', verbose_name='平台', max_length=16)
     lang = models.TextField(blank=True, default='', verbose_name=u'语种')
     recever = models.TextField(blank=True, default='', verbose_name=u'接受者')
     msg = models.TextField(blank=True, default='', verbose_name=u'发送内容')