账号添加宇恒一号用户id管理
This commit is contained in:
@@ -51,7 +51,8 @@ def get_account(request: AccountGetRequest, db: Session = Depends(get_db)):
|
||||
username=request.username,
|
||||
project_name=request.project_name,
|
||||
status=request.status,
|
||||
today_updated=request.today_updated
|
||||
today_updated=request.today_updated,
|
||||
yh_id=request.yh_id
|
||||
)
|
||||
if not accounts:
|
||||
return AccountListResponse(
|
||||
|
||||
@@ -15,8 +15,9 @@ class Account(Base):
|
||||
updated_at = Column(DateTime, server_default=func.now(), onupdate=func.now(), comment="更新时间")
|
||||
update_time = Column(String(1000), nullable=False, comment="更新时间跨度")
|
||||
max_variation = Column(Integer, default=1, comment="变化量的绝对值,单位是毫米")
|
||||
yh_id = Column(String(1000), comment="宇恒一号用户id")
|
||||
|
||||
|
||||
|
||||
# 模型转字典
|
||||
def to_dict(self):
|
||||
"""将模型实例转换为字典,支持 Pydantic 序列化"""
|
||||
|
||||
@@ -10,6 +10,7 @@ class AccountBase(BaseModel):
|
||||
project_name: Optional[str] = None
|
||||
update_time: Optional[str] = None
|
||||
max_variation: Optional[int] = None
|
||||
yh_id: Optional[str] = None
|
||||
|
||||
class AccountCreate(AccountBase):
|
||||
pass
|
||||
@@ -45,6 +46,7 @@ class AccountResponse(AccountBase):
|
||||
updated_at=account.updated_at,
|
||||
update_time=account.update_time,
|
||||
max_variation=account.max_variation,
|
||||
yh_id=account.yh_id
|
||||
)
|
||||
|
||||
class AccountListRequest(BaseModel):
|
||||
@@ -58,6 +60,7 @@ class AccountGetRequest(BaseModel):
|
||||
status: Optional[int] = None
|
||||
today_updated: Optional[int] = None
|
||||
update_time: Optional[str] = None
|
||||
yh_id: Optional[str] = None
|
||||
|
||||
class AccountUpdateRequest(BaseModel):
|
||||
account_id: int
|
||||
|
||||
@@ -32,7 +32,8 @@ class AccountService:
|
||||
@staticmethod
|
||||
def search_accounts(db: Session, account_id: Optional[int] = None,
|
||||
username: Optional[str] = None, project_name: Optional[str] = None,
|
||||
status: Optional[int] = None, today_updated: Optional[int] = None) -> List[AccountResponse]:
|
||||
status: Optional[int] = None, today_updated: Optional[int] = None,
|
||||
yh_id: Optional[str] = None) -> List[AccountResponse]:
|
||||
"""根据多种条件搜索账号"""
|
||||
query = db.query(Account)
|
||||
|
||||
@@ -46,6 +47,8 @@ class AccountService:
|
||||
query = query.filter(Account.status == status)
|
||||
if today_updated is not None:
|
||||
query = query.filter(Account.today_updated == today_updated)
|
||||
if yh_id is not None:
|
||||
query = query.filter(Account.yh_id == yh_id)
|
||||
|
||||
accounts = query.all()
|
||||
return [AccountResponse.from_orm_account(account) for account in accounts]
|
||||
|
||||
Reference in New Issue
Block a user