修改已读

api/internal/handler/workdesklisthandler.go

@@ -0,0 +1,28 @@
+package handler
+
+import (
+	"net/http"
+
+	"app.yhyue.com/moapp/MessageCenter/api/internal/logic"
+	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func WorkDeskListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.WorkDeskListReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := logic.NewWorkDeskListLogic(r.Context(), svcCtx)
+		resp, err := l.WorkDeskList(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

api/internal/logic/messagelistlogic.go

@@ -43,6 +43,7 @@ func (l *MessageListLogic) MessageList(req *types.MessageListReq) (resp *types.M
 		NewUserId:       req.NewUserId,
 		IsContainLetter: req.IsContainLetter,
 		IsClassSearch:   req.IsClassSearch,
+		IsfilterActive:  req.IsfilterActive,
 	})
 	if err != nil {
 		return nil, err

api/internal/logic/workdesklistlogic.go

@@ -0,0 +1,66 @@
+package logic
+
+import (
+	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
+	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
+	"context"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type WorkDeskListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewWorkDeskListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkDeskListLogic {
+	return &WorkDeskListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *WorkDeskListLogic) WorkDeskList(req *types.WorkDeskListReq) (resp *types.WorkDeskListResp, err error) {
+	// todo: add your logic here and delete this line
+	result := &types.WorkDeskListResp{}
+	lsi := l.svcCtx.MessageCenter
+	res, err := lsi.WorkingDesktopList(l.ctx, &messageclient.WorkingDesktopReq{
+		Appid:              req.AppId,
+		UserId:             req.UserId,
+		MsgType:            req.MsgType,
+		OffSet:             req.Offset,
+		PageSize:           req.PageSize,
+		NeedDealtWithCount: req.NeedDealtWithCount,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	for _, val := range res.BusMsgList {
+		result.BusData = append(result.BusData, map[string]interface{}{
+			"title":      val.Title,
+			"content":    val.Content,
+			"url":        val.Url,
+			"link":       val.Link,
+			"createTime": val.Createtime,
+			"id":         val.Id,
+			"msgLogId":   val.MsgLogId,
+		})
+	}
+	for _, v := range res.NeedDo {
+		result.NeedDoData = append(result.NeedDoData, map[string]interface{}{
+			"title":      v.Title,
+			"content":    v.Content,
+			"url":        v.Url,
+			"link":       v.Link,
+			"createTime": v.Createtime,
+			"id":         v.Id,
+			"msgLogId":   v.MsgLogId,
+		})
+	}
+	result.Code = res.Code
+	result.Message = res.Message
+	return result, nil
+}

rpc/internal/logic/workingdesktoplistlogic.go

@@ -0,0 +1,45 @@
+package logic
+
+import (
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
+	"context"
+	"fmt"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type WorkingDesktopListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewWorkingDesktopListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkingDesktopListLogic {
+	return &WorkingDesktopListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 工作桌面列表
+func (l *WorkingDesktopListLogic) WorkingDesktopList(in *message.WorkingDesktopReq) (*message.WorkingDesktopResp, error) {
+	// todo: add your logic here and delete this line
+	msg := ""
+	code := 0
+	res1, res2, err := common.WorkDeskList(in)
+	fmt.Println(len(res1))
+	fmt.Println(len(res2))
+	if err != nil {
+		code = 1
+		msg = err.Error()
+	}
+	return &message.WorkingDesktopResp{
+		Code:       int64(code),
+		Message:    msg,
+		BusMsgList: res1,
+		NeedDo:     res2,
+	}, nil
+}