fix:更新接口修改为patch接口以实现部分更新

Author: insistence

dash-fastapi-backend/controller/dept_controller.py

@@ -62,7 +62,7 @@ async def add_system_dept(request: Request, add_dept: DeptModel, token: Optional
         return response_500(data="", message="接口异常")
 
 
-@deptController.post("/dept/edit", response_model=CrudDeptResponse)
+@deptController.patch("/dept/edit", response_model=CrudDeptResponse)
 async def edit_system_dept(request: Request, edit_dept: DeptModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
     try:
         current_user = await get_current_user(request, token, query_db)

dash-fastapi-backend/controller/menu_controller.py

@@ -62,7 +62,7 @@ async def add_system_menu(request: Request, add_menu: MenuModel, token: Optional
         return response_500(data="", message="接口异常")
 
 
-@menuController.post("/menu/edit", response_model=CrudMenuResponse)
+@menuController.patch("/menu/edit", response_model=CrudMenuResponse)
 async def edit_system_menu(request: Request, edit_menu: MenuModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
     try:
         current_user = await get_current_user(request, token, query_db)

dash-fastapi-backend/controller/post_controler.py

@@ -50,7 +50,7 @@ async def add_system_post(request: Request, add_post: PostModel, token: Optional
         return response_500(data="", message="接口异常")
 
 
-@postController.post("/post/edit", response_model=CrudPostResponse)
+@postController.patch("/post/edit", response_model=CrudPostResponse)
 async def edit_system_post(request: Request, edit_post: PostModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
     try:
         current_user = await get_current_user(request, token, query_db)

dash-fastapi-backend/controller/role_controller.py

@@ -50,7 +50,7 @@ async def add_system_role(request: Request, add_role: AddRoleModel, token: Optio
         return response_500(data="", message="接口异常")
 
 
-@roleController.post("/role/edit", response_model=CrudRoleResponse)
+@roleController.patch("/role/edit", response_model=CrudRoleResponse)
 async def edit_system_role(request: Request, edit_role: AddRoleModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
     try:
         current_user = await get_current_user(request, token, query_db)

dash-fastapi-backend/controller/user_controller.py

@@ -41,7 +41,7 @@ async def add_system_user(request: Request, add_user: AddUserModel, token: Optio
         return response_500(data="", message="接口异常")
 
 
-@userController.post("/user/edit", response_model=CrudUserResponse)
+@userController.patch("/user/edit", response_model=CrudUserResponse)
 async def edit_system_user(request: Request, edit_user: AddUserModel, token: Optional[str] = Header(...), query_db: Session = Depends(get_db)):
     try:
         current_user = await get_current_user(request, token, query_db)

dash-fastapi-backend/mapper/crud/dept_crud.py

@@ -144,23 +144,20 @@ def add_dept_crud(db: Session, dept: DeptModel):
     return CrudDeptResponse(**result)
 
 
-def edit_dept_crud(db: Session, dept: DeptModel):
+def edit_dept_crud(db: Session, dept: dict):
     """
     编辑部门数据库操作
     :param db: orm对象
-    :param dept: 部门对象
+    :param dept: 需要更新的部门字典
     :return: 编辑校验结果
     """
-    print(dept.dept_id)
-    is_dept_id = db.query(SysDept).filter(SysDept.dept_id == dept.dept_id).all()
+    is_dept_id = db.query(SysDept).filter(SysDept.dept_id == dept.get('dept_id')).all()
     if not is_dept_id:
         result = dict(is_success=False, message='部门不存在')
     else:
-        # 筛选出属性值为不为None和''的
-        filtered_dict = {k: v for k, v in dept.dict().items() if v is not None and v != ''}
         db.query(SysDept) \
-            .filter(SysDept.dept_id == dept.dept_id) \
-            .update(filtered_dict)
+            .filter(SysDept.dept_id == dept.get('dept_id')) \
+            .update(dept)
         db.commit()  # 提交保存到数据库中
         result = dict(is_success=True, message='更新成功')
 

dash-fastapi-backend/mapper/crud/menu_crud.py

@@ -74,22 +74,20 @@ def add_menu_crud(db: Session, menu: MenuModel):
     return CrudMenuResponse(**result)
 
 
-def edit_menu_crud(db: Session, menu: MenuModel):
+def edit_menu_crud(db: Session, menu: dict):
     """
     编辑菜单数据库操作
     :param db: orm对象
-    :param menu: 菜单对象
+    :param menu: 需要更新的菜单字典
     :return: 编辑校验结果
     """
-    is_menu_id = db.query(SysMenu).filter(SysMenu.menu_id == menu.menu_id).all()
+    is_menu_id = db.query(SysMenu).filter(SysMenu.menu_id == menu.get('menu_id')).all()
     if not is_menu_id:
         result = dict(is_success=False, message='菜单不存在')
     else:
-        # 筛选出属性值为不为None和''的
-        filtered_dict = {k: v for k, v in menu.dict().items() if v is not None and v != ''}
         db.query(SysMenu) \
-            .filter(SysMenu.menu_id == menu.menu_id) \
-            .update(filtered_dict)
+            .filter(SysMenu.menu_id == menu.get('menu_id')) \
+            .update(menu)
         db.commit()  # 提交保存到数据库中
         result = dict(is_success=True, message='更新成功')
 

dash-fastapi-backend/mapper/crud/post_crud.py

@@ -84,22 +84,20 @@ def add_post_crud(db: Session, post: PostModel):
     return CrudPostResponse(**result)
 
 
-def edit_post_crud(db: Session, post: PostModel):
+def edit_post_crud(db: Session, post: dict):
     """
     编辑岗位数据库操作
     :param db: orm对象
-    :param post: 岗位对象
+    :param post: 需要更新的岗位字典
     :return: 编辑校验结果
     """
-    is_post_id = db.query(SysPost).filter(SysPost.post_id == post.post_id).all()
+    is_post_id = db.query(SysPost).filter(SysPost.post_id == post.get('post_id')).all()
     if not is_post_id:
         result = dict(is_success=False, message='岗位不存在')
     else:
-        # 筛选出属性值为不为None和''的
-        filtered_dict = {k: v for k, v in post.dict().items() if v is not None and v != ''}
         db.query(SysPost) \
-            .filter(SysPost.post_id == post.post_id) \
-            .update(filtered_dict)
+            .filter(SysPost.post_id == post.get('post_id')) \
+            .update(post)
         db.commit()  # 提交保存到数据库中
         result = dict(is_success=True, message='更新成功')
 

dash-fastapi-backend/mapper/crud/role_crud.py

@@ -126,22 +126,20 @@ def add_role_crud(db: Session, role: RoleModel):
     return CrudRoleResponse(**result)
 
 
-def edit_role_crud(db: Session, role: RoleModel):
+def edit_role_crud(db: Session, role: dict):
     """
     编辑角色数据库操作
     :param db: orm对象
-    :param role: 角色对象
+    :param role: 需要更新的角色字典
     :return: 编辑校验结果
     """
-    is_role_id = db.query(SysRole).filter(SysRole.role_id == role.role_id).all()
+    is_role_id = db.query(SysRole).filter(SysRole.role_id == role.get('role_id')).all()
     if not is_role_id:
         result = dict(is_success=False, message='角色不存在')
     else:
-        # 筛选出属性值为不为None和''的
-        filtered_dict = {k: v for k, v in role.dict().items() if v is not None and v != ''}
         db.query(SysRole) \
-            .filter(SysRole.role_id == role.role_id) \
-            .update(filtered_dict)
+            .filter(SysRole.role_id == role.get('role_id')) \
+            .update(role)
         db.commit()  # 提交保存到数据库中
         result = dict(is_success=True, message='更新成功')
 

dash-fastapi-backend/mapper/crud/user_crud.py

@@ -211,25 +211,23 @@ def add_user_crud(db: Session, user: UserModel):
     return CrudUserResponse(**result)
 
 
-def edit_user_crud(db: Session, user: UserModel):
+def edit_user_crud(db: Session, user: dict):
     """
     编辑用户数据库操作
     :param db: orm对象
-    :param user: 用户对象
+    :param user: 需要更新的用户字典
     :return: 编辑校验结果
     """
-    is_user_id = db.query(SysUser).filter(SysUser.user_id == user.user_id, SysUser.del_flag == 0).all()
-    is_user_name = db.query(SysUser).filter(SysUser.user_name == user.user_name, SysUser.del_flag == 0).all()
+    is_user_id = db.query(SysUser).filter(SysUser.user_id == user.get('user_id'), SysUser.del_flag == 0).all()
+    is_user_name = db.query(SysUser).filter(SysUser.user_name == user.get('user_name'), SysUser.del_flag == 0).all()
     if not is_user_id:
         result = dict(is_success=False, message='用户不存在')
     elif is_user_name:
         result = dict(is_success=False, message='用户名已存在，不允许修改')
     else:
-        # 筛选出属性值为不为None和''的
-        filtered_dict = {k: v for k, v in user.dict().items() if v is not None and v != ''}
         db.query(SysUser) \
-            .filter(SysUser.user_id == user.user_id) \
-            .update(filtered_dict)
+            .filter(SysUser.user_id == user.get('user_id')) \
+            .update(user)
         db.commit()  # 提交保存到数据库中
         result = dict(is_success=True, message='更新成功')