Havoc420/catface_backend_go
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add Department Field to Animal

Browse Source
This commit is contained in:
Havoc412 2024-11-06 18:50:39 +08:00
parent 2d0478d917
commit 9d1f5f8e62
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/http/controller/web/animal_controller.go
View File

@ -26,11 +26,12 @@ func (a *Animals) List(context *gin.Context) {
breed := context.GetString(consts.ValidatorPrefix + "breed") breed := context.GetString(consts.ValidatorPrefix + "breed")
sterilization := context.GetString(consts.ValidatorPrefix + "sterilization") sterilization := context.GetString(consts.ValidatorPrefix + "sterilization")
status := context.GetString(consts.ValidatorPrefix + "status") status := context.GetString(consts.ValidatorPrefix + "status")
department := context.GetString(consts.ValidatorPrefix + "department")
num := context.GetFloat64(consts.ValidatorPrefix + "num") num := context.GetFloat64(consts.ValidatorPrefix + "num")
skip := context.GetFloat64(consts.ValidatorPrefix + "skip") skip := context.GetFloat64(consts.ValidatorPrefix + "skip")
userId := context.GetFloat64(consts.ValidatorPrefix + "user_id") userId := context.GetFloat64(consts.ValidatorPrefix + "user_id")
animals := curd.CreateAnimalsCurdFactory().List(attrs, gender, breed, sterilization, status, int(num), int(skip), int(userId)) animals := curd.CreateAnimalsCurdFactory().List(attrs, gender, breed, sterilization, status, department, int(num), int(skip), int(userId))
if animals != nil { if animals != nil {
response.Success(context, consts.CurdStatusOkMsg, animals) response.Success(context, consts.CurdStatusOkMsg, animals)
} else { } else {

1
app/http/validator/web/animal/list.go
View File

@ -15,6 +15,7 @@ type List struct {
Breed string `form:"breed" json:"breed"` Breed string `form:"breed" json:"breed"`
Sterilization string `form:"sterilization" json:"sterilization"` Sterilization string `form:"sterilization" json:"sterilization"`
Status string `form:"status" json:"status"` Status string `form:"status" json:"status"`
Department string `form:"department" json:"department"`
Num int `form:"num" json:"num"` Num int `form:"num" json:"num"`
Skip int `form:"skip" json:"skip"` Skip int `form:"skip" json:"skip"`
UserId int `form:"user_id" json:"user_id"` UserId int `form:"user_id" json:"user_id"`

9
app/model/animal.go
View File

@ -34,7 +34,7 @@ type Animal struct {
HeadImg string `gorm:"type:varchar(50)" json:"head_img,omitempty"` // Head 默认处理为正方形。 HeadImg string `gorm:"type:varchar(50)" json:"head_img,omitempty"` // Head 默认处理为正方形。
Photos string `gorm:"type:varchar(255)" json:"photos,omitempty"` // 图片数组 Photos string `gorm:"type:varchar(255)" json:"photos,omitempty"` // 图片数组
// TAG POI // TAG POI
Department uint8 `gorm:"column:department" json:"department"` Department uint8 `gorm:"column:department" json:"department,omitempty"`
Latitude float64 `json:"latitude,omitempty"` // POI 位置相关 Latitude float64 `json:"latitude,omitempty"` // POI 位置相关
Longitude float64 `json:"longitude,omitempty"` // POI 位置相关 Longitude float64 `json:"longitude,omitempty"` // POI 位置相关
ActivityRadius uint64 `json:"activity_radius,omitempty"` // 活动半径 ActivityRadius uint64 `json:"activity_radius,omitempty"` // 活动半径
@ -43,7 +43,7 @@ type Animal struct {
FaceBreeds string `json:"face_breeds,omitempty" gorm:"size:20"` FaceBreeds string `json:"face_breeds,omitempty" gorm:"size:20"`
FaceBreedProbs string `json:"face_breed_probs,omitempty" gorm:"size:20"` FaceBreedProbs string `json:"face_breed_probs,omitempty" gorm:"size:20"`
// 上传者 ID // 上传者 ID
UsersModelId int64 `gorm:"column:user_id" json:"user_id"` // 上传者 ID UsersModelId int64 `gorm:"column:user_id" json:"user_id,omitempty"` // 上传者 ID
UsersModel *UsersModel `json:"users_model,omitempty"` UsersModel *UsersModel `json:"users_model,omitempty"`
} }
@ -51,7 +51,7 @@ func (a *Animal) TableName() string {
return "animals" return "animals"
} }
func (a *Animal) Show(attrs []string, gender []uint8, breed []uint8, sterilization []uint8, status []uint8, num int, skip int) (temp []Animal) { func (a *Animal) Show(attrs []string, gender []uint8, breed []uint8, sterilization []uint8, status []uint8, department []uint8, num int, skip int) (temp []Animal) {
db := a.DB.Table(a.TableName()).Limit(int(num)).Offset(int(skip)).Select(attrs) db := a.DB.Table(a.TableName()).Limit(int(num)).Offset(int(skip)).Select(attrs)
// 创建条件映射 // 创建条件映射
@ -60,9 +60,10 @@ func (a *Animal) Show(attrs []string, gender []uint8, breed []uint8, sterilizati
"breed": breed, "breed": breed,
"sterilization": sterilization, "sterilization": sterilization,
"status": status, "status": status,
"department": department,
} }
db = gorm_v2.BuildWhere(db, conditions) db = gorm_v2.BuildWhere(db, conditions) // TIP 这里的 Where 条件连接就很方便了。
err := db.Find(&temp).Error err := db.Find(&temp).Error
if err != nil { if err != nil {

6
app/service/animals/curd/animals_curd.go
View File

@ -6,7 +6,6 @@ import (
"catface/app/utils/query_handler" "catface/app/utils/query_handler"
"fmt" "fmt"
"strconv" "strconv"
) )
func CreateAnimalsCurdFactory() *AnimalsCurd { func CreateAnimalsCurdFactory() *AnimalsCurd {
@ -49,18 +48,19 @@ func getSelectAttrs(attrs string) (validSelectedFields []string) {
return return
} }
func (a *AnimalsCurd) List(attrs string, gender string, breed string, sterilization 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, department string, num int, skip int, userId int) (temp []model.AnimalWithLikeList) {
validSelectedFields := getSelectAttrs(attrs) validSelectedFields := getSelectAttrs(attrs)
genderArray := query_handler.StringToUint8Array(gender) genderArray := query_handler.StringToUint8Array(gender)
breedArray := query_handler.StringToUint8Array(breed) breedArray := query_handler.StringToUint8Array(breed)
sterilizationArray := query_handler.StringToUint8Array(sterilization) sterilizationArray := query_handler.StringToUint8Array(sterilization)
statusArray := query_handler.StringToUint8Array(status) statusArray := query_handler.StringToUint8Array(status)
departmentArray := query_handler.StringToUint8Array(department)
if num == 0 { if num == 0 {
num = 10 num = 10
} }
animals := model.CreateAnimalFactory("").Show(validSelectedFields, genderArray, breedArray, sterilizationArray, statusArray, num, skip) animals := model.CreateAnimalFactory("").Show(validSelectedFields, genderArray, breedArray, sterilizationArray, statusArray, departmentArray, num, skip)
// 状态记录 // 状态记录
var likeRes []bool var likeRes []bool