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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongWellheadView.java

 package pps.core.space.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -15,6 +19,9 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SpaceOptimizeLongWellheadView extends BaseModel implements Serializable {
 
     @XText("长期优化周期ID")
@@ -36,4 +43,10 @@ public class SpaceOptimizeLongWellheadView extends BaseModel implements Serializ
     @XText("优化日期")
     @TableField
     private Date optimizeDate;
+
+    /*------------------------- other -------------------------*/
+
+    @XText("运行时长（小时/天）")
+    @TableField(exist = false)
+    private BigDecimal runDuration;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidWellheadView.java

 package pps.core.space.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -15,6 +19,9 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SpaceOptimizeMidWellheadView extends BaseModel implements Serializable {
 
     @XText("中短期优化周期ID")
@@ -36,4 +43,10 @@ public class SpaceOptimizeMidWellheadView extends BaseModel implements Serializa
     @XText("优化日期")
     @TableField
     private Date optimizeDate;
+
+    /*------------------------- other -------------------------*/
+
+    @XText("运行时长（小时/天）")
+    @TableField(exist = false)
+    private BigDecimal runDuration;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeUltraWellheadView.java

 package pps.core.space.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -15,6 +19,9 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SpaceOptimizeUltraWellheadView extends BaseModel implements Serializable {
     @XText("长期优化周期ID")
     @TableField
@@ -35,4 +42,10 @@ public class SpaceOptimizeUltraWellheadView extends BaseModel implements Seriali
     @XText("优化日期")
     @TableField
     private Date optimizeDate;
+
+    /*------------------------- other -------------------------*/
+
+    @XText("运行时长（小时/天）")
+    @TableField(exist = false)
+    private BigDecimal runDuration;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeLongWellheadViewMapper.java

@@ -14,10 +14,30 @@ import java.util.List;
  */
 @Repository(value = "pps.core.space.mapper.SpaceOptimizeLongWellheadViewMapper")
 public interface SpaceOptimizeLongWellheadViewMapper {
+    /**
+     * 选择一个
+     *
+     * @param record 记录
+     * @return {@link SpaceOptimizeLongWellheadView }
+     */
     SpaceOptimizeLongWellheadView selectOne(SpaceOptimizeLongWellheadView record);
 
+    /**
+     * 选择列表
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SpaceOptimizeLongWellheadView }>
+     */
     List<SpaceOptimizeLongWellheadView> selectList(SpaceOptimizeLongWellheadView record);
 
+    /**
+     * 选择列表联接
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SpaceOptimizeLongWellheadView }>
+     */
+    List<SpaceOptimizeLongWellheadView> selectListJoin(SpaceOptimizeLongWellheadView record);
+
     /**
      * 批量新增
      *

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeMidWellheadViewMapper.java

@@ -13,7 +13,27 @@ import java.util.List;
  */
 @Repository(value = "pps.core.space.mapper.SpaceOptimizeMidWellheadViewMapper")
 public interface SpaceOptimizeMidWellheadViewMapper {
+    /**
+     * 选择一个
+     *
+     * @param record 记录
+     * @return {@link SpaceOptimizeMidWellheadView }
+     */
     SpaceOptimizeMidWellheadView selectOne(SpaceOptimizeMidWellheadView record);
 
+    /**
+     * 选择列表
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SpaceOptimizeMidWellheadView }>
+     */
     List<SpaceOptimizeMidWellheadView> selectList(SpaceOptimizeMidWellheadView record);
+
+    /**
+     * 选择列表联接
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SpaceOptimizeMidWellheadView }>
+     */
+    List<SpaceOptimizeMidWellheadView> selectListJoin(SpaceOptimizeMidWellheadView record);
 }

C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeUltraWellheadViewMapper.java

@@ -13,7 +13,27 @@ import java.util.List;
  */
 @Repository(value = "pps.core.space.mapper.SpaceOptimizeUltraWellheadViewMapper")
 public interface SpaceOptimizeUltraWellheadViewMapper {
+    /**
+     * 选择一个
+     *
+     * @param record 记录
+     * @return {@link SpaceOptimizeUltraWellheadView }
+     */
     SpaceOptimizeUltraWellheadView selectOne(SpaceOptimizeUltraWellheadView record);
 
+    /**
+     * 选择列表
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SpaceOptimizeUltraWellheadView }>
+     */
     List<SpaceOptimizeUltraWellheadView> selectList(SpaceOptimizeUltraWellheadView record);
+
+    /**
+     * 选择列表联接
+     *
+     * @param record 记录
+     * @return {@link List }<{@link SpaceOptimizeUltraWellheadView }>
+     */
+    List<SpaceOptimizeUltraWellheadView> selectListJoin(SpaceOptimizeUltraWellheadView record);
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java

@@ -1445,13 +1445,11 @@ public class SpaceOptimizeBaseService {
         List<SpaceOptimizeDateDuration> durationOutputs = null;
         switch (flag) {
             case 1:
-                wellheadOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeUltraWellheadMapper.class)
-                        .selectList(new LambdaQueryWrapper<SpaceOptimizeUltraWellheadEnt>()
-                                .eq(SpaceOptimizeUltraWellheadEnt::getUltraPeriodId, periodId)
-                                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
-                                .eq(SpaceOptimizeUltraWellheadEnt::getOptimizeDate, optimizeDate)
-                                .orderByAsc(SpaceOptimizeUltraWellheadEnt::getStartSeq)
-                        ), GetSpaceOptimizeWellheadOutput.class);
+                wellheadOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeUltraWellheadViewMapper.class)
+                        .selectListJoin(SpaceOptimizeUltraWellheadView.builder()
+                                .ultraPeriodId(periodId)
+                                .optimizeDate(optimizeDate)
+                                .build()), GetSpaceOptimizeWellheadOutput.class);
                 durationOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeUltraDurationMapper.class)
                         .selectList(new LambdaQueryWrapper<SpaceOptimizeUltraDurationEnt>()
                                 .eq(SpaceOptimizeUltraDurationEnt::getUltraPeriodId, periodId)
@@ -1461,12 +1459,11 @@ public class SpaceOptimizeBaseService {
                         ), SpaceOptimizeDateDuration.class);
                 break;
             case 2:
-                wellheadOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeLongWellheadMapper.class).selectList(new LambdaQueryWrapper<SpaceOptimizeLongWellheadEnt>()
-                        .eq(SpaceOptimizeLongWellheadEnt::getLongPeriodId, periodId)
-                        .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
-                        .eq(SpaceOptimizeLongWellheadEnt::getOptimizeDate, optimizeDate)
-                        .orderByAsc(SpaceOptimizeLongWellheadEnt::getStartSeq)
-                ), GetSpaceOptimizeWellheadOutput.class);
+                wellheadOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeLongWellheadViewMapper.class)
+                        .selectListJoin(SpaceOptimizeLongWellheadView.builder()
+                                .longPeriodId(periodId)
+                                .optimizeDate(optimizeDate)
+                                .build()), GetSpaceOptimizeWellheadOutput.class);
                 durationOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeLongDurationMapper.class).selectList(new LambdaQueryWrapper<SpaceOptimizeLongDurationEnt>()
                         .eq(SpaceOptimizeLongDurationEnt::getLongPeriodId, periodId)
                         .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
@@ -1475,12 +1472,11 @@ public class SpaceOptimizeBaseService {
                 ), SpaceOptimizeDateDuration.class);
                 break;
             case 3:
