|
@@ -58,11 +58,13 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
classMsg := userClassMsgMap[util.IntAll(val["group_id"])]
|
|
|
if len(classMsg) > 0 {
|
|
|
lastMsgId = classMsg[len(classMsg)-1]
|
|
|
+ } else {
|
|
|
+ continue
|
|
|
}
|
|
|
}
|
|
|
lastMsg := GlobMsgMap[lastMsgId]
|
|
|
if lastMsg == nil || len(lastMsg) <= 0 {
|
|
|
- mess := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": int(lastMsgId)}, "id,msg_type,title,content,send_time,link,menu_name,group_id", "")
|
|
|
+ mess := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": int(lastMsgId)}, "id,msg_type,title,content,send_time,link,menu_name,group_id,sign", "")
|
|
|
if mess != nil && len(*mess) > 0 {
|
|
|
lastMsg = *mess
|
|
|
} else {
|
|
@@ -233,7 +235,6 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
|
|
|
for i := len(resData) - 1; i >= 0; i-- {
|
|
|
data.Data = append(data.Data, resData[i])
|
|
|
}
|
|
|
- fmt.Println("数据长度:", len(data.Data))
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -262,12 +263,19 @@ func BitmapMessageGetLast(this *message.UserMsgListReq, msgId int) *message.Mess
|
|
|
}
|
|
|
lastMsg := GlobMsgMap[msgId]
|
|
|
if lastMsg == nil && len(lastMsg) <= 0 {
|
|
|
- m := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": msgId}, "id,msg_type,title,content,send_time,link,menu_name,group_id", "")
|
|
|
- if m != nil && len(*m) > 0 {
|
|
|
- lastMsg = *m
|
|
|
+ mess := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": msgId}, "id,msg_type,title,content,send_time,link,menu_name,group_id,sign", "")
|
|
|
+ if mess != nil && len(*mess) > 0 {
|
|
|
+ lastMsg = *mess
|
|
|
}
|
|
|
}
|
|
|
if lastMsg != nil && len(lastMsg) > 0 {
|
|
|
+ if common.IntAll(lastMsg["sign"]) == 4 {
|
|
|
+ //查询用户注册时间
|
|
|
+ rData, _ := entity.MQFW.FindOneByField("user", map[string]interface{}{"_id": m.StringTOBsonId(this.UserId)}, `{"l_registedate":1}`)
|
|
|
+ if rData != nil && len(*rData) > 0 {
|
|
|
+ lastMsg["send_time"] = time.Unix(common.Int64All((*rData)["l_registedate"]), 0).Local().Format("2006-01-02 15:04:05")
|
|
|
+ }
|
|
|
+ }
|
|
|
msg := message.Messages{
|
|
|
Id: common.InterfaceToStr(lastMsg["id"]),
|
|
|
Createtime: common.InterfaceToStr(lastMsg["send_time"]),
|
|
@@ -337,7 +345,6 @@ func BitmapCountClassUnread(userId string, groupId int64, classUnreadCountMap ma
|
|
|
count int64
|
|
|
)
|
|
|
data := make(map[string]int64)
|
|
|
- fmt.Println("=========", groupId, entity.ClassSearchMap)
|
|
|
if _, ok := entity.ClassSearchMap[groupId]; !ok {
|
|
|
return
|
|
|
}
|
|
@@ -416,18 +423,15 @@ func FindUserClassMsg(userId string) (map[int]int, map[int][]int) {
|
|
|
func GetUserMsgSummary(userId string) (userAllMsg, userReadMsg, userUnreadMsg []uint32, err error) {
|
|
|
var count uint64
|
|
|
sqlc := fmt.Sprintf("SELECT COUNT(*) as count from message_user_summary WHERE userId = '%s'", userId)
|
|
|
- fmt.Println("sqlc", sqlc)
|
|
|
+ log.Println("GetUserMsgSummary selcet ", sqlc)
|
|
|
row1 := entity.ClickhouseConn.QueryRow(context.Background(), sqlc)
|
|
|
err = row1.Scan(&count)
|
|
|
- fmt.Println(err, count)
|
|
|
- //row1, err := entity.ClickhouseConn.Query(context.Background(), )
|
|
|
- //row1.Scan(&count)
|
|
|
if count == 0 {
|
|
|
err = errors.New("用户暂无数据")
|
|
|
return
|
|
|
}
|
|
|
sql := fmt.Sprintf("SELECT bitmapToArray(allMsg) as userAllMsg,bitmapToArray(readMsg) as userReadMsg,bitmapToArray(bitmapAndnot(allMsg,readMsg)) as userunRead from messageCenter.message_user_summary where userId ='%s'", userId)
|
|
|
- fmt.Println(sql)
|
|
|
+ log.Println("GetUserMsgSummary selcet2 ", sql)
|
|
|
row := entity.ClickhouseConn.QueryRow(context.Background(), sql)
|
|
|
err = row.Scan(&userAllMsg, &userReadMsg, &userUnreadMsg)
|
|
|
if err != nil {
|