Commit bb0e8d03 authored by ZWT's avatar ZWT

feat[零碳项目]: 松原演示

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
]
parent 36a3c0c7
......@@ -53,4 +53,8 @@ public class WellheadDailyProductionSituationEnt implements Serializable {
@XText("日产液量(t)")
@TableField
private BigDecimal dailyLiquidProduction;
@XText("来源系统")
@TableField
private String systemSource;
}
......@@ -50,6 +50,12 @@ public class WellheadDailyProductionSituationView implements Serializable {
@TableField
private BigDecimal dailyLiquidProduction;
@XText("来源系统")
@TableField
private String systemSource;
/*------------------------ exist ------------------------*/
@XText("线路ID")
@TableField(exist = false)
private String lineId;
......
......@@ -200,6 +200,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
.wellNumbers(collect)
.build());
result.throwIfFail();
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
Map<String, String> map = result.getResult().stream()
.collect(Collectors.toMap(DynamicQueryBaseWellheadOutput::getWellNumber, DynamicQueryBaseWellheadOutput::getId));
List<WellheadDailyProductionSituationView> dtoList = new ArrayList<>(list.size());
......@@ -211,6 +212,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
.productionTime(wellhead.getProductionTime())
.dailyElectricityConsumption(wellhead.getDailyElectricityConsumption())
.wellheadId(map.get(wellhead.getWellNumber()))
.systemSource(oilFieldCode)
.build()
);
}
......
......@@ -9,6 +9,7 @@
<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"/>
<result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id
......@@ -18,7 +19,8 @@
data_date,
production_time,
daily_electricity_consumption,
daily_liquid_production
daily_liquid_production,
system_source
</sql>
<select id="selectOne" parameterType="pps.core.prediction.entity.WellheadDailyProductionSituationView"
resultMap="BaseResultMap">
......@@ -39,7 +41,7 @@
<insert id="batchInsertList" parameterType="list">
INSERT INTO wellhead_daily_production_situation ( wellhead_id, well_number, data_date, production_time,
daily_electricity_consumption, daily_liquid_production )
daily_electricity_consumption, daily_liquid_production, system_source )
VALUES
<foreach collection="list" item="item" separator=",">
(
......@@ -48,7 +50,8 @@
#{item.dataDate},
#{item.productionTime},
#{item.dailyElectricityConsumption},
#{item.dailyLiquidProduction}
#{item.dailyLiquidProduction},
#{item.systemSource}
)
</foreach>
</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