未读消息数量修改

api/internal/handler/messageunreadcounthandler.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 MessageUnreadCountHandler(ctx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.MessageUnreadCountReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewMessageUnreadCountLogic(r.Context(), ctx)
-		resp, err := l.MessageUnreadCount(req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

api/internal/handler/routes.go

@@ -17,11 +17,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/messageCenter/messageDetail",
 				Handler: MessageDetailHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/messageUnreadCount",
-				Handler: MessageUnreadCountHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/messageCenter/getMsgType",

api/internal/logic/messageunreadcountlogic.go

@@ -1,45 +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 MessageUnreadCountLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewMessageUnreadCountLogic(ctx context.Context, svcCtx *svc.ServiceContext) MessageUnreadCountLogic {
-	return MessageUnreadCountLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *MessageUnreadCountLogic) MessageUnreadCount(req types.MessageUnreadCountReq) (*types.MessageUnreadCountRes, error) {
-	result := &types.MessageUnreadCountRes{}
-	//log.Println(req)
-	lsi := l.svcCtx.MessageCenter
-	resp, err := lsi.GetUnreadCount(l.ctx, &messageclient.GetUnreadCountRequest{
-		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.Data = map[string]interface{}{
-		"count": resp.Count,
-	}
-	return result, nil
-}

api/internal/types/types.go

@@ -16,17 +16,6 @@ type MessageDetailResp struct {
 	Data    map[string]interface{} `json:"data"`
 }
 
-type MessageUnreadCountReq struct {
-	UserId string `header:"mgoUserId"`
-	AppId  string `header:"appId"`
-}
-
-type MessageUnreadCountRes struct {
-	Code    int64                  `json:"code"`
-	Message string                 `json:"message"`
-	Data    map[string]interface{} `json:"data"`
-}
-
 type GetMsgTypeReq struct {
 	UserId string `header:"mgoUserId"`
 	AppId  string `header:"appId"`

api/message.api

@@ -22,15 +22,6 @@ type MessageDetailResp {
 	Data    map[string]interface{} `json:"data"`
 }
 
-type MessageUnreadCountReq {
-	UserId string `header:"mgoUserId"`
-	AppId  string `header:"appId"`
-}
-type MessageUnreadCountRes {
-	Code    int64                  `json:"code"`
-	Message string                 `json:"message"`
-	Data    map[string]interface{} `json:"data"`
-}
 type GetMsgTypeReq {
 	UserId string `header:"mgoUserId"`
 	AppId  string `header:"appId"`
@@ -155,9 +146,6 @@ service message-api {
 	//查询消息详情
 	@handler MessageDetailHandler
 	get /messageCenter/messageDetail (MessageDetailReq) returns (MessageDetailResp)
-	// 获取未读消息总量
-	@handler MessageUnreadCountHandler
-	post /messageCenter/messageUnreadCount (MessageUnreadCountReq) returns (MessageUnreadCountRes)
 	// 获取消息分类
 	@handler GetMsgTypeHandler
 	post /messageCenter/getMsgType (GetMsgTypeReq) returns (GetMsgTypeRes)

rpc/internal/common/sendMsg.go

@@ -336,19 +336,6 @@ func MessageGetLast(this *message.UserMsgListReq) *message.Messages {
 	return nil
 }
 
-// 指定分类未读消息合计
-func ClassCountUnread(msgType int, userId string, appId string) (int64, string, int64) {
-	query := map[string]interface{}{
-		"msg_type":       msgType,
-		"receive_userid": userId,
-		"isdel":          1,
-		"appid":          appId,
-		"isRead":         0,
-	}
-	count := entity.Mysql.Count("message", query)
-	return 1, "查询指定分类未读消息成功", count
-}
-
 // MsgCountAdd 消息未读数量加1
 func MsgCountAdd(userId, appId string, msgType int64) bool {
 	keyString := fmt.Sprintf(MsgCountKey, userId, msgType)

rpc/internal/logic/getunreadcountlogic.go

@@ -1,39 +0,0 @@
-package logic
-
-import (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	qutil "app.yhyue.com/moapp/jybase/common"
-	"context"
-	"log"
-
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/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 *messageclient.GetUnreadCountRequest) (*messageclient.GetUnreadCountResponse, error) {
-
-	m := &service.MessageService{}
-	log.Println("参数：", in.Appid, in.UserId)
-	code, msg, count := m.CountUnread(in.UserId, in.Appid)
-	return &messageclient.GetUnreadCountResponse{
-		Code:    code,
-		Message: msg,
-		Count:   qutil.Int64All(count),
-	}, nil
-}

rpc/internal/server/messageserver.go

@@ -34,12 +34,6 @@ func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message.Change
 	return l.ChangeReadStatus(in)
 }
 
-//   查询指定用户未读消息合计
-func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message.GetUnreadCountRequest) (*message.GetUnreadCountResponse, error) {
-	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)
-	return l.GetUnreadCount(in)
-}
-
 //   查询指定用户的历史消息记录
 func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsgReq) (*message.FindUserMsgRes, error) {
 	l := logic.NewFindUserMsgLogic(ctx, s.svcCtx)

rpc/message.proto

@@ -12,23 +12,12 @@ message ResCount {
     int64 msgType = 1; // 类型及未读数量
     int64 count = 2; // 类型及未读数量
 }
-// 查询指定用户未读消息合计
-message GetUnreadCountRequest {
-    string userId = 1; // 用户id
-    string appid = 2; //应用标识
-}
 
 message Response {
     int64 code = 1; //状态码
     string message = 2; //响应消息
 }
 
-message GetUnreadCountResponse {
-    int64 code = 1; //状态码
-    string message = 2; //响应消息
-    int64 count = 3; //
-}
-
 message FindUserMsgReq {
     string userId = 1; //用户id
     string receiveUserId = 2; //聊天方用户id
@@ -266,8 +255,6 @@ service Message {
     rpc multipleSaveMsg (multipleSaveMsgReq) returns (multipleSaveMsgResp);
     // 修改消息阅读状态
     rpc ChangeReadStatus (ChangeReadStatusReq) returns (Response);
-    //  查询指定用户未读消息合计
-    rpc GetUnreadCount (GetUnreadCountRequest) returns (GetUnreadCountResponse);
     //  查询指定用户的历史消息记录
     rpc FindUserMsg (FindUserMsgReq) returns (FindUserMsgRes);
     //查看详细详情

rpc/messageclient/message.go

@@ -28,8 +28,6 @@ type (
 	GetMsgTypeRes          = message.GetMsgTypeRes
 	GetUnreadClassCountReq = message.GetUnreadClassCountReq
 	GetUnreadClassCountRes = message.GetUnreadClassCountRes
-	GetUnreadCountRequest  = message.GetUnreadCountRequest
-	GetUnreadCountResponse = message.GetUnreadCountResponse
 	JySchoolMsg            = message.JySchoolMsg
 	MessageDetailReq       = message.MessageDetailReq
 	MessageDetailResp      = message.MessageDetailResp
@@ -54,8 +52,6 @@ type (
 		MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
 		//  修改消息阅读状态
 		ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
-		//   查询指定用户未读消息合计
-		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 		//   查询指定用户的历史消息记录
 		FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
 		// 查看详细详情
@@ -97,12 +93,6 @@ func (m *defaultMessage) ChangeReadStatus(ctx context.Context, in *ChangeReadSta
 	return client.ChangeReadStatus(ctx, in, opts...)
 }
 
-//   查询指定用户未读消息合计
-func (m *defaultMessage) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.GetUnreadCount(ctx, in, opts...)
-}
-
 //   查询指定用户的历史消息记录
 func (m *defaultMessage) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())

rpc/type/message/message_grpc.pb.go

@@ -26,8 +26,6 @@ type MessageClient interface {
 	MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
 	ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
-	//  查询指定用户未读消息合计
-	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
 	FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
 	//查看详细详情
@@ -74,15 +72,6 @@ func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStat
 	return out, nil
 }
 
-func (c *messageClient) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, 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
-}
-
 func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error) {
 	out := new(FindUserMsgRes)
 	err := c.cc.Invoke(ctx, "/message.Message/FindUserMsg", in, out, opts...)
@@ -163,8 +152,6 @@ type MessageServer interface {
 	MultipleSaveMsg(context.Context, *MultipleSaveMsgReq) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
 	ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error)
-	//  查询指定用户未读消息合计
-	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
 	FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error)
 	//查看详细详情
@@ -196,9 +183,6 @@ func (UnimplementedMessageServer) MultipleSaveMsg(context.Context, *MultipleSave
 func (UnimplementedMessageServer) ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ChangeReadStatus not implemented")
 }
-func (UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadCount not implemented")
-}
 func (UnimplementedMessageServer) FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserMsg not implemented")
 }
@@ -272,24 +256,6 @@ func _Message_ChangeReadStatus_Handler(srv interface{}, ctx context.Context, dec
 	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(GetUnreadCountRequest)
-	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.(*GetUnreadCountRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_FindUserMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(FindUserMsgReq)
 	if err := dec(in); err != nil {
@@ -449,10 +415,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ChangeReadStatus",
 			Handler:    _Message_ChangeReadStatus_Handler,
 		},
-		{
-			MethodName: "GetUnreadCount",
-			Handler:    _Message_GetUnreadCount_Handler,
-		},
 		{
 			MethodName: "FindUserMsg",
 			Handler:    _Message_FindUserMsg_Handler,