OMS,SKUMS, 调拨数据分页查询修改, 避免漏数据.

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -35,81 +35,62 @@ public class OrderSyncJob extends PointJob {
 
     @Override
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
-
-        //如果页号为0, 就表示上次查完了, 这次要从总页数开始查, 如果页号 > 0, 就降序查, 防止漏单
-        if (jobPointLog.getPageIndex() == 0) {
-            jobPointLog.setPageIndex(requestBailunOrder(jobPointLog));
-        }
-        if (jobPointLog.getPageIndex() > 0) {
-            do {
-                requestBailunOrder(jobPointLog);
-                jobPointLog.setPageIndex(jobPointLog.getPageIndex() - 1);
-                if (jobPointLog.getPageIndex() % 10 == 0) {
-                    try {
-                        JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class);
-                        mapper.upsertSelective(jobPointLog);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        throw new RuntimeException("Mybatis操作DB失败", e);
-                    } finally {
-                        SessionUtil.closeSession();
-                    }
-                }
-            } while (0 < jobPointLog.getPageIndex());
-        }
-        if (jobPointLog.getPageIndex() == 0) {
-            jobPointLog.setStartTime(jobPointLog.getEndTime());
-            jobPointLog.setEndTime(jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()));
-        }
-    }
-
-    /**
-     * 请求OMS接口
-     *
-     * @param jobPointLog
-     * @return
-     */
-    private Integer requestBailunOrder(JobPointLog jobPointLog) {
-        Integer totalPages = null;
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
-        map.put("pageIndex", jobPointLog.getPageIndex() == 0 ? "1" : jobPointLog.getPageIndex().toString());
         map.put("pageCount", jobPointLog.getPageSize().toString());
         //时间回退一点, 避免服务器时间不一致而漏单
-        map.put("BailunLastUpdateTimeFrom", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusMinutes(5)));
+        map.put("BailunLastUpdateTimeFrom", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusMinutes(3)));
         map.put("BailunLastUpdateTimeTo", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime()));
