Commit f4b25af9 by songyinghui

feat: 群发到群 记录60秒

parent 92cdf0fb
...@@ -368,8 +368,8 @@ public class GroupMessageServiceImpl implements GroupMessageService { ...@@ -368,8 +368,8 @@ public class GroupMessageServiceImpl implements GroupMessageService {
Optional<QywxGroupMessageInfoDTO> messageInfoDTO = qywxGroupMessageInfos Optional<QywxGroupMessageInfoDTO> messageInfoDTO = qywxGroupMessageInfos
.stream() .stream()
.filter(item -> !excludeMsgIds.contains(item.getMsgId())) .filter(item -> !excludeMsgIds.contains(item.getMsgId()))
.filter(item -> item.getCreateTime() - createTime <= 0) .filter(item -> item.getCreateTime() - createTime <= 0 && createTime - item.getCreateTime() <= 30)
.min((first, second) -> (int) (second.getCreateTime() - first.getCreateTime())); .min((first, second) -> (int) (Math.abs(first.getCreateTime() - createTime) - Math.abs(second.getCreateTime() - createTime)));
if (messageInfoDTO.isPresent()) { if (messageInfoDTO.isPresent()) {
QywxGroupMessageInfoDTO dto = messageInfoDTO.get(); QywxGroupMessageInfoDTO dto = messageInfoDTO.get();
excludeMsgIds.add(dto.getMsgId()); excludeMsgIds.add(dto.getMsgId());
...@@ -379,8 +379,8 @@ public class GroupMessageServiceImpl implements GroupMessageService { ...@@ -379,8 +379,8 @@ public class GroupMessageServiceImpl implements GroupMessageService {
messageInfoDTO = qywxGroupMessageInfos messageInfoDTO = qywxGroupMessageInfos
.stream() .stream()
.filter(item -> !excludeMsgIds.contains(item.getMsgId())) .filter(item -> !excludeMsgIds.contains(item.getMsgId()))
.filter(item -> item.getCreateTime() - createTime > 0) .filter(item -> item.getCreateTime() - createTime > 0 && item.getCreateTime() - createTime <= 30)
.min((first, second) -> (int) (first.getCreateTime() - second.getCreateTime())); .min((first, second) -> (int) (Math.abs(first.getCreateTime() - createTime) - Math.abs(second.getCreateTime() - createTime)));
if (messageInfoDTO.isPresent()) { if (messageInfoDTO.isPresent()) {
QywxGroupMessageInfoDTO dto = messageInfoDTO.get(); QywxGroupMessageInfoDTO dto = messageInfoDTO.get();
excludeMsgIds.add(dto.getMsgId()); excludeMsgIds.add(dto.getMsgId());
...@@ -477,7 +477,7 @@ public class GroupMessageServiceImpl implements GroupMessageService { ...@@ -477,7 +477,7 @@ public class GroupMessageServiceImpl implements GroupMessageService {
QywxMomentInfoQDTO qywxMomentInfoQDTO = new QywxMomentInfoQDTO(); QywxMomentInfoQDTO qywxMomentInfoQDTO = new QywxMomentInfoQDTO();
qywxMomentInfoQDTO.setCorpid(corpid); qywxMomentInfoQDTO.setCorpid(corpid);
qywxMomentInfoQDTO.setSuiteid(config.getWxSuiteid()); 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.setEndTime(currentTime.getTime() / 1000);
qywxMomentInfoQDTO.setCreatorId(userId); qywxMomentInfoQDTO.setCreatorId(userId);
qywxMomentInfoQDTO.setPageSize(20); qywxMomentInfoQDTO.setPageSize(20);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment