forked from free-lancers/electricity_bill_calc_service
feat(user):基本完成用户分页查询列表功能,待测。
This commit is contained in:
@@ -4,11 +4,13 @@ import (
|
||||
"electricity_bill_calc/cache"
|
||||
"electricity_bill_calc/exceptions"
|
||||
"electricity_bill_calc/model"
|
||||
"electricity_bill_calc/repository"
|
||||
"electricity_bill_calc/response"
|
||||
"electricity_bill_calc/security"
|
||||
"electricity_bill_calc/service"
|
||||
"errors"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
@@ -27,6 +29,7 @@ func InitializeUserController(router *gin.Engine) {
|
||||
UserController.Router.DELETE("/logout", security.MustAuthenticated, UserController.Logout)
|
||||
UserController.Router.DELETE("/password/:uid", security.OPSAuthorize, UserController.InvalidUserPassword)
|
||||
UserController.Router.PUT("/password", UserController.ResetUserPassword)
|
||||
UserController.Router.GET("/accounts", security.OPSAuthorize, UserController.ListPagedUser)
|
||||
}
|
||||
|
||||
type LoginFormData struct {
|
||||
@@ -133,3 +136,37 @@ func (_UserController) ResetUserPassword(c *gin.Context) {
|
||||
}
|
||||
result.NotAccept("用户凭据未能成功更新。")
|
||||
}
|
||||
|
||||
func (_UserController) ListPagedUser(c *gin.Context) {
|
||||
result := response.NewResult(c)
|
||||
requestPage, err := strconv.Atoi(c.DefaultQuery("page", "1"))
|
||||
if err != nil {
|
||||
result.NotAccept("查询参数[page]格式不正确。")
|
||||
return
|
||||
}
|
||||
requestKeyword := c.DefaultQuery("keyword", "")
|
||||
requestUserType, err := strconv.Atoi(c.DefaultQuery("type", "-1"))
|
||||
if err != nil {
|
||||
result.NotAccept("查询参数[type]格式不正确。")
|
||||
return
|
||||
}
|
||||
var requestUserStat *bool
|
||||
state, err := strconv.ParseBool(c.Query("state"))
|
||||
if err != nil {
|
||||
requestUserStat = nil
|
||||
} else {
|
||||
requestUserStat = &state
|
||||
}
|
||||
users, total, err := repository.UserRepo.ListUserDetail(requestKeyword, requestUserType, requestUserStat, requestPage)
|
||||
if err != nil {
|
||||
result.Error(http.StatusNotFound, err.Error())
|
||||
return
|
||||
}
|
||||
result.Json(
|
||||
http.StatusOK,
|
||||
http.StatusOK,
|
||||
"已取得符合条件的用户集合。",
|
||||
response.NewPagedResponse(requestPage, total).ToMap(),
|
||||
gin.H{"accounts": users},
|
||||
)
|
||||
}
|
||||
|
Reference in New Issue
Block a user