devi】

Controller/SysMsg.py

@@ -15,7 +15,7 @@ import time
 
 from django.views.generic.base import View
 
-from Model.models import SysMsgModel, FeedBackModel, SysMassModel, UserExModel
+from Model.models import SysMsgModel, FeedBackModel, SysMassModel, UserExModel, UidSetModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.ModelService import ModelService
@@ -151,10 +151,24 @@ class SysMsgView(View):
             sm_qs = SysMsgModel.objects.filter(userID_id=userID)
             count = sm_qs.count()
             sm_qs = sm_qs[(page - 1) * line:page * line]. \
-                values('status', 'id', 'msg', 'addTime', 'updTime')
-            # sm_qs = SysMsgModel.objects.filter(userID_id=userID)[(page - 1) * line:page * line].values('sta')
+                values('status', 'id', 'msg', 'addTime', 'updTime', 'uid', 'eventType')
+            data_res = []
+            uid_list = []
+
+            for sm_q in sm_qs:
+                if sm_q['eventType'] > 0:
+                    uid_list.append(sm_q['uid'])
+                data_res.append(sm_q)
+            if uid_list:
+                uid_set_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'nickname')
+                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']
+                    data_res.append(sm_q)
             if sm_qs.exists():
-                return response.json(0, {'data': list(sm_qs), 'count': count})
+                return response.json(0, {'data': data_res, 'count': count})
             else:
                 return response.json(0, [])
         else:

Model/models.py

@@ -613,8 +613,8 @@ class SysMsgModel(models.Model):
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
-    # type = models.IntegerField(verbose_name='消息类型', default=0) # 默认系统消息类型,
-
+    eventType = models.IntegerField(verbose_name='消息类型', default=0) # 默认系统消息类型,0系统消息，1 ipcamera消息
+    uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
 
     class Meta:
         db_table = 'sys_msg'