Commit bd39692c by huluobin

update

parent a831086f
...@@ -32,11 +32,7 @@ ...@@ -32,11 +32,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
......
...@@ -22,13 +22,6 @@ ...@@ -22,13 +22,6 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -21,12 +21,6 @@ ...@@ -21,12 +21,6 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -27,12 +27,7 @@ ...@@ -27,12 +27,7 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
......
...@@ -21,12 +21,7 @@ ...@@ -21,12 +21,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -80,4 +75,4 @@ ...@@ -80,4 +75,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -26,11 +26,7 @@ ...@@ -26,11 +26,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>io.github.linus87</groupId> <groupId>io.github.linus87</groupId>
......
...@@ -37,9 +37,9 @@ public class EbayFinanceSyncJobTest { ...@@ -37,9 +37,9 @@ public class EbayFinanceSyncJobTest {
ExecutorService threadPool = Executors.newFixedThreadPool(300); ExecutorService threadPool = Executors.newFixedThreadPool(300);
//获取时间区间reportDate列表 //获取时间区间reportDate列表
List<LocalDateTime> localDateList = Stream.iterate(LocalDateTime.of(2020, 7, 31, 0, 0), localDate -> localDate.plusDays(1)) List<LocalDateTime> localDateList = Stream.iterate(LocalDateTime.of(2020, 8, 31, 0, 0), localDate -> localDate.plusDays(1))
.limit(ChronoUnit.DAYS.between(LocalDateTime.of(2020, 7, 31, 0, 0), .limit(ChronoUnit.DAYS.between(LocalDateTime.of(2020, 8, 31, 0, 0),
LocalDateTime.of(2020, 9, 2, 0, 0)) + 1) LocalDateTime.of(2020, 10, 2, 0, 0)) + 1)
.collect(Collectors.toList()); .collect(Collectors.toList());
localDateList.forEach(localDateTime -> { localDateList.forEach(localDateTime -> {
......
...@@ -56,8 +56,8 @@ public class EbayFinanceAdSyncJobTest { ...@@ -56,8 +56,8 @@ public class EbayFinanceAdSyncJobTest {
List<DcBaseFinanceEbay> dcBaseFinanceEbayList = dcBaseFinanceEbayMapper.selectByExample(DcBaseFinanceEbayExample.newAndCreateCriteria() List<DcBaseFinanceEbay> dcBaseFinanceEbayList = dcBaseFinanceEbayMapper.selectByExample(DcBaseFinanceEbayExample.newAndCreateCriteria()
// .andAccountIdEqualTo(314) // .andAccountIdEqualTo(314)
.andBjDateBetween(LocalDateTime.of(2020, 8, 1, 0, 0), .andBjDateBetween(LocalDateTime.of(2020, 9, 1, 0, 0),
LocalDateTime.of(2020, 9, 1, 0, 0)) LocalDateTime.of(2020, 10, 1, 0, 0))
.example()); .example());
List<EbayFinanceExport> ebayFinanceExportList = dcBaseFinanceEbayList.stream() List<EbayFinanceExport> ebayFinanceExportList = dcBaseFinanceEbayList.stream()
...@@ -75,7 +75,7 @@ public class EbayFinanceAdSyncJobTest { ...@@ -75,7 +75,7 @@ public class EbayFinanceAdSyncJobTest {
return ebayFinanceExport; return ebayFinanceExport;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
EasyExcel.write("/Users/huluobin/exportEbayAll.xlsx", EbayFinanceExport.class).sheet().doWrite(ebayFinanceExportList); EasyExcel.write("/Users/huluobin/exportEbay202009-2020-10-26.xlsx", EbayFinanceExport.class).sheet().doWrite(ebayFinanceExportList);
} }
@Test @Test
......
...@@ -26,12 +26,6 @@ ...@@ -26,12 +26,6 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -42,15 +42,13 @@ public class Application { ...@@ -42,15 +42,13 @@ public class Application {
private static LiteJobConfiguration createJobConfiguration() { private static LiteJobConfiguration createJobConfiguration() {
JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME"), propertiesUtil.getPropertyAsString("JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build(); JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME"), propertiesUtil.getPropertyAsString("JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, FeeJob.class.getCanonicalName()); SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, FeeJob.class.getCanonicalName());
LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build(); return LiteJobConfiguration.newBuilder(simpleJobConfig).build();
return simpleJobRootConfig;
} }
private static LiteJobConfiguration createJobConfiguration1() { private static LiteJobConfiguration createJobConfiguration1() {
JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("LOGISTICS_JOB_NAME"), propertiesUtil.getPropertyAsString("LOGISTICS_JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build(); JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("LOGISTICS_JOB_NAME"), propertiesUtil.getPropertyAsString("LOGISTICS_JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, LogisticsJob.class.getCanonicalName()); SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, LogisticsJob.class.getCanonicalName());
LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build(); return LiteJobConfiguration.newBuilder(simpleJobConfig).build();
return simpleJobRootConfig;
} }
private static LiteJobConfiguration createJobConfiguration2() { private static LiteJobConfiguration createJobConfiguration2() {
...@@ -61,20 +59,17 @@ public class Application { ...@@ -61,20 +59,17 @@ public class Application {
.build(); .build();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, ManageCostJob.class.getCanonicalName()); SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, ManageCostJob.class.getCanonicalName());
LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build(); return LiteJobConfiguration.newBuilder(simpleJobConfig).build();
return simpleJobRootConfig;
} }
private static LiteJobConfiguration createJobConfiguration3() { private static LiteJobConfiguration createJobConfiguration3() {
JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("DAILY_FEE_JOB_NAME"), propertiesUtil.getPropertyAsString("DAILY_FEE_JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build(); JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("DAILY_FEE_JOB_NAME"), propertiesUtil.getPropertyAsString("DAILY_FEE_JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, DailyFeeJob.class.getCanonicalName()); SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, DailyFeeJob.class.getCanonicalName());
LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build(); return LiteJobConfiguration.newBuilder(simpleJobConfig).build();
return simpleJobRootConfig;
} }
private static JobEventConfiguration createJobEventConfiguration() { private static JobEventConfiguration createJobEventConfiguration() {
JobEventConfiguration jobEventRdbConfig = new JobEventRdbConfiguration(setUpEventTraceDataSource()); return new JobEventRdbConfiguration(setUpEventTraceDataSource());
return jobEventRdbConfig;
} }
private static DataSource setUpEventTraceDataSource() { private static DataSource setUpEventTraceDataSource() {
......
...@@ -13,13 +13,11 @@ public class DailyFeeJob extends PointJob { ...@@ -13,13 +13,11 @@ public class DailyFeeJob extends PointJob {
@Override @Override
public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) { public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
DcBaseFinanceFeeMapper dcBaseFinanceFeeMapper = SessionUtil.getSession().getMapper(DcBaseFinanceFeeMapper.class); DcBaseFinanceFeeMapper dcBaseFinanceFeeMapper = SessionUtil.getSession().getMapper(DcBaseFinanceFeeMapper.class);
try LocalDate time = LocalDate.of(2020, 9, 29);
{ try {
dcBaseFinanceFeeMapper.deleteDailyFee(LocalDate.now().minusDays(1L)); dcBaseFinanceFeeMapper.deleteDailyFee(time.minusDays(1L));
dcBaseFinanceFeeMapper.insertDailyFee(LocalDate.now().minusDays(1L)); dcBaseFinanceFeeMapper.insertDailyFee(time.minusDays(1L));
} } catch (Exception ex) {
catch (Exception ex)
{
} }
......
...@@ -38,7 +38,7 @@ public class FeeJob extends PointJob { ...@@ -38,7 +38,7 @@ public class FeeJob extends PointJob {
public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) { public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
LinkedHashMap<String, String> map = new LinkedHashMap<>(4); LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
map.put("pageSize", jobPointLog.getPageSize().toString()); map.put("pageSize", jobPointLog.getPageSize().toString());
map.put("@Re", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusHours(3L))); map.put("startDate", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusHours(3L)));
map.put("endDate", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime())); map.put("endDate", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime()));
do { do {
map.put("pageIndex", jobPointLog.getPageIndex().equals(0) ? "1" : jobPointLog.getPageIndex().toString()); map.put("pageIndex", jobPointLog.getPageIndex().equals(0) ? "1" : jobPointLog.getPageIndex().toString());
...@@ -82,6 +82,7 @@ public class FeeJob extends PointJob { ...@@ -82,6 +82,7 @@ public class FeeJob extends PointJob {
} }
} }
} }
log.info("sync finance_fee success");
} else { } else {
throw new RuntimeException("调用费用接口同步百伦流水失败, 响应为null, 请求参数" + map.toString()); throw new RuntimeException("调用费用接口同步百伦流水失败, 响应为null, 请求参数" + map.toString());
} }
......
...@@ -11,7 +11,7 @@ ZOOKEEPER_SERVER=172.31.255.120:2181 ...@@ -11,7 +11,7 @@ ZOOKEEPER_SERVER=172.31.255.120:2181
NAME_SPACE=data-center NAME_SPACE=data-center
JOB_NAME=base-sync-finance-fee JOB_NAME=base-sync-finance-fee
JOB_CRON=0/1 * * * * ? * JOB_CRON=0 0 0/1 * * ?
LOGISTICS_JOB_NAME=base-sync-logistics LOGISTICS_JOB_NAME=base-sync-logistics
LOGISTICS_JOB_CRON=0 01 7 * * ? * LOGISTICS_JOB_CRON=0 01 7 * * ? *
...@@ -23,4 +23,4 @@ DAILY_FEE_JOB_NAME=base-daily-fee ...@@ -23,4 +23,4 @@ DAILY_FEE_JOB_NAME=base-daily-fee
DAILY_FEE_JOB_CRON=0 1 0 * * ? * DAILY_FEE_JOB_CRON=0 1 0 * * ? *
SHARDING_TOTAL_COUNT=1 SHARDING_TOTAL_COUNT=1
DailyFeeJob
...@@ -19,9 +19,6 @@ public class MainTest { ...@@ -19,9 +19,6 @@ public class MainTest {
public void testDailyFee() { public void testDailyFee() {
DailyFeeJob syncDailyFeeJob = new DailyFeeJob(); DailyFeeJob syncDailyFeeJob = new DailyFeeJob();
JobPointLog jobPointLog = new JobPointLog("base-daily-fee", 1, 1, 1, 1, syncDailyFeeJob.executeJob(null, null);
LocalDateTime.of(2020, 6, 12, 23, 35, 40),
LocalDateTime.of(2020, 6, 16, 23, 35, 40));
syncDailyFeeJob.executeJob(null, jobPointLog);
} }
} }
...@@ -30,12 +30,7 @@ ...@@ -30,12 +30,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -26,12 +26,7 @@ ...@@ -26,12 +26,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -22,12 +22,7 @@ ...@@ -22,12 +22,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
......
...@@ -21,12 +21,7 @@ ...@@ -21,12 +21,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
...@@ -79,4 +74,4 @@ ...@@ -79,4 +74,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -21,12 +21,7 @@ ...@@ -21,12 +21,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
...@@ -79,4 +74,4 @@ ...@@ -79,4 +74,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -26,12 +26,7 @@ ...@@ -26,12 +26,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
......
...@@ -31,12 +31,7 @@ ...@@ -31,12 +31,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -28,12 +28,7 @@ ...@@ -28,12 +28,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -22,12 +22,7 @@ ...@@ -22,12 +22,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
...@@ -80,4 +75,4 @@ ...@@ -80,4 +75,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
package com.bailuntec.job; package com.bailuntec.job;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bailuntec.domain.entity.DcBaseLogistics; import com.bailuntec.domain.entity.DcBaseLogistics;
import com.bailuntec.domain.entity.DcBaseStock;
import com.bailuntec.domain.entity.JobPointLog; import com.bailuntec.domain.entity.JobPointLog;
import com.bailuntec.domain.example.DcBaseLogisticsExample; import com.bailuntec.domain.example.DcBaseLogisticsExample;
import com.bailuntec.domain.example.DcBaseStockExample; import com.bailuntec.domain.pojo.Logistics;
import com.bailuntec.domain.pojo.*; import com.bailuntec.domain.pojo.WmsLogisticsInfo;
import com.bailuntec.mapper.DcBaseLogisticsMapper; import com.bailuntec.mapper.DcBaseLogisticsMapper;
import com.bailuntec.mapper.DcBaseStockMapper;
import com.bailuntec.mapper.DcBaseWarehouseMapper;
import com.bailuntec.mapper.JobPointLogMapper; import com.bailuntec.mapper.JobPointLogMapper;
import com.bailuntec.support.PointJob; import com.bailuntec.support.PointJob;
import com.bailuntec.utils.OkHttpUtil; import com.bailuntec.utils.OkHttpUtil;
...@@ -41,7 +37,7 @@ public class WmsLogisticsJob extends PointJob { ...@@ -41,7 +37,7 @@ public class WmsLogisticsJob extends PointJob {
do { do {
OkHttpClient client = OkHttpUtil.getInstance(); OkHttpClient client = OkHttpUtil.getInstance();
MediaType mediaType = MediaType.parse("application/json"); MediaType mediaType = MediaType.parse("application/json");
wmsLogistic.setPageIndex(jobPointLog.getPageIndex() > 0? jobPointLog.getPageIndex() : 1); wmsLogistic.setPageIndex(jobPointLog.getPageIndex() > 0 ? jobPointLog.getPageIndex() : 1);
RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(wmsLogistic)); RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(wmsLogistic));
Request request = new Request.Builder() Request request = new Request.Builder()
.url(propertiesUtil.getPropertyAsString("LOGISTICS_WMS_URL")) .url(propertiesUtil.getPropertyAsString("LOGISTICS_WMS_URL"))
...@@ -62,7 +58,7 @@ public class WmsLogisticsJob extends PointJob { ...@@ -62,7 +58,7 @@ public class WmsLogisticsJob extends PointJob {
} }
if (StringUtils.isNotBlank(resultStr)) { if (StringUtils.isNotBlank(resultStr)) {
WmsLogisticsInfo wmsLogisticsInfo = JSON.parseObject(resultStr, WmsLogisticsInfo.class); WmsLogisticsInfo wmsLogisticsInfo = JSON.parseObject(resultStr, WmsLogisticsInfo.class);
if (wmsLogisticsInfo.getSuccess() != null && wmsLogisticsInfo.getSuccess()) { if (wmsLogisticsInfo.getSuccess() != null && wmsLogisticsInfo.getSuccess()) {
WmsLogisticsInfo.Result result = wmsLogisticsInfo.getResult(); WmsLogisticsInfo.Result result = wmsLogisticsInfo.getResult();
List<WmsLogisticsInfo.Result.LogisticsInner> items = result.getResult(); List<WmsLogisticsInfo.Result.LogisticsInner> items = result.getResult();
if (jobPointLog.getPageIndex().equals(0)) { if (jobPointLog.getPageIndex().equals(0)) {
......
...@@ -21,12 +21,7 @@ ...@@ -21,12 +21,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
...@@ -79,4 +74,4 @@ ...@@ -79,4 +74,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -21,12 +21,7 @@ ...@@ -21,12 +21,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -80,4 +75,4 @@ ...@@ -80,4 +75,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -26,12 +26,7 @@ ...@@ -26,12 +26,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -21,12 +21,7 @@ ...@@ -21,12 +21,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
...@@ -80,4 +75,4 @@ ...@@ -80,4 +75,4 @@
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -22,12 +22,7 @@ ...@@ -22,12 +22,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -26,12 +26,7 @@ ...@@ -26,12 +26,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -21,12 +21,7 @@ ...@@ -21,12 +21,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
...@@ -80,4 +75,4 @@ ...@@ -80,4 +75,4 @@
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -22,12 +22,7 @@ ...@@ -22,12 +22,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
...@@ -80,4 +75,4 @@ ...@@ -80,4 +75,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -24,12 +24,7 @@ ...@@ -24,12 +24,7 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -61,6 +61,15 @@ ...@@ -61,6 +61,15 @@
<dependencyManagement> <dependencyManagement>
<dependencies><!--这下面进行依赖管理 --> <dependencies><!--这下面进行依赖管理 -->
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.5.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/redis.clients/jedis --> <!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
<dependency> <dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment