|
@@ -215,7 +215,7 @@ public class WeComHistoryDataJob {
|
|
|
.getJSONObject(MessageAttachmentTypeEnum.IMAGE.getType());
|
|
|
messageAttachment.setMediaId(image.getString("media_id"));
|
|
|
messageAttachment.setPicUrl(image.getString("pic_url"));
|
|
|
- messageAttachment.setType(MessageAttachmentTypeEnum.MINI_PROGRAM.getCode());
|
|
|
+ messageAttachment.setType(MessageAttachmentTypeEnum.IMAGE.getCode());
|
|
|
messageAttachmentList.add(messageAttachment);
|
|
|
}
|
|
|
|
|
@@ -227,7 +227,7 @@ public class WeComHistoryDataJob {
|
|
|
messageAttachment.setPicUrl(link.getString("picurl"));
|
|
|
messageAttachment.setDesc(link.getString("desc"));
|
|
|
messageAttachment.setUrl(link.getString("url"));
|
|
|
- messageAttachment.setType(MessageAttachmentTypeEnum.MINI_PROGRAM.getCode());
|
|
|
+ messageAttachment.setType(MessageAttachmentTypeEnum.LINK.getCode());
|
|
|
messageAttachmentList.add(messageAttachment);
|
|
|
|
|
|
}
|
|
@@ -289,7 +289,7 @@ public class WeComHistoryDataJob {
|
|
|
.addMessageAttachment(messageAttachmentList, createTime);
|
|
|
}
|
|
|
insertHistoryMessageList(msgId, staffList.get(0), externalUsers, miniprogramRecordList,
|
|
|
- createTime, corpId, startTime, endTime, attachmentIds);
|
|
|
+ createTime, corpId, startTime, endTime, attachmentIds, textContent);
|
|
|
}
|
|
|
}
|
|
|
String nextCursor = jsonObject.getString("next_cursor");
|
|
@@ -406,7 +406,8 @@ public class WeComHistoryDataJob {
|
|
|
|
|
|
private void insertHistoryMessageList(String msgId, Staff staff, List<ExternalUser> externalUsers,
|
|
|
List<MiniprogramRecord> miniprogramRecordList,
|
|
|
- Long createTime, Long corpId, Long startTime, Long endTime, List<Long> attachmentIds) {
|
|
|
+ Long createTime, Long corpId, Long startTime, Long endTime,
|
|
|
+ List<Long> attachmentIds, String textContent) {
|
|
|
if (CollectionUtils.isEmpty(externalUsers)) {
|
|
|
return;
|
|
|
}
|
|
@@ -438,6 +439,7 @@ public class WeComHistoryDataJob {
|
|
|
SendMsgResult sendMsgResult = new SendMsgResult();
|
|
|
sendMsgResult.setMsgId(msgId);
|
|
|
sendMsgResult.setUserId(userId);
|
|
|
+ sendMsgResult.setTextContent(textContent);
|
|
|
sendMsgResult.setStaffId(staff.getId());
|
|
|
if (sendTime != null) {
|
|
|
sendMsgResult.setSendTime(new Date(sendTime));
|