From 37929361bee5737520b2e021c728ad31dd3a488b Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Wed, 29 Nov 2023 17:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8D=E7=94=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../article_collect/article_collect_ctl.go    | 39 +----------
 .../article_collect_service.go                | 70 ++-----------------
 server/admin/article_collect_route.go         |  4 --
 3 files changed, 7 insertions(+), 106 deletions(-)

diff --git a/server/admin/article_collect/article_collect_ctl.go b/server/admin/article_collect/article_collect_ctl.go
index a511f7c..b4beef2 100644
--- a/server/admin/article_collect/article_collect_ctl.go
+++ b/server/admin/article_collect/article_collect_ctl.go
@@ -9,7 +9,7 @@ import (
 )
 
 type ArticleCollectHandler struct {
-	Service IArticleCollectService
+	Service ArticleCollectService
 }
 
 // list article_collect列表
@@ -25,40 +25,3 @@ func (hd ArticleCollectHandler) List(c *gin.Context) {
 	res, err := hd.Service.List(page, listReq)
 	response.CheckAndRespWithData(c, res, err)
 }
-
-// detail article_collect详情
-func (hd ArticleCollectHandler) Detail(c *gin.Context) {
-	var detailReq ArticleCollectDetailReq
-	if response.IsFailWithResp(c, util.VerifyUtil.VerifyQuery(c, &detailReq)) {
-		return
-	}
-	res, err := hd.Service.Detail(detailReq.Id)
-	response.CheckAndRespWithData(c, res, err)
-}
-
-// add article_collect新增
-func (hd ArticleCollectHandler) Add(c *gin.Context) {
-	var addReq ArticleCollectAddReq
-	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &addReq)) {
-		return
-	}
-	response.CheckAndResp(c, hd.Service.Add(addReq))
-}
-
-// edit article_collect编辑
-func (hd ArticleCollectHandler) Edit(c *gin.Context) {
-	var editReq ArticleCollectEditReq
-	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &editReq)) {
-		return
-	}
-	response.CheckAndResp(c, hd.Service.Edit(editReq))
-}
-
-// del article_collect删除
-func (hd ArticleCollectHandler) Del(c *gin.Context) {
-	var delReq ArticleCollectDelReq
-	if response.IsFailWithResp(c, util.VerifyUtil.VerifyBody(c, &delReq)) {
-		return
-	}
-	response.CheckAndResp(c, hd.Service.Del(delReq.Id))
-}
diff --git a/server/admin/article_collect/article_collect_service.go b/server/admin/article_collect/article_collect_service.go
index 8982db7..0564d00 100644
--- a/server/admin/article_collect/article_collect_service.go
+++ b/server/admin/article_collect/article_collect_service.go
@@ -17,17 +17,18 @@ type IArticleCollectService interface {
 }
 
 // NewArticleCollectService 初始化
-func NewArticleCollectService(db *gorm.DB) IArticleCollectService {
-	return &articleCollectService{db: db}
+func NewArticleCollectService(db *gorm.DB) ArticleCollectService {
+
+	return ArticleCollectService{db: db}
 }
 
-// articleCollectService 文章收藏服务实现类
-type articleCollectService struct {
+// ArticleCollectService 文章收藏服务实现类
+type ArticleCollectService struct {
 	db *gorm.DB
 }
 
 // List 文章收藏列表
-func (Service articleCollectService) List(page request.PageReq, listReq ArticleCollectListReq) (res response.PageResp, e error) {
+func (Service ArticleCollectService) List(page request.PageReq, listReq ArticleCollectListReq) (res response.PageResp, e error) {
 	// 分页信息
 	limit := page.PageSize
 	offset := page.PageSize * (page.PageNo - 1)
@@ -61,62 +62,3 @@ func (Service articleCollectService) List(page request.PageReq, listReq ArticleC
 		Lists:    resps,
 	}, nil
 }
-
-// Detail 文章收藏详情
-func (Service articleCollectService) Detail(id int) (res ArticleCollectResp, e error) {
-	var obj model.ArticleCollect
-	err := Service.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&obj).Error
-	if e = response.CheckErrDBNotRecord(err, "数据不存在!"); e != nil {
-		return
-	}
-	if e = response.CheckErr(err, "Detail First err"); e != nil {
-		return
-	}
-	response.Copy(&res, obj)
-	return
-}
-
-// Add 文章收藏新增
-func (Service articleCollectService) Add(addReq ArticleCollectAddReq) (e error) {
-	var obj model.ArticleCollect
-	response.Copy(&obj, addReq)
-	err := Service.db.Create(&obj).Error
-	e = response.CheckErr(err, "Add Create err")
-	return
-}
-
-// Edit 文章收藏编辑
-func (Service articleCollectService) Edit(editReq ArticleCollectEditReq) (e error) {
-	var obj model.ArticleCollect
-	err := Service.db.Where("id = ? AND is_delete = ?", editReq.Id, 0).Limit(1).First(&obj).Error
-	// 校验
-	if e = response.CheckErrDBNotRecord(err, "数据不存在!"); e != nil {
-		return
-	}
-	if e = response.CheckErr(err, "Edit First err"); e != nil {
-		return
-	}
-	// 更新
-	response.Copy(&obj, editReq)
-	err = Service.db.Model(&obj).Updates(obj).Error
-	e = response.CheckErr(err, "Edit Updates err")
-	return
-}
-
-// Del 文章收藏删除
-func (Service articleCollectService) Del(id int) (e error) {
-	var obj model.ArticleCollect
-	err := Service.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&obj).Error
-	// 校验
-	if e = response.CheckErrDBNotRecord(err, "数据不存在!"); e != nil {
-		return
-	}
-	if e = response.CheckErr(err, "Del First err"); e != nil {
-		return
-	}
-	// 删除
-	obj.IsDelete = 1
-	err = Service.db.Save(&obj).Error
-	e = response.CheckErr(err, "Del Save err")
-	return
-}
diff --git a/server/admin/article_collect_route.go b/server/admin/article_collect_route.go
index 38e17bc..613df53 100644
--- a/server/admin/article_collect_route.go
+++ b/server/admin/article_collect_route.go
@@ -19,8 +19,4 @@ func ArticleCollectRoute(rg *gin.RouterGroup) {
 
 	rg = rg.Group("/", middleware.TokenAuth())
 	rg.GET("/article_collect/list", handle.List)
-	rg.GET("/article_collect/detail", handle.Detail)
-	rg.POST("/article_collect/add", handle.Add)
-	rg.POST("/article_collect/edit", handle.Edit)
-	rg.POST("/article_collect/del", handle.Del)
 }