Commit a1d88a96 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent f1ae58b4
...@@ -1522,6 +1522,7 @@ public class SpaceOptimizeBaseService { ...@@ -1522,6 +1522,7 @@ public class SpaceOptimizeBaseService {
.filter(p -> p.getPower().compareTo(BigDecimal.ZERO) > 0) .filter(p -> p.getPower().compareTo(BigDecimal.ZERO) > 0)
.collect(Collectors.toList()); .collect(Collectors.toList());
for (GetSpaceOptimizeWellheadOutput w : wellheadOutputs) { for (GetSpaceOptimizeWellheadOutput w : wellheadOutputs) {
BigDecimal runDuration = w.getRunDuration();
BigDecimal initializeGreenRate = BigDecimal.ZERO; BigDecimal initializeGreenRate = BigDecimal.ZERO;
BigDecimal optimizeGreenRate = BigDecimal.ZERO; BigDecimal optimizeGreenRate = BigDecimal.ZERO;
if (collect.containsKey(w.getWellheadId())) { if (collect.containsKey(w.getWellheadId())) {
......
...@@ -57,7 +57,12 @@ ...@@ -57,7 +57,12 @@
s.well_number, s.well_number,
s.start_seq, s.start_seq,
s.optimize_date, s.optimize_date,
w.run_duration CASE
w.run_type_key
WHEN 'CONTINUOUS' THEN
24
ELSE w.run_duration
END run_duration
FROM space_optimize_long_wellhead s FROM space_optimize_long_wellhead s
LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id
WHERE s.is_deleted = 1 WHERE s.is_deleted = 1
......
...@@ -56,7 +56,12 @@ ...@@ -56,7 +56,12 @@
s.well_number, s.well_number,
s.start_seq, s.start_seq,
s.optimize_date, s.optimize_date,
w.run_duration CASE
w.run_type_key
WHEN 'CONTINUOUS' THEN
24
ELSE w.run_duration
END run_duration
FROM space_optimize_mid_wellhead s FROM space_optimize_mid_wellhead s
LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id
WHERE s.is_deleted = 1 WHERE s.is_deleted = 1
......
...@@ -59,7 +59,12 @@ ...@@ -59,7 +59,12 @@
s.well_number, s.well_number,
s.start_seq, s.start_seq,
s.optimize_date, s.optimize_date,
w.run_duration CASE
w.run_type_key
WHEN 'CONTINUOUS' THEN
24
ELSE w.run_duration
END run_duration
FROM space_optimize_short_wellhead s FROM space_optimize_short_wellhead s
LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id
WHERE s.is_deleted = 1 WHERE s.is_deleted = 1
......
...@@ -57,7 +57,12 @@ ...@@ -57,7 +57,12 @@
s.well_number, s.well_number,
s.start_seq, s.start_seq,
s.optimize_date, s.optimize_date,
w.run_duration CASE
w.run_type_key
WHEN 'CONTINUOUS' THEN
24
ELSE w.run_duration
END run_duration
FROM space_optimize_ultra_wellhead s FROM space_optimize_ultra_wellhead s
LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id
WHERE s.is_deleted = 1 WHERE s.is_deleted = 1
......
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