feat: 群发到群 记录60秒

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/GroupMessageServiceImpl.java

@@ -368,8 +368,8 @@ public class GroupMessageServiceImpl implements GroupMessageService {
         Optional<QywxGroupMessageInfoDTO> messageInfoDTO = qywxGroupMessageInfos
                 .stream()
                 .filter(item -> !excludeMsgIds.contains(item.getMsgId()))
-                .filter(item -> item.getCreateTime() - createTime <= 0)
-                .min((first, second) -> (int) (second.getCreateTime() - first.getCreateTime()));
+                .filter(item -> item.getCreateTime() - createTime <= 0 && createTime - item.getCreateTime() <= 30)
+                .min((first, second) -> (int) (Math.abs(first.getCreateTime() - createTime) - Math.abs(second.getCreateTime() - createTime)));
         if (messageInfoDTO.isPresent()) {
             QywxGroupMessageInfoDTO dto = messageInfoDTO.get();
             excludeMsgIds.add(dto.getMsgId());
@@ -379,8 +379,8 @@ public class GroupMessageServiceImpl implements GroupMessageService {
         messageInfoDTO = qywxGroupMessageInfos
                 .stream()
                 .filter(item -> !excludeMsgIds.contains(item.getMsgId()))
-                .filter(item -> item.getCreateTime() - createTime > 0)
-                .min((first, second) -> (int) (first.getCreateTime() - second.getCreateTime()));
+                .filter(item -> item.getCreateTime() - createTime > 0 && item.getCreateTime() - createTime <= 30)
+                .min((first, second) -> (int) (Math.abs(first.getCreateTime() - createTime) - Math.abs(second.getCreateTime() - createTime)));
         if (messageInfoDTO.isPresent()) {
             QywxGroupMessageInfoDTO dto = messageInfoDTO.get();
             excludeMsgIds.add(dto.getMsgId());
@@ -477,7 +477,7 @@ public class GroupMessageServiceImpl implements GroupMessageService {
         QywxMomentInfoQDTO qywxMomentInfoQDTO = new QywxMomentInfoQDTO();
         qywxMomentInfoQDTO.setCorpid(corpid);
         qywxMomentInfoQDTO.setSuiteid(config.getWxSuiteid());
-        qywxMomentInfoQDTO.setStartTime(DateUtil.addNumForMinute(currentTime, -30).getTime() / 1000);
+        qywxMomentInfoQDTO.setStartTime(DateUtil.addNumForSecond(currentTime, -60).getTime() / 1000);
         qywxMomentInfoQDTO.setEndTime(currentTime.getTime() / 1000);
         qywxMomentInfoQDTO.setCreatorId(userId);
         qywxMomentInfoQDTO.setPageSize(20);