修复角色管理,权限设置

app/system/controller/menu.go

@@ -91,7 +91,7 @@ func (c *menu) RoutesExt(cxt *gin.Context) {
 
 }
 
-//由于子菜单 没有分的很详细，这里直接先让他们全部有这个权限 2022-12-07 dsx
+// 由于子菜单 没有分的很详细，这里直接先让他们全部有这个权限 2022-12-07 dsx
 func (c *menu) Buttons(ctx *gin.Context) {
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
@@ -144,11 +144,32 @@ func (c *menu) Tree(ctx *gin.Context) {
 }
 
 func (c *menu) GrantTree(ctx *gin.Context) {
-
+	//菜单权限
+	tree, err := service.MenuService.GetNameTree()
+	if err != nil {
+		ctx.JSON(http.StatusOK, common.FailResponse(err.Error(), nil))
+		return
+	}
+	rsp := model.ResGrantTree{
+		Menu:      tree,
+		DataScope: nil,
+		ApiScope:  nil,
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
+	//数据权限
+	//接口权限
 }
 
 func (c *menu) RoleTreeKeys(ctx *gin.Context) {
-
+	i, _ := strconv.Atoi(ctx.Query("roleIds"))
+	roleIds := int64(i)
+	menuIds := service.RoleMenuService.GetMenuIdByRoleId(roleIds)
+	rsp := model.ResMenuIds{
+		Menu:      menuIds,
+		DataScope: nil,
+		ApiScope:  nil,
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
 }
 
 func (c *menu) GrantTopTree(ctx *gin.Context) {

app/system/controller/role.go

@@ -79,6 +79,15 @@ func (c *role) Submit(ctx *gin.Context) {
 }
 
 func (c *role) Remove(ctx *gin.Context) {
+	//参数在url后面时:
+	i, _ := strconv.Atoi(ctx.Query("ids"))
+	ids := int64(i)
+	if ids > 0 {
+		err := service.RoleService.Remove(ids)
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	//参数在请求体里面时:
 	var req *model.ReqRoleRemove
 	if err := ctx.ShouldBindJSON(&req); err != nil {
 		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))

app/system/dao/menu.go

@@ -72,3 +72,10 @@ func (c *Menu) HasChildren(parentIds []int64) (map[int64]bool, error) {
 	}
 	return m, err
 }
+
+// todo 查询菜单树,只查id,parent_id和name
+func (c *Menu) GetMenuTree() ([]Menu, error) {
+	var menus []Menu
+	err := Db.Debug().Model(&c).Select("id,name,parent_id").Where(" is_deleted = 0 and category = 1").Order("sort").Find(&menus).Error
+	return menus, err
+}

app/system/dao/role.go

@@ -46,11 +46,11 @@ func (c *Role) Save() error {
 }
 
 func (c *Role) Update() error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(&c).Error
+	return Db.Debug().Model(&c).Updates(&c).Error
 }
 
 func (c *Role) Remove() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"is_deleted": c.IsDeleted}).Error
+	return Db.Debug().Model(&c).Updates(map[string]interface{}{"is_deleted": c.IsDeleted}).Error
 }
 
 func (c *Role) IsExistChild() bool {
@@ -60,7 +60,7 @@ func (c *Role) IsExistChild() bool {
 }
 
 func (c *Role) UpdatePwd(pwd string) error {
-	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Updates(map[string]interface{}{"password": pwd}).Error
+	return Db.Debug().Model(&c).Updates(map[string]interface{}{"password": pwd}).Error
 }
 
 func (c *Role) GetAll() ([]Role, error) {

app/system/model/menu.go

@@ -3,11 +3,11 @@ package model
 import "iot_manager_service/app/system/dao"
 
 type RsqMenuList struct {
-	Records []dao.Menu `js+on:"records"` //记录列表
-	Current int        `json:"current"`  //当前分页
-	Size    int        `json:"size"`     //每页数量
-	Pages   int        `json:"pages"`    //总页数
-	Total   int        `json:"total"`    //总数
+	Records []dao.Menu `json:"records"` //记录列表
+	Current int        `json:"current"` //当前分页
+	Size    int        `json:"size"`    //每页数量
+	Pages   int        `json:"pages"`   //总页数
+	Total   int        `json:"total"`   //总数
 }
 
 type MenuRouteDetail struct {
@@ -24,3 +24,15 @@ type MenuLazyListDetail struct {
 	dao.Menu
 	HasChildren bool `json:"hasChildren"`
 }
+
+type ResMenuIds struct {
+	Menu      []int64 `json:"menu"`
+	DataScope []int   `json:"dataScope"` //类型还未确定
+	ApiScope  []int   `json:"apiScope"`  //类型还未确定
+}
+
+type ResGrantTree struct {
+	Menu      []MenuRouteDetail `json:"menu"`
+	DataScope []int             `json:"dataScope"` //类型还未确定
+	ApiScope  []int             `json:"apiScope"`  //类型还未确定
+}

app/system/model/role.go

@@ -16,10 +16,10 @@ type ReqRoleRemove struct {
 }
 
 type ReqRoleGrant struct {
-	RoleIds      string `json:"roleIds"`      //角色ID
-	MenuIds      string `json:"menuIds"`      //菜单权限ID
-	DataScopeIds string `json:"dataScopeIds"` //数据权限ID
-	ApiScopeIds  string `json:"apiScopeIds"`  //接口权限ID
+	RoleIds      []int64 `json:"roleIds"`      //角色ID
+	MenuIds      []int64 `json:"menuIds"`      //菜单权限ID
+	DataScopeIds []int64 `json:"dataScopeIds"` //数据权限ID
+	ApiScopeIds  []int64 `json:"apiScopeIds"`  //接口权限ID
 }
 
 type RspRoleTree struct {

app/system/service/menuService.go

@@ -49,7 +49,6 @@ func (s *menuService) GetAll() []dao.Menu {
 
 func (s *menuService) Tree() ([]model.MenuRouteDetail, error) {
 	allMenus := s.GetAll()
-
 	var rsp []model.MenuRouteDetail
 	//上级角色——多个下级角色数组
 	tmp := make(map[int64][]dao.Menu)
@@ -159,3 +158,41 @@ func (s *menuService) LazyList(parentId int64, name, code, alias string) ([]mode
 	}
 	return rsp, nil
 }
+
+// 请求获取menu名称树(id,parent_id和name)
+func (s *menuService) GetNameTree() ([]model.MenuRouteDetail, error) {
+	menuDao := dao.Menu{
+		ParentId: int64(0),
+	}
+	var menuDetails []model.MenuRouteDetail
+	var temp model.MenuRouteDetail
+
+	//所有菜单包装为菜单详情
+	menus, _ := menuDao.GetMenuTree()
+	var allDetails []model.MenuRouteDetail
+	for _, v := range menus {
+		temp.Menu = v
+		allDetails = append(allDetails, temp)
+	}
+	//一级菜单 parent_id为0 包装为菜单详情
+	lv1s, _ := menuDao.GetByParentId()
+	for _, v := range lv1s {
+		temp.Menu = v
+		temp.Children, temp.HasChildren = s.getChildren(temp, allDetails)
+		menuDetails = append(menuDetails, temp)
+	}
+	return menuDetails, nil
+}
+
+func (s *menuService) getChildren(parent model.MenuRouteDetail,
+	all []model.MenuRouteDetail) ([]model.MenuRouteDetail, bool) {
+	id := parent.ID
+	var children []model.MenuRouteDetail
+	for _, detail := range all {
+		if detail.ParentId == id {
+			detail.Children, detail.HasChildren = s.getChildren(detail, all)
+			children = append(children, detail)
+		}
+	}
+	return children, children != nil
+}

app/system/service/roleMenuService.go

@@ -45,3 +45,15 @@ func (s *roleMenuService) GetMenuByRole(roleId int64) []dao.RoleMenu {
 		return menus
 	}
 }
+func (s *roleMenuService) GetMenuIdByRoleId(roleId int64) []int64 {
+	rmDao := &dao.RoleMenu{RoleId: roleId}
+	menus, err := rmDao.GetMenusByRole()
+	if err != nil {
+		return nil
+	}
+	var ids []int64
+	for _, menu := range menus {
+		ids = append(ids, menu.MenuId)
+	}
+	return ids
+}

app/system/service/roleService.go

@@ -150,9 +150,9 @@ func (s *roleService) Remove(id int64) *common.Errors {
 }
 
 func (s *roleService) Grant(req *model.ReqRoleGrant) error {
-	roleIds := common.StringToInt64Array(req.RoleIds)
 	//todo 数据权限 接口权限
-	menuIds := common.StringToInt64Array(req.MenuIds)
+	roleIds := req.RoleIds
+	menuIds := req.MenuIds
 	menuErr := RoleMenuService.UpdateRoleMenus(roleIds, menuIds)
 	return menuErr
 }

router/router.go

@@ -384,6 +384,7 @@ func InitRouter(engine *gin.Engine) {
 		user.POST("/reset-password", system.User.ResetPwd)
 		user.POST("/user-list", system.User.GetList)
 		user.POST("/grant", system.User.Grant)
+		//todo 添加/info 路由
 	}
 
 	//租户
@@ -423,7 +424,7 @@ func InitRouter(engine *gin.Engine) {
 		menu.GET("buttons", system.Menu.Buttons)
 		menu.GET("tree", system.Menu.Tree)
 		menu.GET("grantTree", system.Menu.GrantTree)
-		menu.GET("roleTreeKeys", system.Menu.RoleTreeKeys)
+		menu.GET("role-tree-keys", system.Menu.RoleTreeKeys)
 		menu.GET("grantTopTree", system.Menu.GrantTopTree)
 		menu.GET("topTreeKeys", system.Menu.GrantTopTree)
 		menu.GET("top-menu", system.Menu.TopMenu)