feat(零碳): 长庆

1.长庆演示首页功能开发,新增查询井场/场站列表接口,添加接口文档并完成接口冒烟测试;
2.长庆演示首页功能开发,新增总览信息统计接口,添加接口文档并完成接口冒烟测试;
3.长庆演示首页功能开发,新增用能分析统计接口,添加接口文档并完成接口冒烟测试;
4.长庆演示首页功能开发,新增累计用电统计接口,添加接口文档并完成接口冒烟测试;
5.长庆演示首页功能开发,新增光伏实时监控统计接口,添加接口文档并完成接口冒烟测试;
6.长庆演示首页功能开发,新增先导实验井间开制度统计接口,添加接口文档并完成接口冒烟测试;
7.长庆演示首页功能开发,新增零碳井场收益分析统计接口,添加接口文档并完成接口冒烟测试;
8.长庆演示首页功能开发,新增零碳井场实时监控接口,添加接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 间开制度小间开时段配置
+ * 间开制度间开时段配置
  *
  * @author ZWT
  * @date 2023/09/05

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

@@ -8,7 +8,7 @@ import xstartup.annotation.XText;
 import java.io.Serializable;
 
 /**
- * 间开制度小间开时段配置
+ * 间开制度间开时段配置
  *
  * @author ZWT
  * @date 2023/09/05

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

@@ -45,6 +45,10 @@ public class SpaceOptimizeDurationDTO extends BaseModel implements Serializable
     @TableField
     private String closeWellTime;
 
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
+
     @XText("开井时间")
     @TableField(exist = false)
     private Date openTime;

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

@@ -51,4 +51,8 @@ public class SpaceOptimizeLongDurationEnt extends BaseModel implements Serializa
     @XText("关井时间")
     @TableField
     private String closeWellTime;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
 }

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

@@ -43,4 +43,8 @@ public class SpaceOptimizeLongDurationView extends BaseModel implements Serializ
     @XText("关井时间")
     @TableField
     private String closeWellTime;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
 }

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

@@ -45,4 +45,8 @@ public class SpaceOptimizeMidDurationEnt extends BaseModel implements Serializab
     @XText("关井时间")
     @TableField
     private String closeWellTime;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
 }

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

@@ -43,4 +43,8 @@ public class SpaceOptimizeMidDurationView extends BaseModel implements Serializa
     @XText("关井时间")
     @TableField
     private String closeWellTime;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
 }

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

@@ -45,4 +45,8 @@ public class SpaceOptimizeShortDurationEnt extends BaseModel implements Serializ
     @XText("关井时间")
     @TableField
     private String closeWellTime;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
 }

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

@@ -51,6 +51,10 @@ public class SpaceOptimizeShortDurationView extends BaseModel implements Seriali
     @TableField
     private String closeWellTime;
 
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
+
     /*------------------------------------------------------*/
 
     @XText("组织ID")

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

@@ -45,4 +45,8 @@ public class SpaceOptimizeUltraDurationEnt extends BaseModel implements Serializ
     @XText("关井时间")
     @TableField
     private String closeWellTime;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
 }

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

@@ -43,4 +43,8 @@ public class SpaceOptimizeUltraDurationView extends BaseModel implements Seriali
     @XText("关井时间")
     @TableField
     private String closeWellTime;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    @TableField
+    private Integer firstStart;
 }

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

@@ -479,7 +479,8 @@ public class SpaceOptimizeBaseService {
                     endTime = BusinessConstant.END_OF_DAY_TIME;
                 }
                 this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.PHOTOVOLTAIC,
-                        DateUtil.date(durationDTO.getOpenTime()).toString(BusinessConstant.MINUTES_FORMAT), endTime
+                        DateUtil.date(durationDTO.getOpenTime()).toString(BusinessConstant.MINUTES_FORMAT), endTime,
+                        BusinessConstant.ONE
                 );
                 //-----------------------------------原始逻辑
 //                Date openTime = durationDTO.getOpenTime();