-                wellheadOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeMidWellheadMapper.class).selectList(new LambdaQueryWrapper<SpaceOptimizeMidWellheadEnt>()
-                        .eq(SpaceOptimizeMidWellheadEnt::getMidPeriodId, periodId)
-                        .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
-                        .eq(SpaceOptimizeMidWellheadEnt::getOptimizeDate, optimizeDate)
-                        .orderByAsc(SpaceOptimizeMidWellheadEnt::getStartSeq)
-                ), GetSpaceOptimizeWellheadOutput.class);
+                wellheadOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeMidWellheadViewMapper.class)
+                        .selectListJoin(SpaceOptimizeMidWellheadView.builder()
+                                .midPeriodId(periodId)
+                                .optimizeDate(optimizeDate)
+                                .build()), GetSpaceOptimizeWellheadOutput.class);
                 durationOutputs = XCopyUtils.copyNewList(context.getBean(SpaceOptimizeMidDurationMapper.class).selectList(new LambdaQueryWrapper<SpaceOptimizeMidDurationEnt>()
                         .eq(SpaceOptimizeMidDurationEnt::getMidPeriodId, periodId)
                         .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceOptimizeLongWellheadViewMapper.xml

@@ -47,6 +47,26 @@
         id=#{id}
     </select>
 
+    <resultMap id="ExtResultMap" type="pps.core.space.entity.SpaceOptimizeLongWellheadView" extends="BaseResultMap">
+        <result column="run_duration" property="runDuration" jdbcType="DECIMAL"/>
+    </resultMap>
+
+    <select id="selectListJoin" parameterType="pps.core.space.entity.SpaceOptimizeLongWellheadView"
+            resultMap="BaseResultMap">
+        SELECT s.wellhead_id,
+               s.well_number,
+               s.start_seq,
+               s.optimize_date,
+               w.run_duration
+        FROM space_optimize_long_wellhead s
+                 LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id
+        WHERE s.is_deleted = 1
+          AND w.is_deleted = 1
+          AND s.long_period_id = #{shortPeriodId}
+          AND s.optimize_date = #{optimizeDate}
+        ORDER BY s.start_seq ASC
+    </select>
+
     <insert id="batchInsertList" parameterType="list">
         INSERT INTO space_optimize_long_wellhead ( id, create_by_id, create_by_name, create_time,
         modify_by_id, modify_by_name, modify_time, long_period_id, wellhead_id, well_number )

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceOptimizeMidWellheadViewMapper.xml

@@ -45,4 +45,24 @@
         where
         id=#{id}
     </select>
+
+    <resultMap id="ExtResultMap" type="pps.core.space.entity.SpaceOptimizeMidWellheadView" extends="BaseResultMap">
+        <result column="run_duration" property="runDuration" jdbcType="DECIMAL"/>
+    </resultMap>
+
+    <select id="selectListJoin" parameterType="pps.core.space.entity.SpaceOptimizeMidWellheadView"
+            resultMap="BaseResultMap">
+        SELECT s.wellhead_id,
+               s.well_number,
+               s.start_seq,
+               s.optimize_date,
+               w.run_duration
+        FROM space_optimize_mid_wellhead s
+                 LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id
+        WHERE s.is_deleted = 1
+          AND w.is_deleted = 1
+          AND s.mid_period_id = #{shortPeriodId}
+          AND s.optimize_date = #{optimizeDate}
+        ORDER BY s.start_seq ASC
+    </select>
 </mapper>
\ No newline at end of file

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceOptimizeUltraWellheadViewMapper.xml

@@ -46,4 +46,24 @@
         where
         id=#{id}
     </select>
+
+    <resultMap id="ExtResultMap" type="pps.core.space.entity.SpaceOptimizeUltraWellheadView" extends="BaseResultMap">
+        <result column="run_duration" property="runDuration" jdbcType="DECIMAL"/>
+    </resultMap>
+
+    <select id="selectListJoin" parameterType="pps.core.space.entity.SpaceOptimizeUltraWellheadView"
+            resultMap="BaseResultMap">
+        SELECT s.wellhead_id,
+               s.well_number,
+               s.start_seq,
+               s.optimize_date,
+               w.run_duration
+        FROM space_optimize_ultra_wellhead s
+                 LEFT JOIN space_institution_wellhead w ON s.wellhead_id = w.wellhead_id
+        WHERE s.is_deleted = 1
+          AND w.is_deleted = 1
+          AND s.ultra_period_id = #{shortPeriodId}
+          AND s.optimize_date = #{optimizeDate}
+        ORDER BY s.start_seq ASC
+    </select>
 </mapper>
\ No newline at end of file