xuzhiheng 4 tahun lalu
induk
melakukan
9c4a24db9b

+ 1 - 1
rpc/etc/message.yaml

@@ -1,5 +1,5 @@
 Name: message.rpc
-ListenOn: 127.0.0.1:8080
+ListenOn: 127.0.0.1:8081
 Etcd:
   Hosts:
   - 127.0.0.1:2379

+ 35 - 0
rpc/internal/logic/getclassunreadcountlogic.go

@@ -0,0 +1,35 @@
+package logic
+
+import (
+	"context"
+
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/rpc/message"
+	"app.yhyue.com/moapp/MessageCenter/service"
+	"github.com/tal-tech/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 *message.GetClassUnreadCountReq) (*message.GetUnreadCountResponse, error) {
+	// todo: add your logic here and delete this line
+	code, msg, count := service.ClassCountUnread(int(in.MsgType), in.UserId, in.Appid)
+	return &message.GetUnreadCountResponse{
+		Code:    code,
+		Message: msg,
+		Count:   count,
+	}, nil
+}

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

@@ -56,3 +56,9 @@ func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsg
 	l := logic.NewFindUserMsgLogic(ctx, s.svcCtx)
 	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)
+}

+ 8 - 0
rpc/message.proto

@@ -78,6 +78,12 @@ message FindUserMsgRes {
   int64 count = 4; //总数
 }
 
