Commit eec8f6e0 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;
3.长庆极短期间开优化随动算法功能开发,设置自定义参数,初步完成极短时间,间开时间段优化测试功能;
4.间开制度管理模块,间开制度关联井口信息表表结构修改,增加"单次最高开井时长(h)","单次最低开井时长(h)","单次最高关井时长(h)","单次最低关井时长(h)"字段,同时修改数据表对应代码实体及表单参数,修改部分相关模块功能查询修改逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e949310f
...@@ -61,17 +61,17 @@ public class SpaceInstitutionWellheadEnt extends BaseModel implements Serializab ...@@ -61,17 +61,17 @@ public class SpaceInstitutionWellheadEnt extends BaseModel implements Serializab
@XText("单次最高开井时长(h)") @XText("单次最高开井时长(h)")
@TableField @TableField
private Integer maxOpen; private BigDecimal maxOpen;
@XText("单次最低开井时长(h)") @XText("单次最低开井时长(h)")
@TableField @TableField
private Integer minOpen; private BigDecimal minOpen;
@XText("单次最高关井时长(h)") @XText("单次最高关井时长(h)")
@TableField @TableField
private Integer maxClose; private BigDecimal maxClose;
@XText("单次最低关井时长(h)") @XText("单次最低关井时长(h)")
@TableField @TableField
private Integer minClose; private BigDecimal minClose;
} }
...@@ -60,19 +60,19 @@ public class SpaceInstitutionWellheadView extends BaseModel implements Serializa ...@@ -60,19 +60,19 @@ public class SpaceInstitutionWellheadView extends BaseModel implements Serializa
@XText("单次最高开井时长(h)") @XText("单次最高开井时长(h)")
@TableField @TableField
private Integer maxOpen; private BigDecimal maxOpen;
@XText("单次最低开井时长(h)") @XText("单次最低开井时长(h)")
@TableField @TableField
private Integer minOpen; private BigDecimal minOpen;
@XText("单次最高关井时长(h)") @XText("单次最高关井时长(h)")
@TableField @TableField
private Integer maxClose; private BigDecimal maxClose;
@XText("单次最低关井时长(h)") @XText("单次最低关井时长(h)")
@TableField @TableField
private Integer minClose; private BigDecimal minClose;
/** /**
* 运行功率 * 运行功率
......
...@@ -49,16 +49,16 @@ public class CreateSpaceInstitutionWellheadInput { ...@@ -49,16 +49,16 @@ public class CreateSpaceInstitutionWellheadInput {
private BigDecimal runDuration; private BigDecimal runDuration;
@XText("单次最高开井时长(h)") @XText("单次最高开井时长(h)")
private Integer maxOpen; private BigDecimal maxOpen;
@XText("单次最低开井时长(h)") @XText("单次最低开井时长(h)")
private Integer minOpen; private BigDecimal minOpen;
@XText("单次最高关井时长(h)") @XText("单次最高关井时长(h)")
private Integer maxClose; private BigDecimal maxClose;
@XText("单次最低关井时长(h)") @XText("单次最低关井时长(h)")
private Integer minClose; private BigDecimal minClose;
/** /**
* 间开制度小间开时段配置 * 间开制度小间开时段配置
......
...@@ -44,16 +44,16 @@ public class GetSpaceInstitutionWellheadViewOutput { ...@@ -44,16 +44,16 @@ public class GetSpaceInstitutionWellheadViewOutput {
private BigDecimal runDuration; private BigDecimal runDuration;
@XText("单次最高开井时长(h)") @XText("单次最高开井时长(h)")
private Integer maxOpen; private BigDecimal maxOpen;
@XText("单次最低开井时长(h)") @XText("单次最低开井时长(h)")
private Integer minOpen; private BigDecimal minOpen;
@XText("单次最高关井时长(h)") @XText("单次最高关井时长(h)")
private Integer maxClose; private BigDecimal maxClose;
@XText("单次最低关井时长(h)") @XText("单次最低关井时长(h)")
private Integer minClose; private BigDecimal minClose;
/** /**
* 运行类型名称 * 运行类型名称
......
...@@ -47,16 +47,16 @@ public class UpdateSpaceInstitutionWellheadInput { ...@@ -47,16 +47,16 @@ public class UpdateSpaceInstitutionWellheadInput {
private BigDecimal runDuration; private BigDecimal runDuration;
@XText("单次最高开井时长(h)") @XText("单次最高开井时长(h)")
private Integer maxOpen; private BigDecimal maxOpen;
@XText("单次最低开井时长(h)") @XText("单次最低开井时长(h)")
private Integer minOpen; private BigDecimal minOpen;
@XText("单次最高关井时长(h)") @XText("单次最高关井时长(h)")
private Integer maxClose; private BigDecimal maxClose;
@XText("单次最低关井时长(h)") @XText("单次最低关井时长(h)")
private Integer minClose; private BigDecimal minClose;
/** /**
* 间开制度小间开时段配置 * 间开制度小间开时段配置
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<result column="open_well_day" property="openWellDay" jdbcType="INTEGER"/> <result column="open_well_day" property="openWellDay" jdbcType="INTEGER"/>
<result column="close_well_day" property="closeWellDay" jdbcType="INTEGER"/> <result column="close_well_day" property="closeWellDay" jdbcType="INTEGER"/>
<result column="run_duration" property="runDuration" jdbcType="DECIMAL"/> <result column="run_duration" property="runDuration" jdbcType="DECIMAL"/>
<result column="max_open" property="maxOpen" jdbcType="INTEGER"/> <result column="max_open" property="maxOpen" jdbcType="DECIMAL"/>
<result column="min_open" property="minOpen" jdbcType="INTEGER"/> <result column="min_open" property="minOpen" jdbcType="DECIMAL"/>
<result column="max_close" property="maxClose" jdbcType="INTEGER"/> <result column="max_close" property="maxClose" jdbcType="DECIMAL"/>
<result column="min_close" property="minClose" jdbcType="INTEGER"/> <result column="min_close" property="minClose" jdbcType="DECIMAL"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id id
......
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