num-new"> 10
 from utils.page_utils import pagination
11
-from utils.redis.rmessage import get_system_message_delete_info, get_system_message_read_info, set_system_message_delete_info, set_system_message_read_info
11
+from utils.redis.rmessage import (get_system_message_delete_info, get_system_message_read_info,
12
+                                  set_system_message_delete_info, set_system_message_read_info)
12 13
 
13 14
 
14 15
 def message_list_api(request):

+ 15 - 2
utils/redis/retrieve.py

@@ -1,19 +1,31 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
+import json
4
+
3 5
 from django.conf import settings
4 6
 
5 7
 from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo
6
-from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET
8
+from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_PHOTO_DATA, GROUP_USERS_APPLYING_SET, GROUP_USERS_DELETED_SET,
9
+                               GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET)
7 10
 
8 11
 
9 12
 r = settings.REDIS_CACHE
10 13
 
11 14
 
15
+def retrieve_group_data():
16
+    """ 群组数据 """
17
+    groups = GroupInfo.objects.filter(status=True)
18
+    for group in groups:
19
+        group_photos = GroupPhotoInfo.objects.filter(group_id=group.group_id, status=True)
20
+        group_photos = [photo.photo_data for photo in group_photos]
21
+        r.set(GROUP_PHOTO_DATA % group.group_id, json.dumps(group_photos))
22
+
23
+
12 24
 def retrieve_last_pk():
13 25
     """ 群组最后一张照片PK """
14 26
     groups = GroupInfo.objects.filter(status=True)
15 27
     for group in groups:
16
-        group_photo = GroupPhotoInfo.objects.filter(group_id=group.group_id).last()
28
+        group_photo = GroupPhotoInfo.objects.filter(group_id=group.group_id, status=True).last()
17 29
         r.set(GROUP_LAST_PHOTO_PK % group.group_id, group_photo and group_photo.pk or -1)
18 30
 
19 31
 
@@ -33,5 +45,6 @@ def retrieve_group_user_status():
33 45
 
34 46
 
35 47
 def retrieve_redis_data():
48
+    retrieve_group_data()
36 49
     retrieve_last_pk()
37 50
     retrieve_group_user_status()

+ 18 - 1
utils/redis/rgroup.py

@@ -5,7 +5,7 @@ import json
5 5
 from django.conf import settings
6 6
 from django.core.serializers.json import DjangoJSONEncoder
7 7
 
8
-from utils.redis.rkeys import GROUP_INFO, GROUP_PHOTO_THUMB_UP, GROUP_USERS_INFO
8
+from utils.redis.rkeys import GROUP_INFO, GROUP_PHOTO_DATA, GROUP_PHOTO_THUMB_UP, GROUP_USERS_INFO
9 9
 
10 10
 
11 11
 r = settings.REDIS_CACHE
@@ -71,15 +71,32 @@ def get_group_users_info(group_id, user_id):
71 71
 # 群组照片相关
72 72
 
73 73
 
74
+def set_group_photo_data(group_id):
75
+    """ 设置群组照片数据信息 """
76
+    from group.models import GroupPhotoInfo
77
+    group_photos = GroupPhotoInfo.objects.filter(group_id=group_id, status=True)
78
+    group_photos = [photo.photo_data for photo in group_photos]
79
+    r.set(GROUP_PHOTO_DATA % group_id, json.dumps(group_photos))
80
+    return group_photos
81
+
82
+
83
+def get_group_photo_data(group_id):
84
+    """ 获取群组照片数据信息 """
85
+    return json.loads(r.get(GROUP_PHOTO_DATA % group_id) or '[]') or set_group_photo_data(group_id)
86
+
87
+
74 88
 def set_group_photo_thumbup_flag(photo_id, user_id):
89
+    """ 设置群组照片用户点赞标识信息 """
75 90
     r.setex(GROUP_PHOTO_THUMB_UP % (photo_id, user_id), settings.REDIS_EXPIRED_MONTH, True)
76 91
 
77 92
 
78 93
 def del_group_photo_thumbup_flag(photo_id, user_id):
94
+    """ 删除群组照片用户点赞标识信息 """
79 95
     r.delete(GROUP_PHOTO_THUMB_UP % (photo_id, user_id))
80 96
 
81 97
 
82 98
 def get_group_photo_thumbup_flag(photo_id, user_id):
99
+    """ 获取群组照片用户点赞标识信息 """
83 100
     if r.exists(GROUP_PHOTO_THUMB_UP % (photo_id, user_id)):
84 101
         return True
85 102
     else:

+ 1 - 0
utils/redis/rkeys.py

@@ -15,6 +15,7 @@ GROUP_USERS_DELETED_SET = 'group:users:deleted:set:%s'  # SET,群组用户移
15 15
 GROUP_USERS_QUIT_SET = 'group:users:quit:set:%s'  # SET,群组用户退出集合,group_id
16 16
 
17 17
 # 群组照片相关
18
+GROUP_PHOTO_DATA = 'group:photo:data:%s'  # STRING,群组数据记录,photo_id
18 19
 GROUP_PHOTO_THUMB_UP = 'group:photo:thumb:up:%s:%s'  # STRING,群组照片用户点赞记录,photo_id、user_id
19 20
 GROUP_LAST_PHOTO_PK = 'group:last:photo:pk:%s'  # STRING,群组最后一张照片PK,group_id
20 21
 

kodo - Gogs: Go Git Service

Aucune description

Brightcells: d4f34707b9 Return user_info of tgu_group_user_locations_api the same as tg_group_detail_api 9 ans auparavant
..
error b065bf7b3a Remove unnecessary u 9 ans auparavant
redis d4f34707b9 Return user_info of tgu_group_user_locations_api the same as tg_group_detail_api 9 ans auparavant
sql 7111961986 Return session_id in api pai2_home_api 9 ans auparavant
__init__.py 52ce35cbfc add api uuid_init/uuid 10 ans auparavant
disk_utils.py af2b3f483f change download.html to be generated from download.tmpl.html 10 ans auparavant
group_photo_utils.py 347e920d39 Return session_id grouped photos in group_join_api & Return session_id in photo detail 9 ans auparavant
ip_utils.py 0ab056c3fd Change ip_addr to get_client_ip 9 ans auparavant
message_utils.py 21b4a5403a add api lensman_brief_api 10 ans auparavant
original_CGzC_10a50000c8811190.jpg 4a8b4f8819 add watermark 10 ans auparavant
original_CGzC_10a50000c8811190副本.jpg 4a8b4f8819 add watermark 10 ans auparavant
page_utils.py b2cf473db5 optimize pagination 10 ans auparavant
paiai_96_96.png 4a8b4f8819 add watermark 10 ans auparavant
storage_utils.py 25b296f848 Add attentions/schedules for GroupInfo 9 ans auparavant
strip_utils.py e4c95c78c7 tstrip 10 ans auparavant
thumbnail_utils.py 5c9e21b29b add Only Once Function statistic_thumbnail_size to statistic thumbnail size 10 ans auparavant
time_utils.py 1fac624f0e Add paage tgu_group_detail 9 ans auparavant
url_utils.py bbc43c96ec add photo_share_url 10 ans auparavant
version_utils.py 63eaee0951 modify guest_login_api 10 ans auparavant
watermark_utils.py 4a8b4f8819 add watermark 10 ans auparavant