Commit d6759c81 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 4033f1a2
......@@ -58,4 +58,20 @@ public class SpaceInstitutionWellheadEnt extends BaseModel implements Serializab
@XText("运行时长(小时/天)")
@TableField
private BigDecimal runDuration;
@XText("单次最高开井时长(h)")
@TableField
private Integer maxOpen;
@XText("单次最低开井时长(h)")
@TableField
private Integer minOpen;
@XText("单次最高关井时长(h)")
@TableField
private Integer maxClose;
@XText("单次最低关井时长(h)")
@TableField
private Integer minClose;
}
......@@ -58,6 +58,22 @@ public class SpaceInstitutionWellheadView extends BaseModel implements Serializa
@TableField
private BigDecimal runDuration;
@XText("单次最高开井时长(h)")
@TableField
private Integer maxOpen;
@XText("单次最低开井时长(h)")
@TableField
private Integer minOpen;
@XText("单次最高关井时长(h)")
@TableField
private Integer maxClose;
@XText("单次最低关井时长(h)")
@TableField
private Integer minClose;
/**
* 运行功率
*/
......
......@@ -278,7 +278,6 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
int maxOpenMinute = maxOpen * 60;
int minCloseMinute = minClose * 60;
int maxCloseMinute = maxClose * 60;
int sumMinute = minCloseMinute + maxOpenMinute;
//测试用 ====== end -----------------------------------------------
//取权重最高的开始位置
......
......@@ -20,6 +20,10 @@
<result column="open_well_day" property="openWellDay" jdbcType="INTEGER"/>
<result column="close_well_day" property="closeWellDay" jdbcType="INTEGER"/>
<result column="run_duration" property="runDuration" jdbcType="DECIMAL"/>
<result column="max_open" property="maxOpen" jdbcType="INTEGER"/>
<result column="min_open" property="minOpen" jdbcType="INTEGER"/>
<result column="max_close" property="maxClose" jdbcType="INTEGER"/>
<result column="min_close" property="minClose" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
id
......@@ -40,7 +44,11 @@
start_seq,
open_well_day,
close_well_day,
run_duration
run_duration,
max_open,
min_open,
max_close,
min_close
</sql>
<select id="selectOne" parameterType="pps.core.space.entity.SpaceInstitutionWellheadView" resultMap="BaseResultMap">
select
......@@ -76,7 +84,11 @@
start_seq,
open_well_day,
close_well_day,
run_duration
run_duration,
max_open,
min_open,
max_close,
min_close
)
VALUES
<foreach collection="list" item="item" separator=",">
......@@ -97,7 +109,11 @@
#{item.startSeq},
#{item.openWellDay},
#{item.closeWellDay},
#{item.runDuration}
#{item.runDuration} ,
#{item.maxOpen},
#{item.minOpen},
#{item.maxClose},
#{item.minClose}
)
</foreach>
</insert>
......@@ -143,6 +159,10 @@
w.open_well_day,
w.close_well_day,
w.run_duration,
w.max_open,
w.min_open,
w.max_close,
w.min_close,
b.service_rating
FROM
space_institution_wellhead w
......
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