拆分接口

api/internal/logic/messageunreadclasscountlogic.go

@@ -33,7 +33,6 @@ func (l *MessageUnreadClassCountLogic) MessageUnreadClassCount(req types.Message
 	resp, err := lsi.GetUnreadClassCount(l.ctx, &messageclient.GetUnreadClassCountReq{
 		Appid:  req.AppId,
 		UserId: req.UserId,
-		NeedMsg: req.NeedMsg,
 	})
 	log.Println(resp,888888)
 	if err != nil {
@@ -49,23 +48,6 @@ func (l *MessageUnreadClassCountLogic) MessageUnreadClassCount(req types.Message
 			"count": v.Count,
 		})
 
-	}
-	for _, v2 := range resp.Info {
-		result.Info = append(result.Info, map[string]interface{}{
-			"id":           v2.Id,
-			"appid":        v2.Appid,
-			"receive_name": v2.ReceiveName,
-			"send_userid":  v2.SendUserId,
-			"send_name":    v2.SendName,
-			"createtime":   v2.Createtime,
-			"title":        v2.Title,
-			"msg_type":     v2.MsgType,
-			"link":         v2.Link,
-			"cite_id":      v2.CiteId,
-			"content":      v2.Content,
-			"isRead":       v2.IsRead,
-		})
-
 	}
 	return result, nil
 }

api/internal/types/types.go

