Merge branch 'dev-xym-log' of Server/we-com-manage into master

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

@@ -80,12 +80,12 @@ public class WeComHistoryDataJob {
         Long endTime = staffWithUserParam.getEndTime();
 
         for (; startTime < endTime; startTime += TimeConstant.DAY) {
-            selectHistoryMessage(startTime, Math.min(startTime + TimeConstant.DAY, endTime), staffWithUserParam.getStaffId());
+            selectHistoryMessage(startTime, Math.min(startTime + TimeConstant.DAY, endTime));
         }
         return ReturnT.SUCCESS;
     }
 
-    public void selectHistoryMessage(Long startTime, Long endTime, Long staffId) {
+    public void selectHistoryMessage(Long startTime, Long endTime) {
         try {
             Integer total = getHistoryDataTotal(startTime, endTime);
             if (total == null || total == 0) {
@@ -104,7 +104,7 @@ public class WeComHistoryDataJob {
                     List<String> allExternalUserList = new ArrayList<>();
                     List<MiniprogramRecord> miniprogramRecordList = new ArrayList<>();
                     List<MessageAttachment> messageAttachmentList = new ArrayList<>();
-                    Date createdAt = jsonArray.getJSONObject(i).getDate("created_at");
+                    Date sendAt = jsonArray.getJSONObject(i).getDate("send_at");
                     JSONArray attachments = jsonArray.getJSONObject(i).getJSONObject("msg_data").getJSONArray("attachments");
                     for (int j = 0; j < attachments.size(); j++) {
                         MiniprogramRecord miniprogramRecord = new MiniprogramRecord();
@@ -123,7 +123,7 @@ public class WeComHistoryDataJob {
                         messageAttachment.setPage(indexPage);
                         messageAttachment.setTitle(title);
                         messageAttachment.setMiniprogramVideoId(videoId);
-                        messageAttachment.setSendTime(createdAt);
+                        messageAttachment.setSendTime(sendAt);
                         messageAttachment.setType(MessageAttachmentTypeEnum.MINIPROGRAM.getType());
                         messageAttachmentList.add(messageAttachment);
                     }
@@ -138,7 +138,7 @@ public class WeComHistoryDataJob {
                         }
                         allExternalUserList.addAll(externalUserList);
                     }
-                    insertHistoryMessageList(allExternalUserList, miniprogramRecordList, createdAt, staffId);
+                    insertHistoryMessageList(allExternalUserList, miniprogramRecordList, sendAt);
                     messageAttachmentService.addMiniprogram(messageAttachmentList);
                 }
             }
@@ -148,21 +148,13 @@ public class WeComHistoryDataJob {
     }
 
 
-    private void insertHistoryMessageList(List<String> allExternalUserList, List<MiniprogramRecord> miniprogramRecordList, Date sendTime, Long staffId) {
+    private void insertHistoryMessageList(List<String> allExternalUserList, List<MiniprogramRecord> miniprogramRecordList, Date sendTime) {
         List<HistoryMessage> historyMessageList = new ArrayList<>();
         for (String externalUserId3rdParty : allExternalUserList) {
             Long userId = userMapper.selectIdByExternalUserId3rdParty(externalUserId3rdParty);
             if (userId == null) {
                 continue;
             }
-            if (staffId != null) {
-                StaffWithUserExample example = new StaffWithUserExample();
-                example.createCriteria().andStaffIdEqualTo(staffId).andUserIdEqualTo(userId);
-                List<StaffWithUser> staffWithUserList = staffWithUserMapper.selectByExample(example);
-                if (staffWithUserList == null) {
-                    continue;
-                }
-            }
             for (MiniprogramRecord miniprogramRecord : miniprogramRecordList) {
                 HistoryMessage historyMessage = new HistoryMessage();
                 historyMessage.setSendTime(sendTime);