feat(能源管理系统): 测试问题修复

1.修改间开制度管理-长期/中长期间开优化定时任务,解决未设置区间的井口不展示时间区间问题;
2.开发间开制度管理-校准周期模块,间开制度跟踪接口,完成接口冒烟测试,并生成接口文档;
3.修改间开制度管理-短期间开模块,短期间开制度详情接口,解决井口间开时间段展示异常问题;
4.开发间开制度管理-校准周期模块,井口生产情况分页列表接口,创建测试数据表,添加模拟数据,生成映射类,完成接口冒烟测试,并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationEnt.java

+package pps.core.prediction.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 井口生产情况表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/09/27
+ */
+@Data
+@TableName("wellhead_daily_production_situation")
+public class WellheadDailyProductionSituationEnt implements Serializable {
+    @XText("ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @XText("井口ID")
+    @TableField
+    private String wellheadId;
+
+    @XText("井号")
+    @TableField
+    private String wellNumber;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+
+    @XText("生产时间(h)")
+    @TableField
+    private BigDecimal productionTime;
+
+    @XText("日耗电量(kW-h)")
+    @TableField
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日产液量(t)")
+    @TableField
+    private BigDecimal dailyLiquidProduction;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationView.java

+package pps.core.prediction.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 井口生产情况表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/09/27
+ */
+@Data
+public class WellheadDailyProductionSituationView implements Serializable {
+    @XText("ID")
+    @TableField
+    private Long id;
+
+    @XText("井口ID")
+    @TableField
+    private String wellheadId;
+
+    @XText("井号")
+    @TableField
+    private String wellNumber;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+
+    @XText("生产时间(h)")
+    @TableField
+    private BigDecimal productionTime;
+
+    @XText("日耗电量(kW-h)")
+    @TableField
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日产液量(t)")
+    @TableField
+    private BigDecimal dailyLiquidProduction;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/WellheadDailyProductionSituationMapper.java

+package pps.core.prediction.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
+
+/**
+ * 井口生产情况表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/09/27
+ */
+@Repository(value = "pps.core.prediction.mapper.WellheadDailyProductionSituationMapper")
+public interface WellheadDailyProductionSituationMapper extends BaseMapper<WellheadDailyProductionSituationEnt> {
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/WellheadDailyProductionSituationViewMapper.java

+package pps.core.prediction.mapper;
+
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.WellheadDailyProductionSituationView;
+
+import java.util.List;
+
+/**
+ * 井口生产情况表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/09/27
+ */
+@Repository(value = "pps.core.prediction.mapper.WellheadDailyProductionSituationViewMapper")
+public interface WellheadDailyProductionSituationViewMapper {
+
+    WellheadDailyProductionSituationView selectOne(WellheadDailyProductionSituationView record);
+
+    List<WellheadDailyProductionSituationView> selectList(WellheadDailyProductionSituationView record);
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/WellheadDailyProductionSituationService.java

+package pps.core.prediction.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
+import pps.core.prediction.mapper.WellheadDailyProductionSituationMapper;
+import pps.core.prediction.service.data.wellhead_daily_production_situation.QueryWellheadDailyProductionSituationInput;
+import pps.core.prediction.service.data.wellhead_daily_production_situation.QueryWellheadDailyProductionSituationOutput;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.base.util.XCopyUtils;
+import xstartup.data.XPageResult;
+import xstartup.feature.api.annotation.XApiAnonymous;
+import xstartup.feature.api.annotation.XApiGet;
+
+import java.util.List;
+
+/**
+ * 井口生产情况模块(测试用)
+ *
+ * @author ZWT
+ * @date 2023/09/27
+ */
+@XText("井口生产情况模块")
+@XService
+public class WellheadDailyProductionSituationService {
+
+    /**
+     * 井口生产情况--分页列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XPageResult}<{@link QueryWellheadDailyProductionSituationOutput}>
+     */
+    @XText("井口生产情况--分页列表")
+    @XApiAnonymous
+    @XApiGet
+    public XPageResult<QueryWellheadDailyProductionSituationOutput> queryWellheadDailyProductionSituationView(XContext context, QueryWellheadDailyProductionSituationInput input) {
+        WellheadDailyProductionSituationMapper mapper = context.getBean(WellheadDailyProductionSituationMapper.class);
+        PageHelper.startPage(input.getPage(), input.getLimit());
+        List<WellheadDailyProductionSituationEnt> list = mapper.selectList(new LambdaQueryWrapper<WellheadDailyProductionSituationEnt>()
+                .eq(WellheadDailyProductionSituationEnt::getWellheadId, input.getWellheadId())
+                .eq(WellheadDailyProductionSituationEnt::getWellNumber, input.getWellNumber())
+                .orderByDesc(WellheadDailyProductionSituationEnt::getDataDate)
+        );
+        PageInfo<WellheadDailyProductionSituationEnt> pageInfo = new PageInfo<>(list);
+        List<QueryWellheadDailyProductionSituationOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryWellheadDailyProductionSituationOutput.class);
+        return XPageResult.success(outputs, input, pageInfo.getTotal());
+    }
+}
\ No newline at end of file

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/wellhead_daily_production_situation/QueryWellheadDailyProductionSituationInput.java

+package pps.core.prediction.service.data.wellhead_daily_production_situation;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+/**
+ * 井口生产情况表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/09/27
+ */
+@Data
+public class QueryWellheadDailyProductionSituationInput extends XPageInput {
+
+    @XText("井口ID")
+    @NotBlank(message = "缺少井口ID")
+    private String wellheadId;
+
+    @XText("井号")
+    @NotBlank(message = "缺少井号")
+    private String wellNumber;
+}
\ No newline at end of file

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/wellhead_daily_production_situation/QueryWellheadDailyProductionSituationOutput.java

+package pps.core.prediction.service.data.wellhead_daily_production_situation;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 井口生产情况表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/09/27
+ */
+@Data
+public class QueryWellheadDailyProductionSituationOutput {
+
+    @XText("井口ID")
+    private String wellheadId;
+
+    @XText("井号")
+    private String wellNumber;
+
+    @XText("日期")
+    private Date dataDate;
+
+    @XText("生产时间(h)")
+    private BigDecimal productionTime;
+
+    @XText("日耗电量(kW-h)")
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日产液量(t)")
+    private BigDecimal dailyLiquidProduction;
+}

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/WellheadDailyProductionSituationViewMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pps.core.prediction.mapper.WellheadDailyProductionSituationViewMapper">
+    <resultMap id="BaseResultMap" type="pps.core.prediction.entity.WellheadDailyProductionSituationView">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
+        <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
+        <result column="data_date" property="dataDate" jdbcType="DATE"/>
+        <result column="production_time" property="productionTime" jdbcType="DECIMAL"/>
+        <result column="daily_electricity_consumption" property="dailyElectricityConsumption" jdbcType="DECIMAL"/>
+        <result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        ,
+    wellhead_id,
+    well_number,
+    data_date,
+    production_time,
+    daily_electricity_consumption,
+    daily_liquid_production
+    </sql>
+    <select id="selectOne" parameterType="pps.core.prediction.entity.WellheadDailyProductionSituationView"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from wellhead_daily_production_situation
+        where
+        id=#{id}
+    </select>
+    <select id="selectList" parameterType="pps.core.prediction.entity.WellheadDailyProductionSituationView"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from wellhead_daily_production_situation
+        where
+        id=#{id}
+    </select>
+</mapper>
\ No newline at end of file