zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2025-09-23 18:09:49 +08:00
parent 9cd63f144a 0fb22a2ee4
commit 4b629100de
28 changed files with 197 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
base-server/pom.xml
View File

@@ -17,34 +17,34 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-system-api</artifactId> <artifactId>zt-module-system-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-infra-api</artifactId> <artifactId>zt-module-infra-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-base-server</artifactId> <artifactId>zt-module-base-server</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-contract-order-server</artifactId> <artifactId>zt-module-contract-order-server</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-erp-server</artifactId> <artifactId>zt-module-erp-server</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- Web 相关 --> <!-- Web 相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-web</artifactId> <artifactId>zt-spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@@ -56,7 +56,7 @@
<!-- 服务保障相关 --> <!-- 服务保障相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-protection</artifactId> <artifactId>zt-spring-boot-starter-protection</artifactId>
</dependency> </dependency>
<!-- Registry 注册中心相关 --> <!-- Registry 注册中心相关 -->
@@ -74,7 +74,7 @@
<!-- RPC 远程调用相关 --> <!-- RPC 远程调用相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-rpc</artifactId> <artifactId>zt-spring-boot-starter-rpc</artifactId>
<!-- 目的：zt-server 单体启动，禁用 openfeign --> <!-- 目的：zt-server 单体启动，禁用 openfeign -->
<exclusions> <exclusions>
<exclusion> <exclusion>

4
base-server/src/main/java/com/zt/plat/base/BaseServerApplication.java
View File

