文章新增了排序值字段

This commit is contained in:
wucongxing8150 2024-11-04 15:35:05 +08:00
parent 0fea9c2e51
commit 397f20c15c
4 changed files with 13 additions and 2 deletions

View File

@ -163,6 +163,7 @@ func (b *ArticleScience) AddArticleScience(c *gin.Context) {
ArticleTitle: req.ArticleTitle, ArticleTitle: req.ArticleTitle,
ArticleStatus: req.ArticleStatus, ArticleStatus: req.ArticleStatus,
IsTop: req.IsTop, IsTop: req.IsTop,
Sort: req.Sort,
ArticleImage: utils.RemoveOssDomain(req.ArticleImage), ArticleImage: utils.RemoveOssDomain(req.ArticleImage),
SourceId: articleScienceSource.SourceId, SourceId: articleScienceSource.SourceId,
ArticleUrl: req.ArticleUrl, ArticleUrl: req.ArticleUrl,
@ -255,6 +256,11 @@ func (b *ArticleScience) PutArticleScience(c *gin.Context) {
articleScienceData["is_top"] = req.IsTop articleScienceData["is_top"] = req.IsTop
} }
// 排序值
if req.Sort != articleScience.Sort {
articleScienceData["sort"] = req.Sort
}
// 文章图片 // 文章图片
articleImage := utils.RemoveOssDomain(req.ArticleImage) articleImage := utils.RemoveOssDomain(req.ArticleImage)
if articleImage != articleScience.ArticleImage { if articleImage != articleScience.ArticleImage {

View File

@ -12,6 +12,7 @@ type ArticleScienceDto struct {
ArticleTitle string `json:"article_title"` // 文章标题 ArticleTitle string `json:"article_title"` // 文章标题
ArticleStatus int `json:"article_status"` // 文章状态1:正常 2:禁用) ArticleStatus int `json:"article_status"` // 文章状态1:正常 2:禁用)
IsTop int `json:"is_top"` // 是否置顶0:否 1:是) IsTop int `json:"is_top"` // 是否置顶0:否 1:是)
Sort int `json:"sort"` // 排序值(越大越靠前)
ArticleImage string `json:"article_image"` // 文章图片1张 ArticleImage string `json:"article_image"` // 文章图片1张
SourceId string `json:"source_id"` // 文章来源id SourceId string `json:"source_id"` // 文章来源id
ArticleUrl string `json:"article_url"` // 文章地址 ArticleUrl string `json:"article_url"` // 文章地址

View File

@ -12,6 +12,7 @@ type ArticleScience struct {
ArticleTitle string `gorm:"column:article_title;type:varchar(255);comment:文章标题" json:"article_title"` ArticleTitle string `gorm:"column:article_title;type:varchar(255);comment:文章标题" json:"article_title"`
ArticleStatus int `gorm:"column:article_status;type:tinyint(1);default:1;comment:文章状态1:正常 2:禁用)" json:"article_status"` ArticleStatus int `gorm:"column:article_status;type:tinyint(1);default:1;comment:文章状态1:正常 2:禁用)" json:"article_status"`
IsTop int `gorm:"column:is_top;type:tinyint(1);default:0;comment:是否置顶0:否 1:是)" json:"is_top"` IsTop int `gorm:"column:is_top;type:tinyint(1);default:0;comment:是否置顶0:否 1:是)" json:"is_top"`
Sort int `gorm:"column:sort;type:int(5);default:1;comment:排序值(越大越靠前)" json:"sort"`
ArticleImage string `gorm:"column:article_image;type:varchar(255);comment:文章图片1张" json:"article_image"` ArticleImage string `gorm:"column:article_image;type:varchar(255);comment:文章图片1张" json:"article_image"`
SourceId int64 `gorm:"column:source_id;type:bigint(19);comment:文章来源id;NOT NULL" json:"source_id"` SourceId int64 `gorm:"column:source_id;type:bigint(19);comment:文章来源id;NOT NULL" json:"source_id"`
ArticleUrl string `gorm:"column:article_url;type:varchar(255);comment:文章地址;NOT NULL" json:"article_url"` ArticleUrl string `gorm:"column:article_url;type:varchar(255);comment:文章地址;NOT NULL" json:"article_url"`

View File

@ -15,7 +15,8 @@ type GetArticleSciencePage struct {
ArticleTitle string `json:"article_title" form:"article_title" label:"文章标题"` // 文章标题 ArticleTitle string `json:"article_title" form:"article_title" label:"文章标题"` // 文章标题
ArticleStatus *int `json:"article_status" form:"article_status" label:"文章状态" validate:"omitempty,numeric,oneof=1 2"` // 文章状态1:正常 2:禁用) ArticleStatus *int `json:"article_status" form:"article_status" label:"文章状态" validate:"omitempty,numeric,oneof=1 2"` // 文章状态1:正常 2:禁用)
IsTop *int `json:"is_top" form:"is_top" label:"是否置顶" validate:"omitempty,numeric,oneof=0 1"` // 是否置顶0:否 1:是) IsTop *int `json:"is_top" form:"is_top" label:"是否置顶" validate:"omitempty,numeric,oneof=0 1"` // 是否置顶0:否 1:是)
SourceId string `json:"source_id" form:"source_id" label:"文章来源"` // 文章来源id Sort int `json:"sort" form:"sort" label:"排序值" validate:"required,numeric,min=1"`
SourceId string `json:"source_id" form:"source_id" label:"文章来源"` // 文章来源id
Order *GetArticleSciencePageOrder `json:"order" form:"order" label:"排序"` Order *GetArticleSciencePageOrder `json:"order" form:"order" label:"排序"`
} }
@ -28,7 +29,8 @@ type GetArticleSciencePageOrder struct {
type PutArticleScience struct { type PutArticleScience struct {
ArticleTitle string `json:"article_title" form:"article_title" label:"文章标题" validate:"required"` // 文章标题 ArticleTitle string `json:"article_title" form:"article_title" label:"文章标题" validate:"required"` // 文章标题
ArticleStatus int `json:"article_status" form:"article_status" label:"文章状态" validate:"omitempty,numeric,oneof=1 2"` // 文章状态1:正常 2:禁用) ArticleStatus int `json:"article_status" form:"article_status" label:"文章状态" validate:"omitempty,numeric,oneof=1 2"` // 文章状态1:正常 2:禁用)
IsTop int `json:"is_top" form:"is_top" label:"是否置顶" validate:"omitempty,numeric,oneof=0 1"` // 是否置顶0:否 1:是) IsTop int `json:"is_top" form:"is_top" label:"是否置顶" validate:"omitempty,numeric,oneof=0 1"`
Sort int `json:"sort" form:"sort" label:"排序值" validate:"required,numeric,min=1"` // 是否置顶0:否 1:是)
ArticleImage string `json:"article_image" form:"is_top" label:"文章图片" validate:"required"` ArticleImage string `json:"article_image" form:"is_top" label:"文章图片" validate:"required"`
SourceId string `json:"source_id" form:"source_id" label:"文章来源" validate:"required"` SourceId string `json:"source_id" form:"source_id" label:"文章来源" validate:"required"`
ArticleUrl string `json:"article_url" form:"article_url" label:"文章地址" validate:"required"` ArticleUrl string `json:"article_url" form:"article_url" label:"文章地址" validate:"required"`
@ -45,6 +47,7 @@ type AddArticleScience struct {
ArticleTitle string `json:"article_title" form:"article_title" label:"文章标题" validate:"required"` // 文章标题 ArticleTitle string `json:"article_title" form:"article_title" label:"文章标题" validate:"required"` // 文章标题
ArticleStatus int `json:"article_status" form:"article_status" label:"文章状态" validate:"omitempty,numeric,oneof=1 2"` // 文章状态1:正常 2:禁用) ArticleStatus int `json:"article_status" form:"article_status" label:"文章状态" validate:"omitempty,numeric,oneof=1 2"` // 文章状态1:正常 2:禁用)
IsTop int `json:"is_top" form:"is_top" label:"是否置顶" validate:"omitempty,numeric,oneof=0 1"` // 是否置顶0:否 1:是) IsTop int `json:"is_top" form:"is_top" label:"是否置顶" validate:"omitempty,numeric,oneof=0 1"` // 是否置顶0:否 1:是)
Sort int `json:"sort" form:"sort" label:"排序值" validate:"required,numeric,min=1"` // 是否置顶0:否 1:是)
ArticleImage string `json:"article_image" form:"is_top" label:"文章图片" validate:"required"` ArticleImage string `json:"article_image" form:"is_top" label:"文章图片" validate:"required"`
SourceId string `json:"source_id" form:"source_id" label:"文章来源" validate:"required"` SourceId string `json:"source_id" form:"source_id" label:"文章来源" validate:"required"`
ArticleUrl string `json:"article_url" form:"article_url" label:"文章地址" validate:"required"` ArticleUrl string `json:"article_url" form:"article_url" label:"文章地址" validate:"required"`