@@ -654,7 +655,8 @@ public class SpaceOptimizeBaseService {
                                          SpaceInstitutionDurationEnt durationEnt,
                                          String periodId, String recordId, String wellheadId) {
         this.createDuration(unOptimizeDurationList, recordId, periodId, wellheadId, BusinessConstant.ONE,
-                durationEnt.getOpenWellTime(), durationEnt.getCloseWellTime(), null);
+                durationEnt.getOpenWellTime(), durationEnt.getCloseWellTime(), null,
+                BusinessConstant.ONE);
     }
 
     /**
@@ -667,12 +669,13 @@ public class SpaceOptimizeBaseService {
      * @param generationTypeKey 生成类型密钥
      * @param openWellTime      开井时间
      * @param endTimeString     结束时间字符串
+     * @param firstStart        是否第一次启动
      */
     public void createOptimizeDuration(List<SpaceOptimizeDurationDTO> durationDTOList, String periodId,
                                        String recordId, String wellheadId, String generationTypeKey,
-                                       String openWellTime, String endTimeString) {
+                                       String openWellTime, String endTimeString, Integer firstStart) {
         this.createDuration(durationDTOList, recordId, periodId, wellheadId, BusinessConstant.ZERO,
-                openWellTime, endTimeString, generationTypeKey);
+                openWellTime, endTimeString, generationTypeKey, firstStart);
     }
 
     /**
@@ -686,10 +689,11 @@ public class SpaceOptimizeBaseService {
      * @param openWellTime      开井时间
      * @param closeWellTime     关井时间
      * @param generationTypeKey 生成类型密钥
+     * @param firstStart        是否第一次启动
      */
     public void createDuration(List<SpaceOptimizeDurationDTO> durationDTOList, String recordId,
-                               String periodId, String wellheadId, Integer isOptimize,
-                               String openWellTime, String closeWellTime, String generationTypeKey) {
+                               String periodId, String wellheadId, Integer isOptimize, String openWellTime,
+                               String closeWellTime, String generationTypeKey, Integer firstStart) {
         SpaceOptimizeDurationDTO durationDTO = new SpaceOptimizeDurationDTO();
         BaseUtils.setBaseModelDefaultForJob(durationDTO);
         durationDTO.setRecordId(recordId);
@@ -699,6 +703,7 @@ public class SpaceOptimizeBaseService {
         durationDTO.setOpenWellTime(openWellTime);
         durationDTO.setCloseWellTime(closeWellTime);
         durationDTO.setGenerationTypeKey(generationTypeKey);
+        durationDTO.setFirstStart(firstStart);
         durationDTOList.add(durationDTO);
     }
 
@@ -778,7 +783,8 @@ public class SpaceOptimizeBaseService {
                         int startDuration = (int) startTime.between(endTime, DateUnit.MINUTE);
                         DateTime endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, startDuration);
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                startTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT), endTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT)
+                                startTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT), endTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT),
+                                BusinessConstant.ZERO
                         );
                         firstStartTime = startTimeOptimize;
                         //计算时间偏移,取时间间隔(分钟)
@@ -806,7 +812,8 @@ public class SpaceOptimizeBaseService {
                             int openDuration = (int) startTime.between(endTime, DateUnit.MINUTE);
                             DateTime endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, openDuration);
                             this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                    startTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT), BaseUtils.getEndTimeString(endTimeOptimize)
+                                    startTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT), BaseUtils.getEndTimeString(endTimeOptimize),
+                                    BusinessConstant.ONE
                             );
                             //取时间间隔(分钟)
                             between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
@@ -818,7 +825,8 @@ public class SpaceOptimizeBaseService {
                     //计算偏移
                     this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
                             DateUtil.offsetMinute(startTime, between).toString(BusinessConstant.MINUTES_FORMAT),
-                            DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT)
+                            DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT),
+                            BusinessConstant.ONE
                     );
                 }
             }
@@ -917,7 +925,8 @@ public class SpaceOptimizeBaseService {
                         //第一次关井时间按照启动时长顺延
                         DateTime endTimeOptimize = firstStartTime.offsetNew(DateField.MINUTE, startDuration);
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                startTimeString, endTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT)
+                                startTimeString, endTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT),
+                                BusinessConstant.ZERO
                         );
                         //取时间间隔(分钟)
                         between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
