草稿箱的操作相关

@@ -52,7 +52,7 @@ service Core {
 	@handler MiniGetArticleDraftMe
 	@handler MiniGetArticleDraftMe
 	get /article_draft/me/:id (MiniArticleDraftGetMeRequest) returns (MiniArticleDraftGetMeResponse)
 	get /article_draft/me/:id (MiniArticleDraftGetMeRequest) returns (MiniArticleDraftGetMeResponse)
 
 
-	@doc "小程序获取我的草稿内容"
+	@doc "小程序删除我的草稿内容"
 	@handler MiniDeleteArticleDraftMe
 	@handler MiniDeleteArticleDraftMe
 	delete /article_draft/me/:id (MiniArticleDraftDeleteMeRequest) returns (MiniArticleDraftDeleteMeResponse)
 	delete /article_draft/me/:id (MiniArticleDraftDeleteMeRequest) returns (MiniArticleDraftDeleteMeResponse)
 
 

@@ -213,21 +213,21 @@ type (
 		List  []MiniArticleDraftItem `json:"list"`
 		List  []MiniArticleDraftItem `json:"list"`
 	}
 	}
 	MiniArticleDraftItem {
 	MiniArticleDraftItem {
-		Id       int64    `json:"id"`
-		Template int      `json:"template"` // 使用哪个模板进行编辑 0、无 1、演绎式 2、归纳式
-		Content  []string `json:"content"`  // 填写的内容
-		Title    string   `json:"title"`    // 标题
-		Images   []string `json:"images"`   // 图片
+		Id        int64    `json:"id"`
+		Template  int      `json:"template"` // 使用哪个模板进行编辑 0、无 1、演绎式 2、归纳式
+		Content   []string `json:"content"`  // 填写的内容
+		Title     string   `json:"title"`    // 标题
+		Images    []string `json:"images"`   // 图片
+		CreatedAt int64    `json:"createdAt"`
 	}
 	}
 )
 )
 
 
 //获取我的草稿内容
 //获取我的草稿内容
 type (
 type (
 	MiniArticleDraftGetMeRequest {
 	MiniArticleDraftGetMeRequest {
-		CompanyId int64 `json:",optional"` // 公司id
-		AuthorId  int64 `json:",optional"` // 发布人
-		Page      int   `json:"page"`
-		Size      int   `json:"size"`
+		CompanyId int64 `path:",optional"` // 公司id
+		AuthorId  int64 `path:",optional"` // 发布人
+		Id        int64 `path:"id"`
 	}
 	}
 
 
 	MiniArticleDraftGetMeResponse {
 	MiniArticleDraftGetMeResponse {
@@ -251,14 +251,7 @@ type (
 	}
 	}
 
 
 	MiniArticleDraftDeleteMeResponse {
 	MiniArticleDraftDeleteMeResponse {
-		Id        int64    `json:"id"`        //
-		Template  int      `json:"template"`  // 使用哪个模板进行编辑 0、无 1、演绎式 2、归纳式
-		Content   []string `json:"content"`   // 填写的内容
-		Title     string   `json:"title"`     // 标题
-		Images    []string `json:"images"`    // 图片
-		WhoRead   []int64  `json:"whoRead"`   // 谁可以看
-		WhoReview []int64  `json:"whoReview"` // 评论人
-		Location  Location `json:"location"`  // 坐标
+		Id int64 `json:"id"` //
 	}
 	}
 )
 )
 
 

@@ -7,6 +7,8 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/article"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/article"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/contextdata"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
 func MiniDeleteArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniDeleteArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
@@ -18,11 +20,10 @@ func MiniDeleteArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFun
 		}
 		}
 
 
 		l := article.NewMiniDeleteArticleDraftMeLogic(r.Context(), svcCtx)
 		l := article.NewMiniDeleteArticleDraftMeLogic(r.Context(), svcCtx)
+		token := contextdata.GetUserTokenFromCtx(r.Context())
+		req.AuthorId = token.UserId
+		req.CompanyId = token.CompanyId
 		resp, err := l.MiniDeleteArticleDraftMe(&req)
 		resp, err := l.MiniDeleteArticleDraftMe(&req)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
+		result.HttpResult(r, w, resp, err)
 	}
 	}
 }
 }

@@ -7,6 +7,8 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/article"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/article"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/contextdata"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
 func MiniSearchArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniSearchArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
@@ -18,11 +20,10 @@ func MiniSearchArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFun
 		}
 		}
 
 
 		l := article.NewMiniSearchArticleDraftMeLogic(r.Context(), svcCtx)
 		l := article.NewMiniSearchArticleDraftMeLogic(r.Context(), svcCtx)
+		token := contextdata.GetUserTokenFromCtx(r.Context())
+		req.AuthorId = token.UserId
+		req.CompanyId = token.CompanyId
 		resp, err := l.MiniSearchArticleDraftMe(&req)
 		resp, err := l.MiniSearchArticleDraftMe(&req)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
+		result.HttpResult(r, w, resp, err)
 	}
 	}
 }
 }

@@ -83,6 +83,7 @@ func (l *MiniArticleMarkUserReadLogic) MiniArticleMarkUserRead(req *types.MiniAr
 		if err != nil {
 		if err != nil {
 			return err
 			return err
 		}
 		}
+		//增加浏览计数
 		err = l.svcCtx.ArticleRepository.IncreaseCountRead(ctx, c, 1, articleInfo)
 		err = l.svcCtx.ArticleRepository.IncreaseCountRead(ctx, c, 1, articleInfo)
 		return err
 		return err
 	}, true)
 	}, true)

@@ -5,6 +5,7 @@ import (
 
 
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
 
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 )
@@ -23,8 +24,25 @@ func NewMiniDeleteArticleDraftMeLogic(ctx context.Context, svcCtx *svc.ServiceCo
 	}
 	}
 }
 }
 
 
+// 删除我的草稿记录
 func (l *MiniDeleteArticleDraftMeLogic) MiniDeleteArticleDraftMe(req *types.MiniArticleDraftDeleteMeRequest) (resp *types.MiniArticleDraftDeleteMeResponse, err error) {
 func (l *MiniDeleteArticleDraftMeLogic) MiniDeleteArticleDraftMe(req *types.MiniArticleDraftDeleteMeRequest) (resp *types.MiniArticleDraftDeleteMeResponse, err error) {
-	// todo: add your logic here and delete this line
+	var conn = l.svcCtx.DefaultDBConn()
 
 
-	return
+	draftInfo, err := l.svcCtx.ArticleDraftRepository.FindOne(l.ctx, conn, req.Id)
+	if err != nil {
+		return nil, xerr.NewErrMsgErr("删除草稿失败", err)
+	}
+	if draftInfo.AuthorId != req.AuthorId {
+		if err != nil {
+			return nil, xerr.NewErrMsg("删除草稿失败")
+		}
+	}
+	_, err = l.svcCtx.ArticleDraftRepository.Delete(l.ctx, conn, draftInfo)
+	if err != nil {
+		return nil, xerr.NewErrMsgErr("删除草稿失败", err)
+	}
+	resp = &types.MiniArticleDraftDeleteMeResponse{
+		Id: draftInfo.Id,
+	}
+	return resp, nil
 }
 }

@@ -5,6 +5,7 @@ import (
 
 
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
 
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 )
@@ -23,8 +24,35 @@ func NewMiniGetArticleDraftMeLogic(ctx context.Context, svcCtx *svc.ServiceConte
 	}
 	}
 }
 }
 
 
+// 获取我的草稿记录
 func (l *MiniGetArticleDraftMeLogic) MiniGetArticleDraftMe(req *types.MiniArticleDraftGetMeRequest) (resp *types.MiniArticleDraftGetMeResponse, err error) {
 func (l *MiniGetArticleDraftMeLogic) MiniGetArticleDraftMe(req *types.MiniArticleDraftGetMeRequest) (resp *types.MiniArticleDraftGetMeResponse, err error) {
-	// todo: add your logic here and delete this line
+	var conn = l.svcCtx.DefaultDBConn()
 
 
+	draftInfo, err := l.svcCtx.ArticleDraftRepository.FindOne(l.ctx, conn, req.Id)
+	if err != nil {
+		return nil, xerr.NewErrMsgErr("获取草稿失败", err)
+	}
+	if draftInfo.AuthorId != req.AuthorId {
+		if err != nil {
+			return nil, xerr.NewErrMsg("获取草稿失败")
+		}
+	}
+	resp = &types.MiniArticleDraftGetMeResponse{
+		Id:        draftInfo.Id,
+		Template:  draftInfo.Template,
+		Content:   draftInfo.Content,
+		Title:     draftInfo.Title,
+		Images:    []string{},
+		WhoRead:   draftInfo.WhoRead,
+		WhoReview: draftInfo.WhoReview,
+		Location: types.Location{
+			Longitude: draftInfo.Location.Longitude,
+			Latitude:  draftInfo.Location.Latitude,
+			Descript:  draftInfo.Location.Descript,
+		},
+	}
+	for _, val := range draftInfo.Images {
+		resp.Images = append(resp.Images, val.Url)
+	}
 	return
 	return
 }
 }

