新增删除角色-批量

api/service/menu.go

@@ -122,3 +122,73 @@ func (r *MenuService) AddMenu(AddMenuRequest requests.AddMenu) (bool, error) {
 
 	return true, nil
 }
+
+// PutMenu 修改菜单
+func (r *MenuService) PutMenu(PutMenuRequest requests.PutMenu) (bool, error) {
+	AdminMenuDao := dao.AdminMenuDao{}
+	AdminMenuApiDao := dao.AdminMenuApiDao{}
+	AdminApiDao := dao.AdminApiDao{}
+
+	// 判断父级id
+	if PutMenuRequest.ParentId != 0 {
+		adminMenu, _ := AdminMenuDao.GetAdminMenuById(PutMenuRequest.ParentId)
+		if adminMenu == nil {
+			return false, errors.New("上级菜单错误")
+		}
+	}
+
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	// 新增菜单
+	AdminMenuModel := &model.AdminMenu{
+		MenuName:   PutMenuRequest.MenuName,
+		MenuTitle:  PutMenuRequest.MenuTitle,
+		ParentId:   PutMenuRequest.ParentId,
+		MenuStatus: PutMenuRequest.MenuStatus,
+		MenuType:   PutMenuRequest.MenuType,
+		Permission: PutMenuRequest.Permission,
+		OrderNum:   PutMenuRequest.OrderNum,
+		Icon:       PutMenuRequest.Icon,
+		Path:       PutMenuRequest.Path,
+		Component:  PutMenuRequest.Component,
+	}
+
+	adminMenu, _ := AdminMenuDao.AddAdminMenu(tx, AdminMenuModel)
+	if adminMenu == nil {
+		tx.Rollback()
+		return false, errors.New("新增失败")
+	}
+
+	// 新增菜单api
+	if len(PutMenuRequest.ApiIds) > 0 {
+		for _, v := range PutMenuRequest.ApiIds {
+			// 检测api
+			adminApi, _ := AdminApiDao.GetAdminApiById(v)
+			if adminApi == nil {
+				tx.Rollback()
+				return false, errors.New("接口不存在")
+			}
+
+			AdminMenuApiModel := &model.AdminMenuApi{
+				MenuId: adminMenu.MenuId,
+				ApiId:  v,
+			}
+
+			adminMenuApi, _ := AdminMenuApiDao.AddAdminMenuApi(tx, AdminMenuApiModel)
+			if adminMenuApi == nil {
+				tx.Rollback()
+				return false, errors.New("新增失败")
+			}
+		}
+	}
+
+	tx.Commit()
+
+	return true, nil
+}

api/service/role.go

@@ -202,7 +202,7 @@ func (r *RoleService) AddRole(c *gin.Context, AddRoleRequest requests.AddRole) (
 }
 
 // PutRole 修改角色
