修改组装数据逻辑

we-com-server/src/main/java/com/tzld/piaoquan/wecom/job/WeComHistoryDataJob.java

@@ -228,7 +228,7 @@ public class WeComHistoryDataJob {
                         if (CollectionUtils.isEmpty(externalUsers)) {
                             continue;
                         }
-                        insertHistoryMessageList(staffList.get(0), externalUsers, miniprogramRecordList, createTime, corpId);
+                        insertHistoryMessageList(staffList.get(0), externalUsers, miniprogramRecordList, createTime, corpId, startTime, endTime);
                         messageAttachmentService.addMiniProgram(messageAttachmentList);
                     }
                 }
@@ -339,19 +339,24 @@ public class WeComHistoryDataJob {
 
     }
 
-    private void insertHistoryMessageList(Staff staff, List<ExternalUser> externalUsers, List<MiniprogramRecord> miniprogramRecordList, Long createTime, Long corpId) {
+    private void insertHistoryMessageList(Staff staff, List<ExternalUser> externalUsers,
+                                          List<MiniprogramRecord> miniprogramRecordList,
+                                          Long createTime, Long corpId, Long startTime, Long endTime) {
         if (CollectionUtils.isEmpty(externalUsers) || CollectionUtils.isEmpty(miniprogramRecordList)) {
             return;
         }
         MessageAttachmentExample example = new MessageAttachmentExample();
-        example.createCriteria().andStaffIdEqualTo(staff.getId()).andSendTimeGreaterThan(DateUtil.getThatDayDate());
+        example.createCriteria().andStaffIdEqualTo(staff.getId())
+                .andSendTimeBetween(new Date(startTime * 1000), new Date(endTime * 1000));
         List<MessageAttachment> messageAttachments = messageAttachmentMapper.selectByExample(example);
-        if(CollectionUtils.isEmpty(messageAttachments)){
+        if (CollectionUtils.isEmpty(messageAttachments)) {
             LarkRobotUtil.sendMessage("获取保底set失败");
             return;
         }
-        Set<Long> guaranteedSet = messageAttachments.stream().map(MessageAttachment::getMiniprogramVideoId).collect(Collectors.toSet());
-        Long sendTime = externalUsers.stream().map(ExternalUser::getSendTime).filter(Objects::nonNull).findFirst().orElse(null);
+        Set<Long> guaranteedSet = messageAttachments.stream()
+                .map(MessageAttachment::getMiniprogramVideoId).collect(Collectors.toSet());
+        Long sendTime = externalUsers.stream()
+                .map(ExternalUser::getSendTime).filter(Objects::nonNull).findFirst().orElse(null);
         List<HistoryMessage> historyMessageList = new ArrayList<>();
         for (ExternalUser externalUser : externalUsers) {
             Long userId = userMapper.selectIdByExternalUserId(externalUser.getExternalUserId());