1 文章浏览记录 列表

@@ -34,6 +34,10 @@ service Core {
 	@handler MiniArticleMarkUserRead
 	@handler MiniArticleMarkUserRead
 	post /article/mark/user_read (MiniArticleMarkUserReadRequest) returns (MiniArticleMarkUserReadResponse)
 	post /article/mark/user_read (MiniArticleMarkUserReadRequest) returns (MiniArticleMarkUserReadResponse)
 
 
+	@doc "小程序获取文章浏览记录"
+	@handler MiniArticleMarkList
+	post /article/mark/list (MiniArticleMarkListRequest) returns (MiniArticleMarkListResponse)
+
 	@doc "小程序获取我发布的文章"
 	@doc "小程序获取我发布的文章"
 	@handler MiniArticleSearchMe
 	@handler MiniArticleSearchMe
 	post /article/search/me (MiniArticleSearchMeRequest) returns (MiniArticleSearchMeResponse)
 	post /article/search/me (MiniArticleSearchMeRequest) returns (MiniArticleSearchMeResponse)

@@ -160,6 +160,29 @@ type (
 	}
 	}
 )
 )
 
 
+type (
+	MiniArticleMarkListRequest {
+		Page      int   `json:"page"`
+		Size      int   `json:"size"`
+	}
+
+	MiniArticleMarkListResponse {
+		Total int64                 `json:"total"`
+		List  []MiniArticleMarkItem `json:"list"`
+	}
+
+	MiniArticleMarkItem {
+		Id        int64      `json:"id"`
+		CompanyId int64      `json:"companyId"`
+		UserId    int64      `json:"userId"`
+		ArticleId int64      `json:"articleId"`
+		Title     string     `json:"title"`
+		Author    SimpleUser `json:"author"` // 发布人
+		UpdatedAt int64      `json:"updatedAt"`
+	}
+
+)
+
 //管理后台获取文章详情
 //管理后台获取文章详情
 type (
 type (
 	SystemArticleGetRequest {
 	SystemArticleGetRequest {

+package article
+
+import (
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"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/types"
+)
+
+func MiniArticleMarkListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniArticleMarkListRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := article.NewMiniArticleMarkListLogic(r.Context(), svcCtx)
+		resp, err := l.MiniArticleMarkList(&req)
+		result.HttpResult(r, w, resp, err)
+	}
+}

@@ -215,6 +215,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			},
 			{
 			{
 				Method:  http.MethodPost,
 				Method:  http.MethodPost,
+				Path:    "/article/mark/list",
+				Handler: article.MiniArticleMarkListHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
 				Path:    "/article/search/me",
 				Path:    "/article/search/me",
 				Handler: article.MiniArticleSearchMeHandler(serverCtx),
 				Handler: article.MiniArticleSearchMeHandler(serverCtx),
 			},
 			},

+package article
+
+import (
+	"context"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/contextdata"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniArticleMarkListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniArticleMarkListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniArticleMarkListLogic {
+	return &MiniArticleMarkListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniArticleMarkListLogic) MiniArticleMarkList(req *types.MiniArticleMarkListRequest) (resp *types.MiniArticleMarkListResponse, err error) {
+	var userToken = contextdata.GetUserTokenFromCtx(l.ctx)
+
+	total, list, err := l.svcCtx.UserReadArticleRepository.Find(l.ctx, l.svcCtx.DefaultDBConn(), domain.NewQueryOptions().
+		WithOffsetLimit(req.Page, req.Size).
+		WithKV("userId", userToken.UserId))
+	if err != nil {
+		return nil, err
+	}
+	resp = &types.MiniArticleMarkListResponse{}
+	resp.Total = total
+	resp.List = make([]types.MiniArticleMarkItem, 0)
+	for _, item := range list {
+		to := types.MiniArticleMarkItem{
+			Id:        item.Id,
+			CompanyId: item.CompanyId,
+			ArticleId: item.ArticleId,
+			Title:     item.Title,
+			Author: types.SimpleUser{
+				Id:          item.Author.Id,
+				CompanyId:   item.Author.CompanyId,
+				CompanyName: item.Author.Company,
+				Name:        item.Author.Name,
+				Avatar:      item.Author.Avatar,
+				Position:    item.Author.Position,
+			},
+			UpdatedAt: item.UpdatedAt,
+		}
+		resp.List = append(resp.List, to)
+	}
+	return resp, nil
+}

@@ -460,6 +460,26 @@ type MiniArticleMarkUserReadResponse struct {
 	Id int64 `json:"id"`
 	Id int64 `json:"id"`
 }
 }
 
 
+type MiniArticleMarkListRequest struct {
+	Page int `json:"page"`
+	Size int `json:"size"`
+}
+
+type MiniArticleMarkListResponse struct {
+	Total int64                 `json:"total"`
+	List  []MiniArticleMarkItem `json:"list"`
+}
+
+type MiniArticleMarkItem struct {
+	Id        int64      `json:"id"`
+	CompanyId int64      `json:"companyId"`
+	UserId    int64      `json:"userId"`
+	ArticleId int64      `json:"articleId"`
+	Title     string     `json:"title"`
+	Author    SimpleUser `json:"author"` // 发布人
+	UpdatedAt int64      `json:"updatedAt"`
+}
+
 type SystemArticleGetRequest struct {
 type SystemArticleGetRequest struct {
 	Id        int64 `path:"id"` //id
 	Id        int64 `path:"id"` //id
 	CompanyId int64 `path:",optional"`
 	CompanyId int64 `path:",optional"`