新建定性标签接口

@@ -63,6 +63,15 @@ service Core {
 	@doc "小程序获取文章的编辑记录"
 	@doc "小程序获取文章的编辑记录"
 	@handler MiniArticleBackupSearch
 	@handler MiniArticleBackupSearch
 	post /article_backup/search (MiniArticleBackupSearchRequest) returns (MiniArticleBackupSearchResponse)
 	post /article_backup/search (MiniArticleBackupSearchRequest) returns (MiniArticleBackupSearchResponse)
+
+
+	@doc "小程序设置文章的定性标签"
+	@handler MiniArticleSetTag
+	post /article/set_tag (MiniArticleSetTagRequest) returns (MiniArticleSetTagResponse)
+
+	@doc "小程序所有的定性标签"
+	@handler MiniAllArticleTag
+	get /article_tag/list/all (MiniAllArticleTagRequest) returns (MiniAllArticleTagResponse)
 }
 }
 
 
 // 管理后台接口
 // 管理后台接口

@@ -278,6 +278,39 @@ type (
 	}
 	}
 )
 )
 
 
+//小程序端设置文章的定性标签
+type (
+	MiniArticleSetTagRequest{
+		CompanyId int64 `json:",optional"` // 公司id
+		UserId    int64 `json:",optional"` // 公司id
+		ArticleId int64 `json:"articleId"` // 文章id
+		TagId     int64 `json:"tagId"`     // 标签id
+	}
+	MiniArticleSetTagResponse{
+		Id int64 `json:"id"`
+	}
+)
+
+
+//小程序端获取所有的定性标签
+type (
+	MiniAllArticleTagRequest{
+		CompanyId int64 `json:",optional"` // 公司id
+		UserId    int64 `json:",optional"` // 公司id
+		ArticleId int64 `json:"articleId"` // 文章id
+		TagId     int64 `json:"tagId"`     // 标签id
+	}
+	MiniAllArticleTagResponse{
+		TagGroup []string     `json:"tagGroup"`
+		Tags []ArticleTagItem `json:"tags"`
+ 	}
+
+	ArticleTagItem {
+		Id    int64     `json:"id"`
+		Group string    `json:"group"`
+		Name  string   `json:"name"`
+	}
+)
 
 
 
 
 
 

@@ -39,6 +39,10 @@ service Core {
 	@doc "小程序展示删除文章评论"
 	@doc "小程序展示删除文章评论"
 	@handler MiniDeleteArticleComment
 	@handler MiniDeleteArticleComment
 	delete /article_comment/:id (MiniDeleteArticleCommentRequest) returns (MiniDeleteArticleCommentResponse)
 	delete /article_comment/:id (MiniDeleteArticleCommentRequest) returns (MiniDeleteArticleCommentResponse)
+
+	@doc "小程序展示评论时@人可选列表"
+	@handler MiniArticleCommentAtWho
+	post /article_comment/at_who/list (MiniArticleCommentAtWhoRequest) returns (MiniArticleCommentAtWhoResponse)
 }
 }
 
 
 //
 //
@@ -161,6 +165,7 @@ type (
 	}
 	}
 )
 )
 
 
+// 热门前5的评论列表
 type (
 type (
 	MiniTop5ArticleCommentRequest {
 	MiniTop5ArticleCommentRequest {
 		CompanyId int64 `json:",optional"`
 		CompanyId int64 `json:",optional"`
@@ -171,4 +176,17 @@ type (
 	MiniTop5ArticleCommentResponse {
 	MiniTop5ArticleCommentResponse {
 		List []ArticleCommentItem `json:"list"`
 		List []ArticleCommentItem `json:"list"`
 	}
 	}
+)
+
+// 填写评论时选择@人
+type (
+	MiniArticleCommentAtWhoRequest {
+		CompanyId int64 `json:",optional"`
+		UserId    int64 `json:",optional"`
+		ArticleId int64 `json:"articleId"`
+	}
+
+	MiniArticleCommentAtWhoResponse {
+		List []CommentAtWho `json:"list"`
+	}
 )
 )

+package article
+
+import (
+	"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 MiniAllArticleTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniAllArticleTagRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := article.NewMiniAllArticleTagLogic(r.Context(), svcCtx)
+		resp, err := l.MiniAllArticleTag(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package article
+
+import (
+	"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 MiniArticleSetTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniArticleSetTagRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := article.NewMiniArticleSetTagLogic(r.Context(), svcCtx)
+		resp, err := l.MiniArticleSetTag(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package comment
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/comment"
+	"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 MiniArticleCommentAtWhoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniArticleCommentAtWhoRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := comment.NewMiniArticleCommentAtWhoLogic(r.Context(), svcCtx)
+		resp, err := l.MiniArticleCommentAtWho(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

@@ -50,6 +50,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/article_comment/:id",
 				Path:    "/article_comment/:id",
 				Handler: comment.MiniDeleteArticleCommentHandler(serverCtx),
 				Handler: comment.MiniDeleteArticleCommentHandler(serverCtx),
 			},
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/article_comment/at_who/list",
+				Handler: comment.MiniArticleCommentAtWhoHandler(serverCtx),
+			},
 		},
 		},
 		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
 		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
 		rest.WithPrefix("/v1/mini"),
 		rest.WithPrefix("/v1/mini"),
@@ -336,6 +341,16 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/article_backup/search",
 				Path:    "/article_backup/search",
 				Handler: article.MiniArticleBackupSearchHandler(serverCtx),
 				Handler: article.MiniArticleBackupSearchHandler(serverCtx),
 			},
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/article/set_tag",
+				Handler: article.MiniArticleSetTagHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/article_tag/list/all",
+				Handler: article.MiniAllArticleTagHandler(serverCtx),
+			},
 		},
 		},
 		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
 		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
 		rest.WithPrefix("/v1/mini"),
 		rest.WithPrefix("/v1/mini"),

