fix async apis

app/db/models/message.py

@@ -1,9 +1,10 @@
 from typing import Optional
 
-from sqlalchemy import Column, Integer, String, Sequence, JSON
+from sqlalchemy import Column, Integer, String, Sequence, JSON, select
+from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
-from app.db import db_query, Base
+from app.db import db_query, Base, async_db_query
 
 
 class Message(Base):
@@ -38,3 +39,11 @@ class Message(Base):
     @db_query
     def list_by_page(cls, db: Session, page: Optional[int] = 1, count: Optional[int] = 30):
         return db.query(cls).order_by(cls.reg_time.desc()).offset((page - 1) * count).limit(count).all()
+
+    @classmethod
+    @async_db_query
+    async def async_list_by_page(cls, db: AsyncSession, page: Optional[int] = 1, count: Optional[int] = 30):
+        result = await db.execute(
+            select(cls).order_by(cls.reg_time.desc()).offset((page - 1) * count).limit(count)
+        )
+        return result.scalars().all()

app/db/models/site.py

@@ -1,10 +1,10 @@
 from datetime import datetime
 
-from sqlalchemy import Boolean, Column, Integer, String, Sequence, JSON, select
+from sqlalchemy import Boolean, Column, Integer, String, Sequence, JSON, select, delete
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
-from app.db import db_query, db_update, Base, async_db_query
+from app.db import db_query, db_update, Base, async_db_query, async_db_update
 
 
 class Site(Base):
@@ -82,6 +82,12 @@ class Site(Base):
     def list_order_by_pri(cls, db: Session):
         return db.query(cls).order_by(cls.pri).all()
 
+    @classmethod
+    @async_db_query
+    async def async_list_order_by_pri(cls, db: AsyncSession):
+        result = await db.execute(select(cls).order_by(cls.pri))
+        return result.scalars().all()
+
     @classmethod
     @db_query
     def get_domains_by_ids(cls, db: Session, ids: list):
@@ -91,3 +97,8 @@ class Site(Base):
     @db_update
     def reset(cls, db: Session):
         db.query(cls).delete()
+
+    @classmethod
+    @async_db_update
+    async def async_reset(cls, db: AsyncSession):
+        await db.execute(delete(cls))

app/db/models/siteuserdata.py

@@ -1,10 +1,11 @@
 from datetime import datetime
 from typing import Optional
 
-from sqlalchemy import Column, Integer, String, Sequence, Float, JSON, func, or_
+from sqlalchemy import Column, Integer, String, Sequence, Float, JSON, func, or_, select
+from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
-from app.db import db_query, Base
+from app.db import db_query, Base, async_db_query
 
 
 class SiteUserData(Base):
@@ -65,6 +66,17 @@ class SiteUserData(Base):
                                         cls.updated_day == workdate).all()
         return db.query(cls).filter(cls.domain == domain).all()
 
+    @classmethod
+    @async_db_query
+    async def async_get_by_domain(cls, db: AsyncSession, domain: str, workdate: Optional[str] = None, worktime: Optional[str] = None):
+        query = select(cls).filter(cls.domain == domain)
+        if workdate and worktime:
+            query = query.filter(cls.updated_day == workdate, cls.updated_time == worktime)
+        elif workdate:
+            query = query.filter(cls.updated_day == workdate)
+        result = await db.execute(query)
+        return result.scalars().all()
+
     @classmethod
     @db_query
     def get_by_date(cls, db: Session, date: str):
@@ -92,3 +104,28 @@ class SiteUserData(Base):
             (cls.domain == subquery.c.domain) &
             (cls.updated_day == subquery.c.latest_update_day)
         ).order_by(cls.updated_time.desc()).all()
+
+    @classmethod
+    @async_db_query
+    async def async_get_latest(cls, db: AsyncSession):
+        """
+        异步获取各站点最新一天的数据
+        """
+        subquery = (
+            select(
+                cls.domain,
+                func.max(cls.updated_day).label('latest_update_day')
+            )
+            .group_by(cls.domain)
+            .filter(or_(cls.err_msg.is_(None), cls.err_msg == ""))
+            .subquery()
+        )
+
+        # 主查询：按 domain 和 updated_day 获取最新的记录
+        result = await db.execute(
+            select(cls).join(
+                subquery,
+                (cls.domain == subquery.c.domain) &
+                (cls.updated_day == subquery.c.latest_update_day)
+            ).order_by(cls.updated_time.desc()))
+        return result.scalars().all()

app/db/models/systemconfig.py

@@ -1,7 +1,8 @@
-from sqlalchemy import Column, Integer, String, Sequence, JSON
+from sqlalchemy import Column, Integer, String, Sequence, JSON, select
+from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
-from app.db import db_query, db_update, Base
+from app.db import db_query, db_update, Base, async_db_query
 
 
 class SystemConfig(Base):
@@ -19,6 +20,12 @@ class SystemConfig(Base):
     def get_by_key(cls, db: Session, key: str):
         return db.query(cls).filter(cls.key == key).first()
 
+    @classmethod
+    @async_db_query
+    async def async_get_by_key(cls, db: AsyncSession, key: str):
+        result = await db.execute(select(cls).where(cls.key == key))
+        return result.scalar_one_or_none()
+
     @db_update
     def delete_by_key(self, db: Session, key: str):
         systemconfig = self.get_by_key(db, key)

app/db/models/transferhistory.py

@@ -173,6 +173,21 @@ class TransferHistory(Base):
                                       time.localtime(time.time() - 86400 * days))).subquery()
         return db.query(sub_query.c.date, func.count(sub_query.c.id)).group_by(sub_query.c.date).all()
 
+    @classmethod
+    @async_db_query
+    async def async_statistic(cls, db: AsyncSession, days: Optional[int] = 7):
+        """
+        统计最近days天的下载历史数量，按日期分组返回每日数量
+        """
+        sub_query = select(func.substr(cls.date, 1, 10).label('date'),
+                           cls.id.label('id')).filter(
+            cls.date >= time.strftime("%Y-%m-%d %H:%M:%S",
+                                      time.localtime(time.time() - 86400 * days))).subquery()
+        result = await db.execute(
+            select(sub_query.c.date, func.count(sub_query.c.id)).group_by(sub_query.c.date)
+        )
+        return result.scalars().all()
+
     @classmethod
     @db_query
     def count(cls, db: Session, status: bool = None):