调整handler返回

@@ -72,6 +72,12 @@ service Core {
 	@doc "小程序所有的定性标签"
 	@handler MiniAllArticleTag
 	get /article_tag/list/all (MiniAllArticleTagRequest) returns (MiniAllArticleTagResponse)
+
+	@doc "小程序首页数据展示"
+	@handler MinishowHomePage
+	get /show/home_page (MiniAllArticleTagRequest) returns (MiniAllArticleTagResponse)
+
+
 }
 
 // 管理后台接口

@@ -425,3 +425,7 @@ type (
 		UpdatedAt string `json:"updatedAt"` //编辑时间
 	}
 )
+
+//小程序端 首页数据展示
+// 统计各标签下的文章数量，和已被人员阅读的数量
+type 
\ No newline at end of file

@@ -15,7 +15,7 @@ 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)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniArticleBackupSearchHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleBackupSearchRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 		token := contextdata.GetUserTokenFromCtx(r.Context())

 package article
 
 import (
-	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"net/http"
 
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
+
 	"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"
@@ -14,7 +15,7 @@ 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)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -16,7 +16,7 @@ func MiniArticleMarkUserReadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleMarkUserReadRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniArticleSearchMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleSearchMeRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ 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)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniCreateArticleDraftHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftCreateRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniCreateArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleCreateRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 		token := contextdata.GetUserTokenFromCtx(r.Context())

@@ -15,7 +15,7 @@ func MiniDeleteArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFun
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftDeleteMeRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -7,22 +7,23 @@ 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/svc"
 	"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 MiniGetArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftGetMeRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 
 		l := article.NewMiniGetArticleDraftMeLogic(r.Context(), svcCtx)
+		token := contextdata.GetUserTokenFromCtx(r.Context())
+		req.AuthorId = token.UserId
+		req.CompanyId = token.CompanyId
 		resp, err := l.MiniGetArticleDraftMe(&req)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
+		result.HttpResult(r, w, resp, err)
 	}
 }

@@ -15,7 +15,7 @@ func MiniGetArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleGetRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniSearchArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFun
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftSearchMeRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniSetUserLikeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniSetUserLikeRequset
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniUpdateArticleDraftHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftUpdateRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 		l := article.NewMiniUpdateArticleDraftLogic(r.Context(), svcCtx)

@@ -15,7 +15,7 @@ func MiniUserLikeArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniUserLikeArticleRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ 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)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniCreateArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFun
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniCreateArticleCommentRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 		l := comment.NewMiniCreateArticleCommentLogic(r.Context(), svcCtx)

@@ -15,7 +15,7 @@ func MiniDeleteArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFun
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniDeleteArticleCommentRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniGetArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniGetArticleCommentRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func MiniListArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniListArticleCommentRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 		l := comment.NewMiniListArticleCommentLogic(r.Context(), svcCtx)

@@ -15,7 +15,7 @@ func MiniTop5ArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniTop5ArticleCommentRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func CreateTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.TagCreateRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func DeleteTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.TagDeleteRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func EditTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.TagEditRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -15,7 +15,7 @@ func GetTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.TagGetRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 		token := contextdata.GetUserTokenFromCtx(r.Context())

@@ -15,7 +15,7 @@ func SearchTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.TagListRequest
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			result.HttpResult(r, w, nil, err)
 			return
 		}
 

@@ -53,3 +53,10 @@ func (m *ArticleAndTag) CachePrimaryKeyFunc() string {
 	}
 	return fmt.Sprintf("%v:cache:%v:primarykey:%v", domain.ProjectName, m.TableName(), "key")
 }
+
+// 统计所有已有标签的文章和人员已读的文章
+type CountArticleTagRead struct {
+	TotalArticle int   `gorm:"total_article"` //标签下文章的数量
+	ReadArticle  int   `gorm:"read_article"`  //人员已读的文章
+	TagId        int64 `gorm:"tag_id"`        // 标签的id
+}

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
@@ -132,6 +133,59 @@ func (repository *ArticleAndTagRepository) DomainModelToModel(from *domain.Artic
 	return to, err
 }
 
