系统消息增加保存通道号

Controller/SysMsg.py

@@ -184,7 +184,7 @@ class SysMsgView(View):
 
             count = sm_qs.count()
             sm_qs = sm_qs[(page - 1) * line:page * line]. \
-                values('status', 'id', 'msg', 'addTime', 'updTime', 'uid', 'eventType', 'title', 'jumpLink')
+                values('status', 'id', 'msg', 'addTime', 'updTime', 'uid', 'eventType', 'title', 'jumpLink', 'channel')
             data_res = []
             uid_list = []
 
@@ -199,12 +199,13 @@ class SysMsgView(View):
                             sm_q['code'] = number
                 data_res.append(sm_q)
             if uid_list:
-                uid_set_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'nickname')
+                uid_set_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'nickname', 'device_type')
                 data_res = []
                 for sm_q in sm_qs:
                     for uid_set_q in uid_set_qs:
                         if uid_set_q['uid'] == sm_q['uid']:
                             sm_q['devNickName'] = uid_set_q['nickname']
+                            sm_q['devType'] = int(uid_set_q['device_type'])
                     data_res.append(sm_q)
             return response.json(0, {'data': data_res, 'count': count})
         except Exception as e:

Model/models.py

@@ -2275,6 +2275,7 @@ class SysMsgModel(models.Model):
     eventType = models.IntegerField(verbose_name='消息类型', default=0)
     jumpLink = models.TextField(default='', verbose_name='跳转链接')
     uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
+    channel = models.IntegerField(default=0, verbose_name='通道号')
 
     class Meta:
         db_table = 'sys_msg'