Browse Source

获取用户已收到消息的分类rpc接口及api接口

fuwencai 3 years ago
parent
commit
04ee561fc7

+ 29 - 0
api/internal/handler/messagetypehandler.go

@@ -0,0 +1,29 @@
+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/tal-tech/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)
+		}
+	}
+}

+ 5 - 0
api/internal/handler/routes.go

@@ -37,6 +37,11 @@ func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/message/messageUnreadCount",
 				Handler: MessageUnreadCountHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/message/messageType",
+				Handler: MessageTypeHandler(serverCtx),
+			},
 		},
 	)
 }

+ 48 - 0
api/internal/logic/messagetypelogic.go

@@ -0,0 +1,48 @@
+package logic
+
+import (
+	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
+	"context"
+	"log"
+
+	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
+
+	"github.com/tal-tech/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.MessageTypeReqRes, error) {
+	// todo: add your logic here and delete this line
+	result := &types.MessageTypeReqRes{}
+	log.Println(req)
+	lsi := l.svcCtx.MessageCenter
+	resp, err := lsi.GetMsgType(l.ctx, &messageclient.GetMsgTypeReq{
+		Appid:   req.AppId,
+		UserId:  req.UserId,
+	})
+	if err != nil {
+		return nil, err
+	}
+	//data := make([]map[string]interface{}, 0)
+
+	result.Code = resp.Code
+	result.Message = resp.Message
+	result.Status = 0
+	result.Data = resp.Data
+
+	return result, nil
+}

+ 12 - 0
api/internal/types/types.go

@@ -67,3 +67,15 @@ type MessageUnreadCountRes struct {
 	Message string                 `json:"message"`
 	Data    map[string]interface{} `json:"data"`
 }
+
+type MessageTypeReq struct {
+	UserId string `form:"userId"`
+	AppId  string `form:"appId"`
+}
+
+type MessageTypeReqRes struct {
+	Code    int64   `json:"code"`
+	Status  int64   `json:"isOk"`
+	Message string  `json:"message"`
+	Data    []int64 `json:"data"`
+}

+ 12 - 1
api/message.api

@@ -67,7 +67,16 @@ type MessageUnreadCountRes {
 	Message string                 `json:"message"`
 	Data    map[string]interface{} `json:"data"`
 }
-
+type MessageTypeReq {
+	UserId string `form:"userId"`
+	AppId  string `form:"appId"`
+}
+type MessageTypeReqRes {
+	Code    int64   `json:"code"`
+	Status  int64   `json:"isOk"`
+	Message string  `json:"message"`
+	Data    []int64 `json:"data"`
+}
 service message-api {
 	@handler MessageDeleteHandler // TODO: set handler name and delete this comment
 	get /message/messageDelete (MessageDeleteReq) returns (MessageDeleteResp)
@@ -79,4 +88,6 @@ service message-api {
 	get /message/messageUnreadClassCount (MessageUnreadClassCountReq) returns (MessageUnreadClassCountRes)
 	@handler MessageUnreadCountHandler // 获取用户未读消息数量
 	get /message/messageUnreadCount (MessageUnreadCountReq) returns (MessageUnreadCountRes)
+	@handler MessageTypeHandler // 获取用户未读消息数量
+	get /message/messageType (MessageTypeReq) returns (MessageTypeReqRes)
 }

+ 43 - 0
rpc/internal/logic/getmsgtypelogic.go

@@ -0,0 +1,43 @@
+package logic
+
+import (
+	"app.yhyue.com/moapp/MessageCenter/service"
+	"context"
+
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/rpc/message"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type GetMsgTypeLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetMsgTypeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetMsgTypeLogic {
+	return &GetMsgTypeLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+//   获取指定用户收到消息的分类
+func (l *GetMsgTypeLogic) GetMsgType(in *message.GetMsgTypeReq) (*message.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
+	}
+	return &message.GetMsgTypeRes{
+		Code:    int64(code),
+		Message: msg,
+		Data:    data,
+	}, nil
+
+}

+ 6 - 0
rpc/internal/server/messageserver.go

@@ -80,3 +80,9 @@ func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message.Get
 	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)
