fix：改为分批

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxClerkSyncOperation.java

@@ -138,12 +138,12 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
                     // 每1秒产生5个令牌
                     rateLimiter.trySetRate(RateType.OVERALL, 5, 1, RateIntervalUnit.SECONDS);
                     int pageNum = 1;
-                    while (true){
+                    while (true) {
                         // 获取令牌
                         rateLimiter.acquire();
                         //企微转换最多支持1000个
                         //批量处理wx_user_id to wx_open_user_id
-                        Page<StaffDTO> staffDTOPageInfo = pageStaffListByWxEnterpriseId(wxEnterpriseId,pageNum,1000);
+                        Page<StaffDTO> staffDTOPageInfo = staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId, pageNum, 1000);
                         List<StaffDTO> staffDTOS = staffDTOPageInfo.getResult();
                         if (CollectionUtils.isEmpty(staffDTOS)) {
                             logger.info("转换完成，为最后一个");
@@ -166,7 +166,7 @@ public class QywxClerkSyncOperation implements BaseSyncOperation {
 
 
     private Page<StaffDTO> pageStaffListByWxEnterpriseId(String wxEnterpriseId, Integer pageNum, Integer pageSize) {
-        return staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId,pageNum,pageSize);
+        return staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId, pageNum, pageSize);
     }
 
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -17,6 +17,9 @@ import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RRateLimiter;
+import org.redisson.api.RateIntervalUnit;
+import org.redisson.api.RateType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -219,7 +222,7 @@ public class TestController extends WebBaseController {
             if (wxEnterpriseDTO == null) {
                 return resultResponse(HaoBanErrCode.ERR_10012);
             }
-            wxEnterpriseApiService.agreeExternalUseridFlag(wxEnterpriseDTO.getWxEnterpriseId(),1);
+            wxEnterpriseApiService.agreeExternalUseridFlag(wxEnterpriseDTO.getWxEnterpriseId(), 1);
             return resultResponse(HaoBanErrCode.ERR_1);
         } else {
             return resultResponse(HaoBanErrCode.ERR_0);
@@ -249,15 +252,27 @@ public class TestController extends WebBaseController {
      */
     @RequestMapping("/useridToOpenuserid")
     public HaobanResponse useridToOpenuserid(String corpid, String suiteId, String wxEnterpriseId) {
-        //批量处理wx_user_id to wx_open_user_id
-        List<StaffDTO> staffDTOS = staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId);
-        logger.info("useridToOpenuserid请求：corpid：{}", corpid);
-        List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, suiteId, staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
-        if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
-            for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {
-                staffApiService.updateOpenUserIdsByUserId(wxEnterpriseId, qywxNewUseridDTO.getUserid(), qywxNewUseridDTO.getOpen_userid());
+        // 限流器
+        RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("haoban:manage3:updateWxOpenUserId:limit");
+        // 每1秒产生5个令牌
+        rateLimiter.trySetRate(RateType.OVERALL, 5, 1, RateIntervalUnit.SECONDS);
+        int pageNum = 1;
+        while (true) {
+            rateLimiter.acquire();
+            //批量处理wx_user_id to wx_open_user_id
+            Page<StaffDTO> staffDTOPageInfo = staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId, pageNum, 1000);
+            List<StaffDTO> staffDTOS = staffDTOPageInfo.getResult();
+            if (CollectionUtils.isEmpty(staffDTOS)) {
+                break;
+            }
+            logger.info("useridToOpenuserid请求：corpid：{}", corpid);
+            List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, suiteId, staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
+            if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
+                for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {
+                    staffApiService.updateOpenUserIdsByUserId(wxEnterpriseId, qywxNewUseridDTO.getUserid(), qywxNewUseridDTO.getOpen_userid());
+                }
             }
         }
-        return resultResponse(HaoBanErrCode.ERR_1, qywxNewUseridDTOS);
+        return resultResponse(HaoBanErrCode.ERR_1);
     }
 }