@@ -929,14 +938,16 @@ public class SpaceOptimizeBaseService {
                         //取时间间隔(分钟)
                         between = BaseUtils.getTimeDifferenceMinute(endTimeOffset, endTime);
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                startTimeOffset.toString(BusinessConstant.MINUTES_FORMAT), endTimeOffset.toString(BusinessConstant.MINUTES_FORMAT)
+                                startTimeOffset.toString(BusinessConstant.MINUTES_FORMAT), endTimeOffset.toString(BusinessConstant.MINUTES_FORMAT),
+                                BusinessConstant.ONE
                         );
                     }
                 } else {
                     //计算偏移
                     this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
                             DateUtil.offsetMinute(startTime, between).toString(BusinessConstant.MINUTES_FORMAT),
-                            DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT)
+                            DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT),
+                            BusinessConstant.ONE
                     );
                 }
             }
@@ -971,24 +982,31 @@ public class SpaceOptimizeBaseService {
                         for (SpaceInstitutionDurationEnt durationEnt : durationList) {
                             this.createUnOptimizeDuration(unOptimizeDurationList, durationEnt, periodId, recordId, wellheadId);
                             this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
-                                    durationEnt.getOpenWellTime(), durationEnt.getCloseWellTime()
+                                    durationEnt.getOpenWellTime(), durationEnt.getCloseWellTime(),
+                                    BusinessConstant.ONE
                             );
                         }
                         break;
                     //大间开
                     case "1":
                         //创建间开记录(全开)
-                        this.createDuration(unOptimizeDurationList, recordId, periodId, wellheadId, BusinessConstant.ONE, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null);
-                        this.createDuration(durationDTOList, recordId, periodId, wellheadId, BusinessConstant.ZERO, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null);
+                        this.createDuration(unOptimizeDurationList, recordId, periodId, wellheadId, BusinessConstant.ONE, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null,
+                                BusinessConstant.ONE);
+                        this.createDuration(durationDTOList, recordId, periodId, wellheadId, BusinessConstant.ZERO, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null,
+                                BusinessConstant.ONE);
                         break;
                     default:
                         if (StringUtils.equals(wellhead.getRunTypeKey(), BusinessConstant.CONTINUOUS_PUMPING_WELL)) {
-                            this.createDuration(unOptimizeDurationList, recordId, periodId, wellheadId, BusinessConstant.ONE, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null);
-                            this.createDuration(durationDTOList, recordId, periodId, wellheadId, BusinessConstant.ZERO, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null);
+                            this.createDuration(unOptimizeDurationList, recordId, periodId, wellheadId, BusinessConstant.ONE, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null,
+                                    BusinessConstant.ONE);
+                            this.createDuration(durationDTOList, recordId, periodId, wellheadId, BusinessConstant.ZERO, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.END_OF_DAY_TIME, null,
+                                    BusinessConstant.ONE);
                         } else {
                             //未配置全关
-                            this.createDuration(unOptimizeDurationList, recordId, periodId, wellheadId, BusinessConstant.ONE, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.START_OF_DAY_TIME, null);
-                            this.createDuration(durationDTOList, recordId, periodId, wellheadId, BusinessConstant.ZERO, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.START_OF_DAY_TIME, null);
+                            this.createDuration(unOptimizeDurationList, recordId, periodId, wellheadId, BusinessConstant.ONE, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.START_OF_DAY_TIME, null,
+                                    BusinessConstant.ONE);
+                            this.createDuration(durationDTOList, recordId, periodId, wellheadId, BusinessConstant.ZERO, BusinessConstant.START_OF_DAY_TIME, BusinessConstant.START_OF_DAY_TIME, null,
+                                    BusinessConstant.ONE);
                         }
                 }
             }

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/SpaceOptimizeDateDuration.java

@@ -35,4 +35,7 @@ public class SpaceOptimizeDateDuration {
 
     @XText("井口状态:0_关井,1_开井")
     private Integer isOpen;
+
+    @XText("是否第一次启动(0_是;1_否)")
+    private Integer firstStart;
 }

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

