1.划分系统模块

blade-ops/pom.xml

@@ -15,7 +15,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>blade-xxljob</module>
+        <!--<module>blade-xxljob</module>-->
         <module>blade-xxljob-admin</module>
     </modules>
 

blade-service-api/logpm-aftersales-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-aftersales-api</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service-api/logpm-basic-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-basic-api</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service-api/logpm-distribution-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-distribution-api</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service-api/logpm-exception-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-exception-api</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service-api/logpm-statisticsdata-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-statisticsdata-api</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service-api/logpm-trunkline-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-trunkline-api</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service-api/logpm-warehouse-api/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service-api</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-warehouse-api</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service-api/pom.xml

@@ -17,7 +17,23 @@
     <description>BladeX 微服务API集合</description>
 
     <modules>
+        <!--工厂数据-->
         <module>logpm-factory-api</module>
+        <!--基础平台-->
+        <module>logpm-basic-api</module>
+        <!--干线运输-->
+        <module>logpm-trunkline-api</module>
+        <!--仓库管理-->
+        <module>logpm-warehouse-api</module>
+        <!--配送签收管理-->
+        <module>logpm-distribution-api</module>
+        <!--售后管理-->
+        <module>logpm-aftersales-api</module>
+        <!--异常管理-->
+        <module>logpm-exception-api</module>
+        <!--数据统计+结算-->
+        <module>logpm-statisticsdata-api</module>
+
     </modules>
 
     <dependencies>

blade-service/logpm-aftersales/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-aftersales</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service/logpm-basic/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-basic</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service/logpm-distribution/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-distribution</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service/logpm-exception/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-exception</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java

@@ -69,25 +69,15 @@ public class FactoryXxlJob {
 
 		List<StationlinenumEntity> 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<OrderLogEntity> ls = orderLogService.lambdaQuery().eq(OrderLogEntity::getType, 1).eq(OrderLogEntity::getStatus, 1).list();
-
 		XxlJobLogger.log("日志集合 {}", ls);
 		// 查询所有的数据库内容 只包含客户单号
 		List<StationOrderEntity> allDataList = stationOrderService.lambdaQuery().select(StationOrderEntity::getTcWlb008).list();
@@ -114,7 +103,6 @@ public class FactoryXxlJob {
 			XxlJobLogger.log("日志对象 {}", orderLogEntity);
 			Map<String, List> map = orderService.dataRelative(orderLogEntity);
 			List<StationOrderEntity> dataList = map.get(StationOrderEntity.class.getName());
-
 			if(dataList.size()==0){
 				XxlJobLogger.log("本次解析操作没有数据");
 				return;

blade-service/logpm-statisticsdata/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-statisticsdata</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service/logpm-trunkline/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-trunkline</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service/logpm-warehouse/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springblade</groupId>
+        <artifactId>blade-service</artifactId>
+        <version>3.1.0.RELEASE</version>
+    </parent>
+
+    <groupId>org.springblade</groupId>
+    <artifactId>logpm-warehouse</artifactId>
+    <version>3.1.0.RELEASE</version>
+
+    
+</project>

blade-service/pom.xml

@@ -14,10 +14,17 @@
     <name>${project.artifactId}</name>
     <version>3.1.0.RELEASE</version>
     <packaging>pom</packaging>
-    <description>BladeX 微服务集合</description>
+    <description>微服务集合</description>
 
     <modules>
         <module>logpm-factory</module>
+        <module>logpm-basic</module>
+        <module>logpm-trunkline</module>
+        <module>logpm-warehouse</module>
+        <module>logpm-distribution</module>
+        <module>logpm-aftersales</module>
+        <module>logpm-exception</module>
+        <module>logpm-statisticsdata</module>
     </modules>
 
     <dependencies>