+// 以TagId作为分组，统计所有已有标签的文章和人员已读的文章
+func (repository *ArticleAndTagRepository) CountArticleReadGroupByTag(ctx context.Context, conn transaction.Conn, userId int64, companyId int64) ([]*domain.CountArticleTagRead, error) {
+
+	sqlStr := `
+-- 首页统计数据
+with
+-- 按查看权限查询文章
+-- 获取有标签的文章
+-- 过滤出可展示的文章id
+t_article_and_tag_2 as (
+	select article_and_tag.article_id , article_and_tag.tag_id
+	from article_and_tag
+	join article on article_and_tag.article_id = article.id
+	where article.deleted_at=0
+	and article.company_id =1598224576532189184
+	and article."show" =0
+	and (article.target_user =0 or article.who_read @>'[1]')
+),
+-- 查询人员已查看的文章
+t_user_read as(
+	select user_read_article.article_id from user_read_article where user_read_article.user_id =1
+)
+-- 汇总统计 total_article 符合条件的文章总数,read_article 已浏览的数量
+select count(t_article_and_tag_2.article_id) as total_article ,count(t_user_read.article_id) as read_article, t_article_and_tag_2.tag_id
+from t_article_and_tag_2
+left join t_user_read on t_article_and_tag_2.article_id=t_user_read.article_id
+group by t_article_and_tag_2.tag_id
+`
+	condition := []interface{}{
+		companyId,
+		fmt.Sprintf("[%d]", userId),
+		userId,
+	}
+
+	m := []*models.CountArticleTagRead{}
+	db := conn.DB()
+	result := db.Raw(sqlStr, condition...).Scan(&m)
+	if result.Error != nil {
+		return nil, result.Error
+	}
+
+	var dm []*domain.CountArticleTagRead
+
+	for _, val := range m {
+		dm = append(dm, &domain.CountArticleTagRead{
+			TagId:        val.TagId,
+			TotalArticle: val.TotalArticle,
+			ReadArticle:  val.ReadArticle,
+		})
+	}
+	return dm, nil
+}
+
 func NewArticleAndTagRepository(cache *cache.CachedRepository) domain.ArticleAndTagRepository {
 	return &ArticleAndTagRepository{CachedRepository: cache}
 }

@@ -278,28 +278,20 @@ func NewArticleRepository(cache *cache.CachedRepository) domain.ArticleRepositor
 	return &ArticleRepository{CachedRepository: cache}
 }
 
+// -- 首页统计数据
 // with
 // -- 按查看权限查询文章
-// t_article as(
-// 	select article.id
-// 	from article
+// -- 获取有标签的文章
+// -- 过滤出可展示的文章id
+// t_article_and_tag_2 as (
+// 	select article_and_tag.article_id , article_and_tag.tag_id
+// 	from article_and_tag
+// 	join article on article_and_tag.article_id = article.id
 // 	where article.deleted_at=0
 // 	and article.company_id =1598224576532189184
 // 	and article."show" =0
 // 	and (article.target_user =0 or article.who_read @>'[1]')
 // ),
-// -- 获取有标签的文章
-// t_article_and_tag as (
-// 	select article_and_tag.article_id ,article_and_tag.tag_id
-// 	from article_and_tag
-// 	where article_and_tag.company_id =1598224576532189184
-// ),
-// -- 过滤出可展示的文章id
-// t_article_and_tag_2 as (
-// 	select t_article_and_tag.article_id, t_article_and_tag.tag_id
-// 	from t_article_and_tag
-// 	join t_article on t_article_and_tag.article_id = t_article.id
-// ),
 // -- 查询人员已查看的文章
 // t_user_read as(
 // 	select user_read_article.article_id from user_read_article where user_read_article.user_id =1
@@ -309,3 +301,4 @@ func NewArticleRepository(cache *cache.CachedRepository) domain.ArticleRepositor
 // from t_article_and_tag_2
 // left join t_user_read on t_article_and_tag_2.article_id=t_user_read.article_id
 // group by t_article_and_tag_2.tag_id
+// ;

@@ -16,10 +16,18 @@ type ArticleAndTag struct {
 	TagId     int64 `json:"tagId"`
 }
 
+// 以TagId作为分组，统计所有已有标签的文章和人员已读的文章
+type CountArticleTagRead struct {
+	TotalArticle int   `gorm:"total_article"` //标签下文章的数量
+	ReadArticle  int   `gorm:"read_article"`  //人员已读的文章
+	TagId        int64 `gorm:"tag_id"`        // 标签的id
+}
+
 type ArticleAndTagRepository interface {
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleAndTag) (*ArticleAndTag, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleAndTag) (*ArticleAndTag, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleAndTag) (*ArticleAndTag, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleAndTag, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleAndTag, error)
+	CountArticleReadGroupByTag(ctx context.Context, con transaction.Conn, userId int64, companyId int64) ([]*CountArticleTagRead, error)
 }