Commit aa91ab63 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 5c732cb0
...@@ -49,6 +49,10 @@ public class SpaceOptimizeDurationDTO extends BaseModel implements Serializable ...@@ -49,6 +49,10 @@ public class SpaceOptimizeDurationDTO extends BaseModel implements Serializable
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
@XText("开井时间") @XText("开井时间")
@TableField(exist = false) @TableField(exist = false)
private Date openTime; private Date openTime;
......
...@@ -10,6 +10,7 @@ import pps.core.common.entity.BaseModel; ...@@ -10,6 +10,7 @@ import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 中期间开优化井口制度记录 * 中期间开优化井口制度记录
...@@ -55,4 +56,8 @@ public class SpaceOptimizeLongDurationEnt extends BaseModel implements Serializa ...@@ -55,4 +56,8 @@ public class SpaceOptimizeLongDurationEnt extends BaseModel implements Serializa
@XText("是否第一次启动(0_是;1_否)") @XText("是否第一次启动(0_是;1_否)")
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
} }
...@@ -6,6 +6,7 @@ import pps.core.common.entity.BaseModel; ...@@ -6,6 +6,7 @@ import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 中期间开优化井口制度记录 * 中期间开优化井口制度记录
...@@ -47,4 +48,8 @@ public class SpaceOptimizeLongDurationView extends BaseModel implements Serializ ...@@ -47,4 +48,8 @@ public class SpaceOptimizeLongDurationView extends BaseModel implements Serializ
@XText("是否第一次启动(0_是;1_否)") @XText("是否第一次启动(0_是;1_否)")
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
} }
...@@ -7,6 +7,7 @@ import pps.core.common.entity.BaseModel; ...@@ -7,6 +7,7 @@ import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 短期间开开优化井口制度记录 * 短期间开开优化井口制度记录
...@@ -49,4 +50,8 @@ public class SpaceOptimizeMidDurationEnt extends BaseModel implements Serializab ...@@ -49,4 +50,8 @@ public class SpaceOptimizeMidDurationEnt extends BaseModel implements Serializab
@XText("是否第一次启动(0_是;1_否)") @XText("是否第一次启动(0_是;1_否)")
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
} }
...@@ -6,6 +6,7 @@ import pps.core.common.entity.BaseModel; ...@@ -6,6 +6,7 @@ import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 短期间开开优化井口制度记录 * 短期间开开优化井口制度记录
...@@ -47,4 +48,8 @@ public class SpaceOptimizeMidDurationView extends BaseModel implements Serializa ...@@ -47,4 +48,8 @@ public class SpaceOptimizeMidDurationView extends BaseModel implements Serializa
@XText("是否第一次启动(0_是;1_否)") @XText("是否第一次启动(0_是;1_否)")
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
} }
...@@ -7,6 +7,7 @@ import pps.core.common.entity.BaseModel; ...@@ -7,6 +7,7 @@ import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 极短期间开优化井口制度记录 * 极短期间开优化井口制度记录
...@@ -49,4 +50,8 @@ public class SpaceOptimizeShortDurationEnt extends BaseModel implements Serializ ...@@ -49,4 +50,8 @@ public class SpaceOptimizeShortDurationEnt extends BaseModel implements Serializ
@XText("是否第一次启动(0_是;1_否)") @XText("是否第一次启动(0_是;1_否)")
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
} }
...@@ -55,6 +55,10 @@ public class SpaceOptimizeShortDurationView extends BaseModel implements Seriali ...@@ -55,6 +55,10 @@ public class SpaceOptimizeShortDurationView extends BaseModel implements Seriali
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
/*------------------------------------------------------*/ /*------------------------------------------------------*/
@XText("组织ID") @XText("组织ID")
......
...@@ -7,6 +7,7 @@ import pps.core.common.entity.BaseModel; ...@@ -7,6 +7,7 @@ import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 长期间开开优化井口制度记录 * 长期间开开优化井口制度记录
...@@ -49,4 +50,8 @@ public class SpaceOptimizeUltraDurationEnt extends BaseModel implements Serializ ...@@ -49,4 +50,8 @@ public class SpaceOptimizeUltraDurationEnt extends BaseModel implements Serializ
@XText("是否第一次启动(0_是;1_否)") @XText("是否第一次启动(0_是;1_否)")
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
} }
...@@ -6,6 +6,7 @@ import pps.core.common.entity.BaseModel; ...@@ -6,6 +6,7 @@ import pps.core.common.entity.BaseModel;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 长期间开开优化井口制度记录 * 长期间开开优化井口制度记录
...@@ -47,4 +48,8 @@ public class SpaceOptimizeUltraDurationView extends BaseModel implements Seriali ...@@ -47,4 +48,8 @@ public class SpaceOptimizeUltraDurationView extends BaseModel implements Seriali
@XText("是否第一次启动(0_是;1_否)") @XText("是否第一次启动(0_是;1_否)")
@TableField @TableField
private Integer firstStart; private Integer firstStart;
@XText("优化日期")
@TableField
private Date optimizeDate;
} }
...@@ -170,4 +170,4 @@ public class SpaceOptimizeUltraPeriodService extends SpaceOptimizeBaseService { ...@@ -170,4 +170,4 @@ public class SpaceOptimizeUltraPeriodService extends SpaceOptimizeBaseService {
); );
return XSingleResult.success(output); return XSingleResult.success(output);
} }
} }
\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<insert id="longWellheadBatchInsertList" parameterType="list"> <insert id="longWellheadBatchInsertList" parameterType="list">
INSERT INTO space_optimize_long_wellhead ( id, create_by_id, create_by_name, create_time, INSERT INTO space_optimize_long_wellhead ( id, create_by_id, create_by_name, create_time,
modify_by_id, modify_by_name, modify_time, long_period_id, wellhead_id, well_number, start_seq) modify_by_id, modify_by_name, modify_time, long_period_id, wellhead_id, well_number, start_seq, optimize_date)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
#{item.periodId}, #{item.periodId},
#{item.wellheadId}, #{item.wellheadId},
#{item.wellNumber}, #{item.wellNumber},
#{item.startSeq} #{item.startSeq},
#{item.optimizeDate}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
generation_type_key, generation_type_key,
open_well_time, open_well_time,
close_well_time, close_well_time,
first_start first_start, optimize_date
) )
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
...@@ -88,7 +89,8 @@ ...@@ -88,7 +89,8 @@
</choose> </choose>
#{item.openWellTime}, #{item.openWellTime},
#{item.closeWellTime}, #{item.closeWellTime},
#{item.firstStart} #{item.firstStart},
#{item.optimizeDate}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -118,7 +120,7 @@ ...@@ -118,7 +120,7 @@
<insert id="midWellheadBatchInsertList" parameterType="list"> <insert id="midWellheadBatchInsertList" parameterType="list">
INSERT INTO space_optimize_mid_wellhead ( id, create_by_id, create_by_name, create_time, INSERT INTO space_optimize_mid_wellhead ( id, create_by_id, create_by_name, create_time,
modify_by_id, modify_by_name, modify_time, mid_period_id, wellhead_id, well_number, start_seq) modify_by_id, modify_by_name, modify_time, mid_period_id, wellhead_id, well_number, start_seq, optimize_date)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
...@@ -132,7 +134,8 @@ ...@@ -132,7 +134,8 @@
#{item.periodId}, #{item.periodId},
#{item.wellheadId}, #{item.wellheadId},
#{item.wellNumber}, #{item.wellNumber},
#{item.startSeq} #{item.startSeq},
#{item.optimizeDate}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -153,7 +156,7 @@ ...@@ -153,7 +156,7 @@
generation_type_key, generation_type_key,
open_well_time, open_well_time,
close_well_time, close_well_time,
first_start first_start, optimize_date
) )
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
...@@ -179,7 +182,8 @@ ...@@ -179,7 +182,8 @@
</choose> </choose>
#{item.openWellTime}, #{item.openWellTime},
#{item.closeWellTime}, #{item.closeWellTime},
#{item.firstStart} #{item.firstStart},
#{item.optimizeDate}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -207,7 +211,7 @@ ...@@ -207,7 +211,7 @@
<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) modify_by_name, modify_time, short_period_id, wellhead_id, well_number, start_seq, optimize_date)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
...@@ -221,7 +225,8 @@ ...@@ -221,7 +225,8 @@
#{item.periodId}, #{item.periodId},
#{item.wellheadId}, #{item.wellheadId},
#{item.wellNumber}, #{item.wellNumber},
#{item.startSeq} #{item.startSeq},
#{item.optimizeDate}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -229,7 +234,7 @@ ...@@ -229,7 +234,7 @@
<insert id="shortDurationBatchInsertList" parameterType="list"> <insert id="shortDurationBatchInsertList" parameterType="list">
INSERT INTO space_optimize_short_duration (id, create_by_id, create_by_name, create_time, 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, 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, first_start) generation_type_key, open_well_time, close_well_time, first_start, optimize_date)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
...@@ -254,7 +259,8 @@ ...@@ -254,7 +259,8 @@
</choose> </choose>
#{item.openWellTime}, #{item.openWellTime},
#{item.closeWellTime}, #{item.closeWellTime},
#{item.firstStart} #{item.firstStart},
#{item.optimizeDate}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -284,7 +290,7 @@ ...@@ -284,7 +290,7 @@
<insert id="ultraWellheadBatchInsertList" parameterType="list"> <insert id="ultraWellheadBatchInsertList" parameterType="list">
INSERT INTO space_optimize_ultra_wellhead ( id, create_by_id, create_by_name, create_time, INSERT INTO space_optimize_ultra_wellhead ( id, create_by_id, create_by_name, create_time,
modify_by_id, modify_by_name, modify_time, ultra_period_id, wellhead_id, well_number, start_seq) modify_by_id, modify_by_name, modify_time, ultra_period_id, wellhead_id, well_number, start_seq, optimize_date)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
...@@ -298,7 +304,8 @@ ...@@ -298,7 +304,8 @@
#{item.periodId}, #{item.periodId},
#{item.wellheadId}, #{item.wellheadId},
#{item.wellNumber}, #{item.wellNumber},
#{item.startSeq} #{item.startSeq},
#{item.optimizeDate}
) )
</foreach> </foreach>
</insert> </insert>
...@@ -319,7 +326,7 @@ ...@@ -319,7 +326,7 @@
generation_type_key, generation_type_key,
open_well_time, open_well_time,
close_well_time, close_well_time,
first_start first_start, optimize_date
) )
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
...@@ -345,7 +352,8 @@ ...@@ -345,7 +352,8 @@
</choose> </choose>
#{item.openWellTime}, #{item.openWellTime},
#{item.closeWellTime}, #{item.closeWellTime},
#{item.firstStart} #{item.firstStart},
#{item.optimizeDate}
) )
</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