fuwencai 4 年之前
父節點
當前提交
59883bf2b3

+ 44 - 0
rpc/internal/logic/deletemultiplemessagelogic.go

@@ -0,0 +1,44 @@
+package logic
+
+import (
+	"app.yhyue.com/moapp/MessageCenter/service"
+	"context"
+	"strconv"
+	"strings"
+
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/rpc/message"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type DeleteMultipleMessageLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewDeleteMultipleMessageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteMultipleMessageLogic {
+	return &DeleteMultipleMessageLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+//  删除多条消息
+func (l *DeleteMultipleMessageLogic) DeleteMultipleMessage(in *message.DeleteMultipleMessageRequest) (*message.Response, error) {
+	// todo: add your logic here and delete this line
+	m := &service.MessageService{}
+	var idSlice []int64
+	tmpList := strings.Split(in.Id, ",")
+	for _, v := range tmpList {
+		id, _ := strconv.Atoi(v)
+		idSlice = append(idSlice, int64(id))
+	}
+	code, msg := m.DeleteMessage(idSlice)
+	return &message.Response{
+		Code:    code,
+		Message: msg,
+	}, nil
+}

+ 39 - 0
rpc/internal/logic/deletesinglemessagelogic.go

@@ -0,0 +1,39 @@
+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 DeleteSingleMessageLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewDeleteSingleMessageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteSingleMessageLogic {
+	return &DeleteSingleMessageLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+//  删除单一消息
+func (l *DeleteSingleMessageLogic) DeleteSingleMessage(in *message.DeleteSingleMessageRequest) (*message.Response, error) {
+	// todo: add your logic here and delete this line
+
+	m := &service.MessageService{}
+	var idSlice []int64
+	idSlice = append(idSlice, in.Id)
+	code, msg := m.DeleteMessage(idSlice)
+	return &message.Response{
+		Code:    code,
+		Message: msg,
+	}, nil
+}

+ 31 - 0
rpc/internal/logic/getunreadcountlogic.go

@@ -0,0 +1,31 @@
+package logic
+
+import (
+	"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 GetUnreadCountLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetUnreadCountLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUnreadCountLogic {
+	return &GetUnreadCountLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+//   查询指定用户未读消息合计
+func (l *GetUnreadCountLogic) GetUnreadCount(in *message.DeleteMultipleMessageRequest) (*message.GetUnreadCountResponse, error) {
+	// todo: add your logic here and delete this line
+
+	return &message.GetUnreadCountResponse{}, nil
+}

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

@@ -26,7 +26,26 @@ func (s *MessageServer) Ping(ctx context.Context, in *message.Request) (*message
 	return l.Ping(in)
 }
 
+//  修改消息阅读状态
 func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message.ChangeReadStatusRequest) (*message.Response, error) {
 	l := logic.NewChangeReadStatusLogic(ctx, s.svcCtx)
 	return l.ChangeReadStatus(in)
 }
+
+//  删除单一消息
+func (s *MessageServer) DeleteSingleMessage(ctx context.Context, in *message.DeleteSingleMessageRequest) (*message.Response, error) {
+	l := logic.NewDeleteSingleMessageLogic(ctx, s.svcCtx)
+	return l.DeleteSingleMessage(in)
+}
+
+//  删除多条消息
+func (s *MessageServer) DeleteMultipleMessage(ctx context.Context, in *message.DeleteMultipleMessageRequest) (*message.Response, error) {
+	l := logic.NewDeleteMultipleMessageLogic(ctx, s.svcCtx)
+	return l.DeleteMultipleMessage(in)
+}
+
+//   查询指定用户未读消息合计
+func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message.DeleteMultipleMessageRequest) (*message.GetUnreadCountResponse, error) {
+	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)
+	return l.GetUnreadCount(in)
+}

+ 27 - 1
rpc/message.proto

