天体资源改为最新上传优先,重传贴图/模型后立即生效
get_resources_by_body 与 get_all_resources_grouped_by_body 都按 created_at DESC, id DESC 排序:texture/model 是追加语义,旧行不会删除, 消费方一律取第一条或第一条匹配项,原来按时间正序导致新上传的排在最后取不到。 created_at 用 func.now()(事务时间戳),同批种子数据完全相同,需要 id 兜底。main
parent
f940f1381d
commit
0979d4fd4d
|
|
@ -40,8 +40,11 @@ class ResourceService:
|
|||
statement = select(Resource).where(Resource.body_id == body_id)
|
||||
if resource_type:
|
||||
statement = statement.where(Resource.resource_type == resource_type)
|
||||
# 最新上传优先:texture/model 是追加语义,重传后旧行仍在,
|
||||
# 消费方一律取第一条或第一条匹配项,必须让新资源排在最前面。
|
||||
# created_at 用的是 func.now()(事务时间戳),同批插入的行完全相同,用 id 兜底定序。
|
||||
result = await active_session.execute(
|
||||
statement.order_by(Resource.created_at)
|
||||
statement.order_by(Resource.created_at.desc(), Resource.id.desc())
|
||||
)
|
||||
return list(result.scalars().all())
|
||||
|
||||
|
|
@ -56,8 +59,10 @@ class ResourceService:
|
|||
session: Optional[AsyncSession] = None,
|
||||
) -> Dict[str, List[Resource]]:
|
||||
async def query(active_session: AsyncSession) -> Dict[str, List[Resource]]:
|
||||
# 与 get_resources_by_body 保持一致的“最新优先”,
|
||||
# 否则管理端弹窗先用列表数据渲染、再用详情接口刷新时顺序会跳变。
|
||||
statement = select(Resource).order_by(
|
||||
Resource.body_id, Resource.created_at
|
||||
Resource.body_id, Resource.created_at.desc(), Resource.id.desc()
|
||||
)
|
||||
if body_ids:
|
||||
statement = statement.where(Resource.body_id.in_(body_ids))
|
||||
|
|
|
|||
Loading…
Reference in New Issue