|
|
@@ -374,9 +374,10 @@ func BitmapCountClassUnread(userId string, groupId int64, classUnreadCountMap ma
|
|
|
|
|
|
//FindUserClassUnread 查询用户分类未读消息id
|
|
|
func FindUserClassUnread(userId string) (map[int]int, map[int][]int) {
|
|
|
- sql := fmt.Sprintf(`select bitmapToArray(bitmapAnd(a1.unreadArr,a2.msg_bitmap)) from
|
|
|
+ sql := fmt.Sprintf(`select a2.group_id,bitmapToArray(bitmapAnd(a1.unreadArr,a2.msg_bitmap)) as unreadArr from
|
|
|
(SELECT bitmapAndnot(mus.allMsg,mus.readMsg) unreadArr FROM message_user_summary mus WHERE mus.userId = '%s') a1,
|
|
|
- (select msg_bitmap from message_summary ms where 1=1 limit 10) a2`, userId)
|
|
|
+ (select msg_bitmap,group_id from message_summary ms where 1=1 limit 10) a2`, userId)
|
|
|
+ fmt.Println("FindUserClassUnread", sql)
|
|
|
rows, err := entity.ClickhouseConn.Query(context.Background(), sql)
|
|
|
if err != nil {
|
|
|
log.Println("获取各分类未读消息数组出错：", err)
|
|
|
@@ -399,9 +400,10 @@ func FindUserClassUnread(userId string) (map[int]int, map[int][]int) {
|
|
|
|
|
|
//FindUserClassMsg 查询用户分类所有消息id
|
|
|
func FindUserClassMsg(userId string) (map[int]int, map[int][]int) {
|
|
|
- sql := fmt.Sprintf(`select bitmapToArray(bitmapAnd(a1.readArr,a2.msg_bitmap)) from
|
|
|
- (SELECT mus.readMsg as readArr FROM message_user_summary mus WHERE mus.userId = '%s') a1,
|
|
|
- (select msg_bitmap from message_summary ms where 1=1 limit 10) a2`, userId)
|
|
|
+ sql := fmt.Sprintf(`select a2.group_id,bitmapToArray(bitmapAnd(a1.allMsg,a2.msg_bitmap)) as unreadArr from
|
|
|
+ (SELECT mus.allMsg as allMsg FROM message_user_summary mus WHERE mus.userId = '%s') a1,
|
|
|
+ (select msg_bitmap,group_id from message_summary ms where 1=1 limit 10) a2`, userId)
|
|
|
+ fmt.Println("FindUserClassMsg", sql)
|
|
|
rows, err := entity.ClickhouseConn.Query(context.Background(), sql)
|
|
|
if err != nil {
|
|
|
log.Println("获取各分类未读消息数组出错：", err)
|
