From 370120fd4154ce6c5f69d16a4a343a016cf2e816 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 04 三月 2025 09:53:17 +0800
Subject: [PATCH] 完善问题

---
 app/api/resource.py |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/api/resource.py b/app/api/resource.py
index c722bec..1b82fa4 100644
--- a/app/api/resource.py
+++ b/app/api/resource.py
@@ -1,10 +1,10 @@
 from fastapi import APIRouter, Depends
 from app.api import Response, pwd_context, get_current_user
-from app.models import MenuInfo
+from app.models import MenuInfo, MenuStatus
 from app.models.base_model import get_db
 from app.models.user_model import UserModel
 from app.service.resource import get_resource_tree, get_resource_info, delete_resource_info, create_menu, \
-    edit_resource_data
+    edit_resource_data, edit_resource_status
 
 menu_router = APIRouter()
 
@@ -21,10 +21,11 @@
 
 @menu_router.delete("/{menuId}", response_model=Response)
 async def delete_resource(menuId, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
-    is_edit = await delete_resource_info(db, menuId)
-    if not is_edit:
-        return Response(code=500, msg="menu delete failure", data={})
+    msg = await delete_resource_info(db, menuId)
+    if msg:
+        return Response(code=400, msg=f"{msg}", data={})
     return Response(code=200, msg="menu delete successfully", data={})
+
 
 
 @menu_router.post("/add_menu", response_model=Response)
@@ -47,5 +48,16 @@
         return Response(code=400, msg="The status cannot be {}!".format(menu.status))
     is_create = await edit_resource_data(db, menu.menuId, menu.menuName, menu.component, menu.path, menu.orderNum, menu.perms, menu.menuType, menu.description, menu.parentId, menu.status,menu.icon)
     if not is_create:
-        return Response(code=500, msg="dept edit failure", data={})
-    return Response(code=200, msg="dept edit successfully", data={})
+        return Response(code=500, msg="menu edit failure", data={})
+    return Response(code=200, msg="menu edit successfully", data={})
+
+
+@menu_router.put("/status", response_model=Response)
+async def resource_edit_status(menu: MenuStatus, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+    if menu.status not in ["0", "1"]:
+        return Response(code=400, msg="The status cannot be {}!".format(menu.status))
+    # is_create = await edit_resource_status(db, menu.menuId, menu.status)
+    msg = await edit_resource_status(db, menu.menuId, str(menu.status))
+    if msg:
+        return Response(code=400, msg=f"{msg}", data={})
+    return Response(code=200, msg="menu status update successfully", data={})

--
Gitblit v1.8.0