x

src/moldinsight/services/storage_integration_rustfs.py

@@ -459,7 +459,9 @@ class StorageIntegrationService:
             storage_bucket=upload_result['bucket'],
             filename=filename,
             file_path=file_path,  # 保留本地路径
-            html_content=html_content,  # 保留内容以兼容
+            # 停止双写完整 HTML 进 PG：读取路径走 RustFS（html_json.content），
+            # PG 仅存对象键与文件名，避免大文本撑爆表
+            html_content=None,
             visualization_type=visualization_type
         )
 
@@ -738,20 +740,24 @@ class StorageIntegrationService:
         
         result = await session.execute(query)
         latest_files = result.unique().scalars().all()
-        
+
+        # 一次性聚合每个文件名的上传次数（替代逐文件 count 的 N+1 查询）
+        count_subquery = (
+            select(STPFile.original_filename, func.count().label("upload_count"))
+            .group_by(STPFile.original_filename)
+        )
+        if user_id:
+            count_subquery = count_subquery.where(STPFile.user_id == user_id)
+        count_result = await session.execute(count_subquery)
+        upload_counts = {
+            row.original_filename: row.upload_count for row in count_result
+        }
+
         # 获取每个文件名的上传次数
         file_groups = []
         for f in latest_files:
-            count_query = select(func.count()).where(
-                STPFile.original_filename == f.original_filename
-            )
-            if user_id:
-                count_query = count_query.where(STPFile.user_id == user_id)
-            
-            count_result = await session.execute(count_query)
-            upload_count = count_result.scalar()
-            
             task_id = f.processing_tasks[0].task_id if f.processing_tasks else None
+            upload_count = upload_counts.get(f.original_filename, 1)
             
             file_groups.append({
                 'filename': f.original_filename,