|
@@ -29,7 +29,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
_, userClassMsgMap := FindUserClassMsg(this.UserId)
|
|
_, userClassMsgMap := FindUserClassMsg(this.UserId)
|
|
|
//用户分类未读消息
|
|
//用户分类未读消息
|
|
|
classUnreadCountMap, classUnreadMsgMap := FindUserClassUnread(this.UserId)
|
|
classUnreadCountMap, classUnreadMsgMap := FindUserClassUnread(this.UserId)
|
|
|
- fmt.Println("用户所有消息数：", userAllMsgArr, "已读消息数：", userReadArr, "未读消息数：", userUnreadArr)
|
|
|
|
|
|
|
+ //fmt.Println("用户所有消息数：", userAllMsgArr, "已读消息数：", userReadArr, "未读消息数：", userUnreadArr)
|
|
|
//导航未读消息总数
|
|
//导航未读消息总数
|
|
|
if !this.IsMsgList && !this.IsColumnNewMsg && !this.IsColumn { //消息未读数统计
|
|
if !this.IsMsgList && !this.IsColumnNewMsg && !this.IsColumn { //消息未读数统计
|
|
|
_, unread = BitmapCountUnread(this.UserId, classUnreadCountMap, true)
|
|
_, unread = BitmapCountUnread(this.UserId, classUnreadCountMap, true)
|
|
@@ -46,7 +46,6 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
"group_id": 12,
|
|
"group_id": 12,
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
- fmt.Println("messageColumn", messageColumn)
|
|
|
|
|
for _, val := range messageColumn {
|
|
for _, val := range messageColumn {
|
|
|
if util.IntAll(val["group_id"]) > 0 && util.IntAll(val["group_id"]) < 999 {
|
|
if util.IntAll(val["group_id"]) > 0 && util.IntAll(val["group_id"]) < 999 {
|
|
|
//用户分类未读 交集
|
|
//用户分类未读 交集
|
|
@@ -109,7 +108,6 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
unread += total
|
|
unread += total
|
|
|
for i := 0; i < len(columnArr); i++ {
|
|
for i := 0; i < len(columnArr); i++ {
|
|
|
tmp := columnArr[i]
|
|
tmp := columnArr[i]
|
|
|
- fmt.Println("msgtype", tmp.MsgType)
|
|
|
|
|
var column message.AllSortData
|
|
var column message.AllSortData
|
|
|
column.Name = tmp.Name
|
|
column.Name = tmp.Name
|
|
|
column.Img = fmt.Sprintf("/common-module/msgCenter/%s.png", tmp.Img)
|
|
column.Img = fmt.Sprintf("/common-module/msgCenter/%s.png", tmp.Img)
|
|
@@ -124,7 +122,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
} else if this.IsColumn {
|
|
} else if this.IsColumn {
|
|
|
//获取所有分类未读数 不初始化
|
|
//获取所有分类未读数 不初始化
|
|
|
sortUnread, total := BitmapCountUnread(this.UserId, classUnreadCountMap, false)
|
|
sortUnread, total := BitmapCountUnread(this.UserId, classUnreadCountMap, false)
|
|
|
- fmt.Println("*************", total)
|
|
|
|
|
|
|
+ //fmt.Println("*************", total)
|
|
|
unread += total
|
|
unread += total
|
|
|
for _, v := range entity.MessageColumn {
|
|
for _, v := range entity.MessageColumn {
|
|
|
var column message.AllSortData
|
|
var column message.AllSortData
|
|
@@ -175,9 +173,9 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
if this.Read == 0 { //未读
|
|
if this.Read == 0 { //未读
|
|
|
userMsgArr = Uint32ArrToIntArr(userUnreadArr)
|
|
userMsgArr = Uint32ArrToIntArr(userUnreadArr)
|
|
|
}
|
|
}
|
|
|
- fmt.Println("所有消息", userMsgArr)
|
|
|
|
|
if len(userMsgArr) > 0 {
|
|
if len(userMsgArr) > 0 {
|
|
|
userMsgArr = IntArrSort(userMsgArr)
|
|
userMsgArr = IntArrSort(userMsgArr)
|
|
|
|
|
+ fmt.Println("列表消息：", userMsgArr)
|
|
|
//总页数
|
|
//总页数
|
|
|
var pageCount = 0
|
|
var pageCount = 0
|
|
|
if this.PageSize != 0 {
|
|
if this.PageSize != 0 {
|
|
@@ -192,7 +190,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
if int(this.OffSet) == pageCount || this.PageSize == 0 {
|
|
if int(this.OffSet) == pageCount || this.PageSize == 0 {
|
|
|
end = 0
|
|
end = 0
|
|
|
}
|
|
}
|
|
|
- fmt.Println(end, start)
|
|
|
|
|
|
|
+ //fmt.Println(end, start)
|
|
|
if end < 0 || start < 0 {
|
|
if end < 0 || start < 0 {
|
|
|
return data, nil
|
|
return data, nil
|
|
|
}
|
|
}
|
