Merge remote-tracking branch 'origin/feature-delay-add' into feature-delay-add

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.mongodb.client.result.DeleteResult;
@@ -24,6 +25,7 @@ import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.types.ObjectId;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -124,6 +126,34 @@ public class MsgBiz {
         return ObjectRestResponse.succ(goodPageInfo);
     }
 
+    public ObjectRestResponse getHotMsgListWithoutOne(String messageId, Integer number) {
+        AppUserDTO appUserDTO = userBiz.getUserInfo();
+        Integer userId = null;
+        if (appUserDTO != null) {
+            userId = appUserDTO.getImUserid();
+        }
+       number = number == null ? 10 : number;
+        Query query = new Query(Criteria.where("body.type").is(4).and("count.praise").gt(getNumber()).and("visible").is(1));
+        if (StringUtils.isNotBlank(messageId)) {
+            query.addCriteria(Criteria.where("_id").ne(new ObjectId(messageId)));
+        }
+        query.with(new Sort(Sort.Direction.DESC, "count.praise"));
+        List<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
+
+        Set<Msg> resultList = new HashSet<>();
+        if(CollectionUtils.isNotEmpty(msgList)) {
+            if(number >= msgList.size()) {
+                return ObjectRestResponse.succ(msgList);
+            }
+            Set<Integer> set = new HashSet<>();
+            RandomUtil.randomSet(msgList.size(), number, set, number);
+            for(Integer i : set) {
+                resultList.add(msgList.get(i));
+            }
+        }
+        return ObjectRestResponse.succ(resultList);
+    }
+
     public ObjectRestResponse get(String id) {
         //获取所有朋友圈
         AppUserDTO appUserDTO = userBiz.getUserInfo();

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/MsgController.java

@@ -61,5 +61,14 @@ public class MsgController {
         return msgBiz.getMsgList(msgQueryDto);
     }
 
+    @GetMapping(value = "/app/unauth/getHostMsgList")
+    public ObjectRestResponse getHostMsgList(String messageId, Integer number) {
+        return msgBiz.getHotMsgListWithoutOne(messageId, number);
+    }
+
+    @GetMapping(value = "/app/unauth/get")
+    public ObjectRestResponse getDetail(String id) {
+        return msgBiz.get(id);
+    }
 
 }