+}

+ 14 - 1
rpc/message.proto

@@ -74,7 +74,7 @@ message Messages {
   int64 isRead = 10; //已读未读 0:未读  1:已读
   string createtime = 11;
   string appid = 12; //应用标识
-  int64 id=13;//消息id
+  int64 id = 13;//消息id
 }
 
 message FindUserMsgRes {
@@ -130,6 +130,17 @@ message GetUnreadClassCountRes{
   repeated ResCount data = 3;//
   repeated Messages info = 4; // 每个类型最新消息列表
 
+}
+message GetMsgTypeReq{
+  string userId = 1;    // 用户id
+  string appid = 2;     //应用标识
+}
+message GetMsgTypeRes{
+  int64 code = 1;//状态码
+  string message = 2;//响应消息
+  repeated int64 data = 3;//
+
+
 }
 service Message {
 
@@ -154,4 +165,6 @@ service Message {
   rpc FindMessageDetail (MessageDetailReq) returns (MessageDetailResp);
   //  获取指定用户的未读消息分类及数量 及分类的最新消息
   rpc GetUnreadClassCount(GetUnreadClassCountReq) returns(GetUnreadClassCountRes);
+  //  获取指定用户收到消息的分类
+  rpc GetMsgType(GetMsgTypeReq) returns(GetMsgTypeRes);
 }

+ 258 - 61
rpc/message/message.pb.go

@@ -1368,6 +1368,124 @@ func (x *GetUnreadClassCountRes) GetInfo() []*Messages {
 	return nil
 }
 
+type GetMsgTypeReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` // 用户id
+	Appid  string `protobuf:"bytes,2,opt,name=appid,proto3" json:"appid,omitempty"`   //应用标识
+}
+
+func (x *GetMsgTypeReq) Reset() {
+	*x = GetMsgTypeReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[18]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetMsgTypeReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetMsgTypeReq) ProtoMessage() {}
+
+func (x *GetMsgTypeReq) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[18]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetMsgTypeReq.ProtoReflect.Descriptor instead.
+func (*GetMsgTypeReq) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *GetMsgTypeReq) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *GetMsgTypeReq) GetAppid() string {
+	if x != nil {
+		return x.Appid
+	}
+	return ""
+}
+
+type GetMsgTypeRes struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Code    int64   `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`        //状态码
+	Message string  `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`   //响应消息
+	Data    []int64 `protobuf:"varint,3,rep,packed,name=data,proto3" json:"data,omitempty"` //
+}
+
+func (x *GetMsgTypeRes) Reset() {
+	*x = GetMsgTypeRes{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[19]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetMsgTypeRes) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetMsgTypeRes) ProtoMessage() {}
+
+func (x *GetMsgTypeRes) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[19]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetMsgTypeRes.ProtoReflect.Descriptor instead.
+func (*GetMsgTypeRes) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *GetMsgTypeRes) GetCode() int64 {
+	if x != nil {
+		return x.Code
+	}
+	return 0
+}
+
+func (x *GetMsgTypeRes) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *GetMsgTypeRes) GetData() []int64 {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_message_proto protoreflect.FileDescriptor
 
 var file_message_proto_rawDesc = []byte{
@@ -1523,56 +1641,69 @@ var file_message_proto_rawDesc = []byte{
 	0x2e, 0x52, 0x65, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
 	0x25, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e,
 	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73,
-	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x32, 0x8b, 0x06, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x12, 0x47, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x61, 0x64,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x0b, 0x53,
-	0x65, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x17, 0x2e, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x23, 0x2e,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x69,
-	0x6e, 0x67, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d,
-	0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25,
-	0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d,
-	0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65,
+	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3d, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4d, 0x73, 0x67,
+	0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
+	0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x61, 0x70, 0x70, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4d, 0x73, 0x67, 0x54,
+	0x79, 0x70, 0x65, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xc9, 0x06, 0x0a, 0x07, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x12, 0x47, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65,
+	0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x61, 0x64, 0x53, 0x74, 0x61,
+	0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a,
+	0x0b, 0x53, 0x65, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x17, 0x2e, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x55,
-	0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f,
-	0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f,
-	0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x0b, 0x46,
-	0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x17, 0x2e, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67,
-	0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x46, 0x69,
-	0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x12, 0x57, 0x0a, 0x13,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
+	0x23, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x12, 0x25, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0e, 0x47, 0x65,
+	0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a,
+	0x0b, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x17, 0x2e, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d,
+	0x73, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e,
+	0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x12, 0x57,
+	0x0a, 0x13, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e,
 	0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f,
-	0x75, 0x6e, 0x74, 0x12, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65,
-	0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x52, 0x65, 0x71, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47,
-	0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x73, 0x74,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65,
-	0x74, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x12,
-	0x4a, 0x0a, 0x11, 0x46, 0x69, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x65,
-	0x74, 0x61, 0x69, 0x6c, 0x12, 0x19, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x1a,
-	0x1a, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x57, 0x0a, 0x13, 0x47,
+	0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4c, 0x61,
+	0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e,
+	0x47, 0x65, 0x74, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65,
+	0x73, 0x12, 0x4a, 0x0a, 0x11, 0x46, 0x69, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x19, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65,
+	0x71, 0x1a, 0x1a, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x57, 0x0a,
+	0x13, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47,
 	0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x43, 0x6f, 0x75,
-	0x6e, 0x74, 0x12, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74,
-	0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74,
-	0x52, 0x65, 0x71, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65,
-	0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x52, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e,
+	0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x43, 0x6f,
+	0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x12, 0x3c, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4d, 0x73, 0x67,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47,
+	0x65, 0x74, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70,
+	0x65, 0x52, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1587,7 +1718,7 @@ func file_message_proto_rawDescGZIP() []byte {
 	return file_message_proto_rawDescData
 }
 
-var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
 var file_message_proto_goTypes = []interface{}{
 	(*SendMsgRequest)(nil),               // 0: message.SendMsgRequest
 	(*ChangeReadStatusRequest)(nil),      // 1: message.ChangeReadStatusRequest
@@ -1607,6 +1738,8 @@ var file_message_proto_goTypes = []interface{}{
 	(*GetLastMessageRes)(nil),            // 15: message.GetLastMessageRes
 	(*GetUnreadClassCountReq)(nil),       // 16: message.GetUnreadClassCountReq
 	(*GetUnreadClassCountRes)(nil),       // 17: message.GetUnreadClassCountRes
+	(*GetMsgTypeReq)(nil),                // 18: message.GetMsgTypeReq
+	(*GetMsgTypeRes)(nil),                // 19: message.GetMsgTypeRes
 }
 var file_message_proto_depIdxs = []int32{
 	9,  // 0: message.FindUserMsgRes.data:type_name -> message.Messages
@@ -1623,18 +1756,20 @@ var file_message_proto_depIdxs = []int32{
 	14, // 11: message.Message.GetLastMessage:input_type -> message.GetLastMessageReq
 	12, // 12: message.Message.FindMessageDetail:input_type -> message.MessageDetailReq
 	16, // 13: message.Message.GetUnreadClassCount:input_type -> message.GetUnreadClassCountReq
-	6,  // 14: message.Message.ChangeReadStatus:output_type -> message.Response
-	6,  // 15: message.Message.SendUserMsg:output_type -> message.Response
-	6,  // 16: message.Message.DeleteSingleMessage:output_type -> message.Response
-	6,  // 17: message.Message.DeleteMultipleMessage:output_type -> message.Response
-	7,  // 18: message.Message.GetUnreadCount:output_type -> message.GetUnreadCountResponse
-	10, // 19: message.Message.FindUserMsg:output_type -> message.FindUserMsgRes
-	7,  // 20: message.Message.GetClassUnreadCount:output_type -> message.GetUnreadCountResponse
-	15, // 21: message.Message.GetLastMessage:output_type -> message.GetLastMessageRes
-	13, // 22: message.Message.FindMessageDetail:output_type -> message.MessageDetailResp
-	17, // 23: message.Message.GetUnreadClassCount:output_type -> message.GetUnreadClassCountRes
-	14, // [14:24] is the sub-list for method output_type
-	4,  // [4:14] is the sub-list for method input_type
+	18, // 14: message.Message.GetMsgType:input_type -> message.GetMsgTypeReq
+	6,  // 15: message.Message.ChangeReadStatus:output_type -> message.Response
+	6,  // 16: message.Message.SendUserMsg:output_type -> message.Response
+	6,  // 17: message.Message.DeleteSingleMessage:output_type -> message.Response
+	6,  // 18: message.Message.DeleteMultipleMessage:output_type -> message.Response
+	7,  // 19: message.Message.GetUnreadCount:output_type -> message.GetUnreadCountResponse
+	10, // 20: message.Message.FindUserMsg:output_type -> message.FindUserMsgRes
+	7,  // 21: message.Message.GetClassUnreadCount:output_type -> message.GetUnreadCountResponse
+	15, // 22: message.Message.GetLastMessage:output_type -> message.GetLastMessageRes
+	13, // 23: message.Message.FindMessageDetail:output_type -> message.MessageDetailResp
+	17, // 24: message.Message.GetUnreadClassCount:output_type -> message.GetUnreadClassCountRes
+	19, // 25: message.Message.GetMsgType:output_type -> message.GetMsgTypeRes
+	15, // [15:26] is the sub-list for method output_type
+	4,  // [4:15] is the sub-list for method input_type
 	4,  // [4:4] is the sub-list for extension type_name
 	4,  // [4:4] is the sub-list for extension extendee
 	0,  // [0:4] is the sub-list for field type_name
@@ -1862,6 +1997,30 @@ func file_message_proto_init() {
 				return nil
 			}
 		}
+		file_message_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetMsgTypeReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_message_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetMsgTypeRes); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -1869,7 +2028,7 @@ func file_message_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_message_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   18,
+			NumMessages:   20,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -1915,6 +2074,8 @@ type MessageClient interface {
 	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)
 }
 
 type messageClient struct {
@@ -2015,6 +2176,15 @@ func (c *messageClient) GetUnreadClassCount(ctx context.Context, in *GetUnreadCl
 	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...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // MessageServer is the server API for Message service.
 type MessageServer interface {
 	// 修改消息阅读状态
@@ -2037,6 +2207,8 @@ type MessageServer interface {
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
 	//  获取指定用户的未读消息分类及数量 及分类的最新消息
 	GetUnreadClassCount(context.Context, *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error)
+	//  获取指定用户收到消息的分类
+	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)
 }
 
 // UnimplementedMessageServer can be embedded to have forward compatible implementations.
@@ -2073,6 +2245,9 @@ func (*UnimplementedMessageServer) FindMessageDetail(context.Context, *MessageDe
 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")
+}
 
 func RegisterMessageServer(s *grpc.Server, srv MessageServer) {
 	s.RegisterService(&_Message_serviceDesc, srv)
@@ -2258,6 +2433,24 @@ func _Message_GetUnreadClassCount_Handler(srv interface{}, ctx context.Context,
 	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 {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MessageServer).GetMsgType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/message.Message/GetMsgType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MessageServer).GetMsgType(ctx, req.(*GetMsgTypeReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Message_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "message.Message",
 	HandlerType: (*MessageServer)(nil),
@@ -2302,6 +2495,10 @@ var _Message_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetUnreadClassCount",
 			Handler:    _Message_GetUnreadClassCount_Handler,
 		},
+		{
+			MethodName: "GetMsgType",
+			Handler:    _Message_GetMsgType_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "message.proto",

+ 21 - 11
rpc/messageclient/message.go

@@ -14,24 +14,26 @@ import (
 )
 
 type (
-	ResCount                     = message.ResCount
-	FindUserMsgReq               = message.FindUserMsgReq
-	MessageDetailReq             = message.MessageDetailReq
-	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
+	GetUnreadClassCountReq       = message.GetUnreadClassCountReq
+	GetMsgTypeReq                = message.GetMsgTypeReq
+	GetMsgTypeRes                = message.GetMsgTypeRes
 	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
-	GetUnreadCountResponse       = message.GetUnreadCountResponse
+	Response                     = message.Response
+	FindUserMsgRes               = message.FindUserMsgRes
 	MessageDetailResp            = message.MessageDetailResp
-	GetLastMessageReq            = message.GetLastMessageReq
 	GetLastMessageRes            = message.GetLastMessageRes
 	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
+	GetUnreadCountResponse       = message.GetUnreadCountResponse
+	FindUserMsgReq               = message.FindUserMsgReq
+	SendMsgRequest               = message.SendMsgRequest
 	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
 	GetUnreadCountRequest        = message.GetUnreadCountRequest
-	Response                     = message.Response
-	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
-	GetUnreadClassCountReq       = message.GetUnreadClassCountReq
-	SendMsgRequest               = message.SendMsgRequest
+	GetLastMessageReq            = message.GetLastMessageReq
+	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
+	ResCount                     = message.ResCount
 	Messages                     = message.Messages
-	FindUserMsgRes               = message.FindUserMsgRes
+	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
+	MessageDetailReq             = message.MessageDetailReq
 
 	Message interface {
 		//  修改消息阅读状态
@@ -54,6 +56,8 @@ type (
 		FindMessageDetail(ctx context.Context, in *MessageDetailReq) (*MessageDetailResp, error)
 		//   获取指定用户的未读消息分类及数量 及分类的最新消息
 		GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error)
+		//   获取指定用户收到消息的分类
+		GetMsgType(ctx context.Context, in *GetMsgTypeReq) (*GetMsgTypeRes, error)
 	}
 
 	defaultMessage struct {
@@ -126,3 +130,9 @@ func (m *defaultMessage) GetUnreadClassCount(ctx context.Context, in *GetUnreadC
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetUnreadClassCount(ctx, in)
 }
+
+//   获取指定用户收到消息的分类
+func (m *defaultMessage) GetMsgType(ctx context.Context, in *GetMsgTypeReq) (*GetMsgTypeRes, error) {
+	client := message.NewMessageClient(m.cli.Conn())
+	return client.GetMsgType(ctx, in)
+}

+ 21 - 3
service/messageService.go

@@ -88,7 +88,7 @@ func (service *MessageService) LastMessage(userId string, appId string, msgType
 	if len(m1) > 0 {
 		m := m1[0]
 		msg := message.Messages{
-			Id: int64(m.Id),
+			Id:            int64(m.Id),
 			Appid:         m.AppId,
 			ReceiveUserId: m.ReceiveUserid,
 			ReceiveName:   m.ReceiveName,
@@ -130,7 +130,7 @@ func (service *MessageService) ClassCountAndMessage(userId string, appId string)
 	if query != nil && len(query) > 0 {
 		for _, v := range query {
 			log.Println(v)
-			typeCount = append(typeCount,&message.ResCount{MsgType: v["msg_type"].(int64), Count: v["count"].(int64)})
+			typeCount = append(typeCount, &message.ResCount{MsgType: v["msg_type"].(int64), Count: v["count"].(int64)})
 		}
 	}
 	var m1 []*entity.Message
@@ -147,7 +147,7 @@ func (service *MessageService) ClassCountAndMessage(userId string, appId string)
 			if !existType[int64(v1.MsgType)] {
 				existType[int64(v1.MsgType)] = true
 				m2 = append(m2, &message.Messages{
-					Id: int64(v1.Id),
+					Id:            int64(v1.Id),
 					Appid:         v1.AppId,
 					ReceiveUserId: v1.ReceiveUserid,
 					ReceiveName:   v1.ReceiveName,
@@ -166,3 +166,21 @@ func (service *MessageService) ClassCountAndMessage(userId string, appId string)
 	}
 	return typeCount, m2, nil
 }
+
+// 已接收到消息的分类
+func (service *MessageService) ReceiveMsgType(userId string, appId string) ([]int64, error) {
+	orm := entity.Engine.NewSession()
+	log.Println("123")
+	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 {
+		log.Println(err)
+		return nil, err
+	}
+	msgTypeList := []int64{}
+	for _, v := range m {
+		msgTypeList = append(msgTypeList, int64(v.MsgType))
+	}
+	return msgTypeList, nil
+}