From 397f20c15cd3df7c691a37a125db3c1ad10eaf78 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Mon, 4 Nov 2024 15:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=96=B0=E5=A2=9E=E4=BA=86?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=80=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/controller/ArticleScience.go | 6 ++++++ api/dto/ArticleScience.go | 1 + api/model/ArticleScience.go | 1 + api/requests/ArticleScience.go | 7 +++++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/api/controller/ArticleScience.go b/api/controller/ArticleScience.go index c65d2c0..2a9d7e4 100644 --- a/api/controller/ArticleScience.go +++ b/api/controller/ArticleScience.go @@ -163,6 +163,7 @@ func (b *ArticleScience) AddArticleScience(c *gin.Context) { ArticleTitle: req.ArticleTitle, ArticleStatus: req.ArticleStatus, IsTop: req.IsTop, + Sort: req.Sort, ArticleImage: utils.RemoveOssDomain(req.ArticleImage), SourceId: articleScienceSource.SourceId, ArticleUrl: req.ArticleUrl, @@ -255,6 +256,11 @@ func (b *ArticleScience) PutArticleScience(c *gin.Context) { articleScienceData["is_top"] = req.IsTop } + // 排序值 + if req.Sort != articleScience.Sort { + articleScienceData["sort"] = req.Sort + } + // 文章图片 articleImage := utils.RemoveOssDomain(req.ArticleImage) if articleImage != articleScience.ArticleImage { diff --git a/api/dto/ArticleScience.go b/api/dto/ArticleScience.go index b389044..98f4873 100644 --- a/api/dto/ArticleScience.go +++ b/api/dto/ArticleScience.go @@ -12,6 +12,7 @@ type ArticleScienceDto struct { ArticleTitle string `json:"article_title"` // 文章标题 ArticleStatus int `json:"article_status"` // 文章状态（1:正常 2:禁用） IsTop int `json:"is_top"` // 是否置顶（0:否 1:是） + Sort int `json:"sort"` // 排序值（越大越靠前） ArticleImage string `json:"article_image"` // 文章图片（1张） SourceId string `json:"source_id"` // 文章来源id ArticleUrl string `json:"article_url"` // 文章地址 diff --git a/api/model/ArticleScience.go b/api/model/ArticleScience.go index 3ae4e65..4d85d24 100644 --- a/api/model/ArticleScience.go +++ b/api/model/ArticleScience.go @@ -12,6 +12,7 @@ type ArticleScience struct { 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"` 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"` 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"` diff --git a/api/requests/ArticleScience.go b/api/requests/ArticleScience.go index ad8131a..6979cba 100644 --- a/api/requests/ArticleScience.go +++ b/api/requests/ArticleScience.go @@ -15,7 +15,8 @@ type GetArticleSciencePage struct { 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:禁用） 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:"排序"` } @@ -28,7 +29,8 @@ type GetArticleSciencePageOrder struct { type PutArticleScience struct { 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:禁用） - 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"` SourceId string `json:"source_id" form:"source_id" 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"` // 文章标题 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:是） + 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"` SourceId string `json:"source_id" form:"source_id" label:"文章来源" validate:"required"` ArticleUrl string `json:"article_url" form:"article_url" label:"文章地址" validate:"required"`