增加指定用户

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

@@ -98,7 +98,6 @@ public class WeComHistoryDataJob1 {
                     log.error("selectGroupMsgList error startTime={}, endTime={}", startTime, endTime);
                     return;
                 }
-                cursor = jsonObject.getString("next_cursor");
                 JSONArray groupMsgList = jsonObject.getJSONArray("group_msg_list");
                 if (CollectionUtils.isEmpty(groupMsgList)) {
                     continue;
@@ -154,9 +153,12 @@ public class WeComHistoryDataJob1 {
                         insertHistoryMessageList(staffList.get(0), externalUsers, miniprogramRecordList);
                         messageAttachmentService.addMiniprogram(messageAttachmentList);
                     }
-
-
                 }
+                String nextCursor = jsonObject.getString("next_cursor");
+                if (cursor.equals(nextCursor)) {
+                    break;
+                }
+                cursor = nextCursor;
             } while (StringUtils.isNotEmpty(cursor));
         } catch (IOException e) {
             log.error("selectGroupMsgList error", e);
@@ -176,7 +178,6 @@ public class WeComHistoryDataJob1 {
                 log.error("selectGroupMsgSendResult error msgId={} userId={} errCode={} errmsg={}", msgId, userId, errCode, errmsg);
                 return resList;
             }
-            cursor = jsonObject.getString("next_cursor");
             JSONArray sendList = jsonObject.getJSONArray("send_list");
             for (int i = 0; i < sendList.size(); i++) {
                 JSONObject send = sendList.getJSONObject(i);
@@ -186,6 +187,11 @@ public class WeComHistoryDataJob1 {
                 externalUser.setSendTime(send.getLong("send_time"));
                 resList.add(externalUser);
             }
+            String nextCursor = jsonObject.getString("next_cursor");
+            if (cursor.equals(nextCursor)) {
+                break;
+            }
+            cursor = nextCursor;
         } while (StringUtils.isNotEmpty(cursor));
         return resList;
     }
@@ -217,13 +223,17 @@ public class WeComHistoryDataJob1 {
                 log.error("selectGroupMsgTask error msgId={} errCode={} errmsg={}", msgId, errCode, errmsg);
                 return resList;
             }
-            cursor = jsonObject.getString("next_cursor");
             JSONArray taskList = jsonObject.getJSONArray("task_list");
             for (int i = 0; i < taskList.size(); i++) {
                 JSONObject task = taskList.getJSONObject(i);
                 String userId = task.getString("userid");
                 resList.add(userId);
             }
+            String nextCursor = jsonObject.getString("next_cursor");
+            if (cursor.equals(nextCursor)) {
+                break;
+            }
+            cursor = nextCursor;
         } while (StringUtils.isNotEmpty(cursor));
         return resList;
     }
@@ -258,7 +268,6 @@ public class WeComHistoryDataJob1 {
                 if (externalUser.getSendTime() != null) {
                     historyMessage.setSendTime(new Date(externalUser.getSendTime()));
                 }
-
                 historyMessage.setAttachmentIdx(miniprogramRecord.getAttachmentIdx());
                 historyMessage.setVideoId(miniprogramRecord.getVideoId());
                 historyMessage.setUserId(userId);

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

@@ -74,7 +74,6 @@ public class WeComUserDataJob1 {
                     log.error("updateUserList error carrierId={} cursor={}", staff.getCarrierId(), cursor);
                     return;
                 }
-                cursor = jsonObject.getString("next_cursor");
                 JSONArray externalContactList = jsonObject.getJSONArray("external_contact_list");
                 for (int i = 0; i < externalContactList.size(); i++) {
                     JSONObject externalContact = externalContactList.getJSONObject(i).getJSONObject("external_contact");
@@ -120,6 +119,11 @@ public class WeComUserDataJob1 {
                         staffWithUserMapper.insert(staffWithUser);
                     }
                 }
+                String nextCursor = jsonObject.getString("next_cursor");
+                if (cursor.equals(nextCursor)) {
+                    break;
+                }
+                cursor = nextCursor;
             } while (StringUtils.isEmpty(cursor));
         } catch (IOException e) {
             log.error("updateUser error", e);