优化目前版本中的问题

This commit is contained in:
2025-03-10 13:56:25 +08:00
parent 758082db14
commit b4b1085403
11 changed files with 211 additions and 20 deletions

View File

@ -33,7 +33,8 @@ def get_image_pager2(image: ProjectImage, session: Session):
)
.outerjoin(subquery, piModel.id == subquery.c.image_id)
)
query = query.filter(piModel.project_id == image.project_id).order_by(asc(piModel.id))
query = query.filter(piModel.project_id == image.project_id)\
.filter(piModel.img_type == image.img_type).order_by(asc(piModel.id))
pager = get_pager(query, image.pagerNum, image.pagerSize)
datas = []
for result in pager.data:
@ -44,16 +45,20 @@ def get_image_pager2(image: ProjectImage, session: Session):
return pager
def check_img_name(project_id: int, file_name: str, session: Session):
def check_img_name(project_id: int, img_type: str, file_name: str, session: Session):
"""
根据项目id和文件名称进行查重
:param project_id:
:param img_type:
:param file_name:
:param session:
:return:
"""
image = session.query(piModel)\
.filter(piModel.project_id == project_id).filter(piModel.file_name == file_name).first()
.filter(piModel.project_id == project_id)\
.filter(piModel.file_name == file_name)\
.filter(piModel.img_type == img_type)\
.first()
if image is not None:
return False
return True
@ -72,17 +77,26 @@ def get_img_url(image_id: int, session: Session):
return sour_url, thumb_url
def get_image_list(project_id: int, session: Session):
query = session.query(piModel).filter(piModel.project_id == project_id).order_by(asc(piModel.id))
def get_image_list(project_id: int, img_type: str, session: Session):
query = session.query(piModel).filter(piModel.project_id == project_id)\
.filter(piModel.img_type == img_type)\
.order_by(asc(piModel.id))
image_list = [ProjectImage.from_orm(image) for image in query.all()]
return image_list
def get_images(project_id: int, session: Session):
query = session.query(piModel).filter(piModel.project_id == project_id).order_by(asc(piModel.id))
def get_images(project_id: int, img_type: str, session: Session):
query = session.query(piModel).filter(piModel.project_id == project_id)\
.filter(piModel.img_type == img_type).order_by(asc(piModel.id))
return query.all()
def get_image_count(project_id: int, img_type: str, session: Session):
query = session.query(piModel).filter(piModel.project_id == project_id)\
.filter(piModel.img_type == img_type).order_by(asc(piModel.id))
return query.count()
def add_image(image: ProjectImage, session: Session):
session.add(image)
session.commit()