-func (r *RoleService) PutRole(c *gin.Context, requestRoleId int64, AddRoleRequest requests.PutRole) (bool, error) {
+func (r *RoleService) PutRole(c *gin.Context, requestRoleId int64, PutRoleRequest requests.PutRole) (bool, error) {
 	// 获取当前登陆用户数据
 	roleId := c.GetInt64("RoleId")
 	if roleId == 0 {
@@ -215,14 +215,14 @@ func (r *RoleService) PutRole(c *gin.Context, requestRoleId int64, AddRoleReques
 		return false, errors.New("非法操作")
 	}
 
-	if AddRoleRequest.IsAdmin == 1 && adminRole.IsAdmin == 0 {
+	if PutRoleRequest.IsAdmin == 1 && adminRole.IsAdmin == 0 {
 		return false, errors.New("您当前为普通用户，无法设置管理员")
 	}
 
 	AdminMenuDao := dao.AdminMenuDao{}
 
 	// 判断菜单id
-	for _, menuId := range AddRoleRequest.MenuIds {
+	for _, menuId := range PutRoleRequest.MenuIds {
 		adminMenu, _ := AdminMenuDao.GetAdminMenuById(menuId)
 		if adminMenu == nil {
 			return false, errors.New("菜单错误")
@@ -239,8 +239,8 @@ func (r *RoleService) PutRole(c *gin.Context, requestRoleId int64, AddRoleReques
 
 	// 修改角色
 	data := make(map[string]interface{})
-	data["role_name"] = AddRoleRequest.RoleName
-	data["is_admin"] = AddRoleRequest.IsAdmin
+	data["role_name"] = PutRoleRequest.RoleName
+	data["is_admin"] = PutRoleRequest.IsAdmin
 	err = AdminRoleDao.EditAdminRoleById(tx, requestRoleId, data)
 	if err != nil {
 		tx.Rollback()
@@ -256,7 +256,7 @@ func (r *RoleService) PutRole(c *gin.Context, requestRoleId int64, AddRoleReques
 	}
 
 	// 新增角色菜单
-	for _, menuId := range AddRoleRequest.MenuIds {
+	for _, menuId := range PutRoleRequest.MenuIds {
 		AdminRoleMenuModel := &model.AdminRoleMenu{
 			RoleID: requestRoleId,
 			MenuID: menuId,
@@ -273,3 +273,82 @@ func (r *RoleService) PutRole(c *gin.Context, requestRoleId int64, AddRoleReques
 
 	return true, nil
 }
+
+// DeleteRole 删除角色-批量
+func (r *RoleService) DeleteRole(c *gin.Context, DeleteRoleRequest requests.DeleteRole) (bool, error) {
+	// 获取当前登陆用户数据
+	roleId := c.GetInt64("RoleId")
+	if roleId == 0 {
+		return false, errors.New("数据错误")
+	}
+
+	AdminUserDao := dao.AdminUserDao{}
+	AdminRoleMenuDao := dao.AdminRoleMenuDao{}
+
+	AdminRoleDao := dao.AdminRoleDao{}
+	adminRole, err := AdminRoleDao.GetAdminRoleFirstById(roleId)
+	if err != nil || adminRole == nil {
+		return false, errors.New("非法操作")
+	}
+
+	if adminRole.IsAdmin == 0 {
+		return false, errors.New("暂无权限，请联系管理员删除")
+	}
+
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	for _, v := range DeleteRoleRequest.RoleIds {
+		if v == adminRole.RoleId {
+			tx.Rollback()
+			return false, errors.New("非法操作，请勿删除自己所属角色")
+		}
+
+		// 检测角色id
+		adminRole, err := AdminRoleDao.GetAdminRoleFirstById(v)
+		if err != nil || adminRole == nil {
+			tx.Rollback()
+			return false, errors.New("无法删除不存在的角色")
+		}
+
+		// 获取绑定该角色的用户
+		maps := make(map[string]interface{})
+		maps["role_id"] = v
+		AdminUser, err := AdminUserDao.GetAdminUserList(maps)
+		if AdminUser != nil {
+			for _, user := range AdminUser {
+				// 修改对应用户角色id为0
+				data := make(map[string]interface{})
+				data["role_id"] = nil
+				err = AdminUserDao.EditAdminUserById(tx, user.UserID, data)
+				if err != nil {
+					tx.Rollback()
+					return false, errors.New("删除失败")
+				}
+			}
+		}
+
+		// 删除角色关联菜单
+		err = AdminRoleMenuDao.DeleteAdminRoleMenuByRoleId(tx, v)
+		if err != nil {
+			tx.Rollback()
+			return false, errors.New("删除失败")
+		}
+
+		// 删除角色
+		err = AdminRoleDao.DeleteAdminRoleByRoleId(tx, v)
+		if err != nil {
+			tx.Rollback()
+			return false, errors.New("删除失败")
+		}
+	}
+
+	tx.Commit()
+
+	return true, nil
+}