修改历史数据获取

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

@@ -92,7 +92,7 @@ public class WeComHistoryDataJob1 {
     }
 
     public void selectGroupMsgList(Long startTime, Long endTime) {
-        delHistoryMessageList(startTime, endTime);
+//        delHistoryMessageList(startTime, endTime);
         try {
             String cursor = "";
             do {
@@ -112,7 +112,7 @@ public class WeComHistoryDataJob1 {
                     JSONObject groupMsg = groupMsgList.getJSONObject(i);
                     JSONArray attachments = groupMsg.getJSONArray("attachments");
                     String msgId = groupMsg.getString("msgid");
-                    Long createTime = groupMsg.getLong("create_time");
+                    Long createTime = groupMsg.getLong("create_time") * 1000;
                     if (CollectionUtils.isEmpty(attachments)) {
                         continue;
                     }
@@ -158,7 +158,7 @@ public class WeComHistoryDataJob1 {
                             continue;
                         }
                         insertHistoryMessageList(staffList.get(0), externalUsers, miniprogramRecordList, createTime);
-                        messageAttachmentService.addMiniProgram(messageAttachmentList);
+//                        messageAttachmentService.addMiniProgram(messageAttachmentList);
                     }
                 }
                 String nextCursor = jsonObject.getString("next_cursor");
@@ -192,7 +192,9 @@ public class WeComHistoryDataJob1 {
                 ExternalUser externalUser = new ExternalUser();
                 externalUser.setExternalUserId(send.getString("external_userid"));
                 externalUser.setStatus(send.getInteger("status"));
-                externalUser.setSendTime(send.getLong("send_time"));
+                if(send.getLong("send_time") != null){
+                    externalUser.setSendTime(send.getLong("send_time") * 1000);
+                }
                 resList.add(externalUser);
             }
             String nextCursor = jsonObject.getString("next_cursor");
@@ -263,7 +265,7 @@ public class WeComHistoryDataJob1 {
         HistoryMessage historyMessage = new HistoryMessage();
         historyMessage.setIsDelete(1);
         HistoryMessageExample example = new HistoryMessageExample();
-        example.createCriteria().andCreateTimeBetween(new Date(startTime * 1000), new Date(endTime * 1000));
+        example.createCriteria().andSendTimeBetween(new Date(startTime * 1000), new Date(endTime * 1000));
         historyMessageMapper.updateByExample(historyMessage, example);
 
     }
@@ -273,6 +275,7 @@ public class WeComHistoryDataJob1 {
         if (CollectionUtils.isEmpty(externalUsers) || CollectionUtils.isEmpty(miniprogramRecordList)) {
             return;
         }
+        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());
@@ -284,16 +287,21 @@ public class WeComHistoryDataJob1 {
                 HistoryMessage historyMessage = new HistoryMessage();
                 if (externalUser.getSendTime() != null) {
                     historyMessage.setSendTime(new Date(externalUser.getSendTime()));
+                } else {
+                    if (sendTime != null) {
+                        historyMessage.setSendTime(new Date(sendTime));
+                    } else if (createTime != null) {
+                        historyMessage.setSendTime(new Date(createTime));
+                    }
                 }
                 historyMessage.setAttachmentIdx(miniprogramRecord.getAttachmentIdx());
                 historyMessage.setVideoId(miniprogramRecord.getVideoId());
                 historyMessage.setUserId(userId);
                 historyMessage.setStaffId(staff.getId());
                 historyMessage.setStatus(status);
-                historyMessage.setCreateTime(new Date(createTime * 1000));
                 historyMessageList.add(historyMessage);
                 if (status == 2) {
-                    userService.delStaffWithUser(userId, staff.getId(), createTime);
+                    userService.delStaffWithUser(userId, staff.getId(), sendTime);
                 }
             }
         }

we-com-server/src/main/java/com/tzld/piaoquan/wecom/service/Impl/UserServiceImpl.java

@@ -173,7 +173,9 @@ public class UserServiceImpl implements UserService {
             return;
         }
         StaffWithUser staffWithUser = staffWithUserList.get(0);
-        staffWithUser.setDeleteTime(new Date(deleteTime * 1000));
+        if(deleteTime != null){
+            staffWithUser.setDeleteTime(new Date(deleteTime));
+        }
         staffWithUser.setIsDelete(1);
         staffWithUserMapper.updateByPrimaryKeySelective(staffWithUser);
     }