+package article
+
+import (
+	"context"
+
+	"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 MiniAllArticleTagLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniAllArticleTagLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniAllArticleTagLogic {
+	return &MiniAllArticleTagLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniAllArticleTagLogic) MiniAllArticleTag(req *types.MiniAllArticleTagRequest) (resp *types.MiniAllArticleTagResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package article
+
+import (
+	"context"
+
+	"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 MiniArticleSetTagLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniArticleSetTagLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniArticleSetTagLogic {
+	return &MiniArticleSetTagLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniArticleSetTagLogic) MiniArticleSetTag(req *types.MiniArticleSetTagRequest) (resp *types.MiniArticleSetTagResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package comment
+
+import (
+	"context"
+
+	"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 MiniArticleCommentAtWhoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniArticleCommentAtWhoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniArticleCommentAtWhoLogic {
+	return &MiniArticleCommentAtWhoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniArticleCommentAtWhoLogic) MiniArticleCommentAtWho(req *types.MiniArticleCommentAtWhoRequest) (resp *types.MiniArticleCommentAtWhoResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

@@ -118,6 +118,16 @@ type MiniTop5ArticleCommentResponse struct {
 	List []ArticleCommentItem `json:"list"`
 	List []ArticleCommentItem `json:"list"`
 }
 }
 
 
+type MiniArticleCommentAtWhoRequest struct {
+	CompanyId int64 `json:",optional"`
+	UserId    int64 `json:",optional"`
+	ArticleId int64 `json:"articleId"`
+}
+
+type MiniArticleCommentAtWhoResponse struct {
+	List []CommentAtWho `json:"list"`
+}
+
 type MessageSystemRequest struct {
 type MessageSystemRequest struct {
 	Page int `json:"page"`
 	Page int `json:"page"`
 	Size int `json:"size"`
 	Size int `json:"size"`
@@ -580,16 +590,16 @@ type MiniArticleGetRequest struct {
 }
 }
 
 
 type MiniArticleGetResponse struct {
 type MiniArticleGetResponse struct {
-	Id           int64            `json:"id"`           // id
-	Title        string           `json:"title"`        // 标题
-	AuthorId     int64            `json:"authorId"`     // 发布人id
-	Author       ArticleAuthor    `json:"author"`       // 发布人
-	CreatedAt    int64            `json:"createdAt"`    // 文章的发布时间
-	Section      []ArticleSection `json:"section"`      // 文章的文本内容
-	Images       []string         `json:"images"`       // 图片
-	WhoRead      []int64          `json:"whoRead"`      // 谁可查看
-	WhoReview    []int64          `json:"whoReview"`    // 谁可评论
-	Location     Location         `json:"location"`     // 定位坐标
+	Id           int64            `json:"id"`           //id
+	Title        string           `json:"title"`        //标题
+	AuthorId     int64            `json:"authorId"`     //发布人id
+	Author       ArticleAuthor    `json:"author"`       //发布人
+	CreatedAt    int64            `json:"createdAt"`    //文章的发布时间
+	Section      []ArticleSection `json:"section"`      //文章的文本内容
+	Images       []string         `json:"images"`       //图片
+	WhoRead      []int64          `json:"whoRead"`      //谁可查看
+	WhoReview    []int64          `json:"whoReview"`    //谁可评论
+	Location     Location         `json:"location"`     //定位坐标
 	CountLove    int              `json:"countLove"`    // 点赞数量
 	CountLove    int              `json:"countLove"`    // 点赞数量
 	CountComment int              `json:"countComment"` // 评论数量
 	CountComment int              `json:"countComment"` // 评论数量
 	CountRead    int              `json:"countRead"`    // 浏览数量
 	CountRead    int              `json:"countRead"`    // 浏览数量
@@ -792,6 +802,35 @@ type MiniArticleMarkItem struct {
 	UpdatedAt int64      `json:"updatedAt"`
 	UpdatedAt int64      `json:"updatedAt"`
 }
 }
 
 
+type MiniArticleSetTagRequest struct {
+	CompanyId int64 `json:",optional"` // 公司id
+	UserId    int64 `json:",optional"` // 公司id
+	ArticleId int64 `json:"articleId"` // 文章id
+	TagId     int64 `json:"tagId"`     // 标签id
+}
+
+type MiniArticleSetTagResponse struct {
+	Id int64 `json:"id"`
+}
+
+type MiniAllArticleTagRequest struct {
+	CompanyId int64 `json:",optional"` // 公司id
+	UserId    int64 `json:",optional"` // 公司id
+	ArticleId int64 `json:"articleId"` // 文章id
+	TagId     int64 `json:"tagId"`     // 标签id
+}
+
+type MiniAllArticleTagResponse struct {
+	TagGroup []string         `json:"tagGroup"`
+	Tags     []ArticleTagItem `json:"tags"`
+}
+
+type ArticleTagItem struct {
+	Id    int64  `json:"id"`
+	Group string `json:"group"`
+	Name  string `json:"name"`
+}
+
 type SystemArticleGetRequest struct {
 type SystemArticleGetRequest struct {
 	Id        int64 `path:"id"` //id
 	Id        int64 `path:"id"` //id
 	CompanyId int64 `path:",optional"`
 	CompanyId int64 `path:",optional"`