-        Response response = null;
-        String omsResultStr = null;
-        try {
-            Request request = new Request.Builder()
-                    .get()
-                    .url(OkHttpUtil.attachHttpGetParams(propertiesUtil.getPropertyAsString("BAILUNORDER_URL"), map))
-                    .addHeader("Content-Type", "application/json")
-                    .build();
-            response = okHttpClient.newCall(request).execute();
-            omsResultStr = response.body().string();
-        } catch (IOException e) {
-            throw new RuntimeException(map + "请求OMS接口同步百伦接口失败" + response, e);
-        } finally {
-            if (response != null) {
-                response.close();
+        do {
+            map.put("pageIndex", jobPointLog.getPageIndex().equals(0) ? "1" : jobPointLog.getPageIndex().toString());
+            Response response = null;
+            String omsResultStr = null;
+            try {
+                Request request = new Request.Builder()
+                        .get()
+                        .url(OkHttpUtil.attachHttpGetParams(propertiesUtil.getPropertyAsString("BAILUNORDER_URL"), map))
+                        .addHeader("Content-Type", "application/json")
+                        .build();
+                response = okHttpClient.newCall(request).execute();
+                omsResultStr = response.body().string();
+            } catch (IOException e) {
+                throw new RuntimeException(map + "请求OMS接口同步百伦接口失败" + response, e);
+            } finally {
+                if (response != null) {
+                    response.close();
+                }
             }
-        }
-        if (StringUtils.isNoneBlank(omsResultStr)) {
-            OmsResultRoot omsResultRoot = JSON.parseObject(omsResultStr, OmsResultRoot.class);
-            if (omsResultRoot != null && omsResultRoot.getSuccess().booleanValue()) {
-                OmsResultInfo omsResultInfo = omsResultRoot.getResult();
-                totalPages = omsResultInfo.getTotalPages();
-                if (omsResultInfo.getResult() != null && omsResultInfo.getResult().size() > 0) {
-                    analyseOmsOrder(omsResultInfo.getResult());
+            if (StringUtils.isNoneBlank(omsResultStr)) {
+                OmsResultRoot omsResultRoot = JSON.parseObject(omsResultStr, OmsResultRoot.class);
+                if (omsResultRoot != null && omsResultRoot.getSuccess().booleanValue()) {
+                    OmsResultInfo omsResultInfo = omsResultRoot.getResult();
+                    if (jobPointLog.getPageIndex().equals(0)) {
+                        jobPointLog.setPageIndex(omsResultInfo.getTotalPages() + 1);
+                    }
+                    if (omsResultInfo.getResult() != null && omsResultInfo.getResult().size() > 0) {
+                        analyseOmsOrder(omsResultInfo.getResult());
+                    }
+                } else {
+                    throw new RuntimeException("调用OMS接口同步百伦订单失败, 响应200, 请求参数" + map.toString());
                 }
             } else {
-                throw new RuntimeException("调用OMS接口同步百伦订单失败, 响应200, 请求参数" + map.toString());
+                throw new RuntimeException("调用OMS接口同步百伦订单失败, 响应为null, 请求参数" + map.toString());
             }
-        } else {
-            throw new RuntimeException("调用OMS接口同步百伦订单失败, 响应为null, 请求参数" + map.toString());
-        }
-        //如果PageIndex等于0取总页数, 否则取PageIndex
-        return jobPointLog.getPageIndex() == 0 ? totalPages : jobPointLog.getPageIndex();
+            if (jobPointLog.getPageIndex() % 10 == 0) {
+                try {
+                    JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class);
+                    mapper.upsertSelective(jobPointLog);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new RuntimeException("Mybatis操作DB插入任务记录失败", e);
+                } finally {
+                    SessionUtil.closeSession();
+                }
+            }
+            jobPointLog.setPageIndex(jobPointLog.getPageIndex() - 1);
+        } while (0 < jobPointLog.getPageIndex());
+        jobPointLog.setPageIndex(0);
+        jobPointLog.setStartTime(jobPointLog.getEndTime());
+        jobPointLog.setEndTime(jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()));
     }
 
     /**

data-base/base-sync-oms-order/src/main/resources/job.properties

@@ -9,7 +9,7 @@ EVENT_RDB_STORAGE_USERNAME=root
 EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
-JOB_NAME=base-sync-oms-order-coroutine
-#JOB_NAME=base-sync-oms-order
+#JOB_NAME=base-sync-oms-order-coroutine
+JOB_NAME=base-sync-oms-order
 JOB_CRON=0/1 * * * * ? *
 SHARDING_TOTAL_COUNT=1
\ No newline at end of file

data-base/base-sync-sku/src/main/java/com/bailuntec/job/SkuMSSyncJob.java

@@ -68,7 +68,7 @@ public class SkuMSSyncJob extends PointJob {
                             handleSkuMsJson(data,jobPointLog);
                         }
                         if (jobPointLog.getPageIndex().equals(0) && result.getTotalPage() != null) {
-                            jobPointLog.setPageIndex(result.getTotalPage());
+                            jobPointLog.setPageIndex(result.getTotalPage() + 1);
                         }
                     }
                 } else {

data-base/base-sync-transfer/src/test/java/TransferDetailsTest.java

@@ -8,9 +8,9 @@ public class TransferDetailsTest {
     @Test
     public void test() {
         JobPointLog jobPointLog = new JobPointLog();
-        jobPointLog.setStartTime(LocalDateTime.of(2019,02,12,17,13,18));
-        jobPointLog.setEndTime(LocalDateTime.of(2019,02,13,17,13,19));
-        jobPointLog.setType(3);
+        jobPointLog.setStartTime(LocalDateTime.of(2019,04,17,14,53,14));
+        jobPointLog.setEndTime(LocalDateTime.of(2019,04,17,14,53,15));
+        jobPointLog.setType(5);
         jobPointLog.setIntervalTime(1);
         jobPointLog.setPageIndex(1);
         jobPointLog.setPageSize(1000);