@@ -51,9 +51,8 @@ type MessageFindRes struct {
 }
 
 type MessageUnreadClassCountReq struct {
-	UserId  string `form:"userId"`
-	AppId   string `form:"appId"`
-	NeedMsg bool   `form:"needMsg"`
+	UserId string `form:"userId"`
+	AppId  string `form:"appId"`
 }
 
 type MessageUnreadClassCountRes struct {

api/message.api

@@ -53,9 +53,8 @@ type MessageFindRes {
 	Total   int64                    `json:"total"`
 }
 type MessageUnreadClassCountReq {
-	UserId  string `form:"userId"`
-	AppId   string `form:"appId"`
-	NeedMsg bool   `form:"needMsg"`
+	UserId string `form:"userId"`
+	AppId  string `form:"appId"`
 }
 
 type MessageUnreadClassCountRes {
@@ -116,7 +115,7 @@ service message-api {
 	post /message/messageGetLast (MessageGetLastReq) returns (MessageGetLastRes)
 	@handler MessageFindHandler // 获取指定用户的历史消息  条件可选 消息类型 是否未读
 	post /message/messageFind (MessageFindReq) returns (MessageFindRes)
-	@handler MessageUnreadClassCountHandler // 获取用户未读消息分类及分类下的最新消息
+	@handler MessageUnreadClassCountHandler // 获取用户未读消息分类
 	post /message/messageUnreadClassCount (MessageUnreadClassCountReq) returns (MessageUnreadClassCountRes)
 	@handler MessageUnreadCountHandler // 获取用户未读消息数量
 	post /message/messageUnreadCount (MessageUnreadCountReq) returns (MessageUnreadCountRes)

rpc/internal/logic/getunreadclasscountlogic.go

@@ -28,7 +28,7 @@ func NewGetUnreadClassCountLogic(ctx context.Context, svcCtx *svc.ServiceContext
 func (l *GetUnreadClassCountLogic) GetUnreadClassCount(in *message.GetUnreadClassCountReq) (*message.GetUnreadClassCountRes, error) {
 	// todo: add your logic here and delete this line
 	m := service.MessageService{}
-	count, info, err := m.ClassCountAndMessage(in.UserId, in.Appid,in.NeedMsg)
+	count, err := m.ClassCountAndMessage(in.UserId, in.Appid)
 	code := 0
 	msg := ""
 	if err == nil {
@@ -38,6 +38,5 @@ func (l *GetUnreadClassCountLogic) GetUnreadClassCount(in *message.GetUnreadClas
 		Code:    int64(code),
 		Message: msg,
 		Data:    count,
-		Info:    info,
 	}, nil
 }

rpc/internal/server/messageserver.go

@@ -75,7 +75,7 @@ func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.Messa
 	return l.FindMessageDetail(in)
 }
 
-//   获取指定用户的未读消息分类及数量 及分类的最新消息
+//   获取指定用户的分类及未读消息数量
 func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message.GetUnreadClassCountReq) (*message.GetUnreadClassCountRes, error) {
 	l := logic.NewGetUnreadClassCountLogic(ctx, s.svcCtx)
 	return l.GetUnreadClassCount(in)

rpc/message.proto

@@ -162,7 +162,7 @@ service Message {
     rpc GetLastMessage (GetLastMessageReq) returns (GetLastMessageRes);
     //查看详细详情
     rpc FindMessageDetail (MessageDetailReq) returns (MessageDetailResp);
-    //  获取指定用户的未读消息分类及数量 及分类的最新消息
+    //  获取指定用户的分类及未读消息数量
     rpc GetUnreadClassCount (GetUnreadClassCountReq) returns (GetUnreadClassCountRes);
     //  获取指定用户收到消息的分类
     rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);

rpc/message/message.pb.go

@@ -2160,7 +2160,7 @@ type MessageClient interface {
 	GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error)
 	//查看详细详情
 	FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-	//  获取指定用户的未读消息分类及数量 及分类的最新消息
+	//  获取指定用户的分类及未读消息数量
 	GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error)
 	//  获取指定用户收到消息的分类
 	GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
@@ -2304,7 +2304,7 @@ type MessageServer interface {
 	GetLastMessage(context.Context, *GetLastMessageReq) (*GetLastMessageRes, error)
 	//查看详细详情
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
-	//  获取指定用户的未读消息分类及数量 及分类的最新消息
+	//  获取指定用户的分类及未读消息数量
 	GetUnreadClassCount(context.Context, *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error)
 	//  获取指定用户收到消息的分类
 	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)

rpc/messageclient/message.go

@@ -14,28 +14,28 @@ import (
 )
 
 type (
-	SendMsgRequest               = message.SendMsgRequest
-	ResCount                     = message.ResCount
-	FindUserMsgRes               = message.FindUserMsgRes
-	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
+	MessageDetailResp            = message.MessageDetailResp
+	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
 	GetMsgTypeReq                = message.GetMsgTypeReq
-	GetMsgTypeRes                = message.GetMsgTypeRes
 	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
+	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
+	MessageDetailReq             = message.MessageDetailReq
 	GetUnreadCountRequest        = message.GetUnreadCountRequest
 	GetUnreadCountResponse       = message.GetUnreadCountResponse
-	Messages                     = message.Messages
-	MessageDetailResp            = message.MessageDetailResp
-	GetLastMessageRes            = message.GetLastMessageRes
-	GetUnreadClassCountReq       = message.GetUnreadClassCountReq
-	UpdateMessageReadReq         = message.UpdateMessageReadReq
 	UpdateMessageReadResp        = message.UpdateMessageReadResp
 	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
+	FindUserMsgRes               = message.FindUserMsgRes
+	GetLastMessageReq            = message.GetLastMessageReq
+	GetUnreadClassCountReq       = message.GetUnreadClassCountReq
+	GetMsgTypeRes                = message.GetMsgTypeRes
+	SendMsgRequest               = message.SendMsgRequest
+	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
+	ResCount                     = message.ResCount
+	UpdateMessageReadReq         = message.UpdateMessageReadReq
+	GetLastMessageRes            = message.GetLastMessageRes
 	Response                     = message.Response
 	FindUserMsgReq               = message.FindUserMsgReq
-	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
-	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
-	MessageDetailReq             = message.MessageDetailReq
-	GetLastMessageReq            = message.GetLastMessageReq
+	Messages                     = message.Messages
 
 	Message interface {
 		//  修改消息阅读状态
@@ -56,7 +56,7 @@ type (
 		GetLastMessage(ctx context.Context, in *GetLastMessageReq) (*GetLastMessageRes, error)
 		// 查看详细详情
 		FindMessageDetail(ctx context.Context, in *MessageDetailReq) (*MessageDetailResp, error)
-		//   获取指定用户的未读消息分类及数量 及分类的最新消息
+		//   获取指定用户的分类及未读消息数量
 		GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error)
 		//   获取指定用户收到消息的分类
 		GetMsgType(ctx context.Context, in *GetMsgTypeReq) (*GetMsgTypeRes, error)
@@ -129,7 +129,7 @@ func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetai
 	return client.FindMessageDetail(ctx, in)
 }
 
-//   获取指定用户的未读消息分类及数量 及分类的最新消息
+//   获取指定用户的分类及未读消息数量
 func (m *defaultMessage) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetUnreadClassCount(ctx, in)

service/messageService.go

@@ -124,7 +124,7 @@ func FindMessageDetail(id int64) (entity.Message, error) {
 }
 
 // 获取用户未读消息分类及数量 及分类下的最新一条消息
-func (service *MessageService) ClassCountAndMessage(userId string, appId string,needMsg bool) ([]*message.ResCount, []*message.Messages, error) {
+func (service *MessageService) ClassCountAndMessage(userId string, appId string) ([]*message.ResCount, error) {
 	orm := entity.Engine.NewSession()
 	log.Println("123")
 	defer orm.Close()
@@ -132,12 +132,12 @@ func (service *MessageService) ClassCountAndMessage(userId string, appId string,
 	query, err := orm.QueryInterface("SELECT msg_type,COUNT(CASE WHEN isRead=0 THEN 1 END) as count  FROM message where receive_userid=? and isdel=1 and appid=? and isRead=0 GROUP BY msg_type  ORDER BY FIELD(`msg_type`,\"1\",\"2\",\"3\")", userId, appId)
 	log.Println(query)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	if err != nil {
 		log.Println(err)
 		log.Println("咋回事")
-		return nil, nil, errors.New("查询未读消息失败")
+		return nil,  errors.New("查询未读消息失败")
 	}
 	typeCount := []*message.ResCount{}
 	log.Println(query)
@@ -148,43 +148,8 @@ func (service *MessageService) ClassCountAndMessage(userId string, appId string,
 			typeCount = append(typeCount, &message.ResCount{MsgType: v["msg_type"].(int64), Count: v["count"].(int64)})
 		}
 	}
-	var m1 []*entity.Message
-	var m2 []*message.Messages
-	if needMsg{
-		// 已经有的消息类型
-		existType := map[int64]bool{}
-		// 分类下最新一条消息  先查出来所有所有的  然后再取出来最新的一条
-		err = orm.Select("*").Where("receive_userid=? and isdel=1 and appid=? ", userId, appId).OrderBy("createtime desc").Find(&m1)
-		if err != nil {
-			log.Println(err,9999999)
-			return typeCount, m2, errors.New("获取类型下最新消息失败")
-		}
-		if m1 != nil && (len(m1) > 0) {
-			for _, v1 := range m1 {
-				if !existType[int64(v1.MsgType)] {
-					existType[int64(v1.MsgType)] = true
-					m2 = append(m2, &message.Messages{
-						Id:            int64(v1.Id),
-						Appid:         v1.AppId,
-						ReceiveUserId: v1.ReceiveUserid,
-						ReceiveName:   v1.ReceiveName,
-						SendUserId:    v1.SendUserid,
-						SendName:      v1.SendName,
-						Createtime:    v1.CreateTime.Format("2006-01-02 15:04:05"),
-						Title:         v1.Title,
-						MsgType:       int64(v1.MsgType),
-						Link:          v1.Link,
-						CiteId:        int64(v1.CiteId),
-						Content:       v1.Content,
-						IsRead:        int64(v1.IsRead),
-					})
-				}
-			}
-		}
-		log.Println("78945566",typeCount,m2)
-	}
 
-	return typeCount, m2, nil
+	return typeCount, nil
 }
 
 // 已接收到消息的分类