Commit e0e5ad00 authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.新建油田配置表同时生成相关代码及mapper文件,修改部分第三方数据抽取定时任务,增加针对不同井场开关控制逻辑,同时修改首页页面展示逻辑,通过油田配置功能区分不同首页展示功能;
2.新建定时任务配置表同时生成相关代码及mapper文件,定时任务模块增加mybatis配置,用以操作数据库,修改部分第三方数据抽取定时任务,修改使用方式使其脱离框架方便动态控制;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7cf54ba2
......@@ -14,7 +14,7 @@
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
......
......@@ -12,6 +12,11 @@
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
......@@ -20,11 +25,6 @@
<scope>compile</scope>
</dependency>
</dependencies>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
</properties>
<build>
<plugins>
<!-- 打包jar文件时,配置manifest文件,加入lib包的jar依赖 -->
......@@ -74,4 +74,4 @@
</releases>
</repository>
</repositories>
</project>
</project>
\ No newline at end of file
......@@ -12,35 +12,37 @@
<groupId>gf</groupId>
<artifactId>pps-core-system</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-common</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-prediction</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
<dependency>
......
......@@ -12,9 +12,11 @@
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
......
......@@ -12,31 +12,32 @@
<groupId>gf</groupId>
<artifactId>pps-core-base</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-common</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-system</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
<version>${pps.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-mail -->
......
......@@ -12,38 +12,37 @@
<groupId>gf</groupId>
<artifactId>pps-core-task</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-common</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-prediction</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
<version>${pps.version}</version>
</dependency>
</dependencies>
......
......@@ -8,13 +8,6 @@
<version>1.15.169-xstartup-cloud</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
</properties>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
......@@ -23,6 +16,15 @@
<scope>compile</scope>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>
<groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<!-- 打包jar文件时,配置manifest文件,加入lib包的jar依赖 -->
......
......@@ -12,35 +12,37 @@
<groupId>gf</groupId>
<artifactId>pps-core-space</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-common</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-prediction</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
</dependencies>
<build>
......
......@@ -12,9 +12,11 @@
<groupId>gf</groupId>
<artifactId>pps-cloud-prediction</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
......
......@@ -12,36 +12,37 @@
<groupId>gf</groupId>
<artifactId>pps-core-prediction</artifactId>
<version>1.0.0-pps</version>
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-common</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-prediction</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
<version>${pps.version}</version>
</dependency>
</dependencies>
<build>
......
......@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<properties>
<pps.version>1.0.0-pps</pps.version>
<spring-cloud-huawei.version>1.8.0-2020.0.x</spring-cloud-huawei.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
......
......@@ -14,6 +14,7 @@
<properties>
<project.mainClass>app.DeployPpsAllApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
......
......@@ -12,8 +12,6 @@
<version>1.0.0</version>
<groupId>gf</groupId>
<artifactId>deploy-pps-gateway</artifactId>
<dependencies>
</dependencies>
<profiles>
<!-- 开发环境,默认激活 -->
<profile>
......@@ -42,6 +40,7 @@
</profiles>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- 定义main.class属性,值为你的主类全限定名 -->
<main.class>app.DeployPpsGatewayApplication</main.class>
</properties>
......
......@@ -16,6 +16,7 @@
<properties>
<project.mainClass>app.DeployPpsPredictionApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
......
......@@ -16,6 +16,7 @@
<properties>
<project.mainClass>app.DeployPpsSpaceApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
......
......@@ -16,6 +16,7 @@
<properties>
<project.mainClass>app.DeployPpsSystemApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
......
......@@ -16,6 +16,7 @@
<properties>
<project.mainClass>app.DeployPpsSystemApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
......
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