完成项目信息管理的迁移
This commit is contained in:
@ -9,18 +9,25 @@ import application.settings
|
||||
from . import schemas, models, params
|
||||
from apps.vadmin.auth.utils.validation.auth import Auth
|
||||
from utils import os_utils as os, random_utils as ru
|
||||
from utils.huawei_obs import ObsClient
|
||||
from utils import status
|
||||
from core.exception import CustomException
|
||||
if application.settings.DEBUG:
|
||||
from application.config.development import datasets_url, runs_url, detect_url, yolo_url, images_url
|
||||
from application.config.development import datasets_url, runs_url, images_url
|
||||
else:
|
||||
from application.config.production import datasets_url, runs_url, detect_url, yolo_url, images_url
|
||||
from application.config.production import datasets_url, runs_url, images_url
|
||||
|
||||
from typing import Any, List
|
||||
from core.crud import DalBase
|
||||
from fastapi import UploadFile
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, func, case, and_
|
||||
|
||||
|
||||
class ProjectInfoDal(DalBase):
|
||||
"""
|
||||
项目信息
|
||||
"""
|
||||
|
||||
def __init__(self, db: AsyncSession):
|
||||
super(ProjectInfoDal, self).__init__()
|
||||
@ -106,15 +113,112 @@ class ProjectInfoDal(DalBase):
|
||||
|
||||
|
||||
class ProjectImageDal(DalBase):
|
||||
"""
|
||||
项目图片
|
||||
"""
|
||||
|
||||
def __init__(self, db: AsyncSession):
|
||||
super(ProjectImageDal, self).__init__()
|
||||
self.db = db
|
||||
self.model = models.ProjectImage
|
||||
self.schema = schemas.ProjectImageSimpleOut
|
||||
self.schema = schemas.ProjectImageOut
|
||||
|
||||
async def img_page(self, param: params.ProjectImageParams):
|
||||
"""
|
||||
分页查询图片信息，然后关联一个图片的标签数量
|
||||
"""
|
||||
subquery = (
|
||||
select(
|
||||
models.ProjectImgLabel.image_id,
|
||||
func.ifnull(func.count(models.ProjectImgLabel.id), 0).label('label_count')
|
||||
)
|
||||
.group_by(models.ProjectImgLabel.image_id)
|
||||
.subquery()
|
||||
)
|
||||
# 2 主查询
|
||||
query = (
|
||||
select(
|
||||
models.ProjectImage,
|
||||
func.ifnull(subquery.c.label_count, 0).label('label_count')
|
||||
)
|
||||
.outerjoin(subquery, models.ProjectImage.id == subquery.c.image_id)
|
||||
)
|
||||
v_where = [models.ProjectImage.project_id == param.project_id, models.ProjectImage.img_type == param.img_type]
|
||||
sql = await self.filter_core(
|
||||
v_start_sql=query,
|
||||
v_where=v_where,
|
||||
v_return_sql=True,
|
||||
v_order=param.v_order,
|
||||
v_order_field=param.v_order_field
|
||||
)
|
||||
count = await self.get_count_sql(sql)
|
||||
if param.limit != 0:
|
||||
sql = sql.offset((param.page - 1) * param.limit).limit(param.limit)
|
||||
queryset = await self.db.execute(sql)
|
||||
result = queryset.all()
|
||||
datas = []
|
||||
for result in result:
|
||||
data = schemas.ProjectImageOut.model_validate(result[0])
|
||||
data.label_count = int(result[1])
|
||||
datas.append(data.model_dump())
|
||||
return datas, count
|
||||
|
||||
async def upload_imgs(self, files: List[UploadFile], pro: schemas.ProjectInfoOut, img_type: str) -> int:
|
||||
"""
|
||||
上传项目图片
|
||||
"""
|
||||
image_models = []
|
||||
for file in files:
|
||||
image = models.ProjectImage()
|
||||
image.project_id = pro.id
|
||||
image.file_name = file.filename
|
||||
image.img_type = img_type
|
||||
# 保存原图
|
||||
path = os.save_images(images_url, pro.project_no, file=file)
|
||||
image.image_url = path
|
||||
# 上传图片到obs
|
||||
object_key = pro.project_no + '/' + img_type + '/' + file.filename
|
||||
success, key, url = ObsClient.put_file(object_key=object_key, file_path=path)
|
||||
if success:
|
||||
image.object_key = object_key
|
||||
image.thumb_image_url = url
|
||||
else:
|
||||
raise CustomException("obs上传失败", code=status.HTTP_ERROR)
|
||||
image_models.append(image)
|
||||
await self.create_datas(datas=image_models)
|
||||
return len(image_models)
|
||||
|
||||
async def check_img_name(self, file_name: str, project_id: int, img_type: str):
|
||||
"""
|
||||
校验相同的项目，相同的文件类型是否有同名的文件
|
||||
"""
|
||||
count = await self.get_count(v_where=[
|
||||
models.ProjectImage.file_name == file_name,
|
||||
models.ProjectImage.project_id == project_id,
|
||||
models.ProjectImage.img_type == img_type
|
||||
])
|
||||
return count > 0
|
||||
|
||||
async def del_img(self, ids: List[int]):
|
||||
"""
|
||||
删除图片，删除数据库数据，删除本地的文件，删除obs中的文件
|
||||
"""
|
||||
file_urls = []
|
||||
object_keys = []
|
||||
for img_id in ids:
|
||||
image = self.get_data(data_id=img_id)
|
||||
if image:
|
||||
file_urls.append(image.image_url)
|
||||
object_keys.append(image.object_key)
|
||||
os.delete_file_if_exists(**file_urls)
|
||||
ObsClient.del_objects(object_keys)
|
||||
await self.delete_datas(ids)
|
||||
|
||||
|
||||
class ProjectLabelDal(DalBase):
|
||||
"""
|
||||
项目标签
|
||||
"""
|
||||
|
||||
def __init__(self, db: AsyncSession):
|
||||
super(ProjectLabelDal, self).__init__()
|
||||
@ -139,18 +243,37 @@ class ProjectLabelDal(DalBase):
|
||||
|
||||
|
||||
class ProjectImgLabelDal(DalBase):
|
||||
|
||||
"""
|
||||
图片标签信息
|
||||
"""
|
||||
def __init__(self, db: AsyncSession):
|
||||
super(ProjectImgLabelDal, self).__init__()
|
||||
self.db = db
|
||||
self.model = models.ProjectImgLabel
|
||||
self.schema = schemas.ProjectImgLabelSimpleOut
|
||||
|
||||
async def add_img_label(self, img_label_in: schemas.ProjectImgLeaferLabel):
|
||||
# 先把历史数据都删掉，然后再保存
|
||||
image_id = img_label_in.image_id
|
||||
await self.delete_datas(image_id=image_id)
|
||||
img_labels = [self.model(**i.model_dump()) for i in img_label_in.label_infos]
|
||||
for img in img_labels:
|
||||
img.image_id = image_id
|
||||
await self.create_datas(img_labels)
|
||||
|
||||
|
||||
class ProjectImgLeaferDal(DalBase):
|
||||
"""
|
||||
图片标注信息-leafer.js
|
||||
"""
|
||||
|
||||
def __init__(self, db: AsyncSession):
|
||||
super(ProjectImgLeaferDal, self).__init__()
|
||||
self.db = db
|
||||
self.model = models.ProjectImgLeafer
|
||||
self.schema = schemas.ProjectImgLeaferSimpleOut
|
||||
self.schema = schemas.ProjectImgLeaferOut
|
||||
|
||||
async def add_leafer(self, img_label_in: schemas.ProjectImgLeaferLabel):
|
||||
# 先把历史数据都删掉，然后再保存
|
||||
image_id = img_label_in.image_id
|
||||
await self.delete_datas(image_id=image_id)
|
||||
await self.create_data(data=self.model(**img_label_in.model_dump()))
|
||||
|
||||
Reference in New Issue
Block a user