项目基础模块代码

app/model/crud/project_image_crud.py

@@ -1,5 +1,6 @@
 from sqlalchemy.orm import Session
 from sqlalchemy import asc
+from typing import List
 
 from app.model.bussiness_model import ProjectImage as piModel
 from app.model.schemas.project_image_schemas import ProjectImage, ProjectImagePager
@@ -13,9 +14,9 @@ def get_image_pager(image: ProjectImagePager, session: Session):
     return pager
 
 
-def get_image_list(image: ProjectImage, session: Session):
-    query = session.query(piModel).filter(piModel.project_id == image.project_id).order_by(asc(piModel.id))
-    image_list =  [ProjectImage.from_orm(image) for image in query.all()]
+def get_image_list(project_id: int, session: Session):
+    query = session.query(piModel).filter(piModel.project_id == project_id).order_by(asc(piModel.id))
+    image_list = [ProjectImage.from_orm(image).dict() for image in query.all()]
     return image_list
 
 
@@ -25,8 +26,14 @@ def add_image(image: ProjectImage, session: Session):
     return image
 
 
-def del_image(id: str, session: Session):
-    row_del = session.query(piModel).filter_by(id=id).delete()
+def add_image_batch(images: List[ProjectImage], session: Session):
+    for image in images:
+        session.add(image)
+    session.commit()
+
+
+def del_image(image_id: str, session: Session):
+    row_del = session.query(piModel).filter_by(id=image_id).delete()
     session.commit()
     return row_del
 

app/model/crud/project_info_crud.py

@@ -20,11 +20,12 @@ def get_project_pager(info: ProjectInfoPager, session: Session):
     return pager
 
 
-def get_project_by_id(id: str, session: Session):
-    info = session.query(ProjectInfo).filter_by(id=id).first()
+def get_project_by_id(project_id: str, session: Session):
+    info = session.query(ProjectInfo).filter_by(id=project_id).first()
     info_out = ProjectInfoOut.from_orm(info)
     return info_out
 
+
 def add_project(info: ProjectInfo, session: Session):
     """新建项目,并在对应文件夹下面创建文件夹"""
     session.add(info)

app/model/crud/project_label_crud.py

@@ -1,4 +1,5 @@
 from sqlalchemy.orm import Session
+from sqlalchemy import and_
 
 from app.model.bussiness_model import ProjectLabel as plModel
 from app.model.schemas.project_label_schemas import ProjectLabel
@@ -12,7 +13,7 @@ def get_label_list(project_id: int, session: Session):
     :return:
     """
     label_list = session.query(plModel).filter(plModel.project_id == project_id).all()
-    label_list = [ProjectLabel.from_orm(label) for label in label_list]
+    label_list = [ProjectLabel.from_orm(label).dict() for label in label_list]
     return label_list
 
 
@@ -41,11 +42,12 @@ def check_label_name(project_id: int, label_name: str, session: Session, label_i
     filters = [plModel.project_id == project_id, plModel.label_name == label_name]
     if label_id is not None:
         filters.append(plModel.id != label_id)
-    query.filter(*filters)
-    if query.count() > 0:
-        return False
-    else:
+    query = query.filter(and_(*filters))
+    count = query.count()
+    if count > 0:
         return True
+    else:
+        return False
 
 
 def update_label(label: plModel, session: Session):
@@ -56,17 +58,19 @@ def update_label(label: plModel, session: Session):
     :return:
     """
     session.query(plModel).filter_by(id=label.id).update({
-        "label_name": label.label_name
+        "label_name": label.label_name,
+        "meta": label.meta
     })
     session.commit()
 
 
-def del_label(id: str, session: Session):
+def del_label(label_id: str, session: Session):
     """
     根据标签id删除标签
-    :param id: 标签id
+    :param label_id: 标签id
     :param session:
     :return:
     """
-    row_del = session.query(plModel).filter_by(id=id).delete()
+    row_del = session.query(plModel).filter_by(id=label_id).delete()
+    session.commit()
     return row_del

app/model/crud/sys_user_crud.py

@@ -13,7 +13,7 @@ def user_pager(user: SysUserPager, session: Session):
     if user.username is not None:
         filters.append(SysUser.username.ilike(f"%{user.username}%"))
     if len(filters) > 0:
-        query.filter(and_(*filters))
+        query = query.filter(and_(*filters))
     pager = get_pager(query, user.pagerNum, user.pagerSize)
     pager.data = [SysUserOut.from_orm(user).dict() for user in pager.data]
     return pager
@@ -26,8 +26,8 @@ def add_user(user: SysUser, session:  Session):
     return user
 
 
-def get_user_by_id(id: int, session:  Session):
-    user = session.query(SysUser).filter(SysUser.id == id).first()
+def get_user_by_id(user_id: int, session:  Session):
+    user = session.query(SysUser).filter(SysUser.id == user_id).first()
     return user