Sfoglia il codice sorgente

feature:
1.增加系统消息未读用户统计
2.增加用户更新已读状态

chenjunkai 6 anni fa
parent
commit
a9e78142f2
2 ha cambiato i file con 23 aggiunte e 8 eliminazioni
  1. 14 0
      Controller/SysMsg.py
  2. 9 8
      Controller/UserController.py

+ 14 - 0
Controller/SysMsg.py

@@ -45,6 +45,8 @@ class SysMsgView(View):
                 return self.do_query(userID, request_dict, response)
             elif operation == 'queryByAdmin':
                 return self.do_query_by_admin(userID, request_dict, response)
+            elif operation == 'update':
+                return self.do_update(userID, request_dict, response)
             else:
                 return response.json(414)
         else:
@@ -114,3 +116,15 @@ class SysMsgView(View):
                 return response.json(444, 'page,line')
         else:
             return response.json(404)
+
+    def do_update(self, userID, request_dict, response):
+        sid = request_dict.get('sid', None)
+        if sid:
+            sm_qs = SysMsgModel.objects.filter(userID_id=userID, id=sid)
+            if sm_qs.exists():
+                sm_qs.update(status=1)
+                return response.json(0)
+            else:
+                return response.json(173)
+        else:
+            return response.json(444, 'sid')

+ 9 - 8
Controller/UserController.py

@@ -26,8 +26,7 @@ from ratelimit.decorators import ratelimit
 
 from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
-from Model.models import Device_User
-from Model.models import Role
+from Model.models import Device_User, Role, UID_App, SysMsgModel
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -36,7 +35,6 @@ from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 from Service.TemplateService import TemplateService
-from Model.models import UID_App
 from django.views.generic import View
 
 
@@ -1131,8 +1129,7 @@ class InitInfoView(View):
         tko = TokenObject(token)
         if tko.code == 0:
             userID = tko.userID
-            self.init_uid_app(request_dict, userID, response)
-            return response.json(0)
+            return self.init_uid_app(request_dict, userID, response)
         else:
             return response.json(tko.code)
 
@@ -1140,9 +1137,13 @@ class InitInfoView(View):
     def init_uid_app(self, request_dict, userID, response):
         token_val = request_dict.get('token_val', None)
         m_code = request_dict.get('m_code', None)
-        uid_app = UID_App.objects.filter(userID_id=userID, token_val=token_val, status=2,m_code=m_code)
+        uid_app = UID_App.objects.filter(userID_id=userID, token_val=token_val, status=2, m_code=m_code)
         if uid_app.exists():
             uid_app.update(status=1)
-            return response.json(0)
         else:
-            return response.json(0)
+            pass
+        sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
+        res = {
+            'usmsg': sm_count
+        }
+        return response.json(0,res)