Commit 3db9346c authored by ZWT's avatar ZWT

得到的

parent 6708b15a
......@@ -21,8 +21,8 @@ import java.util.Date;
@TableName("THIRD_ACTIVE_POWER")
public class ThirdActivePowerEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private Long id;
@TableId(type = IdType.ASSIGN_UUID)
private String id;
@XText("井组名称(线路/光伏电站)")
@TableField
......
......@@ -25,7 +25,7 @@ import java.util.List;
public class ThirdActivePowerView implements Serializable {
@XText("ID")
@TableField
private Long id;
private String id;
@XText("井组名称(线路/光伏电站)")
@TableField
......
......@@ -83,6 +83,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.abs();
dtoList.add(
ThirdActivePowerView.builder()
.id(BaseUtils.randomUUIDString())
.stationName(o.getStationName())
.stationId(collect.get(o.getStationName()))
.createDate(o.getCreateDate())
......@@ -204,6 +205,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.abs();
dtoList.add(
ThirdActivePowerView.builder()
.id(BaseUtils.randomUUIDString())
.stationName(o.getStationName())
.stationId(collect.get(o.getStationName()))
.createDate(o.getCreateDate())
......@@ -472,7 +474,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
for (ThirdPhotovoltaicPowerEnt power : powerList) {
String lineId = lineMap.get(power.getStationName());
analysisList.add(EnergyConsumptionAnalysisView.builder()
.id(BaseUtils.randomUUIDString())
.id(BaseUtils.randomUUIDString())
.lineId(lineId)
.stationName(power.getStationName())
.powerGeneration(power.getPhotovoltaicPower())
......@@ -726,6 +728,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.abs();
dtoList.add(
ThirdActivePowerView.builder()
.id(BaseUtils.randomUUIDString())
.stationName(o.getStationName())
.stationId(collect.get(o.getStationName()))
.createDate(o.getCreateDate())
......
......@@ -40,11 +40,12 @@
</select>
<insert id="batchInsertList" parameterType="list">
INSERT INTO THIRD_ACTIVE_POWER ( STATION_NAME, STATION_ID, CREATE_DATE, PHOTOVOLTAIC_POWER, METER_POWER,
INSERT INTO THIRD_ACTIVE_POWER ( ID, STATION_NAME, STATION_ID, CREATE_DATE, PHOTOVOLTAIC_POWER, METER_POWER,
SYSTEM_SOURCE, INPUT_TIME)
VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.id},
#{item.stationName},
#{item.stationId},
#{item.createDate},
......
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