@@ -5,6 +5,8 @@ import (
 
 
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
 
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 )
@@ -24,7 +26,33 @@ func NewMiniSearchArticleDraftMeLogic(ctx context.Context, svcCtx *svc.ServiceCo
 }
 }
 
 
 func (l *MiniSearchArticleDraftMeLogic) MiniSearchArticleDraftMe(req *types.MiniArticleDraftSearchMeRequest) (resp *types.MiniArticleDraftSearchMeResponse, err error) {
 func (l *MiniSearchArticleDraftMeLogic) MiniSearchArticleDraftMe(req *types.MiniArticleDraftSearchMeRequest) (resp *types.MiniArticleDraftSearchMeResponse, err error) {
-	// todo: add your logic here and delete this line
+	var conn = l.svcCtx.DefaultDBConn()
 
 
-	return
+	queryOption := domain.NewQueryOptions().
+		WithOffsetLimit(req.Page, req.Size).
+		MustWithKV("authorId", req.AuthorId)
+
+	cnt, draftList, err := l.svcCtx.ArticleDraftRepository.Find(l.ctx, conn, queryOption)
+	if err != nil {
+		return nil, xerr.NewErrMsgErr("获取草稿列表失败", err)
+	}
+	resp = &types.MiniArticleDraftSearchMeResponse{
+		Total: cnt,
+		List:  make([]types.MiniArticleDraftItem, len(draftList)),
+	}
+
+	for i := range draftList {
+		images := []string{}
+		for _, val := range draftList[i].Images {
+			images = append(images, val.Url)
+		}
+		resp.List[i] = types.MiniArticleDraftItem{
+			Id:       draftList[i].Id,
+			Template: draftList[i].Template,
+			Content:  draftList[i].Content,
+			Title:    draftList[i].Title,
+			Images:   images,
+		}
+	}
+	return resp, nil
 }
 }

@@ -233,7 +233,7 @@ func (l *MiniSetUserLikeLogic) setUserLikeArticle(req *types.MiniSetUserLikeRequ
 			CommentAuthor: 0,
 			CommentAuthor: 0,
 			UserId:        req.UserId,
 			UserId:        req.UserId,
 		}
 		}
-		// 去除点赞标识
+		// 添加点赞标识
 		_, err = l.svcCtx.UserLoveFlagRepository.Insert(ctx, c, &flagInfo)
 		_, err = l.svcCtx.UserLoveFlagRepository.Insert(ctx, c, &flagInfo)
 		if err != nil {
 		if err != nil {
 			return err
 			return err

@@ -200,10 +200,9 @@ type MiniArticleDraftItem struct {
 }
 }
 
 
 type MiniArticleDraftGetMeRequest struct {
 type MiniArticleDraftGetMeRequest struct {
-	CompanyId int64 `json:",optional"` // 公司id
-	AuthorId  int64 `json:",optional"` // 发布人
-	Page      int   `json:"page"`
-	Size      int   `json:"size"`
+	CompanyId int64 `path:",optional"` // 公司id
+	AuthorId  int64 `path:",optional"` // 发布人
+	Id        int64 `path:"id"`
 }
 }
 
 
 type MiniArticleDraftGetMeResponse struct {
 type MiniArticleDraftGetMeResponse struct {
@@ -224,14 +223,7 @@ type MiniArticleDraftDeleteMeRequest struct {
 }
 }
 
 
 type MiniArticleDraftDeleteMeResponse struct {
 type MiniArticleDraftDeleteMeResponse struct {
-	Id        int64    `json:"id"`        //
-	Template  int      `json:"template"`  // 使用哪个模板进行编辑 0、无 1、演绎式 2、归纳式
-	Content   []string `json:"content"`   // 填写的内容
-	Title     string   `json:"title"`     // 标题
-	Images    []string `json:"images"`    // 图片
-	WhoRead   []int64  `json:"whoRead"`   // 谁可以看
-	WhoReview []int64  `json:"whoReview"` // 评论人
-	Location  Location `json:"location"`  // 坐标
+	Id int64 `json:"id"` //
 }
 }
 
 
 type SystemArticleGetRequest struct {
 type SystemArticleGetRequest struct {

@@ -6,6 +6,7 @@ import (
 
 
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gorm.io/gorm"
 	"gorm.io/gorm"
+	"gorm.io/plugin/soft_delete"
 )
 )
 
 
 type UserReadArticle struct {
 type UserReadArticle struct {
@@ -13,6 +14,7 @@ type UserReadArticle struct {
 	CreatedAt int64
 	CreatedAt int64
 	UpdatedAt int64
 	UpdatedAt int64
 	DeletedAt int64
 	DeletedAt int64
+	IsDel     soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt"`
 	Version   int
 	Version   int
 	CompanyId int64
 	CompanyId int64
 	UserId    int64
 	UserId    int64