@@ -9,13 +9,39 @@ message Request {
 message  ChangeReadStatusRequest {
   int64 id = 1; // 消息id
   int64 readStatus = 2;// 阅读状态 0-未读 1-已读
+
 }
 
+// 删除单一消息
+message DeleteSingleMessageRequest{
+  int64 id = 1;    // 消息id
+}
+// 批量删除消息
+message DeleteMultipleMessageRequest{
+  string id = 1;    // 多条消息id, 逗号分隔
+}
+// 查询指定用户未读消息合计
+message GetUnreadCountRequest{
+  string userId = 1;    // 用户id
+}
 message Response {
   int64 code = 1;//状态码
-  string message=2;//响应消息
+  string message = 2;//响应消息
+}
+message GetUnreadCountResponse {
+  int64 code = 1;//状态码
+  string message = 2;//响应消息
+  int64 count = 3;//
 }
 service Message {
   rpc Ping(Request) returns(Response);
+  // 修改消息阅读状态
   rpc ChangeReadStatus(ChangeReadStatusRequest) returns(Response);
+  // 删除单一消息
+  rpc DeleteSingleMessage(DeleteSingleMessageRequest) returns(Response);
+  // 删除多条消息
+  rpc DeleteMultipleMessage(DeleteMultipleMessageRequest) returns(Response);
+  //  查询指定用户未读消息合计
+  rpc GetUnreadCount(DeleteMultipleMessageRequest) returns(GetUnreadCountResponse);
+
 }

+ 436 - 25
rpc/message/message.pb.go

@@ -132,6 +132,150 @@ func (x *ChangeReadStatusRequest) GetReadStatus() int64 {
 	return 0
 }
 
+// 删除单一消息
+type DeleteSingleMessageRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` // 消息id
+}
+
+func (x *DeleteSingleMessageRequest) Reset() {
+	*x = DeleteSingleMessageRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DeleteSingleMessageRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DeleteSingleMessageRequest) ProtoMessage() {}
+
+func (x *DeleteSingleMessageRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[2]
+	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 DeleteSingleMessageRequest.ProtoReflect.Descriptor instead.
+func (*DeleteSingleMessageRequest) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DeleteSingleMessageRequest) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+// 批量删除消息
+type DeleteMultipleMessageRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // 多条消息id, 逗号分隔
+}
+
+func (x *DeleteMultipleMessageRequest) Reset() {
+	*x = DeleteMultipleMessageRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DeleteMultipleMessageRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DeleteMultipleMessageRequest) ProtoMessage() {}
+
+func (x *DeleteMultipleMessageRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[3]
+	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 DeleteMultipleMessageRequest.ProtoReflect.Descriptor instead.
+func (*DeleteMultipleMessageRequest) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *DeleteMultipleMessageRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+// 查询指定用户未读消息合计
+type GetUnreadCountRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` // 用户id
+}
+
+func (x *GetUnreadCountRequest) Reset() {
+	*x = GetUnreadCountRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetUnreadCountRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetUnreadCountRequest) ProtoMessage() {}
+
+func (x *GetUnreadCountRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[4]
+	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 GetUnreadCountRequest.ProtoReflect.Descriptor instead.
+func (*GetUnreadCountRequest) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *GetUnreadCountRequest) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
 type Response struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -144,7 +288,7 @@ type Response struct {
 func (x *Response) Reset() {
 	*x = Response{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_message_proto_msgTypes[2]
+		mi := &file_message_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -157,7 +301,7 @@ func (x *Response) String() string {
 func (*Response) ProtoMessage() {}
 
 func (x *Response) ProtoReflect() protoreflect.Message {
-	mi := &file_message_proto_msgTypes[2]
+	mi := &file_message_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -170,7 +314,7 @@ func (x *Response) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Response.ProtoReflect.Descriptor instead.
 func (*Response) Descriptor() ([]byte, []int) {
-	return file_message_proto_rawDescGZIP(), []int{2}
+	return file_message_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *Response) GetCode() int64 {
@@ -187,6 +331,69 @@ func (x *Response) GetMessage() string {
 	return ""
 }
 
+type GetUnreadCountResponse 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"` //响应消息
+	Count   int64  `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"`    //
+}
+
+func (x *GetUnreadCountResponse) Reset() {
+	*x = GetUnreadCountResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetUnreadCountResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetUnreadCountResponse) ProtoMessage() {}
+
+func (x *GetUnreadCountResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[6]
+	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 GetUnreadCountResponse.ProtoReflect.Descriptor instead.
+func (*GetUnreadCountResponse) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *GetUnreadCountResponse) GetCode() int64 {
+	if x != nil {
+		return x.Code
+	}
+	return 0
+}
+
+func (x *GetUnreadCountResponse) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *GetUnreadCountResponse) GetCount() int64 {
+	if x != nil {
+		return x.Count
+	}
+	return 0
+}
+
 var File_message_proto protoreflect.FileDescriptor
 
 var file_message_proto_rawDesc = []byte{
@@ -198,19 +405,49 @@ var file_message_proto_rawDesc = []byte{
 	0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
 	0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x22, 0x38, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x32, 0x7f, 0x0a, 0x07,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2b, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12,
-	0x10, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 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, 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, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x75, 0x73, 0x22, 0x2c, 0x0a, 0x1a, 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,
+	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64,
+	0x22, 0x2e, 0x0a, 0x1c, 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,
+	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
+	0x22, 0x2f, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75,
+	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
+	0x64, 0x22, 0x38, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x22, 0x5c, 0x0a, 0x16, 0x47,
+	0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x32, 0xfb, 0x02, 0x0a, 0x07, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2b, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x2e,
+	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 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, 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, 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, 0x58, 0x0a,
+	0x0e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 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, 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 (
@@ -225,19 +462,29 @@ func file_message_proto_rawDescGZIP() []byte {
 	return file_message_proto_rawDescData
 }
 
-var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_message_proto_goTypes = []interface{}{
-	(*Request)(nil),                 // 0: message.Request
-	(*ChangeReadStatusRequest)(nil), // 1: message.ChangeReadStatusRequest
-	(*Response)(nil),                // 2: message.Response
+	(*Request)(nil),                      // 0: message.Request
+	(*ChangeReadStatusRequest)(nil),      // 1: message.ChangeReadStatusRequest
+	(*DeleteSingleMessageRequest)(nil),   // 2: message.DeleteSingleMessageRequest
+	(*DeleteMultipleMessageRequest)(nil), // 3: message.DeleteMultipleMessageRequest
+	(*GetUnreadCountRequest)(nil),        // 4: message.GetUnreadCountRequest
+	(*Response)(nil),                     // 5: message.Response
+	(*GetUnreadCountResponse)(nil),       // 6: message.GetUnreadCountResponse
 }
 var file_message_proto_depIdxs = []int32{
 	0, // 0: message.Message.Ping:input_type -> message.Request
 	1, // 1: message.Message.ChangeReadStatus:input_type -> message.ChangeReadStatusRequest
-	2, // 2: message.Message.Ping:output_type -> message.Response
-	2, // 3: message.Message.ChangeReadStatus:output_type -> message.Response
-	2, // [2:4] is the sub-list for method output_type
-	0, // [0:2] is the sub-list for method input_type
+	2, // 2: message.Message.DeleteSingleMessage:input_type -> message.DeleteSingleMessageRequest
+	3, // 3: message.Message.DeleteMultipleMessage:input_type -> message.DeleteMultipleMessageRequest
+	3, // 4: message.Message.GetUnreadCount:input_type -> message.DeleteMultipleMessageRequest
+	5, // 5: message.Message.Ping:output_type -> message.Response
+	5, // 6: message.Message.ChangeReadStatus:output_type -> message.Response
+	5, // 7: message.Message.DeleteSingleMessage:output_type -> message.Response
+	5, // 8: message.Message.DeleteMultipleMessage:output_type -> message.Response
+	6, // 9: message.Message.GetUnreadCount:output_type -> message.GetUnreadCountResponse
+	5, // [5:10] is the sub-list for method output_type
+	0, // [0:5] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
 	0, // [0:0] is the sub-list for extension extendee
 	0, // [0:0] is the sub-list for field type_name
@@ -274,6 +521,42 @@ func file_message_proto_init() {
 			}
 		}
 		file_message_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DeleteSingleMessageRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_message_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DeleteMultipleMessageRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_message_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetUnreadCountRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_message_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Response); i {
 			case 0:
 				return &v.state
@@ -285,6 +568,18 @@ func file_message_proto_init() {
 				return nil
 			}
 		}
+		file_message_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GetUnreadCountResponse); 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{
@@ -292,7 +587,7 @@ func file_message_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_message_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   3,
+			NumMessages:   7,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -319,7 +614,14 @@ const _ = grpc.SupportPackageIsVersion6
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MessageClient interface {
 	Ping(ctx context.Context, in *Request, opts ...grpc.CallOption) (*Response, error)
+	// 修改消息阅读状态
 	ChangeReadStatus(ctx context.Context, in *ChangeReadStatusRequest, opts ...grpc.CallOption) (*Response, error)
+	// 删除单一消息
+	DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest, opts ...grpc.CallOption) (*Response, error)
+	// 删除多条消息
+	DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*Response, error)
+	//  查询指定用户未读消息合计
+	GetUnreadCount(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 }
 
 type messageClient struct {
@@ -348,10 +650,44 @@ func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStat
 	return out, nil
 }
 
+func (c *messageClient) DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest, opts ...grpc.CallOption) (*Response, error) {
+	out := new(Response)
+	err := c.cc.Invoke(ctx, "/message.Message/DeleteSingleMessage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *messageClient) DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*Response, error) {
+	out := new(Response)
+	err := c.cc.Invoke(ctx, "/message.Message/DeleteMultipleMessage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *messageClient) GetUnreadCount(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
+	out := new(GetUnreadCountResponse)
+	err := c.cc.Invoke(ctx, "/message.Message/GetUnreadCount", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // MessageServer is the server API for Message service.
 type MessageServer interface {
 	Ping(context.Context, *Request) (*Response, error)
+	// 修改消息阅读状态
 	ChangeReadStatus(context.Context, *ChangeReadStatusRequest) (*Response, error)
+	// 删除单一消息
+	DeleteSingleMessage(context.Context, *DeleteSingleMessageRequest) (*Response, error)
+	// 删除多条消息
+	DeleteMultipleMessage(context.Context, *DeleteMultipleMessageRequest) (*Response, error)
+	//  查询指定用户未读消息合计
+	GetUnreadCount(context.Context, *DeleteMultipleMessageRequest) (*GetUnreadCountResponse, error)
 }
 
 // UnimplementedMessageServer can be embedded to have forward compatible implementations.
@@ -364,6 +700,15 @@ func (*UnimplementedMessageServer) Ping(context.Context, *Request) (*Response, e
 func (*UnimplementedMessageServer) ChangeReadStatus(context.Context, *ChangeReadStatusRequest) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ChangeReadStatus not implemented")
 }
+func (*UnimplementedMessageServer) DeleteSingleMessage(context.Context, *DeleteSingleMessageRequest) (*Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteSingleMessage not implemented")
+}
+func (*UnimplementedMessageServer) DeleteMultipleMessage(context.Context, *DeleteMultipleMessageRequest) (*Response, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteMultipleMessage not implemented")
+}
+func (*UnimplementedMessageServer) GetUnreadCount(context.Context, *DeleteMultipleMessageRequest) (*GetUnreadCountResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadCount not implemented")
+}
 
 func RegisterMessageServer(s *grpc.Server, srv MessageServer) {
 	s.RegisterService(&_Message_serviceDesc, srv)
@@ -405,6 +750,60 @@ func _Message_ChangeReadStatus_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Message_DeleteSingleMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteSingleMessageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MessageServer).DeleteSingleMessage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/message.Message/DeleteSingleMessage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MessageServer).DeleteSingleMessage(ctx, req.(*DeleteSingleMessageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Message_DeleteMultipleMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteMultipleMessageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MessageServer).DeleteMultipleMessage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/message.Message/DeleteMultipleMessage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MessageServer).DeleteMultipleMessage(ctx, req.(*DeleteMultipleMessageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Message_GetUnreadCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteMultipleMessageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MessageServer).GetUnreadCount(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/message.Message/GetUnreadCount",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MessageServer).GetUnreadCount(ctx, req.(*DeleteMultipleMessageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Message_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "message.Message",
 	HandlerType: (*MessageServer)(nil),
@@ -417,6 +816,18 @@ var _Message_serviceDesc = grpc.ServiceDesc{
 			MethodName: "ChangeReadStatus",
 			Handler:    _Message_ChangeReadStatus_Handler,
 		},
+		{
+			MethodName: "DeleteSingleMessage",
+			Handler:    _Message_DeleteSingleMessage_Handler,
+		},
+		{
+			MethodName: "DeleteMultipleMessage",
+			Handler:    _Message_DeleteMultipleMessage_Handler,
+		},
+		{
+			MethodName: "GetUnreadCount",
+			Handler:    _Message_GetUnreadCount_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "message.proto",

+ 33 - 3
rpc/messageclient/message.go

@@ -14,13 +14,24 @@ import (
 )
 
 type (
-	Response                = message.Response
-	Request                 = message.Request
-	ChangeReadStatusRequest = message.ChangeReadStatusRequest
+	Request                      = message.Request
+	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
+	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
+	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
+	GetUnreadCountRequest        = message.GetUnreadCountRequest
+	Response                     = message.Response
+	GetUnreadCountResponse       = message.GetUnreadCountResponse
 
 	Message interface {
 		Ping(ctx context.Context, in *Request) (*Response, error)
+		//  修改消息阅读状态
 		ChangeReadStatus(ctx context.Context, in *ChangeReadStatusRequest) (*Response, error)
+		//  删除单一消息
+		DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest) (*Response, error)
+		//  删除多条消息
+		DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest) (*Response, error)
+		//   查询指定用户未读消息合计
+		GetUnreadCount(ctx context.Context, in *DeleteMultipleMessageRequest) (*GetUnreadCountResponse, error)
 	}
 
 	defaultMessage struct {
@@ -39,7 +50,26 @@ func (m *defaultMessage) Ping(ctx context.Context, in *Request) (*Response, erro
 	return client.Ping(ctx, in)
 }
 
+//  修改消息阅读状态
 func (m *defaultMessage) ChangeReadStatus(ctx context.Context, in *ChangeReadStatusRequest) (*Response, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.ChangeReadStatus(ctx, in)
 }
+
+//  删除单一消息
+func (m *defaultMessage) DeleteSingleMessage(ctx context.Context, in *DeleteSingleMessageRequest) (*Response, error) {
+	client := message.NewMessageClient(m.cli.Conn())
+	return client.DeleteSingleMessage(ctx, in)
+}
+
+//  删除多条消息
+func (m *defaultMessage) DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest) (*Response, error) {
+	client := message.NewMessageClient(m.cli.Conn())
+	return client.DeleteMultipleMessage(ctx, in)
+}
+
+//   查询指定用户未读消息合计
+func (m *defaultMessage) GetUnreadCount(ctx context.Context, in *DeleteMultipleMessageRequest) (*GetUnreadCountResponse, error) {
+	client := message.NewMessageClient(m.cli.Conn())
+	return client.GetUnreadCount(ctx, in)
+}

+ 37 - 1
service/messageService.go

@@ -8,7 +8,7 @@ import (
 
 type MessageService struct {
 }
-
+// 修改消息阅读状态
 func (service *MessageService) ChangeReadStatus(data *message.ChangeReadStatusRequest) (int64, string) {
 	orm := entity.Engine.NewSession()
 	log.Println("123")
@@ -31,3 +31,39 @@ func (service *MessageService) ChangeReadStatus(data *message.ChangeReadStatusRe
 	}
 	return 1, "修改消息阅读状态成功"
 }
+// 删除消息
+func (service *MessageService) DeleteMessage(id []int64) (int64, string) {
+	orm := entity.Engine.NewSession()
+	log.Println("123")
+	defer orm.Close()
+	m := entity.Message{}
+	m.Isdel=-1
+	count, err := orm.In("id",id).Cols("isdel").Update(&m)
+	if err != nil ||count==0{
+		log.Println(err)
+		log.Println(count)
+		orm.Rollback()
+		return 0, "删除消息失败"
+	}
+	err2 := orm.Commit()
+	if err2 != nil {
+		return 0, "删除消息失败"
+	}
+	return 1, "删除消息成功"
+}
+// 未读消息合计
+func (service *MessageService) CountUnread(userId string) (int64, string,int64) {
+	orm := entity.Engine.NewSession()
+	log.Println("123")
+	defer orm.Close()
+	m := entity.Message{}
+	m.Isdel=-1
+	count, err := orm.Where("receive_userid=? and isdel=1",userId).Count(m)
+	if err != nil ||count==0{
+		log.Println(err)
+		log.Println(count)
+		orm.Rollback()
+		return 0, "查询未读消息失败",0
+	}
+	return 1, "查询未读消息成功",count
+}