odoo增加报错重试机制

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/odoo/OdooAbstrackob.java

@@ -100,18 +100,25 @@ public abstract class OdooAbstrackob {
     private void batchSync(OdooContext context) {
         //分页对象
         Map<String, Integer> pageMap = getPageMap();
-        //查询结果
-        List<Object> dateList = new ArrayList<>();
-        //错误信息
-        List<String> errorList = new ArrayList<>();
         //构建飞书请求对象
         LarkCompanyRelation companyRelation = context.getCompanyRelation();
         LarkTableRelation tableRelation = context.getTableRelation();
         LarkTableRequest larkRequest = new LarkTableRequest(companyRelation.getAppId(), companyRelation.getSecret(), tableRelation.getToAppToken(), tableRelation.getToTableId());
+        List<String> errorList = new ArrayList<>();
+        batchCreate(context, pageMap, larkRequest, errorList);
+        if (!CollectionUtils.isEmpty(errorList)) {
+            String errorKey = String.join(",", errorList);
+            throw new RuntimeException(String.format("存在同步失败的记录 %s", errorKey));
+        }
+
+    }
+
+    private void batchCreate(OdooContext context, Map<String, Integer> pageMap, LarkTableRequest larkRequest, List<String> errorList) {
+        //查询结果
+        List<Object> dateList = new ArrayList<>();
         List<Integer> retryPageList = new ArrayList<>();
-        //待创建关联关系
-        do {
         List<ErpLarkRelation> waitCreateRelation = new ArrayList<>();
+        do {
             dateList = getDate(context, pageMap, context.getWarehouseId(), retryPageList);
             List<JSONObject> midDateList = dateList.stream().map(r -> {
                 return (JSONObject) JSONObject.toJSON(r);
@@ -127,35 +134,11 @@ public abstract class OdooAbstrackob {
             }
             pageMap.put(PAGE_OFFSET_KEY, pageMap.get(PAGE_OFFSET_KEY) + PAGE_SIZE);
         } while (dateList == null || (CollectionUtils.isNotEmpty(dateList) && dateList.size() == PAGE_SIZE));
-        if (CollectionUtils.isNotEmpty(retryPageList)){
-            try {
-                for (Integer page : retryPageList) {
-                    pageMap.put(PAGE_OFFSET_KEY,page + PAGE_SIZE);
-                    List<ErpLarkRelation> waitCreateRelation = new ArrayList<>();
-                    dateList = getDate(context, pageMap,context.getWarehouseId(),null);
-                    List<JSONObject> midDateList = dateList.stream().map(r -> {
-                        return (JSONObject)JSONObject.toJSON(r);
-                    }).collect(Collectors.toList());
-                    if (CollectionUtils.isNotEmpty(midDateList)){
-                        Map<String, String> relationMap = getLarkRelation(midDateList,context.getWarehouseId());
-                        for (JSONObject jsonObject : midDateList) {
-                            sync(jsonObject, errorList, relationMap, larkRequest,waitCreateRelation,context.getWarehouseId());
+        if (retryPageList.size() > 0) {
+            pageMap.put(PAGE_OFFSET_KEY, retryPageList.get(0) + PAGE_SIZE);
+            batchCreate(context, pageMap, larkRequest, errorList);
         }
     }
-                    if (CollectionUtils.isNotEmpty(waitCreateRelation)){
-                        erpLarkRelationMapper.batchInsert(waitCreateRelation);
-                    }
-                }
-            }catch (Exception e){
-                errorList.add(String.format("%s 获取第【%s】页数据失败 %s", this.getClassName(), pageMap.get(PAGE_OFFSET_KEY), e.getMessage()));
-            }
-        }
-        if (!CollectionUtils.isEmpty(errorList)) {
-            String errorKey = String.join(",", errorList);
-            throw new RuntimeException(String.format("存在同步失败的记录 %s", errorKey));
-        }
-
-    }
 
     private void sync(JSONObject jsonObject, List<String> errorList
             , Map<String, String> relationMap, LarkTableRequest larkRequest
@@ -288,10 +271,8 @@ public abstract class OdooAbstrackob {
             )));
         } catch (Exception e) {
             log.error("{} 获取数据失败", this.getClassName(), e);
-            if (retryPageList != null) {
             retryPageList.add(pageMap.get(PAGE_OFFSET_KEY));
         }
-        }
         return null;
     }