um-new">
145
+ os.path.join(settings.MEDIA_ROOT, photo_path).replace('\\', '/'),
|
|
|
146
|
+ os.path.join(settings.MEDIA_ROOT, photo_thumbnail_path).replace('\\', '/'),
|
|
|
147
|
+ settings.THUMBNAIL_MAX_WIDTH
|
|
|
148
|
+ )
|
|
|
149
|
+
|
|
|
150
|
+ # 单列: 1080, xx-100K
|
|
|
151
|
+ photo_w, photo_h, photo_thumbnail2_w, photo_thumbnail2_h = make_thumbnail(
|
|
|
152
|
+ os.path.join(settings.MEDIA_ROOT, photo_path).replace('\\', '/'),
|
|
|
153
|
+ os.path.join(settings.MEDIA_ROOT, photo_thumbnail2_path).replace('\\', '/'),
|
|
|
154
|
+ settings.THUMBNAIL_MAX_WIDTH2
|
|
|
155
|
+ )
|
|
|
156
|
+
|
|
|
157
|
+ # 群组照片记录创建
|
|
|
158
|
+ group_photo = GroupPhotoInfo.objects.create(
|
|
|
159
|
+ group_id=group_id,
|
|
|
160
|
+ user_id=user_id,
|
|
|
161
|
+ nickname=user.final_nickname,
|
|
|
162
|
+ avatar=user.avatar,
|
|
|
163
|
+ photo_path=photo_path,
|
|
|
164
|
+ photo_w=photo_w,
|
|
|
165
|
+ photo_h=photo_h,
|
|
|
166
|
+ photo_thumbnail_path=photo_thumbnail_path,
|
|
|
167
|
+ photo_thumbnail_w=photo_thumbnail_w,
|
|
|
168
|
+ photo_thumbnail_h=photo_thumbnail_h,
|
|
|
169
|
+ photo_thumbnail2_path=photo_thumbnail2_path,
|
|
|
170
|
+ photo_thumbnail2_w=photo_thumbnail2_w,
|
|
|
171
|
+ photo_thumbnail2_h=photo_thumbnail2_h,
|
|
|
172
|
+ photo_from=GroupPhotoInfo.SESSION_GROUP,
|
|
|
173
|
+ session_id=photo.session_id,
|
|
|
174
|
+ lensman_id=photo.lensman_id,
|
|
|
175
|
+ lensman_photo_id=photo.photo_id,
|
|
|
176
|
+ )
|
|
|
177
|
+
|
|
|
178
|
+ # 设置群组最后一张照片PK
|
|
|
179
|
+ r.set(GROUP_LAST_PHOTO_PK % group_id, group_photo.pk)
|
|
|
180
|
+
|
|
|
181
|
+ # 获取从 current_id 到 now 的群组照片列表
|
|
|
182
|
+ group_photos = GroupPhotoInfo.objects.filter(
|
|
|
183
|
+ group_id=group_id,
|
|
|
184
|
+ status=True,
|
|
|
185
|
+ pk__gt=max(current_id, group_user.current_id),
|
|
|
186
|
+ ).order_by(
|
|
|
187
|
+ '-pk'
|
|
|
188
|
+ )
|
|
|
189
|
+ latest_photo = group_photos.first()
|
|
|
190
|
+
|
|
|
191
|
+ return JsonResponse({
|
|
|
192
|
+ 'status': 200,
|
|
|
193
|
+ 'message': u'摄影师照片上传成功',
|
|
|
194
|
+ 'data': {
|
|
|
195
|
+ 'group_id': group_id,
|
|
|
196
|
+ 'current_id': latest_photo and latest_photo.pk or current_id,
|
|
|
197
|
+ 'photos': [photo.photo_info(user_id) for photo in group_photos],
|
|
|
198
|
+ }
|
|
|
199
|
+ })
|
|
|
|
@@ -159,13 +159,11 @@ def session_join_api(request):
|
|
159
|
159
|
user_id = user.user_id
|
|
160
|
160
|
|
|
161
|
161
|
# 判断通过 session_id 创建的群组是否存在，如果不存在，则直接创建
|
|
162
|
|
- group, group_created = GroupInfo.objects.get_or_create(session_id=session_id, defaults={
|
|
|
162
|
+ group, group_created = GroupInfo.objects.get_or_create(session_id=session_id, group_from=GroupInfo.SESSION_GROUP, defaults={
|
|
163
|
163
|
'group_id': CurtailUUID.uuid(GroupInfo, 'group_id'),
|
|
164
|
164
|
'admin_id': user_id,
|
|
165
|
165
|
'group_name': user.final_nickname,
|
|
166
|
166
|
'group_default_avatar': 0,
|
|
167
|
|
- 'group_from': GroupInfo.SESSION_GROUP,
|
|
168
|
|
- 'session_id': session_id,
|
|
169
|
167
|
})
|
|
170
|
168
|
group_id = group.group_id
|
|
171
|
169
|
|