diff --git a/app/lib/recook/trend.go b/app/lib/recook/trend.go index 8a14470..6dcc5a4 100644 --- a/app/lib/recook/trend.go +++ b/app/lib/recook/trend.go @@ -42,14 +42,16 @@ type TrendItem struct { URL string `json:"url"` Width uint `json:"width"` } `json:"imgList"` - OriginID uint `json:"originId"` - TrendType int `json:"trendType"` - UpdatedAt string `json:"updatedAt"` - Short Short `json:"short"` - Praise uint `json:"praise"` - IsPraise uint `json:"isPraise"` - TopicId uint `json:"topicId"` - TopicName string `json:"topicName"` + OriginID uint `json:"originId"` + TrendType int `json:"trendType"` + UpdatedAt string `json:"updatedAt"` + Short Short `json:"short"` + Praise uint `json:"praise"` + IsPraise uint `json:"isPraise"` + TopicId uint `json:"topicId"` + TopicName string `json:"topicName"` + Compliance int `json:"compliance"` + PassStatus int `json:"pass_status"` } type TrendList struct { List []TrendItem `json:"list"` diff --git a/app/logic/user/trend.go b/app/logic/user/trend.go index 7c03bc8..adf7773 100644 --- a/app/logic/user/trend.go +++ b/app/logic/user/trend.go @@ -85,6 +85,14 @@ func (t *Trend) GetList(loginUserId, userId uint, page lib.Page) *recook.TrendLi trendInfo.TopicName = topicMap[shortItem.TopicId].Title } } + //根据需求,返回视频的状态,风险或安全,审核中或审核失败通过 + for i, k := range list.List { + var a short.Short + (&short.Short{}).GetDb().Where("id=?", k.OriginID).First(&a) + list.List[i].Compliance = a.Compliance + list.List[i].PassStatus = a.Pass + } + return list } diff --git a/app/model/short/short.go b/app/model/short/short.go index fb6d7ec..622a8ee 100644 --- a/app/model/short/short.go +++ b/app/model/short/short.go @@ -7,17 +7,19 @@ import ( type Short struct { db.BaseModel - Id uint `gorm:"column:id" json:"id"` - UserId uint `gorm:"column:user_id" json:"userId"` - GoodsId uint `gorm:"column:goods_id" json:"goodsId"` - TopicId uint `gorm:"column:topic_id" json:"topicId"` - Content string `gorm:"column:content" json:"content"` - FileId string `gorm:"column:file_id" json:"fileId"` - CreatedAt formatime.Second `gorm:"column:created_at" json:"createdAt"` - UpdatedAt formatime.Second `gorm:"column:updated_at" json:"updatedAt"` - MediaUrl string `gorm:"column:media_url" json:"mediaUrl"` - CoverUrl string `gorm:"column:cover_url" json:"coverUrl"` - IsDel int `gorm:"column:is_del" json:"isDel"` + Id uint `gorm:"column:id" json:"id"` + UserId uint `gorm:"column:user_id" json:"userId"` + GoodsId uint `gorm:"column:goods_id" json:"goodsId"` + TopicId uint `gorm:"column:topic_id" json:"topicId"` + Content string `gorm:"column:content" json:"content"` + FileId string `gorm:"column:file_id" json:"fileId"` + CreatedAt formatime.Second `gorm:"column:created_at" json:"createdAt"` + UpdatedAt formatime.Second `gorm:"column:updated_at" json:"updatedAt"` + MediaUrl string `gorm:"column:media_url" json:"mediaUrl"` + CoverUrl string `gorm:"column:cover_url" json:"coverUrl"` + IsDel int `gorm:"column:is_del" json:"isDel"` + Compliance int `gorm:"column:compliance" json:"compliance"` + Pass int `gorm:"column:pass" json:"pass"` } // 插入