Commit 6ff1a906 authored by ZWT's avatar ZWT

得到的

parent ad83df5f
......@@ -27,8 +27,8 @@ import java.util.Date;
@TableName("WELLHEAD_DAILY_PRODUCTION_SITUATION")
public class WellheadDailyProductionSituationEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private Long id;
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("井口ID")
@TableField
......
......@@ -24,7 +24,7 @@ import java.util.Date;
public class WellheadDailyProductionSituationView implements Serializable {
@XText("ID")
@TableField
private Long id;
private String id;
@XText("井口ID")
@TableField
......
......@@ -217,6 +217,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
List<WellheadDailyProductionSituationView> dtoList = new ArrayList<>(list.size());
for (WellheadDailyProductionSituationJob wellhead : list) {
dtoList.add(WellheadDailyProductionSituationView.builder()
.id(BaseUtils.randomUUIDString())
.wellNumber(wellhead.getWellNumber())
.dataDate(wellhead.getDataDate())
.dailyLiquidProduction(ObjectUtil.defaultIfNull(wellhead.getDailyLiquidProduction(), BigDecimal.ZERO))
......@@ -326,6 +327,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
List<WellheadDailyProductionSituationView> dtoList = new ArrayList<>(list.size());
for (WellheadDailyProductionSituationJob wellhead : list) {
dtoList.add(WellheadDailyProductionSituationView.builder()
.id(BaseUtils.randomUUIDString())
.wellNumber(wellhead.getWellNumber())
.dataDate(wellhead.getDataDate())
.dailyLiquidProduction(ObjectUtil.defaultIfNull(wellhead.getDailyLiquidProduction(), BigDecimal.ZERO))
......
......@@ -65,7 +65,7 @@
</select>
<insert id="batchInsertList" parameterType="list">
INSERT INTO WELLHEAD_DAILY_PRODUCTION_SITUATION ( WELLHEAD_ID, WELL_NUMBER, DATA_DATE, PRODUCTION_TIME,
INSERT INTO WELLHEAD_DAILY_PRODUCTION_SITUATION (ID, WELLHEAD_ID, WELL_NUMBER, DATA_DATE, PRODUCTION_TIME,
DAILY_ELECTRICITY_CONSUMPTION, DAILY_LIQUID_PRODUCTION, SYSTEM_SOURCE, DAILY_UTILITY_ELECTRICITY_CONSUMPTION,
ELECTRICITY_CONSUMPTION_PH,
ELECTRICITY_CONSUMPTION_HH,
......@@ -81,6 +81,7 @@
VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.id},
#{item.wellheadId},
#{item.wellNumber},
#{item.dataDate},
......
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