Commit 3734e275 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 593af747
...@@ -38,4 +38,8 @@ public class SpaceOptimizeShortWellheadEnt extends BaseModel implements Serializ ...@@ -38,4 +38,8 @@ public class SpaceOptimizeShortWellheadEnt extends BaseModel implements Serializ
@XText("优化日期") @XText("优化日期")
@TableField @TableField
private Date optimizeDate; private Date optimizeDate;
@XText("是否防冻井(0_是;1_否)")
@TableField
private Integer frostproofWell;
} }
...@@ -42,4 +42,8 @@ public class SpaceOptimizeShortWellheadView extends BaseModel implements Seriali ...@@ -42,4 +42,8 @@ public class SpaceOptimizeShortWellheadView extends BaseModel implements Seriali
@XText("优化日期") @XText("优化日期")
@TableField @TableField
private Date optimizeDate; private Date optimizeDate;
@XText("是否防冻井(0_是;1_否)")
@TableField
private Integer frostproofWell;
} }
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/> <result column="wellhead_id" property="wellheadId" jdbcType="VARCHAR"/>
<result column="well_number" property="wellNumber" jdbcType="VARCHAR"/> <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
<result column="start_seq" property="startSeq" jdbcType="INTEGER"/> <result column="start_seq" property="startSeq" jdbcType="INTEGER"/>
<result column="frostproof_well" property="frostproofWell" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id id
...@@ -28,7 +29,8 @@ ...@@ -28,7 +29,8 @@
short_period_id, short_period_id,
wellhead_id, wellhead_id,
well_number, well_number,
start_seq start_seq,
frostproof_well
</sql> </sql>
<select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeShortWellheadView" <select id="selectOne" parameterType="pps.core.space.entity.SpaceOptimizeShortWellheadView"
resultMap="BaseResultMap"> resultMap="BaseResultMap">
......
...@@ -211,7 +211,8 @@ ...@@ -211,7 +211,8 @@
<insert id="shortWellheadBatchInsertList" parameterType="list"> <insert id="shortWellheadBatchInsertList" parameterType="list">
INSERT INTO space_optimize_short_wellhead (id, create_by_id, create_by_name, create_time, modify_by_id, INSERT INTO space_optimize_short_wellhead (id, create_by_id, create_by_name, create_time, modify_by_id,
modify_by_name, modify_time, short_period_id, wellhead_id, well_number, start_seq, optimize_date) modify_by_name, modify_time, short_period_id, wellhead_id, well_number, start_seq,
optimize_date,frostproof_well)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
...@@ -226,7 +227,8 @@ ...@@ -226,7 +227,8 @@
#{item.wellheadId}, #{item.wellheadId},
#{item.wellNumber}, #{item.wellNumber},
#{item.startSeq}, #{item.startSeq},
#{item.optimizeDate} #{item.optimizeDate},
#{item.frostproofWell}
) )
</foreach> </foreach>
</insert> </insert>
......
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