Skip to content

G
gf_back
Commit 40a7445e authored by ZWT's avatar ZWT
Browse files
Options

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

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 32809d38
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 152 deletions
C00-common/pps-common/pom.xml
View file @ 40a7445e
......@@ -146,10 +146,6 @@
<artifactId>pinyin4j</artifactId>
<version>2.5.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>commons-codec</groupId>-->
<!-- <artifactId>commons-codec</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
......
C02-system/pps-core-system/pom.xml
View file @ 40a7445e
......@@ -50,23 +50,11 @@
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>gf</groupId>-->
<!-- <artifactId>pps-core-auth</artifactId>-->
<!-- <version>1.0.0-pps</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.70</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>gf</groupId>-->
<!-- <artifactId>fiybook-cloud</artifactId>-->
<!-- <version>1.0.0-pps</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
</dependencies>
<build>
<plugins>
......
C09-base/pom.xml
View file @ 40a7445e
......@@ -37,5 +37,4 @@
</releases>
</repository>
</repositories>
</project>
</project>
\ No newline at end of file
C09-base/pps-core-base/pom.xml
View file @ 40a7445e
......@@ -22,12 +22,6 @@
<artifactId>pps-common</artifactId>
<version>1.0.0-pps</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>gf</groupId>-->
<!-- <artifactId>pps-core-auth</artifactId>-->
<!-- <version>1.0.0-pps</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
......@@ -107,6 +101,4 @@
</releases>
</repository>
</repositories>
</project>
</project>
\ No newline at end of file
C11-space/pom.xml
View file @ 40a7445e
......@@ -37,5 +37,4 @@
</releases>
</repository>
</repositories>
</project>
</project>
\ No newline at end of file
C11-space/pps-cloud-space/pom.xml
View file @ 40a7445e
......@@ -73,6 +73,4 @@
</releases>
</repository>
</repositories>
</project>
</project>
\ No newline at end of file
C11-space/pps-core-space/pom.xml
View file @ 40a7445e
......@@ -97,6 +97,4 @@
</releases>
</repository>
</repositories>
</project>
</project>
\ No newline at end of file
C12-prediction/pom.xml
View file @ 40a7445e
......@@ -37,5 +37,4 @@
</releases>
</repository>
</repositories>
</project>
\ No newline at end of file
C12-prediction/pps-cloud-prediction/pom.xml
View file @ 40a7445e
......@@ -73,5 +73,4 @@
</releases>
</repository>
</repositories>
</project>
\ No newline at end of file
D01-dependency/pps-dependency-all/pom.xml
View file @ 40a7445e
......@@ -11,7 +11,6 @@
<pps.version>1.0.0-pps</pps.version>
<spring-cloud-huawei.version>1.8.0-2020.0.x</spring-cloud-huawei.version>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
......
D03-deploy/deploy-pps-all/pom.xml
View file @ 40a7445e
......@@ -69,7 +69,6 @@
<artifactId>pps-dependency-all</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
......@@ -79,10 +78,6 @@
<artifactId>mysql-connector-java</artifactId>
<version>8.0.23</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-kafka</artifactId>
</dependency>
</dependencies>
<profiles>
......@@ -116,7 +111,6 @@
<filters>
<filter>../filters/filter-${env}.properties</filter>
</filters>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
......
D03-deploy/deploy-pps-gateway/pom.xml
View file @ 40a7445e
......@@ -12,12 +12,7 @@
<version>1.0.0</version>
<groupId>gf</groupId>
<artifactId>deploy-pps-gateway</artifactId>
<dependencies>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse-gateway</artifactId>
</dependency>
</dependencies>
<profiles>
<!-- 开发环境，默认激活 -->
......
D03-deploy/deploy-pps-gateway/src/main/java/app/DeployPpsGatewayApplication.java
View file @ 40a7445e
......@@ -3,13 +3,11 @@ package app;
import xstartup.base.XStartup;
import xstartup.base.conf.XServerConf;
import xstartup.boot.XStartupApplication;
import xstartup.feature.cloud.XCloudHuaweiCseGatewayFeature;
public class DeployPpsGatewayApplication {
public static void main(String... args) {
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22068).naming("pps-gateway-service"));
startup.enable(XCloudHuaweiCseGatewayFeature.class);
startup.run(args);
}
}
D03-deploy/deploy-pps-prediction/pom.xml
View file @ 40a7445e
......@@ -39,19 +39,6 @@
<artifactId>huawei-gauss-db</artifactId>
<version>1.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>pps</groupId>-->
<!-- <artifactId>pps-core-framedata</artifactId>-->
<!-- <version>${pps.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-kafka</artifactId>
</dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
</dependencies>
<profiles>
......
D03-deploy/deploy-pps-prediction/src/main/java/app/DeployPpsPredictionApplication.java
View file @ 40a7445e
......@@ -9,16 +9,12 @@ import xstartup.base.conf.XServiceConf;
import xstartup.boot.XStartupApplication;
import xstartup.feature.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature;
import xstartup.feature.cloud.conf.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
public class DeployPpsPredictionApplication {
public static void main(String... args) {
System.out.println("println--DeployPpsTaskApplication");
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsPredictionApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22062).naming("pps-task"))
......@@ -27,14 +23,7 @@ public class DeployPpsPredictionApplication {
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCorsFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
// XCloudBundle.naming("pps-workflow").addModule("pps", "cloud", "task"),
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"),
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base")));
startup.run(args);
}
}
D03-deploy/deploy-pps-space/pom.xml
View file @ 40a7445e
......@@ -35,19 +35,6 @@
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</dependency>
<dependency>
<groupId>huawei-gauss-db</groupId>
<artifactId>huawei-gauss-db</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-kafka</artifactId>
</dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
</dependencies>
<profiles>
......
D03-deploy/deploy-pps-space/src/main/java/app/DeployPpsSpaceApplication.java
View file @ 40a7445e
package app;
//import pps.core.common.job.CounterJob;
import pps.core.common.utils.CounterBuilder;
import xstartup.base.XStartup;
......@@ -9,16 +8,12 @@ import xstartup.base.conf.XServiceConf;
import xstartup.boot.XStartupApplication;
import xstartup.feature.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature;
import xstartup.feature.cloud.conf.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
public class DeployPpsSpaceApplication {
public static void main(String... args) {
System.out.println("println--DeployPpsSpaceApplication");
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsSpaceApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-base-info"))
......@@ -26,14 +21,8 @@ public class DeployPpsSpaceApplication {
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XSwaggerFeature.class);
// startup.enable(XJobFeature.class).config(new XJobServiceConf(CounterJob.class));
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base"),
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"))
);
startup.run(args);
}
......
D03-deploy/deploy-pps-system/pom.xml
View file @ 40a7445e
......@@ -45,27 +45,10 @@
<artifactId>pps-dependency-all</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</dependency>
<dependency>
<groupId>huawei-gauss-db</groupId>
<artifactId>huawei-gauss-db</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-kafka</artifactId>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-obs</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
......
D03-deploy/deploy-pps-system/src/main/java/app/DeployPpsSystemApplication.java
View file @ 40a7445e
package app;
//import pps.core.common.job.CounterJob;
import pps.core.common.utils.CounterBuilder;
import xstartup.base.XStartup;
......@@ -9,16 +8,12 @@ import xstartup.base.conf.XServiceConf;
import xstartup.boot.XStartupApplication;
import xstartup.feature.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature;
import xstartup.feature.cloud.conf.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
public class DeployPpsSystemApplication {
public static void main(String... args) {
System.out.println("println--DeployPpsSystemApplication");
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsSystemApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-base-info"))
......@@ -26,13 +21,8 @@ public class DeployPpsSystemApplication {
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XSwaggerFeature.class);
// startup.enable(XJobFeature.class).config(new XJobServiceConf(CounterJob.class));
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-prediction").addModule("pps", "cloud", "prediction"),
XCloudBundle.naming("pps-space").addModule("pps", "cloud", "space")));
startup.run(args);
}
......
D03-deploy/deploy-pps-task/pom.xml
View file @ 40a7445e
......@@ -35,24 +35,6 @@
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</dependency>
<dependency>
<groupId>huawei-gauss-db</groupId>
<artifactId>huawei-gauss-db</artifactId>
<version>1.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>pps</groupId>-->
<!-- <artifactId>pps-core-framedata</artifactId>-->
<!-- <version>${pps.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-kafka</artifactId>
</dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
</dependencies>
<profiles>
......
D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java
View file @ 40a7445e
......@@ -9,9 +9,6 @@ import xstartup.boot.XStartupApplication;
import xstartup.feature.XJobFeature;
import xstartup.feature.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature;
import xstartup.feature.cloud.conf.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
......@@ -45,11 +42,6 @@ public class DeployPpsTaskApplication {
startup.enable(XJobFeature.class).config(new XJobServiceConf(EnergyConsumptionAnalysisJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"),
XCloudBundle.naming("pps-base-prediction").addModule("pps", "cloud", "prediction"),
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base")));
startup.run(args);
}
}
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