Merge branch 'dev/v1.2.16.2_rjj' of moapp/MessageCenter into hotfix/v1.2.16.2

rpc/internal/common/msglistService.go

@@ -389,17 +389,15 @@ func BitmapCountClassUnread(userId string, groupId int64, classUnreadCountMap ma
 //FindUserClassUnreadAndClassAllMsg 查询用户分类未读消息id
 func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[int]int, classUnreadMsgMap, classAllMsgMap map[int][]int, err error) {
 	redisKey := fmt.Sprintf(UserClassMapKey, userId)
-	redisData := redis.Get(redisModule, redisKey)
+	redisData, err := redis.GetBytes(redisModule, redisKey)
 	findRes := []UserClassSummary{}
-	if redisData != nil {
-		if data, err1 := json.Marshal(redisData); err1 == nil {
-			json.Unmarshal(data, &findRes)
-			for _, v := range findRes {
-				classUnreadCountMap[int(v.GroupId)] = len(v.ClassUnread)
-				classUnreadMsgMap[int(v.GroupId)] = Uint32ArrToIntArr(v.ClassUnread)
-				//classAllCountMap[int(v.GroupId)] = len(v.ClassAll)
-				classAllMsgMap[int(v.GroupId)] = Uint32ArrToIntArr(v.ClassAll)
-			}
+	if redisData != nil && err == nil {
+		json.Unmarshal(*redisData, &findRes)
+		for _, v := range findRes {
+			classUnreadCountMap[int(v.GroupId)] = len(v.ClassUnread)
+			classUnreadMsgMap[int(v.GroupId)] = Uint32ArrToIntArr(v.ClassUnread)
+			//classAllCountMap[int(v.GroupId)] = len(v.ClassAll)
+			classAllMsgMap[int(v.GroupId)] = Uint32ArrToIntArr(v.ClassAll)
 		}
 	}
 	sql := fmt.Sprintf(`select a2.group_id,bitmapToArray(bitmapAnd(a1.unreadArr,a2.msg_bitmap)) as unreadArr,bitmapToArray(bitmapAnd(a1.allMsg,a2.msg_bitmap)) as classMsgArr from 
@@ -460,16 +458,14 @@ func FindUserClassUnreadAndClassAllMsg(userId string) (classUnreadCountMap map[i
 // GetUserMsgSummary 从用户消息汇总表取数据
 func GetUserMsgSummary(userId string, isfilterActive bool) (userAllMsg, userReadMsg, userUnreadMsg []uint32, err error) {
 	key := fmt.Sprintf(UserMsgSummery, userId)
-	redisData := redis.Get(redisModule, key)
-	if redisData != nil {
-		if d, err1 := json.Marshal(redisData); err1 == nil {
-			var userData map[string][]uint32
-			json.Unmarshal(d, &userData)
-			userAllMsg = userData["userAllMsg"]
-			userReadMsg = userData["userReadMsg"]
-			userUnreadMsg = userData["userUnreadMsg"]
-			return
-		}
+	redisData, err := redis.GetBytes(redisModule, key)
+	if redisData != nil && err == nil {
+		var userData map[string][]uint32
+		json.Unmarshal(*redisData, &userData)
+		userAllMsg = userData["userAllMsg"]
+		userReadMsg = userData["userReadMsg"]
+		userUnreadMsg = userData["userUnreadMsg"]
+		return
 	}
 	var sql string
 	isfilterActive = config.ConfigJson.IsFilterActive
@@ -538,16 +534,14 @@ type UserMsg struct {
 
 func WorkDeskList(in *message.WorkingDesktopReq) (res1, res2 []*message.Messages, err error) {
 	redisKey := fmt.Sprintf(UserWorkDeskKey, in.UserId)
-	redisData := redis.Get(redisModule, redisKey)
-	if redisData != nil {
-		if d, err1 := json.Marshal(redisData); err1 == nil {
-			var userData map[string][]*message.Messages
-			json.Unmarshal(d, &userData)
-			res1 = userData["res1"]
-			res2 = userData["res2"]
-			//fmt.Println("=====", userData)
-			return
-		}
+	redisData, err := redis.GetBytes(redisModule, redisKey)
+	if redisData != nil && err == nil {
+		var userData map[string][]*message.Messages
+		json.Unmarshal(*redisData, &userData)
+		res1 = userData["res1"]
+		res2 = userData["res2"]
+		//fmt.Println("=====", userData)
+		return
 	}
 	//待办查询
 	sqlStr := ""