|
@@ -5,7 +5,6 @@ import (
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
|
"log"
|
|
|
- "reflect"
|
|
|
"strconv"
|
|
|
"time"
|
|
|
|
|
@@ -407,9 +406,7 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
|
|
|
}
|
|
|
}
|
|
|
rdata, err := redis.GetNewBytes(redisModule, fmt.Sprintf(UserClearUnread, userId))
|
|
|
- fmt.Println("erroer", err)
|
|
|
rdataArr := []uint32{}
|
|
|
- fmt.Println("------", rdata, reflect.TypeOf(rdata))
|
|
|
if rdata != nil {
|
|
|
if json.Unmarshal(*rdata, &rdataArr); err != nil {
|
|
|
fmt.Println("取出本次已读消息反序列化出错:", err)
|
|
@@ -439,9 +436,6 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
|
|
|
//处理已读
|
|
|
unreadArr := []uint32{}
|
|
|
if len(rdataMap) > 0 {
|
|
|
- if group.GroupId == 1 {
|
|
|
- fmt.Println("*****", group.ClassUnread)
|
|
|
- }
|
|
|
if len(group.ClassUnread) > 0 {
|
|
|
for _, v := range group.ClassUnread {
|
|
|
if !rdataMap[v] {
|
|
@@ -453,8 +447,6 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
|
|
|
}
|
|
|
|
|
|
findRes = append(findRes, group)
|
|
|
- //log.Println("========", len(group.ClassUnread))
|
|
|
-
|
|
|
}
|
|
|
if findRes != nil && len(findRes) > 0 { //缓存
|
|
|
for _, val := range findRes {
|
|
@@ -489,12 +481,11 @@ func GetUserMsgSummary(userId string, isfilterActive bool) (userAllMsg, userRead
|
|
|
} else {
|
|
|
sql = fmt.Sprintf("SELECT bitmapToArray(allMsg) as userAllMsg,bitmapToArray(readMsg) as userReadMsg,bitmapToArray(bitmapAndnot(allMsg,readMsg)) as userunRead from message_user_summary where userId ='%s'", userId)
|
|
|
}
|
|
|
- log.Println("GetUserMsgSummary加载缓存:", sql)
|
|
|
+ log.Println("GetUserMsgSummary加载缓存sql:", sql)
|
|
|
// 在这里可以使用 lock 对共享资源进行保护
|
|
|
lock := UserLocksMap.GetLock(userId)
|
|
|
lock.Lock()
|
|
|
defer lock.Unlock()
|
|
|
- log.Println("GetUserMsgSummary selcet2 ", sql)
|
|
|
row := entity.ClickhouseConn.QueryRow(context.Background(), sql)
|
|
|
err = row.Scan(&userAllMsg, &userReadMsg, &userUnreadMsg)
|
|
|
if err != nil {
|