From aab466b4eacef628c9adf1d2108dad8c351f4c9b Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Wed, 16 Oct 2024 15:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=91=E6=99=AE=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/controller/ArticleScience.go | 404 ++++++++++++++++++++++++++++ api/controller/BasicArticleClass.go | 2 +- api/dao/ArticleScienceClass.go | 4 +- api/dto/ArticleScience.go | 12 +- api/requests/ArticleScience.go | 61 +++-- api/router/router.go | 9 + 6 files changed, 459 insertions(+), 33 deletions(-) diff --git a/api/controller/ArticleScience.go b/api/controller/ArticleScience.go index 2491df7..0d34fb9 100644 --- a/api/controller/ArticleScience.go +++ b/api/controller/ArticleScience.go @@ -4,10 +4,12 @@ import ( "github.com/gin-gonic/gin" "hospital-admin-api/api/dao" "hospital-admin-api/api/dto" + "hospital-admin-api/api/model" "hospital-admin-api/api/requests" "hospital-admin-api/api/responses" "hospital-admin-api/global" "hospital-admin-api/utils" + "strconv" ) type ArticleScience struct{} @@ -53,3 +55,405 @@ func (b *ArticleScience) GetArticleSciencePage(c *gin.Context) { result["data"] = g responses.OkWithData(result, c) } + +// GetArticleScience 获取科普文章详情 +func (b *ArticleScience) GetArticleScience(c *gin.Context) { + id := c.Param("article_id") + if id == "" { + responses.FailWithMessage("缺少参数", c) + return + } + + // 将 id 转换为 int64 类型 + articleId, err := strconv.ParseInt(id, 10, 64) + if err != nil { + responses.Fail(c) + return + } + + // 获取科普文章数据 + articleScienceDao := dao.ArticleScienceDao{} + articleScience, err := articleScienceDao.GetArticleScienceById(articleId) + if err != nil { + responses.FailWithMessage("异常", c) + return + } + + // 处理返回值 + g := dto.GetArticleScienceDto(articleScience) + + // 加载文章来源 + articleScienceSourceDao := dao.ArticleScienceSourceDao{} + articleScienceSource, err := articleScienceSourceDao.GetArticleScienceSourceById(articleScience.SourceId) + if err != nil { + responses.FailWithMessage("异常", c) + return + } + g.LoadArticleScienceSource(articleScienceSource) + + // 加载文章分类 + articleScienceClassDao := dao.ArticleScienceClassDao{} + maps := make(map[string]interface{}) + maps["article_id"] = articleScience.ArticleId + articleScienceClass, err := articleScienceClassDao.GetArticleScienceClassList(maps) + if len(articleScienceClass) > 0 { + basicArticleClassDao := dao.BasicArticleClassDao{} + for _, class := range articleScienceClass { + basicArticleClass, err := basicArticleClassDao.GetBasicArticleClassById(class.BasicClassId) + if err != nil { + responses.FailWithMessage("异常", c) + return + } + + // 加载文章分类 + g.LoadArticleScienceClass(basicArticleClass) + } + + } + + responses.OkWithData(g, c) +} + +// AddArticleScience 新增科普文章 +func (b *ArticleScience) AddArticleScience(c *gin.Context) { + articleScienceRequest := requests.ArticleScienceRequest{} + req := articleScienceRequest.AddArticleScience + if err := c.ShouldBindJSON(&req); err != nil { + responses.FailWithMessage(err.Error(), c) + return + } + + // 参数验证 + if err := global.Validate.Struct(req); err != nil { + responses.FailWithMessage(utils.Translate(err), c) + return + } + + // 参数验证 + for _, item := range req.ArticleScienceClass { + if err := global.Validate.Struct(item); err != nil { + responses.FailWithMessage(utils.Translate(err), c) + return + } + } + + // 检测来源是否正确 + sourceId, err := strconv.ParseInt(req.SourceId, 10, 64) + if err != nil { + responses.FailWithMessage("来源错误", c) + return + } + + articleScienceSourceDao := dao.ArticleScienceSourceDao{} + articleScienceSource, err := articleScienceSourceDao.GetArticleScienceSourceById(sourceId) + if err != nil { + responses.FailWithMessage("来源错误", c) + return + } + + // 开始事务 + tx := global.Db.Begin() + defer func() { + if r := recover(); r != nil { + tx.Rollback() + } + }() + + articleScience := &model.ArticleScience{ + ArticleTitle: req.ArticleTitle, + ArticleStatus: req.ArticleStatus, + IsTop: req.IsTop, + ArticleImage: utils.RemoveOssDomain(req.ArticleImage), + SourceId: articleScienceSource.SourceId, + ArticleUrl: req.ArticleUrl, + } + + articleScienceDao := dao.ArticleScienceDao{} + articleScience, err = articleScienceDao.AddArticleScience(tx, articleScience) + if err != nil { + tx.Rollback() + responses.FailWithMessage(err.Error(), c) + return + } + + // 新增文章分类 + articleScienceClassDao := dao.ArticleScienceClassDao{} + for _, i2 := range req.ArticleScienceClass { + basicClassId, err := strconv.ParseInt(i2.BasicClassId, 10, 64) + if err != nil { + responses.FailWithMessage("分类错误", c) + return + } + + articleScienceClass := &model.ArticleScienceClass{ + ArticleId: articleScience.ArticleId, + BasicClassId: basicClassId, + } + articleScienceClass, err = articleScienceClassDao.AddArticleScienceClass(tx, articleScienceClass) + if err != nil { + tx.Rollback() + responses.FailWithMessage(err.Error(), c) + return + } + } + + tx.Commit() + responses.Ok(c) +} + +// PutArticleScience 修改科普文章 +func (b *ArticleScience) PutArticleScience(c *gin.Context) { + articleScienceRequest := requests.ArticleScienceRequest{} + req := articleScienceRequest.PutArticleScience + if err := c.ShouldBindJSON(&req); err != nil { + responses.FailWithMessage(err.Error(), c) + return + } + + // 参数验证 + if err := global.Validate.Struct(req); err != nil { + responses.FailWithMessage(utils.Translate(err), c) + return + } + + id := c.Param("article_id") + if id == "" { + responses.FailWithMessage("缺少参数", c) + return + } + + // 将 id 转换为 int64 类型 + articleId, err := strconv.ParseInt(id, 10, 64) + if err != nil { + responses.Fail(c) + return + } + + // 获取科普分类数据 + articleScienceDao := dao.ArticleScienceDao{} + articleScience, err := articleScienceDao.GetArticleScienceById(articleId) + if err != nil { + responses.FailWithMessage("分类异常", c) + return + } + + // 修改值 + articleScienceData := make(map[string]interface{}) + + // 文章标题 + if req.ArticleTitle != articleScience.ArticleTitle { + articleScienceData["article_title"] = req.ArticleTitle + } + + // 文章状态 + if req.ArticleStatus != articleScience.ArticleStatus { + articleScienceData["article_status"] = req.ArticleStatus + } + + // 是否置顶 + if req.IsTop != articleScience.IsTop { + articleScienceData["is_top"] = req.IsTop + } + + // 文章图片 + articleImage := utils.RemoveOssDomain(req.ArticleImage) + if articleImage != articleScience.ArticleImage { + articleScienceData["article_image"] = req.ArticleImage + } + + // 文章来源 + sourceId, err := strconv.ParseInt(req.SourceId, 10, 64) + if err != nil { + responses.Fail(c) + return + } + + if sourceId != articleScience.SourceId { + articleScienceData["source_id"] = req.SourceId + } + + // 文章地址 + if req.ArticleUrl != articleScience.ArticleUrl { + articleScienceData["article_url"] = req.ArticleUrl + } + + // 开始事务 + tx := global.Db.Begin() + defer func() { + if r := recover(); r != nil { + tx.Rollback() + } + }() + + if len(articleScienceData) > 0 { + err = articleScienceDao.EditArticleScienceById(tx, articleId, articleScienceData) + if err != nil { + tx.Rollback() + responses.FailWithMessage("操作失败", c) + return + } + + tx.Commit() + } + + // 删除文章分类 + articleScienceClassDao := dao.ArticleScienceClassDao{} + maps := make(map[string]interface{}) + maps["article_id"] = articleScience.ArticleId + err = articleScienceClassDao.DeleteArticleScienceClass(tx, maps) + if err != nil { + tx.Rollback() + responses.FailWithMessage("操作失败", c) + return + } + + // 新增文章分类 + for _, i2 := range req.ArticleScienceClass { + basicClassId, err := strconv.ParseInt(i2.BasicClassId, 10, 64) + if err != nil { + tx.Rollback() + responses.FailWithMessage("分类错误", c) + return + } + + articleScienceClass := &model.ArticleScienceClass{ + ArticleId: articleScience.ArticleId, + BasicClassId: basicClassId, + } + articleScienceClass, err = articleScienceClassDao.AddArticleScienceClass(tx, articleScienceClass) + if err != nil { + tx.Rollback() + responses.FailWithMessage(err.Error(), c) + return + } + } + + tx.Commit() + responses.Ok(c) +} + +// PutArticleScienceStatus 操作科普文章状态 +func (b *ArticleScience) PutArticleScienceStatus(c *gin.Context) { + articleScienceRequest := requests.ArticleScienceRequest{} + req := articleScienceRequest.PutArticleScienceStatus + if err := c.ShouldBind(&req); err != nil { + responses.FailWithMessage(err.Error(), c) + return + } + + // 参数验证 + if err := global.Validate.Struct(req); err != nil { + responses.FailWithMessage(utils.Translate(err), c) + return + } + + id := c.Param("article_id") + if id == "" { + responses.FailWithMessage("缺少参数", c) + return + } + + // 将 id 转换为 int64 类型 + articleId, err := strconv.ParseInt(id, 10, 64) + if err != nil { + responses.Fail(c) + return + } + + // 获取科普分类数据 + articleScienceDao := dao.ArticleScienceDao{} + articleScience, err := articleScienceDao.GetArticleScienceById(articleId) + if err != nil { + responses.FailWithMessage("分类异常", c) + return + } + + // 检测状态 + if articleScience.ArticleStatus == req.ArticleStatus { + responses.Ok(c) + return + } + + // 开始事务 + tx := global.Db.Begin() + defer func() { + if r := recover(); r != nil { + tx.Rollback() + } + }() + + articleScienceData := make(map[string]interface{}) + articleScienceData["article_status"] = req.ArticleStatus + err = articleScienceDao.EditArticleScienceById(tx, articleId, articleScienceData) + if err != nil { + tx.Rollback() + responses.FailWithMessage("操作失败", c) + return + } + + tx.Commit() + responses.Ok(c) +} + +// PutArticleScienceTop 操作科普文章置顶状态 +func (b *ArticleScience) PutArticleScienceTop(c *gin.Context) { + articleScienceRequest := requests.ArticleScienceRequest{} + req := articleScienceRequest.PutArticleScienceTop + if err := c.ShouldBind(&req); err != nil { + responses.FailWithMessage(err.Error(), c) + return + } + + // 参数验证 + if err := global.Validate.Struct(req); err != nil { + responses.FailWithMessage(utils.Translate(err), c) + return + } + + id := c.Param("article_id") + if id == "" { + responses.FailWithMessage("缺少参数", c) + return + } + + // 将 id 转换为 int64 类型 + articleId, err := strconv.ParseInt(id, 10, 64) + if err != nil { + responses.Fail(c) + return + } + + // 获取科普分类数据 + articleScienceDao := dao.ArticleScienceDao{} + articleScience, err := articleScienceDao.GetArticleScienceById(articleId) + if err != nil { + responses.FailWithMessage("分类异常", c) + return + } + + // 检测置顶状态 + if articleScience.IsTop == req.IsTop { + responses.Ok(c) + return + } + + // 开始事务 + tx := global.Db.Begin() + defer func() { + if r := recover(); r != nil { + tx.Rollback() + } + }() + + articleScienceData := make(map[string]interface{}) + articleScienceData["is_top"] = req.IsTop + err = articleScienceDao.EditArticleScienceById(tx, articleId, articleScienceData) + if err != nil { + tx.Rollback() + responses.FailWithMessage("操作失败", c) + return + } + + tx.Commit() + responses.Ok(c) +} diff --git a/api/controller/BasicArticleClass.go b/api/controller/BasicArticleClass.go index b236a62..a6eff06 100644 --- a/api/controller/BasicArticleClass.go +++ b/api/controller/BasicArticleClass.go @@ -194,7 +194,7 @@ func (b *BasicArticleClass) PutBasicArticleClass(c *gin.Context) { // AddBasicArticleClass 新增科普分类 func (b *BasicArticleClass) AddBasicArticleClass(c *gin.Context) { basicArticleClassRequest := requests.BasicArticleClassRequest{} - req := basicArticleClassRequest.PutBasicArticleClass + req := basicArticleClassRequest.AddBasicArticleClass if err := c.ShouldBind(&req); err != nil { responses.FailWithMessage(err.Error(), c) return diff --git a/api/dao/ArticleScienceClass.go b/api/dao/ArticleScienceClass.go index 52c2d75..b3a8806 100644 --- a/api/dao/ArticleScienceClass.go +++ b/api/dao/ArticleScienceClass.go @@ -38,8 +38,8 @@ func (r *ArticleScienceClassDao) DeleteArticleScienceClass(tx *gorm.DB, maps int } // DeleteArticleScienceClassById 删除-id -func (r *ArticleScienceClassDao) DeleteArticleScienceClassById(tx *gorm.DB, articleId int64) error { - if err := tx.Delete(&model.ArticleScienceClass{}, articleId).Error; err != nil { +func (r *ArticleScienceClassDao) DeleteArticleScienceClassById(tx *gorm.DB, classId int64) error { + if err := tx.Delete(&model.ArticleScienceClass{}, classId).Error; err != nil { return err } return nil diff --git a/api/dto/ArticleScience.go b/api/dto/ArticleScience.go index 9b6b3cc..b389044 100644 --- a/api/dto/ArticleScience.go +++ b/api/dto/ArticleScience.go @@ -77,15 +77,11 @@ func (r *ArticleScienceDto) LoadArticleScienceSource(m *model.ArticleScienceSour } // LoadArticleScienceClass 加载文章分类 -func (r *ArticleScienceDto) LoadArticleScienceClass(m []*model.ArticleScienceClass) *ArticleScienceDto { - if len(m) > 0 { - for _, v := range m { - if v.BasicArticleClass != nil { - basicArticleClass := GetBasicArticleClassDto(v.BasicArticleClass) +func (r *ArticleScienceDto) LoadArticleScienceClass(m *model.BasicArticleClass) *ArticleScienceDto { + if m != nil { + basicArticleClass := GetBasicArticleClassDto(m) - r.ArticleScienceClass = append(r.ArticleScienceClass, basicArticleClass) - } - } + r.ArticleScienceClass = append(r.ArticleScienceClass, basicArticleClass) } return r } diff --git a/api/requests/ArticleScience.go b/api/requests/ArticleScience.go index 53ddefd..ad8131a 100644 --- a/api/requests/ArticleScience.go +++ b/api/requests/ArticleScience.go @@ -1,10 +1,11 @@ package requests type ArticleScienceRequest struct { - GetArticleSciencePage // 获取科普文章列表-分页 - GetArticleScienceList // 获取科普文章列表 - PutArticleScience // 修改科普文章 - AddArticleScience // 新增科普文章 + GetArticleSciencePage // 获取科普文章列表-分页 + PutArticleScience // 修改科普文章 + AddArticleScience // 新增科普文章 + PutArticleScienceStatus // 操作科普文章状态 + PutArticleScienceTop // 操作科普文章置顶状态 } // GetArticleSciencePage 获取科普文章列表-分页 @@ -23,28 +24,44 @@ type GetArticleSciencePageOrder struct { UpdatedAt string `json:"updated_at" form:"updated_at" label:"排序"` // 修改时间 } -// GetArticleScienceList 获取科普文章列表 -type GetArticleScienceList 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 - Order *GetArticleSciencePageOrder `json:"order" form:"order" label:"排序"` -} - -// GetArticleScienceListOrder 获取科普文章列表-排序条件 -type GetArticleScienceListOrder struct { - BasicClassSort string `json:"basic_class_sort" form:"basic_class_sort" label:"排序"` // 排序（越大排序越靠前） -} - // PutArticleScience 修改科普文章 type PutArticleScience struct { - BasicClassName string `json:"basic_class_name" form:"basic_class_name" label:"分类名称" validate:"required"` - BasicClassSort uint `json:"basic_class_sort" form:"basic_class_sort" label:"排序值" validate:"required,number,min=1"` + 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:是） + 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"` + ArticleScienceClass []*PutArticleScienceClass `json:"article_science_class" form:"article_science_class" label:"文章分类" validate:"required"` +} + +// PutArticleScienceClass 修改科普文章-文章分类 +type PutArticleScienceClass struct { + BasicClassId string `json:"basic_class_id" form:"basic_class_id" label:"分类" validate:"required"` } // AddArticleScience 新增科普文章 type AddArticleScience struct { - BasicClassName string `json:"basic_class_name" form:"basic_class_name" label:"分类名称" validate:"required"` - BasicClassSort uint `json:"basic_class_sort" form:"basic_class_sort" label:"排序值" validate:"required,number,min=1"` + 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:是） + 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"` + ArticleScienceClass []*AddArticleScienceClass `json:"article_science_class" form:"article_science_class" label:"文章分类" validate:"required"` +} + +// AddArticleScienceClass 新增科普文章-文章分类 +type AddArticleScienceClass struct { + BasicClassId string `json:"basic_class_id" form:"basic_class_id" label:"分类" validate:"required"` +} + +// PutArticleScienceStatus 操作科普文章状态 +type PutArticleScienceStatus struct { + ArticleStatus int `json:"article_status" form:"article_status" label:"状态" validate:"required,oneof=1 2"` // 文章状态（1:正常 2:禁用） +} + +// PutArticleScienceTop 操作科普文章置顶状态 +type PutArticleScienceTop struct { + IsTop int `json:"is_top" form:"is_top" label:"状态" validate:"omitempty,numeric,oneof=0 1"` // 是否置顶（0:否 1:是） } diff --git a/api/router/router.go b/api/router/router.go index 7762ad1..01aa1bd 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -887,10 +887,19 @@ func privateRouter(r *gin.Engine, api controller.Api) { scienceGroup.POST("/page", api.ArticleScience.GetArticleSciencePage) // 获取科普文章详情 + scienceGroup.GET("/:article_id", api.ArticleScience.GetArticleScience) // 修改科普文章 + scienceGroup.PUT("/:article_id", api.ArticleScience.PutArticleScience) // 新增科普文章 + scienceGroup.POST("", api.ArticleScience.AddArticleScience) + + // 操作科普文章状态 + scienceGroup.PUT("/status/:article_id", api.ArticleScience.PutArticleScienceStatus) + + // 操作科普文章置顶状态 + scienceGroup.PUT("/top/:article_id", api.ArticleScience.PutArticleScienceTop) // 科普文章来源 sourceGroup := scienceGroup.Group("source")