+message GetClassUnreadCountReq{
+  string userId = 1;    // 用户id
+  int64 msgType = 2;  //分类 1:客服   2:系统通知  3:营销   4:用户会话
+  string appid = 3; //应用标识
+}
+
 service Message {
   // 修改消息阅读状态
   rpc ChangeReadStatus(ChangeReadStatusRequest) returns(Response);
@@ -91,4 +97,6 @@ service Message {
   rpc GetUnreadCount(GetUnreadCountRequest) returns(GetUnreadCountResponse);
   //查询指定用户的历史消息记录
   rpc FindUserMsg(FindUserMsgReq) returns(FindUserMsgRes);
+  //  查询指定用户指定分类的未读消息合计
+  rpc GetClassUnreadCount(GetClassUnreadCountReq) returns(GetUnreadCountResponse);
 }

+ 176 - 48
rpc/message/message.pb.go

@@ -782,6 +782,69 @@ func (x *FindUserMsgRes) GetCount() int64 {
 	return 0
 }
 
+type GetClassUnreadCountReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserId  string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`    // 用户id
+	MsgType int64  `protobuf:"varint,2,opt,name=msgType,proto3" json:"msgType,omitempty"` //分类 1:客服   2:系统通知  3:营销   4:用户会话
+	Appid   string `protobuf:"bytes,3,opt,name=appid,proto3" json:"appid,omitempty"`      //应用标识
+}
+
+func (x *GetClassUnreadCountReq) Reset() {
+	*x = GetClassUnreadCountReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetClassUnreadCountReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetClassUnreadCountReq) ProtoMessage() {}
+
+func (x *GetClassUnreadCountReq) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[10]
+	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 GetClassUnreadCountReq.ProtoReflect.Descriptor instead.
+func (*GetClassUnreadCountReq) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *GetClassUnreadCountReq) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *GetClassUnreadCountReq) GetMsgType() int64 {
+	if x != nil {
+		return x.MsgType
+	}
+	return 0
+}
+
+func (x *GetClassUnreadCountReq) GetAppid() string {
+	if x != nil {
+		return x.Appid
+	}
+	return ""
+}
+
 var File_message_proto protoreflect.FileDescriptor
 
 var file_message_proto_rawDesc = []byte{
@@ -872,35 +935,47 @@ var file_message_proto_rawDesc = []byte{
 	0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x65,
 	0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05,
 	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x32, 0xc3, 0x03, 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, 0x71, 0x75, 0x65, 0x73,
+	0x6e, 0x74, 0x22, 0x60, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x55, 0x6e,
+	0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 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, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14,
+	0x0a, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61,
+	0x70, 0x70, 0x69, 0x64, 0x32, 0x9c, 0x04, 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, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	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, 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, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -915,7 +990,7 @@ func file_message_proto_rawDescGZIP() []byte {
 	return file_message_proto_rawDescData
 }
 
-var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
 var file_message_proto_goTypes = []interface{}{
 	(*SendMsgRequest)(nil),               // 0: message.SendMsgRequest
 	(*ChangeReadStatusRequest)(nil),      // 1: message.ChangeReadStatusRequest
@@ -927,26 +1002,29 @@ var file_message_proto_goTypes = []interface{}{
 	(*FindUserMsgReq)(nil),               // 7: message.FindUserMsgReq
 	(*Messages)(nil),                     // 8: message.Messages
 	(*FindUserMsgRes)(nil),               // 9: message.FindUserMsgRes
+	(*GetClassUnreadCountReq)(nil),       // 10: message.GetClassUnreadCountReq
 }
 var file_message_proto_depIdxs = []int32{
-	8, // 0: message.FindUserMsgRes.data:type_name -> message.Messages
-	1, // 1: message.Message.ChangeReadStatus:input_type -> message.ChangeReadStatusRequest
-	0, // 2: message.Message.SendUserMsg:input_type -> message.SendMsgRequest
-	2, // 3: message.Message.DeleteSingleMessage:input_type -> message.DeleteSingleMessageRequest
-	3, // 4: message.Message.DeleteMultipleMessage:input_type -> message.DeleteMultipleMessageRequest
-	4, // 5: message.Message.GetUnreadCount:input_type -> message.GetUnreadCountRequest
-	7, // 6: message.Message.FindUserMsg:input_type -> message.FindUserMsgReq
-	5, // 7: message.Message.ChangeReadStatus:output_type -> message.Response
-	5, // 8: message.Message.SendUserMsg:output_type -> message.Response
-	5, // 9: message.Message.DeleteSingleMessage:output_type -> message.Response
-	5, // 10: message.Message.DeleteMultipleMessage:output_type -> message.Response
-	6, // 11: message.Message.GetUnreadCount:output_type -> message.GetUnreadCountResponse
-	9, // 12: message.Message.FindUserMsg:output_type -> message.FindUserMsgRes
-	7, // [7:13] is the sub-list for method output_type
-	1, // [1:7] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	8,  // 0: message.FindUserMsgRes.data:type_name -> message.Messages
+	1,  // 1: message.Message.ChangeReadStatus:input_type -> message.ChangeReadStatusRequest
+	0,  // 2: message.Message.SendUserMsg:input_type -> message.SendMsgRequest
+	2,  // 3: message.Message.DeleteSingleMessage:input_type -> message.DeleteSingleMessageRequest
+	3,  // 4: message.Message.DeleteMultipleMessage:input_type -> message.DeleteMultipleMessageRequest
+	4,  // 5: message.Message.GetUnreadCount:input_type -> message.GetUnreadCountRequest
+	7,  // 6: message.Message.FindUserMsg:input_type -> message.FindUserMsgReq
+	10, // 7: message.Message.GetClassUnreadCount:input_type -> message.GetClassUnreadCountReq
+	5,  // 8: message.Message.ChangeReadStatus:output_type -> message.Response
+	5,  // 9: message.Message.SendUserMsg:output_type -> message.Response
+	5,  // 10: message.Message.DeleteSingleMessage:output_type -> message.Response
+	5,  // 11: message.Message.DeleteMultipleMessage:output_type -> message.Response
+	6,  // 12: message.Message.GetUnreadCount:output_type -> message.GetUnreadCountResponse
+	9,  // 13: message.Message.FindUserMsg:output_type -> message.FindUserMsgRes
+	6,  // 14: message.Message.GetClassUnreadCount:output_type -> message.GetUnreadCountResponse
+	8,  // [8:15] is the sub-list for method output_type
+	1,  // [1:8] is the sub-list for method input_type
+	1,  // [1:1] is the sub-list for extension type_name
+	1,  // [1:1] is the sub-list for extension extendee
+	0,  // [0:1] is the sub-list for field type_name
 }
 
 func init() { file_message_proto_init() }
@@ -1075,6 +1153,18 @@ func file_message_proto_init() {
 				return nil
 			}
 		}
+		file_message_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetClassUnreadCountReq); 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{
@@ -1082,7 +1172,7 @@ func file_message_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_message_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   10,
+			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -1120,6 +1210,8 @@ 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)
 }
 
 type messageClient struct {
@@ -1184,6 +1276,15 @@ 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
+}
+
 // MessageServer is the server API for Message service.
 type MessageServer interface {
 	// 修改消息阅读状态
@@ -1198,6 +1299,8 @@ type MessageServer interface {
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
 	//查询指定用户的历史消息记录
 	FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error)
+	//  查询指定用户指定分类的未读消息合计
+	GetClassUnreadCount(context.Context, *GetClassUnreadCountReq) (*GetUnreadCountResponse, error)
 }
 
 // UnimplementedMessageServer can be embedded to have forward compatible implementations.
@@ -1222,6 +1325,9 @@ func (*UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCou
 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 RegisterMessageServer(s *grpc.Server, srv MessageServer) {
 	s.RegisterService(&_Message_serviceDesc, srv)
@@ -1335,6 +1441,24 @@ 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)
+}
+
 var _Message_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "message.Message",
 	HandlerType: (*MessageServer)(nil),
@@ -1363,6 +1487,10 @@ var _Message_serviceDesc = grpc.ServiceDesc{
 			MethodName: "FindUserMsg",
 			Handler:    _Message_FindUserMsg_Handler,
 		},
+		{
+			MethodName: "GetClassUnreadCount",
+			Handler:    _Message_GetClassUnreadCount_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "message.proto",

+ 14 - 5
rpc/messageclient/message.go

@@ -14,16 +14,17 @@ import (
 )
 
 type (
-	GetUnreadCountRequest        = message.GetUnreadCountRequest
+	GetUnreadCountResponse       = message.GetUnreadCountResponse
+	FindUserMsgRes               = message.FindUserMsgRes
 	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
 	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
-	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
+	Response                     = message.Response
 	FindUserMsgReq               = message.FindUserMsgReq
 	Messages                     = message.Messages
-	FindUserMsgRes               = message.FindUserMsgRes
+	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
 	SendMsgRequest               = message.SendMsgRequest
-	Response                     = message.Response
-	GetUnreadCountResponse       = message.GetUnreadCountResponse
+	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
+	GetUnreadCountRequest        = message.GetUnreadCountRequest
 
 	Message interface {
 		//  修改消息阅读状态
@@ -38,6 +39,8 @@ type (
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
 		// 查询指定用户的历史消息记录
 		FindUserMsg(ctx context.Context, in *FindUserMsgReq) (*FindUserMsgRes, error)
+		//   查询指定用户指定分类的未读消息合计
+		GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq) (*GetUnreadCountResponse, error)
 	}
 
 	defaultMessage struct {
@@ -86,3 +89,9 @@ func (m *defaultMessage) FindUserMsg(ctx context.Context, in *FindUserMsgReq) (*
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindUserMsg(ctx, in)
 }
+
+//   查询指定用户指定分类的未读消息合计
+func (m *defaultMessage) GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq) (*GetUnreadCountResponse, error) {
+	client := message.NewMessageClient(m.cli.Conn())
+	return client.GetClassUnreadCount(ctx, in)
+}

+ 12 - 0
rpc/test/send_test.go

@@ -43,3 +43,15 @@ func Test_FindUserMsg(t *testing.T) {
 	res, err := std.FindUserMsg(ctx, req)
 	log.Println("err ", err, res.Code, res.Message, res.Count, res.Data)
 }
+
+func Test_ClassUnread(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
+	std := messageclient.NewMessage(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"127.0.0.1:2379"}, Key: "message.rpc"}}))
+	req := &messageclient.GetClassUnreadCountReq{
+		Appid:   "10000",
+		UserId:  "6042120adca8410f1ef2ec84",
+		MsgType: 4,
+	}
+	res, err := std.GetClassUnreadCount(ctx, req)
+	log.Println("err ", err, res)
+}

+ 18 - 4
service/sendMsg.go

@@ -31,7 +31,7 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
 		if err != nil {
 			log.Panicln("会话创建失败:", err)
 			orm.Rollback()
-			return -1, "会话创建失败"
+			return 0, "会话创建失败"
 		}
 		conversations := entity.Conversation{
 			AppId:       this.Appid,
@@ -48,7 +48,7 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
 		if err != nil {
 			log.Panicln("会话创建失败:", err)
 			orm.Rollback()
-			return -1, "会话创建失败"
+			return 0, "会话创建失败"
 		}
 	}
 	message := entity.Message{
@@ -70,7 +70,7 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
 	if err != nil {
 		log.Panicln("消息发送失败:", err)
 		orm.Rollback()
-		return -1, "消息发送失败"
+		return 0, "消息发送失败"
 	}
 	orm.Commit()
 	return 1, "消息发送成功"
@@ -109,7 +109,7 @@ func FindUserMsg(this message.FindUserMsgReq) message.FindUserMsgRes {
 	}
 	data.Count = count
 	if err != nil {
-		data.Code = -1
+		data.Code = 0
 		data.Message = "查询失败"
 	} else {
 		data.Code = 1
@@ -117,3 +117,17 @@ func FindUserMsg(this message.FindUserMsgReq) message.FindUserMsgRes {
 	}
 	return data
 }
+
+// 指定分类未读消息合计
+func ClassCountUnread(msgType int, userId string, appId string) (int64, string, int64) {
+	orm := entity.Engine
+	count, err := orm.Table("message").Where("msg_type=? and receive_userid=? and isdel=1 and appid=? and isRead=0", msgType, userId, appId).Count()
+	// data, err := orm.Sql("explain select count(*) from message where msg_type = ? and receive_userid=? and isdel=1 and appid=?", msgType, userId, appId).QueryInterface()
+	if err != nil {
+		log.Println(err)
+		log.Println(count)
+		return 0, "查询未读消息失败", 0
+	}
+	log.Println(count)
+	return 1, "查询指定分类未读消息成功", count
+}