@@ -8,8 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* *
* @author ZT * @author ZT
*/ */
@SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${cloud.info.base-package} @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${zt.info.base-package}
@SpringBootApplication(scanBasePackages = {"${cloud.info.base-package}.base", "${cloud.info.base-package}.module"}, @SpringBootApplication(scanBasePackages = {"${zt.info.base-package}.base", "${zt.info.base-package}.module"},
excludeName = {}) excludeName = {})
public class BaseServerApplication { public class BaseServerApplication {

2
base-server/src/main/resources/application-local.yml
View File

@@ -87,7 +87,7 @@ mybatis-plus:
# 芋道配置项，设置当前项目所有自定义的配置 # 芋道配置项，设置当前项目所有自定义的配置
cloud: zt:
env: # 多环境的配置项 env: # 多环境的配置项
tag: ${HOSTNAME} tag: ${HOSTNAME}
security: security:

4
base-server/src/main/resources/application.yml
View File

@@ -101,7 +101,7 @@ xxl:
logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
accessToken: default_token # 执行器通讯TOKEN accessToken: default_token # 执行器通讯TOKEN
cloud: zt:
info: info:
version: 1.0.0 version: 1.0.0
base-package: com.zt.plat base-package: com.zt.plat
@@ -116,7 +116,7 @@ cloud:
swagger: swagger:
title: 管理后台 title: 管理后台
description: 提供管理员管理的所有功能 description: 提供管理员管理的所有功能
version: ${cloud.info.version} version: ${zt.info.version}
tenant: # 多租户相关配置项 tenant: # 多租户相关配置项
enable: true enable: true

4
pom.xml
View File

@@ -19,7 +19,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url> <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties> <properties>
<revision>3.0.34</revision> <revision>3.0.35</revision>
<!-- Maven 相关 --> <!-- Maven 相关 -->
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -38,7 +38,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-dependencies</artifactId> <artifactId>zt-dependencies</artifactId>
<version>${revision}</version> <version>${revision}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>

2
zt-module-base/pom.xml
View File

@@ -13,7 +13,7 @@
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-base</artifactId> <artifactId>zt-module-base</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>

6
zt-module-base/zt-module-base-api/pom.xml
View File

@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>cloud-module-base</artifactId> <artifactId>zt-module-base</artifactId>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-base-api</artifactId> <artifactId>zt-module-base-api</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
@@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-common</artifactId> <artifactId>zt-common</artifactId>
</dependency> </dependency>
<!-- Web 相关 --> <!-- Web 相关 -->
<dependency> <dependency>

38
zt-module-base/zt-module-base-server/pom.xml
View File

@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>cloud-module-base</artifactId> <artifactId>zt-module-base</artifactId>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>cloud-module-base-server</artifactId> <artifactId>zt-module-base-server</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description> <description>
@@ -21,63 +21,63 @@
<!-- Spring Cloud 基础 --> <!-- Spring Cloud 基础 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-env</artifactId> <artifactId>zt-spring-boot-starter-env</artifactId>
</dependency> </dependency>
<!-- 依赖服务 --> <!-- 依赖服务 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-system-api</artifactId> <artifactId>zt-module-system-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-infra-api</artifactId> <artifactId>zt-module-infra-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-base-api</artifactId> <artifactId>zt-module-base-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 业务组件 --> <!-- 业务组件 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-data-permission</artifactId> <artifactId>zt-spring-boot-starter-biz-data-permission</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-tenant</artifactId> <artifactId>zt-spring-boot-starter-biz-tenant</artifactId>
</dependency> </dependency>
<!-- Web 相关 --> <!-- Web 相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-web</artifactId> <artifactId>zt-spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-security</artifactId> <artifactId>zt-spring-boot-starter-security</artifactId>
</dependency> </dependency>
<!-- DB 相关 --> <!-- DB 相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-mybatis</artifactId> <artifactId>zt-spring-boot-starter-mybatis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-redis</artifactId> <artifactId>zt-spring-boot-starter-redis</artifactId>
</dependency> </dependency>
<!-- RPC 远程调用相关 --> <!-- RPC 远程调用相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-rpc</artifactId> <artifactId>zt-spring-boot-starter-rpc</artifactId>
</dependency> </dependency>
<!-- Registry 注册中心相关 --> <!-- Registry 注册中心相关 -->
@@ -95,35 +95,35 @@
<!-- Job 定时任务相关 --> <!-- Job 定时任务相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-job</artifactId> <artifactId>zt-spring-boot-starter-job</artifactId>
</dependency> </dependency>
<!-- 消息队列相关 --> <!-- 消息队列相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-mq</artifactId> <artifactId>zt-spring-boot-starter-mq</artifactId>
</dependency> </dependency>
<!-- Test 测试相关 --> <!-- Test 测试相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-test</artifactId> <artifactId>zt-spring-boot-starter-test</artifactId>
</dependency> </dependency>
<!-- 工具类相关 --> <!-- 工具类相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-excel</artifactId> <artifactId>zt-spring-boot-starter-excel</artifactId>
</dependency> </dependency>
<!-- 监控相关 --> <!-- 监控相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-monitor</artifactId> <artifactId>zt-spring-boot-starter-monitor</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-business</artifactId> <artifactId>zt-spring-boot-starter-biz-business</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
zt-module-base/zt-module-base-server/src/main/resources/application-local.yml
View File

@@ -87,7 +87,7 @@ mybatis-plus:
# 芋道配置项，设置当前项目所有自定义的配置 # 芋道配置项，设置当前项目所有自定义的配置
cloud: zt:
env: # 多环境的配置项 env: # 多环境的配置项
tag: ${HOSTNAME} tag: ${HOSTNAME}
security: security:

4
zt-module-base/zt-module-base-server/src/main/resources/application.yml
View File

@@ -101,7 +101,7 @@ xxl:
logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
accessToken: default_token # 执行器通讯TOKEN accessToken: default_token # 执行器通讯TOKEN
cloud: zt:
info: info:
version: 1.0.0 version: 1.0.0
base-package: com.zt.plat.module.base base-package: com.zt.plat.module.base
@@ -116,7 +116,7 @@ cloud:
swagger: swagger:
title: 管理后台 title: 管理后台
description: 提供管理员管理的所有功能 description: 提供管理员管理的所有功能
version: ${cloud.info.version} version: ${zt.info.version}
tenant: # 多租户相关配置项 tenant: # 多租户相关配置项
enable: true enable: true

2
zt-module-contract-order/pom.xml
View File

@@ -13,7 +13,7 @@
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-contract-order</artifactId> <artifactId>zt-module-contract-order</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>

6
zt-module-contract-order/zt-module-contract-order-api/pom.xml
View File

@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>cloud-module-contract-order</artifactId> <artifactId>zt-module-contract-order</artifactId>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-contract-order-api</artifactId> <artifactId>zt-module-contract-order-api</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
@@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-common</artifactId> <artifactId>zt-common</artifactId>
</dependency> </dependency>
<!-- Web 相关 --> <!-- Web 相关 -->
<dependency> <dependency>

38
zt-module-contract-order/zt-module-contract-order-server/pom.xml
View File

@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>cloud-module-contract-order</artifactId> <artifactId>zt-module-contract-order</artifactId>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>cloud-module-contract-order-server</artifactId> <artifactId>zt-module-contract-order-server</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description> <description>
@@ -21,63 +21,63 @@
<!-- Spring Cloud 基础 --> <!-- Spring Cloud 基础 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-env</artifactId> <artifactId>zt-spring-boot-starter-env</artifactId>
</dependency> </dependency>
<!-- 依赖服务 --> <!-- 依赖服务 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-system-api</artifactId> <artifactId>zt-module-system-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-infra-api</artifactId> <artifactId>zt-module-infra-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-contract-order-api</artifactId> <artifactId>zt-module-contract-order-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 业务组件 --> <!-- 业务组件 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-data-permission</artifactId> <artifactId>zt-spring-boot-starter-biz-data-permission</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-tenant</artifactId> <artifactId>zt-spring-boot-starter-biz-tenant</artifactId>
</dependency> </dependency>
<!-- Web 相关 --> <!-- Web 相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-web</artifactId> <artifactId>zt-spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-security</artifactId> <artifactId>zt-spring-boot-starter-security</artifactId>
</dependency> </dependency>
<!-- DB 相关 --> <!-- DB 相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-mybatis</artifactId> <artifactId>zt-spring-boot-starter-mybatis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-redis</artifactId> <artifactId>zt-spring-boot-starter-redis</artifactId>
</dependency> </dependency>
<!-- RPC 远程调用相关 --> <!-- RPC 远程调用相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-rpc</artifactId> <artifactId>zt-spring-boot-starter-rpc</artifactId>
</dependency> </dependency>
<!-- Registry 注册中心相关 --> <!-- Registry 注册中心相关 -->
@@ -95,35 +95,35 @@
<!-- Job 定时任务相关 --> <!-- Job 定时任务相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-job</artifactId> <artifactId>zt-spring-boot-starter-job</artifactId>
</dependency> </dependency>
<!-- 消息队列相关 --> <!-- 消息队列相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-mq</artifactId> <artifactId>zt-spring-boot-starter-mq</artifactId>
</dependency> </dependency>
<!-- Test 测试相关 --> <!-- Test 测试相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-test</artifactId> <artifactId>zt-spring-boot-starter-test</artifactId>
</dependency> </dependency>
<!-- 工具类相关 --> <!-- 工具类相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-excel</artifactId> <artifactId>zt-spring-boot-starter-excel</artifactId>
</dependency> </dependency>
<!-- 监控相关 --> <!-- 监控相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-monitor</artifactId> <artifactId>zt-spring-boot-starter-monitor</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-business</artifactId> <artifactId>zt-spring-boot-starter-biz-business</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application-local.yml
View File

@@ -87,7 +87,7 @@ mybatis-plus:
# 芋道配置项，设置当前项目所有自定义的配置 # 芋道配置项，设置当前项目所有自定义的配置
cloud: zt:
env: # 多环境的配置项 env: # 多环境的配置项
tag: ${HOSTNAME} tag: ${HOSTNAME}
security: security:

4
zt-module-contract-order/zt-module-contract-order-server/src/main/resources/application.yml
View File

@@ -101,7 +101,7 @@ xxl:
logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
accessToken: default_token # 执行器通讯TOKEN accessToken: default_token # 执行器通讯TOKEN
cloud: zt:
info: info:
version: 1.0.0 version: 1.0.0
base-package: com.zt.plat.module.contractorder base-package: com.zt.plat.module.contractorder
@@ -116,7 +116,7 @@ cloud:
swagger: swagger:
title: 管理后台 title: 管理后台
description: 提供管理员管理的所有功能 description: 提供管理员管理的所有功能
version: ${cloud.info.version} version: ${zt.info.version}
tenant: # 多租户相关配置项 tenant: # 多租户相关配置项
enable: true enable: true

2
zt-module-erp/pom.xml
View File

@@ -13,7 +13,7 @@
</modules> </modules>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-erp</artifactId> <artifactId>zt-module-erp</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>

6
zt-module-erp/zt-module-erp-api/pom.xml
View File

@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>cloud-module-erp</artifactId> <artifactId>zt-module-erp</artifactId>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>cloud-module-erp-api</artifactId> <artifactId>zt-module-erp-api</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
@@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-common</artifactId> <artifactId>zt-common</artifactId>
</dependency> </dependency>
<!-- Web 相关 --> <!-- Web 相关 -->
<dependency> <dependency>

1
zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpSubmitReqDTO.java
View File

@@ -23,7 +23,6 @@ public class ErpSubmitReqDTO {
* "sign": 签名，uuid+srcsys+密码，MD5 32位小写签名，密码另行约定 * "sign": 签名，uuid+srcsys+密码，MD5 32位小写签名，密码另行约定
* "req": {具体参数，参见RFC功能列表} * "req": {具体参数，参见RFC功能列表}
*/ */
private String uuid;
private String srcsys; private String srcsys;
private String funcnr; private String funcnr;
private String bskey; private String bskey;

38
zt-module-erp/zt-module-erp-server/pom.xml
View File

@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>cloud-module-erp</artifactId> <artifactId>zt-module-erp</artifactId>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>cloud-module-erp-server</artifactId> <artifactId>zt-module-erp-server</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<description> <description>
@@ -21,63 +21,63 @@
<!-- Spring Cloud 基础 --> <!-- Spring Cloud 基础 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-env</artifactId> <artifactId>zt-spring-boot-starter-env</artifactId>
</dependency> </dependency>
<!-- 依赖服务 --> <!-- 依赖服务 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-system-api</artifactId> <artifactId>zt-module-system-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-infra-api</artifactId> <artifactId>zt-module-infra-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-module-erp-api</artifactId> <artifactId>zt-module-erp-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 业务组件 --> <!-- 业务组件 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-data-permission</artifactId> <artifactId>zt-spring-boot-starter-biz-data-permission</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-tenant</artifactId> <artifactId>zt-spring-boot-starter-biz-tenant</artifactId>
</dependency> </dependency>
<!-- Web 相关 --> <!-- Web 相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-web</artifactId> <artifactId>zt-spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-security</artifactId> <artifactId>zt-spring-boot-starter-security</artifactId>
</dependency> </dependency>
<!-- DB 相关 --> <!-- DB 相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-mybatis</artifactId> <artifactId>zt-spring-boot-starter-mybatis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-redis</artifactId> <artifactId>zt-spring-boot-starter-redis</artifactId>
</dependency> </dependency>
<!-- RPC 远程调用相关 --> <!-- RPC 远程调用相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-rpc</artifactId> <artifactId>zt-spring-boot-starter-rpc</artifactId>
</dependency> </dependency>
<!-- Registry 注册中心相关 --> <!-- Registry 注册中心相关 -->
@@ -95,35 +95,35 @@
<!-- Job 定时任务相关 --> <!-- Job 定时任务相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-job</artifactId> <artifactId>zt-spring-boot-starter-job</artifactId>
</dependency> </dependency>
<!-- 消息队列相关 --> <!-- 消息队列相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-mq</artifactId> <artifactId>zt-spring-boot-starter-mq</artifactId>
</dependency> </dependency>
<!-- Test 测试相关 --> <!-- Test 测试相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-test</artifactId> <artifactId>zt-spring-boot-starter-test</artifactId>
</dependency> </dependency>
<!-- 工具类相关 --> <!-- 工具类相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-excel</artifactId> <artifactId>zt-spring-boot-starter-excel</artifactId>
</dependency> </dependency>
<!-- 监控相关 --> <!-- 监控相关 -->
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-monitor</artifactId> <artifactId>zt-spring-boot-starter-monitor</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.zt.plat</groupId> <groupId>com.zt.plat</groupId>
<artifactId>cloud-spring-boot-starter-biz-business</artifactId> <artifactId>zt-spring-boot-starter-biz-business</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>

64
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/common/conf/ErpConfig.java
View File

@@ -85,40 +85,42 @@ public class ErpConfig {
/** /**
* 调用ERP接口更新erp数据 * 调用ERP接口更新erp数据
*/ */
public ResponseEntity<String> pushDataToErp(ErpSubmitReqDTO reqDTO) { public ResponseEntity<String> pushDataToErp(ErpSubmitReqDTO reqDTO) {
try { try {
// 构建完整URL // 构建完整URL
String url = "http://" + erpAddress + "/api/rfc/post"; String url = "http://" + erpAddress + "/api/rfc/post";
// 构建请求参数 // 构建请求参数
JSONObject requestBody = new JSONObject(); JSONObject requestBody = new JSONObject();
requestBody.put("uuid", reqDTO.getUuid()); requestBody.put("uuid", UUID.randomUUID().toString());
requestBody.put("sapsys", sapsys); requestBody.put("sapsys", sapsys);
requestBody.put("srcsys", reqDTO.getSrcsys()); requestBody.put("srcsys", reqDTO.getSrcsys());
requestBody.put("funcnr", reqDTO.getFuncnr()); requestBody.put("funcnr", reqDTO.getFuncnr());
requestBody.put("bskey", reqDTO.getBskey()); requestBody.put("bskey", reqDTO.getBskey());
requestBody.put("usrid", reqDTO.getUsrid()); requestBody.put("usrid", reqDTO.getUsrid());
requestBody.put("usrnm", reqDTO.getUsrnm()); requestBody.put("usrnm", reqDTO.getUsrnm());
if (reqDTO.getSign() != null){
requestBody.put("sign", reqDTO.getSign()); requestBody.put("sign", reqDTO.getSign());
if (reqDTO.getReq() != null) {
requestBody.put("req", reqDTO.getReq());
}
// 设置请求头
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
// 创建HTTP请求实体
HttpEntity<String> requestEntity = new HttpEntity<>(requestBody.toJSONString(), headers);
// 发送POST请求
RestTemplate restTemplate = new RestTemplate();
ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);
return response;
} catch (Exception e) {
log.error("调用ERP RFC接口失败: {}", e);
return ResponseEntity.status(500).body("调用ERP接口失败: " + e.getMessage());
} }
if (reqDTO.getReq() != null) {
requestBody.put("req", reqDTO.getReq());
}
// 设置请求头
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
// 创建HTTP请求实体
HttpEntity<String> requestEntity = new HttpEntity<>(requestBody.toJSONString(), headers);
// 发送POST请求
RestTemplate restTemplate = new RestTemplate();
ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);
return response;
} catch (Exception e) {
log.error("调用ERP RFC接口失败:"+e.getMessage(), e);
return ResponseEntity.status(500).body("调用ERP接口失败: " + e.getMessage());
} }
}
//list //list
public Map<String, List<String>> numbers(JSONArray dataArray, String key, String dataKey) { public Map<String, List<String>> numbers(JSONArray dataArray, String key, String dataKey) {

10
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpBomController.java
View File

@@ -103,9 +103,17 @@ public class ErpBomController {
@PostMapping("/getErpBomTask") @PostMapping("/getErpBomTask")
@Operation(summary = "定时获得erp更新物料清单(BOM)") @Operation(summary = "定时获得erp更新物料清单(BOM)")
@PreAuthorize("@ss.hasPermission('sply:erp-bom:query')") @PreAuthorize("@ss.hasPermission('sply:erp-bom:create')")
public void getErpBomTask() { public void getErpBomTask() {
erpBomService.callErpRfcInterface(); erpBomService.callErpRfcInterface();
} }
@PostMapping("/submitDataToErp")
@Operation(summary = "推送")
@PreAuthorize("@ss.hasPermission('sply:erp-bom:create')")
public void submitDataToErp() {
erpBomService.submitDataToErp();
}
} }

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCompanyController.java
View File

@@ -103,7 +103,7 @@ public class ErpCompanyController {
@PostMapping("/getErpCompanyTask") @PostMapping("/getErpCompanyTask")
@Operation(summary = "定时获得erp更新公司") @Operation(summary = "定时获得erp更新公司")
@PreAuthorize("@ss.hasPermission('sply:erp-company:query')") @PreAuthorize("@ss.hasPermission('sply:erp-company:create')")
public void getErpCompanyTask() { public void getErpCompanyTask() {
erpCompanyService.callErpRfcInterface(); erpCompanyService.callErpRfcInterface();
} }

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpContractController.java
View File

@@ -103,7 +103,7 @@ public class ErpContractController {
@PostMapping("/getErpContractTask") @PostMapping("/getErpContractTask")
@Operation(summary = "定时获得erp更新合同") @Operation(summary = "定时获得erp更新合同")
@PreAuthorize("@ss.hasPermission('sply:erp-contract:query')") @PreAuthorize("@ss.hasPermission('sply:erp-contract:create')")
public void getErpContractTask() { public void getErpContractTask() {
erpContractService.callErpRfcInterface(); erpContractService.callErpRfcInterface();
} }

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCostcenterController.java
View File

@@ -103,7 +103,7 @@ public class ErpCostcenterController {
@PostMapping("/getErpCostcenterTask") @PostMapping("/getErpCostcenterTask")
@Operation(summary = "定时获得erp更新成本中心") @Operation(summary = "定时获得erp更新成本中心")
@PreAuthorize("@ss.hasPermission('sply:erp-costcenter:query')") @PreAuthorize("@ss.hasPermission('sply:erp-costcenter:create')")
public void getErpCostcenterTask() { public void getErpCostcenterTask() {
erpCostcenterService.callErpRfcInterface(); erpCostcenterService.callErpRfcInterface();
} }

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomService.java
View File

@@ -62,4 +62,6 @@ public interface ErpBomService {
PageResult<ErpBomDO> getErpBomPage(ErpBomPageReqVO pageReqVO); PageResult<ErpBomDO> getErpBomPage(ErpBomPageReqVO pageReqVO);
void callErpRfcInterface(); void callErpRfcInterface();
void submitDataToErp();
} }

61
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomServiceImpl.java
View File

@@ -3,6 +3,8 @@ package com.zt.plat.module.erp.service.erp;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.module.erp.api.ErpExternalApi;
import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
import com.zt.plat.module.erp.common.conf.ErpConfig; import com.zt.plat.module.erp.common.conf.ErpConfig;
import com.zt.plat.module.erp.common.enums.OftenEnum; import com.zt.plat.module.erp.common.enums.OftenEnum;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBomPageReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.ErpBomPageReqVO;
@@ -16,14 +18,13 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.erp.enums.ErrorCodeConstants.ERP_BOM_NOT_EXISTS; import static com.zt.plat.module.erp.enums.ErrorCodeConstants.ERP_BOM_NOT_EXISTS;
@@ -44,6 +45,9 @@ public class ErpBomServiceImpl implements ErpBomService {
@Resource @Resource
private ErpConfig erpConfig; private ErpConfig erpConfig;
@Resource
public ErpExternalApi erpExternalApi;
@Override @Override
public ErpBomRespVO createErpBom(ErpBomSaveReqVO createReqVO) { public ErpBomRespVO createErpBom(ErpBomSaveReqVO createReqVO) {
// 插入 // 插入
@@ -226,4 +230,53 @@ public class ErpBomServiceImpl implements ErpBomService {
this.allnumbers = allnumbers; this.allnumbers = allnumbers;
} }
} }
@Override
public void submitDataToErp() {
ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
reqDTO.setSrcsys("MOM");
reqDTO.setFuncnr("061");
reqDTO.setBskey("POTEST011");
reqDTO.setUsrid("cuibin");
reqDTO.setUsrnm("崔斌");
Map<String, Object> req = new HashMap<>();
Map<String, String> exte = new HashMap<>();
exte.put("zzhth", "成品采购合同0406-1-xt");
req.put("exte", exte);
Map<String, Object> head = new HashMap<>();
head.put("pur_group", "120");
head.put("purch_org", "3017");
head.put("comp_code", "3017");
head.put("vendor", "0000003162");
head.put("doc_date", "20230406");
head.put("currency", "CNY");
head.put("exch_rate", 1.00000000);
head.put("doc_type", "PO01");
head.put("zzhth", "成品采购合同0406-1-xt");
req.put("head", head);
List<Map<String, Object>> items = new ArrayList<>();
Map<String, Object> item = new HashMap<>();
item.put("material", "000000000000226986");
item.put("net_price", 40000.00);
item.put("plant", "3026");
item.put("po_item", 1);
item.put("po_unit", "TON");
item.put("price_unit", 1);
item.put("quantity", 2000.000);
item.put("stge_loc", "4011");
item.put("tax_code", "J0");
item.put("unlimited_dlv", "X");
items.add(item);
req.put("item", items);
reqDTO.setReq(req);
ResponseEntity<String> response = erpExternalApi.submitDataToErp(reqDTO);
if (response.getStatusCode() == HttpStatus.OK){
log.info("ERP数据提交成功");
}
}
} }

2
zt-module-erp/zt-module-erp-server/src/main/resources/application-local.yml
View File

@@ -87,7 +87,7 @@ mybatis-plus:
# 芋道配置项，设置当前项目所有自定义的配置 # 芋道配置项，设置当前项目所有自定义的配置
cloud: zt:
env: # 多环境的配置项 env: # 多环境的配置项
tag: ${HOSTNAME} tag: ${HOSTNAME}
security: security:

4
zt-module-erp/zt-module-erp-server/src/main/resources/application.yml
View File

@@ -101,7 +101,7 @@ xxl:
logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径 logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
accessToken: default_token # 执行器通讯TOKEN accessToken: default_token # 执行器通讯TOKEN
cloud: zt:
info: info:
version: 1.0.0 version: 1.0.0
base-package: com.zt.plat.module.base base-package: com.zt.plat.module.base
@@ -116,7 +116,7 @@ cloud:
swagger: swagger:
title: 管理后台 title: 管理后台
description: 提供管理员管理的所有功能 description: 提供管理员管理的所有功能
version: ${cloud.info.version} version: ${zt.info.version}
tenant: # 多租户相关配置项 tenant: # 多租户相关配置项
enable: true enable: true