|
@@ -12,6 +12,7 @@
|
|
@Contact: chanjunkai@163.com
|
|
@Contact: chanjunkai@163.com
|
|
"""
|
|
"""
|
|
import os
|
|
import os
|
|
|
|
+import time
|
|
|
|
|
|
from django.http import HttpResponse
|
|
from django.http import HttpResponse
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
@@ -103,9 +104,10 @@ def initMsgFunc(request):
|
|
response.lang = tko.lang
|
|
response.lang = tko.lang
|
|
if tko.code == 0:
|
|
if tko.code == 0:
|
|
userID = tko.userID
|
|
userID = tko.userID
|
|
|
|
+ seven_days_ago = int(time.time()) - 3600 * 24 * 7 # 过滤七天前数据
|
|
sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
|
|
sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
|
|
- eq_count = Equipment_Info.objects.filter(userID_id=userID).filter(status=False).count()
|
|
|
|
- rq_count = Equipment_Info.objects.filter(userID_id=userID).filter(eventType=57, status=False,).count()
|
|
|
|
|
|
+ eq_count = Equipment_Info.objects.filter(userID_id=userID, eventTime__gt=seven_days_ago, status=False).count()
|
|
|
|
+ rq_count = Equipment_Info.objects.filter(userID_id=userID, eventTime__gt=seven_days_ago, eventType=57, status=False,).count()
|
|
uid_reset_count = Device_Info.objects.filter(userID_id=userID, isExist=2).count()
|
|
uid_reset_count = Device_Info.objects.filter(userID_id=userID, isExist=2).count()
|
|
res = {
|
|
res = {
|
|
'sm_count': sm_count, # 系统消息未读数量
|
|
'sm_count': sm_count, # 系统消息未读数量
|