@@ -17,6 +17,7 @@
         <result column="generation_type_key" property="generationTypeKey" jdbcType="VARCHAR"/>
         <result column="open_well_time" property="openWellTime" jdbcType="VARCHAR"/>
         <result column="close_well_time" property="closeWellTime" jdbcType="VARCHAR"/>
+        <result column="first_start" property="firstStart" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -34,7 +35,8 @@
     is_optimize,
     generation_type_key,
     open_well_time,
-    close_well_time
+    close_well_time,
+    first_start
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeLongDurationView"
             resultMap="BaseResultMap">

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

@@ -17,6 +17,7 @@
         <result column="generation_type_key" property="generationTypeKey" jdbcType="VARCHAR"/>
         <result column="open_well_time" property="openWellTime" jdbcType="VARCHAR"/>
         <result column="close_well_time" property="closeWellTime" jdbcType="VARCHAR"/>
+        <result column="first_start" property="firstStart" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -34,7 +35,8 @@
     is_optimize,
     generation_type_key,
     open_well_time,
-    close_well_time
+    close_well_time,
+    first_start
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeMidDurationView" resultMap="BaseResultMap">
         select

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

@@ -17,6 +17,7 @@
         <result column="generation_type_key" property="generationTypeKey" jdbcType="VARCHAR"/>
         <result column="open_well_time" property="openWellTime" jdbcType="VARCHAR"/>
         <result column="close_well_time" property="closeWellTime" jdbcType="VARCHAR"/>
+        <result column="first_start" property="firstStart" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -34,7 +35,8 @@
     is_optimize,
     generation_type_key,
     open_well_time,
-    close_well_time
+    close_well_time,
+    first_start
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeShortDurationView"
             resultMap="BaseResultMap">

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

@@ -17,6 +17,7 @@
         <result column="generation_type_key" property="generationTypeKey" jdbcType="VARCHAR"/>
         <result column="open_well_time" property="openWellTime" jdbcType="VARCHAR"/>
         <result column="close_well_time" property="closeWellTime" jdbcType="VARCHAR"/>
+        <result column="first_start" property="firstStart" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -34,7 +35,8 @@
     is_optimize,
     generation_type_key,
     open_well_time,
-    close_well_time
+    close_well_time,
+    first_start
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeUltraDurationView"
             resultMap="BaseResultMap">

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

@@ -61,7 +61,8 @@
         is_optimize,
         generation_type_key,
         open_well_time,
-        close_well_time
+        close_well_time,
+        first_start
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -86,7 +87,8 @@
                 </otherwise>
             </choose>
             #{item.openWellTime},
-            #{item.closeWellTime}
+            #{item.closeWellTime},
+            #{item.firstStart}
             )
         </foreach>
     </insert>
@@ -150,7 +152,8 @@
         is_optimize,
         generation_type_key,
         open_well_time,
-        close_well_time
+        close_well_time,
+        first_start
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -175,7 +178,8 @@
                 </otherwise>
             </choose>
             #{item.openWellTime},
-            #{item.closeWellTime}
+            #{item.closeWellTime},
+            #{item.firstStart}
             )
         </foreach>
     </insert>
@@ -225,7 +229,7 @@
     <insert id="shortDurationBatchInsertList" parameterType="list">
         INSERT INTO space_optimize_short_duration (id, create_by_id, create_by_name, create_time,
         modify_by_id, modify_by_name, modify_time, record_id, short_period_id, wellhead_id, is_optimize,
-        generation_type_key, open_well_time, close_well_time)
+        generation_type_key, open_well_time, close_well_time, first_start)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -249,7 +253,8 @@
                 </otherwise>
             </choose>
             #{item.openWellTime},
-            #{item.closeWellTime}
+            #{item.closeWellTime},
+            #{item.firstStart}
             )
         </foreach>
     </insert>
@@ -313,7 +318,8 @@
         is_optimize,
         generation_type_key,
         open_well_time,
-        close_well_time
+        close_well_time,
+        first_start
         )
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -338,7 +344,8 @@
                 </otherwise>
             </choose>
             #{item.openWellTime},
-            #{item.closeWellTime}
+            #{item.closeWellTime},
+            #{item.firstStart}
             )
         </foreach>
     </insert>