diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 919da12e7..d7291db82 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -15,7 +15,7 @@ pom - blade-xxljob + blade-xxljob-admin diff --git a/blade-service-api/logpm-aftersales-api/pom.xml b/blade-service-api/logpm-aftersales-api/pom.xml new file mode 100644 index 000000000..69af69401 --- /dev/null +++ b/blade-service-api/logpm-aftersales-api/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.1.0.RELEASE + + + org.springblade + logpm-aftersales-api + 3.1.0.RELEASE + + + diff --git a/blade-service-api/logpm-basic-api/pom.xml b/blade-service-api/logpm-basic-api/pom.xml new file mode 100644 index 000000000..e0ee366ba --- /dev/null +++ b/blade-service-api/logpm-basic-api/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.1.0.RELEASE + + + org.springblade + logpm-basic-api + 3.1.0.RELEASE + + + diff --git a/blade-service-api/logpm-distribution-api/pom.xml b/blade-service-api/logpm-distribution-api/pom.xml new file mode 100644 index 000000000..d02bb1249 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.1.0.RELEASE + + + org.springblade + logpm-distribution-api + 3.1.0.RELEASE + + + diff --git a/blade-service-api/logpm-exception-api/pom.xml b/blade-service-api/logpm-exception-api/pom.xml new file mode 100644 index 000000000..06a903074 --- /dev/null +++ b/blade-service-api/logpm-exception-api/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.1.0.RELEASE + + + org.springblade + logpm-exception-api + 3.1.0.RELEASE + + + diff --git a/blade-service-api/logpm-statisticsdata-api/pom.xml b/blade-service-api/logpm-statisticsdata-api/pom.xml new file mode 100644 index 000000000..7a6b55547 --- /dev/null +++ b/blade-service-api/logpm-statisticsdata-api/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.1.0.RELEASE + + + org.springblade + logpm-statisticsdata-api + 3.1.0.RELEASE + + + diff --git a/blade-service-api/logpm-trunkline-api/pom.xml b/blade-service-api/logpm-trunkline-api/pom.xml new file mode 100644 index 000000000..7768df2e4 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.1.0.RELEASE + + + org.springblade + logpm-trunkline-api + 3.1.0.RELEASE + + + diff --git a/blade-service-api/logpm-warehouse-api/pom.xml b/blade-service-api/logpm-warehouse-api/pom.xml new file mode 100644 index 000000000..3d1d13bdd --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service-api + 3.1.0.RELEASE + + + org.springblade + logpm-warehouse-api + 3.1.0.RELEASE + + + diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 97051909e..2d6808c87 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -17,7 +17,23 @@ BladeX 微服务API集合 + logpm-factory-api + + logpm-basic-api + + logpm-trunkline-api + + logpm-warehouse-api + + logpm-distribution-api + + logpm-aftersales-api + + logpm-exception-api + + logpm-statisticsdata-api + diff --git a/blade-service/logpm-aftersales/pom.xml b/blade-service/logpm-aftersales/pom.xml new file mode 100644 index 000000000..ad3e86919 --- /dev/null +++ b/blade-service/logpm-aftersales/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.1.0.RELEASE + + + org.springblade + logpm-aftersales + 3.1.0.RELEASE + + + diff --git a/blade-service/logpm-basic/pom.xml b/blade-service/logpm-basic/pom.xml new file mode 100644 index 000000000..66ce09565 --- /dev/null +++ b/blade-service/logpm-basic/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.1.0.RELEASE + + + org.springblade + logpm-basic + 3.1.0.RELEASE + + + diff --git a/blade-service/logpm-distribution/pom.xml b/blade-service/logpm-distribution/pom.xml new file mode 100644 index 000000000..f3e2c4fb0 --- /dev/null +++ b/blade-service/logpm-distribution/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.1.0.RELEASE + + + org.springblade + logpm-distribution + 3.1.0.RELEASE + + + diff --git a/blade-service/logpm-exception/pom.xml b/blade-service/logpm-exception/pom.xml new file mode 100644 index 000000000..54d233102 --- /dev/null +++ b/blade-service/logpm-exception/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.1.0.RELEASE + + + org.springblade + logpm-exception + 3.1.0.RELEASE + + + diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index ba3d32367..eefe06d6a 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -69,25 +69,15 @@ public class FactoryXxlJob { List ls = stationlinenumService.lambdaQuery().eq(StationlinenumEntity::getIsDeleted, 0).eq(StationlinenumEntity::getStatus, 1).list(); if (!ObjectUtils.isEmpty(ls)) { - // 获取当前时间 - LocalDate date = LocalDate.now(); - //查询配置站点 ls.forEach(stationlinenumEntity -> { - // 根据站点id和当前时间调用service 请求对方接口获取数据插入到我们的数据库 - XxlJobLogger.log("站点线路编号{}", stationlinenumEntity.getLogisticsLineNumber()); orderService.synOrderByLineNumData(stationlinenumEntity.getLogisticsLineNumber(), date); - - }); - - } - return ReturnT.SUCCESS; } @@ -100,7 +90,6 @@ public class FactoryXxlJob { // 获取请求日志 按照状态来识别 List ls = orderLogService.lambdaQuery().eq(OrderLogEntity::getType, 1).eq(OrderLogEntity::getStatus, 1).list(); - XxlJobLogger.log("日志集合 {}", ls); // 查询所有的数据库内容 只包含客户单号 List allDataList = stationOrderService.lambdaQuery().select(StationOrderEntity::getTcWlb008).list(); @@ -114,7 +103,6 @@ public class FactoryXxlJob { XxlJobLogger.log("日志对象 {}", orderLogEntity); Map map = orderService.dataRelative(orderLogEntity); List dataList = map.get(StationOrderEntity.class.getName()); - if(dataList.size()==0){ XxlJobLogger.log("本次解析操作没有数据"); return; diff --git a/blade-service/logpm-statisticsdata/pom.xml b/blade-service/logpm-statisticsdata/pom.xml new file mode 100644 index 000000000..c1c7e64e0 --- /dev/null +++ b/blade-service/logpm-statisticsdata/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.1.0.RELEASE + + + org.springblade + logpm-statisticsdata + 3.1.0.RELEASE + + + diff --git a/blade-service/logpm-trunkline/pom.xml b/blade-service/logpm-trunkline/pom.xml new file mode 100644 index 000000000..363129de9 --- /dev/null +++ b/blade-service/logpm-trunkline/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.1.0.RELEASE + + + org.springblade + logpm-trunkline + 3.1.0.RELEASE + + + diff --git a/blade-service/logpm-warehouse/pom.xml b/blade-service/logpm-warehouse/pom.xml new file mode 100644 index 000000000..3641045cc --- /dev/null +++ b/blade-service/logpm-warehouse/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + + org.springblade + blade-service + 3.1.0.RELEASE + + + org.springblade + logpm-warehouse + 3.1.0.RELEASE + + + diff --git a/blade-service/pom.xml b/blade-service/pom.xml index a6d5fc06f..89548b157 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -14,10 +14,17 @@ ${project.artifactId} 3.1.0.RELEASE pom - BladeX 微服务集合 + 微服务集合 logpm-factory + logpm-basic + logpm-trunkline + logpm-warehouse + logpm-distribution + logpm-aftersales + logpm-exception + logpm-statisticsdata