添加积分消息队列接口

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -54,12 +54,7 @@ public class MsgBiz {
         List<Msg> msgList = null;
         if (type != null) {
             query = new Query(Criteria.where("body.type").is(type));
-            if (appUserDTO != null) {
-                msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
-                PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
-                return ObjectRestResponse.succ(goodPageInfo);
-            }
-            msgList = mongoTemplate.find(query, Msg.class, "s_msg");
+            msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
             PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
             return ObjectRestResponse.succ(goodPageInfo);
         } else {
@@ -67,12 +62,7 @@ public class MsgBiz {
             ids.add(2);
             ids.add(4);
             query = new Query(Criteria.where("body.type").in(ids));
-            if (appUserDTO != null) {
-                msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
-                PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
-                return ObjectRestResponse.succ(goodPageInfo);
-            }
-            msgList = mongoTemplate.find(query, Msg.class, "s_msg");
+            msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
             PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
             return ObjectRestResponse.succ(goodPageInfo);
         }
@@ -100,15 +90,8 @@ public class MsgBiz {
         if(id == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        List<Msg> msgList = null;
         Query query = new Query(Criteria.where("id").is(new ObjectId(id)));
-        if (appUserDTO != null) {
-            msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
-            PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
-            return ObjectRestResponse.succ(goodPageInfo);
-        }
-        msgList = mongoTemplate.find(query, Msg.class, "s_msg");
-
+        List<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), appUserDTO.getImUserid());
         List<MsgVo> msgVoList = replaceMsgResult(msgList);
         if(msgVoList.size() > 0) {
             return ObjectRestResponse.succ(msgVoList.get(0));
@@ -133,9 +116,13 @@ public class MsgBiz {
             //添加点赞
             List<Praise> praise = mongoTemplate.find(query, Praise.class, "s_praise");
             msg.setPraises(replacePraiseResult(praise));
-
-            msg.setIsPraise(this.exists(userId, msg.getId()) ? 1 : 0);
-            msg.setIsCollect(this.existsCollect(userId, msg.getId()) ? 1 : 0);
+            if(userId != null) {
+                msg.setIsPraise(this.exists(userId, msg.getId()) ? 1 : 0);
+                msg.setIsCollect(this.existsCollect(userId, msg.getId()) ? 1 : 0);
+            } else {
+                msg.setIsPraise(0);
+                msg.setIsCollect(0);
+            }
         }
         return list;
     }