半成品库存流水

data-base/base-sync-semi-order/src/main/java/com/bailuntec/domain/pojo/SemiResultInfo.java → data-base/base-sync-semi-order/src/main/java/com/bailuntec/domain/pojo/SemiOrderResultInfo.java

@@ -7,9 +7,9 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class SemiResultInfo<T> {
+public class SemiOrderResultInfo {
 
     private Boolean success;
-    private List<T> data;
+    private List<DcSemiOrder> data;
 
 }

data-base/base-sync-semi-order/src/main/java/com/bailuntec/domain/pojo/SemiStockReportInfo.java

+package com.bailuntec.domain.pojo;
+
+import com.bailuntec.domain.entity.DcSemiOrder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SemiStockReportInfo<T> {
+
+    private Boolean success;
+    private ResultData<T> data;
+}

data-base/base-sync-semi-order/src/main/java/com/bailuntec/job/SemiOrderSyncJob.java

 package com.bailuntec.job;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.bailuntec.domain.constant.CommonConstant;
 import com.bailuntec.domain.entity.DcSemiOrder;
 import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.domain.pojo.SemiResultInfo;
+import com.bailuntec.domain.pojo.SemiOrderResultInfo;
+import com.bailuntec.domain.pojo.ResultData;
 import com.bailuntec.mapper.DcSemiOrderMapper;
+import com.bailuntec.mapper.JobPointLogMapper;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.OkHttpUtil;
 import com.bailuntec.utils.PropertiesUtil;
@@ -56,7 +56,7 @@ public class SemiOrderSyncJob extends PointJob {
                 }
             }
             if (StringUtils.isNoneBlank(palResultStr)) {
-                SemiResultInfo<DcSemiOrder> palResultRoot = JSONObject.parseObject(palResultStr, new TypeReference<SemiResultInfo<DcSemiOrder>>(){});
+                SemiOrderResultInfo palResultRoot = JSON.parseObject(palResultStr, SemiOrderResultInfo.class);
                 if (palResultRoot != null && palResultRoot.getSuccess().booleanValue()) {
                     List<DcSemiOrder> resultData = palResultRoot.getData();
                     if (resultData != null && resultData.size() > 0) {

data-base/base-sync-semi-order/src/main/java/com/bailuntec/job/SemiStockReportSyncJob.java

@@ -7,14 +7,13 @@ import com.alibaba.fastjson.TypeReference;
 import com.bailuntec.domain.constant.CommonConstant;
 import com.bailuntec.domain.entity.DcSemiStockReport;
 import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.domain.pojo.SemiResultInfo;
+import com.bailuntec.domain.pojo.SemiStockReportInfo;
 import com.bailuntec.mapper.DcSemiStockReportMapper;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.OkHttpUtil;
 import com.bailuntec.utils.PropertiesUtil;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
-import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -39,6 +38,7 @@ public class SemiStockReportSyncJob extends PointJob {
         map.put("rows", jobPointLog.getPageSize().toString());
         map.put("btime", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime()));
         map.put("etime", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime()));
+        Integer totalPage = 0;
         do {
             map.put("page", jobPointLog.getPageIndex().equals(0) ? "1" : jobPointLog.getPageIndex().toString());
             Response response = null;
@@ -59,18 +59,16 @@ public class SemiStockReportSyncJob extends PointJob {
                 }
             }
             if (StringUtils.isNoneBlank(palResultStr)) {
-
-                SemiResultInfo<DcSemiStockReport> palResultRoot = JSONObject.parseObject(palResultStr, new TypeReference<SemiResultInfo<DcSemiStockReport>>(){});
-                if (palResultRoot != null && palResultRoot.getSuccess().booleanValue()) {
-                    List<DcSemiStockReport> resultData = palResultRoot.getData();
+                SemiStockReportInfo<DcSemiStockReport> stockResultRoot = JSONObject.parseObject(palResultStr, new TypeReference<SemiStockReportInfo<DcSemiStockReport>>(){});
+                if (stockResultRoot != null && stockResultRoot.getSuccess().booleanValue()) {
+                    List<DcSemiStockReport> resultData = stockResultRoot.getData() == null ? null : stockResultRoot.getData().getItems();
+                    totalPage = stockResultRoot.getData().getTotalPages();
                     if (resultData != null && resultData.size() > 0) {
                         for(DcSemiStockReport semiStockReport : resultData) {
                             semiStockReport.setId(null);
                             DcSemiStockReportMapper mapper = SessionUtil.getSession().getMapper(DcSemiStockReportMapper.class);
                             mapper.upsertSelective(semiStockReport);
                         }
-                    }else{
-                        break;
                     }
                 } else {
                     throw new RuntimeException("调用库存流水报表接口同步百伦库存流水失败, 响应200, 请求参数" + map.toString());
@@ -79,7 +77,7 @@ public class SemiStockReportSyncJob extends PointJob {
                 throw new RuntimeException("调用库存流水报表接口同步百伦库存流水失败, 响应为null, 请求参数" + map.toString());
             }
             jobPointLog.setPageIndex(jobPointLog.getPageIndex() + 1);
-        } while (true);
+        } while (jobPointLog.getPageIndex() <= totalPage);
         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-semi-order/src/test/java/SyncSemiTest.java

+import com.bailuntec.domain.entity.JobPointLog;
+import com.bailuntec.job.SemiStockReportSyncJob;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+
+public class SyncSemiTest {
+
+    @Test
+    public void testStock() {
+        // String jobName, Integer pageIndex, Integer pageSize, Integer type, Integer intervalTime, LocalDateTime startTime, LocalDateTime endTime
+        new SemiStockReportSyncJob().executeJob(null, new JobPointLog("stock", 1, 100, 1, 1, LocalDateTime.of(2019, 10, 01, 00, 00, 00), LocalDateTime.of(2019, 10, 15, 00, 00, 00)));
+    }
+}