Commit 18488d5e authored by ZWT's avatar ZWT

得到的

parent 6ff1a906
...@@ -27,8 +27,8 @@ import java.util.Date; ...@@ -27,8 +27,8 @@ import java.util.Date;
@TableName("WIND_PREDICTION_FUTURE") @TableName("WIND_PREDICTION_FUTURE")
public class WindPredictionFutureEnt implements Serializable { public class WindPredictionFutureEnt implements Serializable {
@XText("ID") @XText("ID")
@TableId(type = IdType.AUTO) @TableId(type = IdType.ASSIGN_UUID)
private Long id; private String id;
@XText("风电站ID") @XText("风电站ID")
@TableField @TableField
......
...@@ -24,7 +24,7 @@ import java.util.Date; ...@@ -24,7 +24,7 @@ import java.util.Date;
public class WindPredictionFutureView implements Serializable { public class WindPredictionFutureView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
private Long id; private String id;
@XText("风电站ID") @XText("风电站ID")
@TableField @TableField
......
...@@ -92,6 +92,7 @@ public class ThirdApiWeatherDataListener2 implements ReadListener<ThirdApiWeathe ...@@ -92,6 +92,7 @@ public class ThirdApiWeatherDataListener2 implements ReadListener<ThirdApiWeathe
historyView.setWns100m(data.getWns100m()); historyView.setWns100m(data.getWns100m());
historyView.setWnsGrd100m(data.getWnsGrd100m()); historyView.setWnsGrd100m(data.getWnsGrd100m());
WindPredictionFutureView futureView = new WindPredictionFutureView(); WindPredictionFutureView futureView = new WindPredictionFutureView();
futureView.setId(BaseUtils.randomUUIDString());
futureView.setStationId(stationId); futureView.setStationId(stationId);
futureView.setDataTime(dateTime); futureView.setDataTime(dateTime);
futureView.setWindDirection(data.getWnd()); futureView.setWindDirection(data.getWnd());
......
...@@ -75,6 +75,7 @@ public class WindPredictionDataListener implements ReadListener<WindPredictionEx ...@@ -75,6 +75,7 @@ public class WindPredictionDataListener implements ReadListener<WindPredictionEx
//去重 //去重
if (futureList.stream() if (futureList.stream()
.noneMatch(item -> DateUtil.compare(item.getDataTime(), build.getDataTime()) == 0)) { .noneMatch(item -> DateUtil.compare(item.getDataTime(), build.getDataTime()) == 0)) {
build.setId(BaseUtils.randomUUIDString());
futureList.add(build); futureList.add(build);
} }
} else { } else {
......
...@@ -807,6 +807,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService { ...@@ -807,6 +807,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
.collect(Collectors.toList()); .collect(Collectors.toList());
for (int i = 0; i < sortList.size(); i++) { for (int i = 0; i < sortList.size(); i++) {
WindPredictionFutureView item = sortList.get(i); WindPredictionFutureView item = sortList.get(i);
item.setId(BaseUtils.randomUUIDString());
batchList.add(item); batchList.add(item);
if (i < sortList.size() - 1) { if (i < sortList.size() - 1) {
for (int y = 0; y < BusinessConstant.TIME_LIST.size(); y++) { for (int y = 0; y < BusinessConstant.TIME_LIST.size(); y++) {
...@@ -826,6 +827,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService { ...@@ -826,6 +827,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
dao.setPressure(this.compute(Objects.isNull(item.getPressure()) ? BigDecimal.ZERO : item.getPressure(), dao.setPressure(this.compute(Objects.isNull(item.getPressure()) ? BigDecimal.ZERO : item.getPressure(),
Objects.isNull(nextData.getPressure()) ? BigDecimal.ZERO : nextData.getPressure(), Objects.isNull(nextData.getPressure()) ? BigDecimal.ZERO : nextData.getPressure(),
valueOf)); valueOf));
dao.setId(BaseUtils.randomUUIDString());
batchList.add(dao); batchList.add(dao);
} }
} }
......
...@@ -58,10 +58,11 @@ ...@@ -58,10 +58,11 @@
</delete> </delete>
<insert id="insertBatch" parameterType="java.util.List"> <insert id="insertBatch" parameterType="java.util.List">
INSERT INTO WIND_PREDICTION_FUTURE (STATION_ID, DATA_TIME, WIND_DIRECTION, WIND_SPEED, AIR_TEMPERATURE, INSERT INTO WIND_PREDICTION_FUTURE (ID, STATION_ID, DATA_TIME, WIND_DIRECTION, WIND_SPEED, AIR_TEMPERATURE,
HUMIDITY, PRESSURE ,ACTUAL_WIND_SPEED ,ACTUAL_POWER ,PREDICTED_POWER) VALUES HUMIDITY, PRESSURE ,ACTUAL_WIND_SPEED ,ACTUAL_POWER ,PREDICTED_POWER) VALUES
<foreach collection="list" separator="," item="item"> <foreach collection="list" separator="," item="item">
( (
#{item.id},
#{item.stationId}, #{item.stationId},
#{item.dataTime}, #{item.dataTime},
#{item.windDirection}, #{item.windDirection},
......
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