整合代码

api/internal/handler/messagefindhandler.go

@@ -1,29 +0,0 @@
-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 MessageFindHandler(ctx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.MessageFindReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewMessageFindLogic(r.Context(), ctx)
-		resp, err := l.MessageFind(req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

api/internal/handler/messagegetlasthandler.go

@@ -1,29 +0,0 @@
-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 MessageGetLastHandler(ctx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.MessageGetLastReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewMessageGetLastLogic(r.Context(), ctx)
-		resp, err := l.MessageGetLast(req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

api/internal/handler/messagetypehandler.go

@@ -1,29 +0,0 @@
-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 MessageTypeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.MessageTypeReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewMessageTypeLogic(r.Context(), ctx)
-		resp, err := l.MessageType(req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

api/internal/handler/messageunreadclasscounthandler.go

@@ -1,29 +0,0 @@
-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 MessageUnreadClassCountHandler(ctx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.MessageUnreadClassCountReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewMessageUnreadClassCountLogic(r.Context(), ctx)
-		resp, err := l.MessageUnreadClassCount(req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

api/internal/handler/routes.go

@@ -17,21 +17,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/messageCenter/messageDetail",
 				Handler: MessageDetailHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/messageGetLast",
-				Handler: MessageGetLastHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/messageFind",
-				Handler: MessageFindHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/messageUnreadClassCount",
-				Handler: MessageUnreadClassCountHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/messageCenter/messageUnreadCount",
@@ -39,8 +24,8 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodGet,
-				Path:    "/messageCenter/messageType",
-				Handler: MessageTypeHandler(serverCtx),
+				Path:    "/messageCenter/getMsgType",
+				Handler: GetMsgTypeHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,

api/internal/logic/messagefindlogic.go

@@ -1,65 +0,0 @@
-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 MessageFindLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewMessageFindLogic(ctx context.Context, svcCtx *svc.ServiceContext) MessageFindLogic {
-	return MessageFindLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *MessageFindLogic) MessageFind(req types.MessageFindReq) (*types.MessageFindRes, error) {
-	result := &types.MessageFindRes{}
-	lsi := l.svcCtx.MessageCenter
-	resp, err := lsi.FindUserMsg(l.ctx, &messageclient.FindUserMsgReq{
-		MsgType:       req.MsgType,
-		Appid:         req.AppId,
-		UserId:        req.UserId,
-		ReceiveUserId: req.ReceiveUserId,
-		Read:          req.IsRead,
-		OffSet:        req.Offset,
-		PageSize:      req.PageSize,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	result.Code = resp.Code
-	result.Message = resp.Message
-	result.Total = resp.Count
-	for _, v := range resp.Data {
-		result.Data = append(result.Data, map[string]interface{}{
-			"id":           v.Id,
-			"appid":        v.Appid,
-			"receive_name": v.ReceiveName,
-			"send_userid":  v.SendUserId,
-			"send_name":    v.SendName,
-			"createtime":   v.Createtime,
-			"title":        v.Title,
-			"msg_type":     v.MsgType,
-			"link":         v.Link,
-			"cite_id":      v.CiteId,
-			"content":      v.Content,
-			"isRead":       v.IsRead,
-			"msgLogId":     v.MsgLogId,
-		})
-
-	}
-
-	return result, nil
-}

api/internal/logic/messagegetlastlogic.go

@@ -1,58 +0,0 @@
-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 MessageGetLastLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewMessageGetLastLogic(ctx context.Context, svcCtx *svc.ServiceContext) MessageGetLastLogic {
-	return MessageGetLastLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *MessageGetLastLogic) MessageGetLast(req types.MessageGetLastReq) (*types.MessageGetLastRes, error) {
-	result := &types.MessageGetLastRes{}
-	lsi := l.svcCtx.MessageCenter
-	resp, err := lsi.GetLastMessage(l.ctx, &messageclient.GetLastMessageReq{
-		MsgType: req.MsgType,
-		Appid:   req.AppId,
-		UserId:  req.UserId,
-		IsRead:  req.IsRead,
-	})
-
-	if err != nil {
-		return nil, err
-	}
-	result.Code = resp.Code
-	result.Message = resp.Message
-	if resp.Data != nil {
-		result.Data = map[string]interface{}{
-			"id":           resp.Data.Id,
-			"appid":        resp.Data.Appid,
-			"receive_name": resp.Data.ReceiveName,
-			"send_userid":  resp.Data.SendUserId,
-			"send_name":    resp.Data.SendName,
-			"createtime":   resp.Data.Createtime,
-			"title":        resp.Data.Title,
-			"msg_type":     resp.Data.MsgType,
-			"link":         resp.Data.Link,
-			"cite_id":      resp.Data.CiteId,
-			"content":      resp.Data.Content,
-			"isRead":       resp.Data.IsRead,
-			"msgLogId":     resp.Data.MsgLogId,
-		}
-	}
-	return result, nil
-}

api/internal/logic/messagetypelogic.go

@@ -1,42 +0,0 @@
-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 MessageTypeLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewMessageTypeLogic(ctx context.Context, svcCtx *svc.ServiceContext) MessageTypeLogic {
-	return MessageTypeLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *MessageTypeLogic) MessageType(req types.MessageTypeReq) (*types.MessageTypeRes, error) {
-	result := &types.MessageTypeRes{}
-	lsi := l.svcCtx.MessageCenter
-	resp, err := lsi.GetMsgType(l.ctx, &messageclient.GetMsgTypeReq{
-		Appid:  req.AppId,
-		UserId: req.UserId,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	result.Code = resp.Code
-	result.Message = resp.Message
-	result.Data = resp.Data
-
-	return result, nil
-}

api/internal/logic/messageunreadclasscountlogic.go

@@ -1,48 +0,0 @@
-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 MessageUnreadClassCountLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewMessageUnreadClassCountLogic(ctx context.Context, svcCtx *svc.ServiceContext) MessageUnreadClassCountLogic {
-	return MessageUnreadClassCountLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-// 获取用户收到的分类及未读消息数量
-func (l *MessageUnreadClassCountLogic) MessageUnreadClassCount(req types.MessageUnreadClassCountReq) (*types.MessageUnreadClassCountRes, error) {
-	result := &types.MessageUnreadClassCountRes{}
-	lsi := l.svcCtx.MessageCenter
-	resp, err := lsi.GetUnreadClassCount(l.ctx, &messageclient.GetUnreadClassCountReq{
-		Appid:  req.AppId,
-		UserId: req.UserId,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	result.Code = resp.Code
-	result.Message = resp.Message
-	for _, v := range resp.Data {
-		result.Data = append(result.Data, map[string]interface{}{
-			"type":  v.MsgType,
-			"count": v.Count,
-		})
-
-	}
-	return result, nil
-}

api/internal/types/types.go

@@ -1,18 +1,13 @@
 // Code generated by goctl. DO NOT EDIT.
 package types
 
-type MessageDeleteReq struct {
-	Id    string `form:"id"`
-	AppId string `form:"appId"`
-}
-
 type Response struct {
 	Code    int64  `json:"code"`
 	Message string `json:"message"`
 }
 
 type MessageDetailReq struct {
-	Id string `form:"id"`
+	Id string `json:"id"`
 }
 
 type MessageDetailResp struct {
@@ -21,47 +16,6 @@ type MessageDetailResp struct {
 	Data    map[string]interface{} `json:"data"`
 }
 
-type MessageGetLastReq struct {
-	UserId  string `form:"userId"`
-	AppId   string `form:"appId"`
-	MsgType int64  `form:"msgType"`
-	IsRead  int64  `form:"isRead"` // 1 0 -1
-}
-
-type MessageGetLastRes struct {
-	Code    int64                  `json:"code"`
-	Message string                 `json:"message"`
-	Data    map[string]interface{} `json:"data"`
-}
-
-type MessageFindReq struct {
-	UserId        string `form:"userId"`
-	AppId         string `form:"appId"`
-	ReceiveUserId string `form:"receiveUserId"`
-	MsgType       int64  `form:"msgType"`  // 是否限制消息类型  -1 不限制
-	IsRead        int64  `form:"isRead"`   // 是否限制未读    -1 不限制
-	Offset        int64  `form:"offset"`   // 页数
-	PageSize      int64  `form:"pageSize"` //
-}
-
-type MessageFindRes struct {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	Data    []map[string]interface{} `json:"data"`
-	Total   int64                    `json:"total"`
-}
-
-type MessageUnreadClassCountReq struct {
-	UserId string `form:"userId"`
-	AppId  string `form:"appId"`
-}
-
-type MessageUnreadClassCountRes struct {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	Data    []map[string]interface{} `json:"data"`
-}
-
 type MessageUnreadCountReq struct {
 	UserId string `header:"mgoUserId"`
 	AppId  string `header:"appId"`
@@ -73,15 +27,15 @@ type MessageUnreadCountRes struct {
 	Data    map[string]interface{} `json:"data"`
 }
 
-type MessageTypeReq struct {
-	UserId string `form:"userId"`
-	AppId  string `form:"appId"`
+type GetMsgTypeReq struct {
+	UserId string `header:"userId"`
+	AppId  string `header:"appId"`
 }
 
-type MessageTypeRes struct {
-	Code    int64   `json:"code"`
-	Message string  `json:"message"`
-	Data    []int64 `json:"data"`
+type GetMsgTypeRes struct {
+	Code    int64                    `json:"code"`
+	Message string                   `json:"message"`
+	Data    []map[string]interface{} `json:"data"`
 }
 
 type MsgReadStatusReq struct {

api/message.api

@@ -7,11 +7,6 @@ info(
 	email: "renjiaojiao@topnet.net.cn"
 )
 
-type MessageDeleteReq {
-	Id    string `form:"id"`
-	AppId string `form:"appId"`
-}
-
 type response {
 	Code    int64  `json:"code"`
 	Message string `json:"message"`
@@ -19,50 +14,14 @@ type response {
 
 //查询消息详情
 type MessageDetailReq {
-	Id string `form:"id"`
+	Id string `json:"id"`
 }
 type MessageDetailResp {
 	Code    int64                  `json:"code"`
 	Message string                 `json:"message"`
 	Data    map[string]interface{} `json:"data"`
 }
-type MessageGetLastReq {
-	UserId  string `form:"userId"`
-	AppId   string `form:"appId"`
-	MsgType int64  `form:"msgType"`
-	IsRead  int64  `form:"isRead"` // 1 0 -1
-}
-type MessageGetLastRes {
-	Code    int64                  `json:"code"`
-	Message string                 `json:"message"`
-	Data    map[string]interface{} `json:"data"`
-}
-type MessageFindReq {
-	UserId string `form:"userId"`
-	AppId  string `form:"appId"`
-	//    MsgType int64 `form:"msgType"`
-	ReceiveUserId string `form:"receiveUserId"`
-	MsgType       int64  `form:"msgType"`  // 是否限制消息类型  -1 不限制
-	IsRead        int64  `form:"isRead"`   // 是否限制未读    -1 不限制
-	Offset        int64  `form:"offset"`   // 页数
-	PageSize      int64  `form:"pageSize"` //
-}
-type MessageFindRes {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	Data    []map[string]interface{} `json:"data"`
-	Total   int64                    `json:"total"`
-}
-type MessageUnreadClassCountReq {
-	UserId string `form:"userId"`
-	AppId  string `form:"appId"`
-}
 
-type MessageUnreadClassCountRes {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	Data    []map[string]interface{} `json:"data"`
-}
 type MessageUnreadCountReq {
 	UserId string `header:"mgoUserId"`
 	AppId  string `header:"appId"`
@@ -72,14 +31,14 @@ type MessageUnreadCountRes {
 	Message string                 `json:"message"`
 	Data    map[string]interface{} `json:"data"`
 }
-type MessageTypeReq {
-	UserId string `form:"userId"`
-	AppId  string `form:"appId"`
+type GetMsgTypeReq {
+	UserId string `header:"userId"`
+	AppId  string `header:"appId"`
 }
-type MessageTypeRes {
-	Code    int64   `json:"code"`
-	Message string  `json:"message"`
-	Data    []int64 `json:"data"`
+type GetMsgTypeRes {
+	Code    int64                    `json:"code"`
+	Message string                   `json:"message"`
+	Data    []map[string]interface{} `json:"data"`
 }
 
 //修改指定用户某个分类的消息为已读
@@ -177,21 +136,12 @@ service message-api {
 	//查询消息详情
 	@handler MessageDetailHandler
 	get /messageCenter/messageDetail (MessageDetailReq) returns (MessageDetailResp)
-	// 获取指定类型的最新一条未读消息
-	@handler MessageGetLastHandler
-	post /messageCenter/messageGetLast (MessageGetLastReq) returns (MessageGetLastRes)
-	// 获取指定用户的历史消息  条件可选 消息类型 是否未读
-	@handler MessageFindHandler
-	post /messageCenter/messageFind (MessageFindReq) returns (MessageFindRes)
-	// 获取用户收到的消息分类及未读消息数量
-	@handler MessageUnreadClassCountHandler
-	post /messageCenter/messageUnreadClassCount (MessageUnreadClassCountReq) returns (MessageUnreadClassCountRes)
 	// 获取用户未读消息总量
 	@handler MessageUnreadCountHandler
 	post /messageCenter/messageUnreadCount (MessageUnreadCountReq) returns (MessageUnreadCountRes)
 	// 获取用户接收到的消息分类
-	@handler MessageTypeHandler
-	get /messageCenter/messageType (MessageTypeReq) returns (MessageTypeRes)
+	@handler GetMsgTypeHandler
+	get /messageCenter/getMsgType (GetMsgTypeReq) returns (GetMsgTypeRes)
 	// 标记为已读
 	@handler MarkReadHandler
 	post /messageCenter/markRead (MarkReadReq) returns (MarkReadRes)

rpc/internal/common/messageService.go

@@ -141,19 +141,23 @@ func (service *MessageService) ClassCountAndMessage(userId string, appId string)
 }
 
 // 已接收到消息的分类
-func (service *MessageService) ReceiveMsgType(userId string, appId string) ([]int64, error) {
+func (service *MessageService) GetMsgType() (data []*message.MsgTypes, err error) {
 	orm := entity.Engine.NewSession()
 	defer orm.Close()
-	m := []entity.Message{}
-	err := orm.Distinct("msg_type").Where("receive_userid=? and isdel=1 and appid=?", userId, appId).Find(&m)
-	if err != nil {
-		return nil, err
-	}
-	msgTypeList := []int64{}
-	for _, v := range m {
-		msgTypeList = append(msgTypeList, int64(v.MsgType))
+	types := entity.Mysql.Find("message_column", map[string]interface{}{}, "", "sequence ASC", -1, -1)
+	if types != nil && len(*types) > 0 {
+		for _, val := range *types {
+			data = append(data, &message.MsgTypes{
+				MsgType:         qutil.Int64All(val["msg_type"]),
+				Name:            qutil.ObjToString(val["name"]),
+				Img:             qutil.ObjToString(val["img"]),
+				Code:            qutil.ObjToString(val["switch"]),
+				DisplayPlatform: qutil.ObjToString(val["display_platform"]),
+			})
+		}
+		return data, nil
 	}
-	return msgTypeList, nil
+	return nil, nil
 }
 
 func (service *MessageService) UpdateMessageReadStatus(msgType int, receiveUserid, appId string) (int, error) {

rpc/internal/logic/getclassunreadcountlogic.go

@@ -1,35 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GetClassUnreadCountLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewGetClassUnreadCountLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetClassUnreadCountLogic {
-	return &GetClassUnreadCountLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 查询指定用户指定分类的未读消息合计
-func (l *GetClassUnreadCountLogic) GetClassUnreadCount(in *messageclient.GetClassUnreadCountReq) (*messageclient.GetUnreadCountResponse, error) {
-	// todo: add your logic here and delete this line
-	code, msg, count := service.ClassCountUnread(int(in.MsgType), in.UserId, in.Appid)
-	return &messageclient.GetUnreadCountResponse{
-		Code:    code,
-		Message: msg,
-		Count:   count,
-	}, nil
-}

rpc/internal/logic/getlastmessagelogic.go

@@ -1,41 +0,0 @@
-package logic
-
-import (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GetLastMessageLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewGetLastMessageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetLastMessageLogic {
-	return &GetLastMessageLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 获取指定分类的最新一条未读消息
-func (l *GetLastMessageLogic) GetLastMessage(in *messageclient.GetLastMessageReq) (*messageclient.GetLastMessageRes, error) {
-	// todo: add your logic here and delete this line
-	m := service.MessageService{}
-	data, err := m.LastMessage(in.UserId, in.Appid, in.MsgType, in.IsRead)
-	code := 0
-	msg := ""
-	if err == nil {
-		code = 1
-	}
-	return &messageclient.GetLastMessageRes{
-		Code:    int64(code),
-		Message: msg,
-		Data:    data,
-	}, nil
-}

rpc/internal/logic/getmsgtypelogic.go

@@ -25,17 +25,14 @@ func NewGetMsgTypeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetMsg
 
 // 获取指定用户收到消息的分类
 func (l *GetMsgTypeLogic) GetMsgType(in *messageclient.GetMsgTypeReq) (*messageclient.GetMsgTypeRes, error) {
-	// todo: add your logic here and delete this line
 	m := service.MessageService{}
-	data, err := m.ReceiveMsgType(in.UserId, in.Appid)
-	code := 0
-	msg := ""
-	if err == nil {
-		code = 1
+	data, err := m.GetMsgType()
+	if err != nil {
+		return nil, err
 	}
 	return &messageclient.GetMsgTypeRes{
-		Code:    int64(code),
-		Message: msg,
+		Code:    int64(0),
+		Message: "请求成功",
 		Data:    data,
 	}, nil
 

rpc/internal/logic/getunreadclasscountlogic.go

@@ -1,41 +0,0 @@
-package logic
-
-import (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GetUnreadClassCountLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewGetUnreadClassCountLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUnreadClassCountLogic {
-	return &GetUnreadClassCountLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 获取指定用户的分类及未读消息的数量
-func (l *GetUnreadClassCountLogic) GetUnreadClassCount(in *messageclient.GetUnreadClassCountReq) (*messageclient.GetUnreadClassCountRes, error) {
-	// todo: add your logic here and delete this line
-	m := service.MessageService{}
-	count, err := m.ClassCountAndMessage(in.UserId, in.Appid)
-	code := 0
-	msg := ""
-	if err == nil {
-		code = 1
-	}
-	return &messageclient.GetUnreadClassCountRes{
-		Code:    int64(code),
-		Message: msg,
-		Data:    count,
-	}, nil
-}

rpc/internal/server/messageserver.go

@@ -46,31 +46,13 @@ func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsg
 	return l.FindUserMsg(in)
 }
 
-//   查询指定用户指定分类的未读消息合计
-func (s *MessageServer) GetClassUnreadCount(ctx context.Context, in *message.GetClassUnreadCountReq) (*message.GetUnreadCountResponse, error) {
-	l := logic.NewGetClassUnreadCountLogic(ctx, s.svcCtx)
-	return l.GetClassUnreadCount(in)
-}
-
-//   获取指定用户指定分类的最新一条消息
-func (s *MessageServer) GetLastMessage(ctx context.Context, in *message.GetLastMessageReq) (*message.GetLastMessageRes, error) {
-	l := logic.NewGetLastMessageLogic(ctx, s.svcCtx)
-	return l.GetLastMessage(in)
-}
-
 // 查看详细详情
 func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.MessageDetailReq) (*message.MessageDetailResp, error) {
 	l := logic.NewFindMessageDetailLogic(ctx, s.svcCtx)
 	return l.FindMessageDetail(in)
 }
 
-//   获取指定用户的分类及未读消息数量
-func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message.GetUnreadClassCountReq) (*message.GetUnreadClassCountRes, error) {
-	l := logic.NewGetUnreadClassCountLogic(ctx, s.svcCtx)
-	return l.GetUnreadClassCount(in)
-}
-
-//   获取指定用户收到消息的分类
+//   消息的分类
 func (s *MessageServer) GetMsgType(ctx context.Context, in *message.GetMsgTypeReq) (*message.GetMsgTypeRes, error) {
 	l := logic.NewGetMsgTypeLogic(ctx, s.svcCtx)
 	return l.GetMsgType(in)

rpc/message.proto

@@ -64,12 +64,6 @@ message FindUserMsgRes {
     int64 count = 4; //总数
 }
 
-message GetClassUnreadCountReq {
-    string userId = 1; // 用户id
-    int64 msgType = 2; //分类 1：客服   2：系统通知  3：营销   4：用户会话
-    string appid = 3; //应用标识
-}
-
 //查看消息内容
 message MessageDetailReq {
     string id = 1; //消息id
@@ -79,37 +73,21 @@ message MessageDetailResp {
     string message = 2; //响应消息
     Messages data = 3; //
 }
-message GetLastMessageReq {
-    string userId = 1; // 用户id
-    int64 msgType = 2; //分类 1：客服   2：系统通知  3：营销   4：用户会话
-    string appid = 3; //应用标识
-    int64 isRead = 4; // 0：未读  1：已读  -1 不区分
-}
-message GetLastMessageRes {
-    int64 code = 1; //状态码
-    string message = 2; //响应消息
-    Messages data = 3; //
-}
-// 获取用户分类的的未读消息分类及数量 及分类下最新的消息
-message GetUnreadClassCountReq {
-    string userId = 1; // 用户id
-    string appid = 2; //应用标识
-    bool needMsg = 3; //是否需要分类下的最新一条消息
-}
-message GetUnreadClassCountRes {
-    int64 code = 1; //状态码
-    string message = 2; //响应消息
-    repeated ResCount data = 3; //
-    repeated Messages info = 4; // 每个类型最新消息列表
-}
 message GetMsgTypeReq {
     string userId = 1; // 用户id
     string appid = 2; //应用标识
 }
+message MsgTypes{
+    int64 msgType =1;
+    string img = 2;
+    string name =3;
+    string code = 4;
+    string displayPlatform = 5;
+}
 message GetMsgTypeRes {
     int64 code = 1; //状态码
     string message = 2; //响应消息
-    repeated int64 data = 3; //
+    repeated MsgTypes data = 3; //
 }
 
 message user {
@@ -248,15 +226,9 @@ service Message {
     rpc GetUnreadCount (GetUnreadCountRequest) returns (GetUnreadCountResponse);
     //  查询指定用户的历史消息记录
     rpc FindUserMsg (FindUserMsgReq) returns (FindUserMsgRes);
-    //  查询指定用户指定分类的未读消息合计
-    rpc GetClassUnreadCount (GetClassUnreadCountReq) returns (GetUnreadCountResponse);
-    //  获取指定用户指定分类的最新一条消息
-    rpc GetLastMessage (GetLastMessageReq) returns (GetLastMessageRes);
     //查看详细详情
     rpc FindMessageDetail (MessageDetailReq) returns (MessageDetailResp);
-    //  获取指定用户的分类及未读消息数量
-    rpc GetUnreadClassCount (GetUnreadClassCountReq) returns (GetUnreadClassCountRes);
-    //  获取指定用户收到消息的分类
+    //  消息的分类
     rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
     //  查询指定用户的浮标消息
     rpc FindUserBuoyMsg (FindUserBuoyMsgReq) returns (FindUserBuoyMsgRes);

rpc/messageclient/message.go

@@ -21,18 +21,14 @@ type (
 	FindUserBuoyMsgRes     = message.FindUserBuoyMsgRes
 	FindUserMsgReq         = message.FindUserMsgReq
 	FindUserMsgRes         = message.FindUserMsgRes
-	GetClassUnreadCountReq = message.GetClassUnreadCountReq
-	GetLastMessageReq      = message.GetLastMessageReq
-	GetLastMessageRes      = message.GetLastMessageRes
 	GetMsgTypeReq          = message.GetMsgTypeReq
 	GetMsgTypeRes          = message.GetMsgTypeRes
-	GetUnreadClassCountReq = message.GetUnreadClassCountReq
-	GetUnreadClassCountRes = message.GetUnreadClassCountRes
 	GetUnreadCountRequest  = message.GetUnreadCountRequest
 	GetUnreadCountResponse = message.GetUnreadCountResponse
 	MessageDetailReq       = message.MessageDetailReq
 	MessageDetailResp      = message.MessageDetailResp
 	Messages               = message.Messages
+	MsgTypes               = message.MsgTypes
 	MultipleSaveMsgReq     = message.MultipleSaveMsgReq
 	MultipleSaveMsgResp    = message.MultipleSaveMsgResp
 	ResCount               = message.ResCount
@@ -55,15 +51,9 @@ type (
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 		//   查询指定用户的历史消息记录
 		FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
-		//   查询指定用户指定分类的未读消息合计
-		GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-		//   获取指定用户指定分类的最新一条消息
-		GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error)
 		// 查看详细详情
 		FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-		//   获取指定用户的分类及未读消息数量
-		GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error)
-		//   获取指定用户收到消息的分类
+		//   消息的分类
 		GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
 		//   查询指定用户的浮标消息
 		FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
@@ -112,31 +102,13 @@ func (m *defaultMessage) FindUserMsg(ctx context.Context, in *FindUserMsgReq, op
 	return client.FindUserMsg(ctx, in, opts...)
 }
 
-//   查询指定用户指定分类的未读消息合计
-func (m *defaultMessage) GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.GetClassUnreadCount(ctx, in, opts...)
-}
-
-//   获取指定用户指定分类的最新一条消息
-func (m *defaultMessage) GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.GetLastMessage(ctx, in, opts...)
-}
-
 // 查看详细详情
 func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindMessageDetail(ctx, in, opts...)
 }
 
-//   获取指定用户的分类及未读消息数量
-func (m *defaultMessage) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.GetUnreadClassCount(ctx, in, opts...)
-}
-
-//   获取指定用户收到消息的分类
+//   消息的分类
 func (m *defaultMessage) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetMsgType(ctx, in, opts...)

rpc/type/message/message_grpc.pb.go

@@ -30,15 +30,9 @@ type MessageClient interface {
 	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
 	FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
-	//  查询指定用户指定分类的未读消息合计
-	GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-	//  获取指定用户指定分类的最新一条消息
-	GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error)
 	//查看详细详情
 	FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-	//  获取指定用户的分类及未读消息数量
-	GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error)
-	//  获取指定用户收到消息的分类
+	//  消息的分类
 	GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
@@ -96,24 +90,6 @@ func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opt
 	return out, nil
 }
 
-func (c *messageClient) GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
-	out := new(GetUnreadCountResponse)
-	err := c.cc.Invoke(ctx, "/message.Message/GetClassUnreadCount", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *messageClient) GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error) {
-	out := new(GetLastMessageRes)
-	err := c.cc.Invoke(ctx, "/message.Message/GetLastMessage", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error) {
 	out := new(MessageDetailResp)
 	err := c.cc.Invoke(ctx, "/message.Message/FindMessageDetail", in, out, opts...)
@@ -123,15 +99,6 @@ func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetail
 	return out, nil
 }
 
-func (c *messageClient) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error) {
-	out := new(GetUnreadClassCountRes)
-	err := c.cc.Invoke(ctx, "/message.Message/GetUnreadClassCount", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
 	out := new(GetMsgTypeRes)
 	err := c.cc.Invoke(ctx, "/message.Message/GetMsgType", in, out, opts...)
@@ -198,15 +165,9 @@ type MessageServer interface {
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
 	FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error)
-	//  查询指定用户指定分类的未读消息合计
-	GetClassUnreadCount(context.Context, *GetClassUnreadCountReq) (*GetUnreadCountResponse, error)
-	//  获取指定用户指定分类的最新一条消息
-	GetLastMessage(context.Context, *GetLastMessageReq) (*GetLastMessageRes, error)
 	//查看详细详情
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
-	//  获取指定用户的分类及未读消息数量
-	GetUnreadClassCount(context.Context, *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error)
-	//  获取指定用户收到消息的分类
+	//  消息的分类
 	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error)
@@ -237,18 +198,9 @@ func (UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCoun
 func (UnimplementedMessageServer) FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserMsg not implemented")
 }
-func (UnimplementedMessageServer) GetClassUnreadCount(context.Context, *GetClassUnreadCountReq) (*GetUnreadCountResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetClassUnreadCount not implemented")
-}
-func (UnimplementedMessageServer) GetLastMessage(context.Context, *GetLastMessageReq) (*GetLastMessageRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetLastMessage not implemented")
-}
 func (UnimplementedMessageServer) FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindMessageDetail not implemented")
 }
-func (UnimplementedMessageServer) GetUnreadClassCount(context.Context, *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadClassCount not implemented")
-}
 func (UnimplementedMessageServer) GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetMsgType not implemented")
 }
@@ -352,42 +304,6 @@ func _Message_FindUserMsg_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_GetClassUnreadCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetClassUnreadCountReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetClassUnreadCount(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetClassUnreadCount",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetClassUnreadCount(ctx, req.(*GetClassUnreadCountReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Message_GetLastMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetLastMessageReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetLastMessage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetLastMessage",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetLastMessage(ctx, req.(*GetLastMessageReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(MessageDetailReq)
 	if err := dec(in); err != nil {
@@ -406,24 +322,6 @@ func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_GetUnreadClassCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetUnreadClassCountReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetUnreadClassCount(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetUnreadClassCount",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetUnreadClassCount(ctx, req.(*GetUnreadClassCountReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_GetMsgType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetMsgTypeReq)
 	if err := dec(in); err != nil {
@@ -555,22 +453,10 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindUserMsg",
 			Handler:    _Message_FindUserMsg_Handler,
 		},
-		{
-			MethodName: "GetClassUnreadCount",
-			Handler:    _Message_GetClassUnreadCount_Handler,
-		},
-		{
-			MethodName: "GetLastMessage",
-			Handler:    _Message_GetLastMessage_Handler,
-		},
 		{
 			MethodName: "FindMessageDetail",
 			Handler:    _Message_FindMessageDetail_Handler,
 		},
-		{
-			MethodName: "GetUnreadClassCount",
-			Handler:    _Message_GetUnreadClassCount_Handler,
-		},
 		{
 			MethodName: "GetMsgType",
 			Handler:    _Message_GetMsgType_Handler,