修正返回目录

api/controller/adminRole.go

@@ -3,9 +3,9 @@ package controller
 import (
 	"github.com/gin-gonic/gin"
 	"hospital-admin-api/api/dao"
+	"hospital-admin-api/api/dto"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
-	"hospital-admin-api/api/responses/roleResponse"
 	"hospital-admin-api/api/service"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
@@ -45,24 +45,7 @@ func (r *Role) GetRolePage(c *gin.Context) {
 	}
 
 	// 处理返回值
-	getRolePageResponses := make([]roleResponse.GetRolePage, len(adminRole))
-
-	if len(adminRole) > 0 {
-		for i, v := range adminRole {
-			// 将原始结构体转换为新结构体
-			getRolePageResponse := roleResponse.GetRolePage{
-				RoleId:     strconv.Itoa(int(v.RoleId)),
-				RoleName:   v.RoleName,
-				RoleStatus: v.RoleStatus,
-				IsAdmin:    v.IsAdmin,
-				CreatedAt:  v.CreatedAt,
-				UpdatedAt:  v.UpdatedAt,
-			}
-
-			// 将转换后的结构体添加到新切片中
-			getRolePageResponses[i] = getRolePageResponse
-		}
-	}
+	getRolePageResponses := dto.GetAdminRoleListDto(adminRole)
 
 	result := make(map[string]interface{})
 	result["page"] = RoleRequest.GetRolePage.Page
@@ -208,27 +191,10 @@ func (r *Role) GetRole(c *gin.Context) {
 	}
 
 	// 处理返回值
-	// 转换int64为string
-	var menuIdsString []string
-	for _, menuId := range menuIds {
-		menuId := strconv.FormatInt(menuId, 10)
-		menuIdsString = append(menuIdsString, menuId)
-	}
+	GetRoleResponse := dto.GetAdminRoleDto(adminRole)
 
-	// 转换int64为string
-	RoleId := strconv.FormatInt(adminRole.RoleId, 10)
-	if err != nil {
-		responses.Fail(c)
-		return
-	}
-
-	GetRoleResponse := &roleResponse.GetRole{
-		MenuIds:    menuIdsString,
-		RoleId:     RoleId,
-		RoleName:   adminRole.RoleName,
-		RoleStatus: adminRole.RoleStatus,
-		IsAdmin:    adminRole.IsAdmin,
-	}
+	// 加载角色菜单id
+	GetRoleResponse.LoadRoleMenuIdsDto(menuIds)
 
 	responses.OkWithData(GetRoleResponse, c)
 }
@@ -344,7 +310,7 @@ func (r *Role) GetRoleList(c *gin.Context) {
 	}
 
 	// 处理返回值
-	getRoleListResponses := roleResponse.GetRoleListResponse(adminRoles)
+	getRoleListResponses := dto.GetAdminRoleListDto(adminRoles)
 
 	responses.OkWithData(getRoleListResponses, c)
 }