diff --git a/app/http/controller/web/animal_controller.go b/app/http/controller/web/animal_controller.go index 86266f8..0af0d0e 100644 --- a/app/http/controller/web/animal_controller.go +++ b/app/http/controller/web/animal_controller.go @@ -17,13 +17,13 @@ func (a *Animals) List(context *gin.Context) { attrs := context.GetString(consts.ValidatorPrefix + "attrs") gender := context.GetString(consts.ValidatorPrefix + "gender") breed := context.GetString(consts.ValidatorPrefix + "breed") - sterilzation := context.GetString(consts.ValidatorPrefix + "sterilzation") + sterilization := context.GetString(consts.ValidatorPrefix + "sterilization") status := context.GetString(consts.ValidatorPrefix + "status") num := context.GetFloat64(consts.ValidatorPrefix + "num") skip := context.GetFloat64(consts.ValidatorPrefix + "skip") userId := context.GetFloat64(consts.ValidatorPrefix + "user_id") - animals := curd.CreateAnimalsCurdFactory().List(attrs, gender, breed, sterilzation, status, int(num), int(skip), int(userId)) + animals := curd.CreateAnimalsCurdFactory().List(attrs, gender, breed, sterilization, status, int(num), int(skip), int(userId)) if animals != nil { response.Success(context, consts.CurdStatusOkMsg, animals) } else { diff --git a/app/http/validator/web/animal/list.go b/app/http/validator/web/animal/list.go index b94dc5b..b21b4b8 100644 --- a/app/http/validator/web/animal/list.go +++ b/app/http/validator/web/animal/list.go @@ -10,14 +10,14 @@ import ( ) type List struct { - Attrs string `form:"attrs" json:"attrs"` - Gender string `form:"gender" json:"gender"` - Breed string `form:"breed" json:"breed"` - Sterilzation string `form:"sterilzation" json:"sterilzation"` - Status string `form:"status" json:"status"` - Num int `form:"num" json:"num"` - Skip int `form:"skip" json:"skip"` - UserId int `form:"user_id" json:"user_id"` + Attrs string `form:"attrs" json:"attrs"` + Gender string `form:"gender" json:"gender"` + Breed string `form:"breed" json:"breed"` + Sterilization string `form:"sterilization" json:"sterilization"` + Status string `form:"status" json:"status"` + Num int `form:"num" json:"num"` + Skip int `form:"skip" json:"skip"` + UserId int `form:"user_id" json:"user_id"` } func (l List) CheckParams(context *gin.Context) { diff --git a/app/model/animal.go b/app/model/animal.go index a640608..31e5248 100644 --- a/app/model/animal.go +++ b/app/model/animal.go @@ -47,14 +47,14 @@ func (a *Animal) TableName() string { return "animals" } -func (a *Animal) Show(attrs []string, gender []uint8, breed []uint8, sterilzation []uint8, status []uint8, num int, skip int) (temp []Animal) { +func (a *Animal) Show(attrs []string, gender []uint8, breed []uint8, sterilization []uint8, status []uint8, num int, skip int) (temp []Animal) { db := a.DB.Table(a.TableName()).Limit(int(num)).Offset(int(skip)).Select(attrs) // 创建条件映射 conditions := map[string][]uint8{ "gender": gender, "breed": breed, - "sterilization": sterilzation, + "sterilization": sterilization, "status": status, } diff --git a/app/service/animals/curd/animals_curd.go b/app/service/animals/curd/animals_curd.go index 1a8c542..a1b4a17 100644 --- a/app/service/animals/curd/animals_curd.go +++ b/app/service/animals/curd/animals_curd.go @@ -48,18 +48,18 @@ func getSelectAttrs(attrs string) (validSelectedFields []string) { return } -func (a *AnimalsCurd) List(attrs string, gender string, breed string, sterilzation string, status string, num int, skip int, userId int) (temp []model.AnimalWithLikeList) { +func (a *AnimalsCurd) List(attrs string, gender string, breed string, sterilization string, status string, num int, skip int, userId int) (temp []model.AnimalWithLikeList) { validSelectedFields := getSelectAttrs(attrs) genderArray := query_handler.StringToUint8Array(gender) breedArray := query_handler.StringToUint8Array(breed) - sterilzationArray := query_handler.StringToUint8Array(sterilzation) + sterilizationArray := query_handler.StringToUint8Array(sterilization) statusArray := query_handler.StringToUint8Array(status) if num == 0 { num = 10 } - animals := model.CreateAnimalFactory("").Show(validSelectedFields, genderArray, breedArray, sterilzationArray, statusArray, num, skip) + animals := model.CreateAnimalFactory("").Show(validSelectedFields, genderArray, breedArray, sterilizationArray, statusArray, num, skip) if userId > 0 { for i := range animals {