Commit 75c7c5dc authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改天气数据抽取定时任务,解决部分历史数据丢失问题;
2.修改第三方风机电站真实数据定时任务,修改代码逻辑,解决时间未按照15分钟间隔推送问题;
3.修改第三方风机电站模拟数据定时任务,解决时间日期格式错误导致数据重复问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent f74e12b5
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/> <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR"/> <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR"/> <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE"/> <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/> <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
<result column="modify_time" property="modifyTime" jdbcType="DATE"/> <result column="modify_time" property="modifyTime" jdbcType="VARCHAR"/>
<result column="station_id" property="stationId" jdbcType="VARCHAR"/> <result column="station_id" property="stationId" jdbcType="VARCHAR"/>
<result column="tower_id" property="towerId" jdbcType="VARCHAR"/> <result column="tower_id" property="towerId" jdbcType="VARCHAR"/>
<result column="tower_name" property="towerName" jdbcType="VARCHAR"/> <result column="tower_name" property="towerName" jdbcType="VARCHAR"/>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<mapper namespace="pps.core.base.mapper.WeatherBureauDataViewMapper"> <mapper namespace="pps.core.base.mapper.WeatherBureauDataViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.WeatherBureauDataView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.WeatherBureauDataView">
<id column="id" property="id" jdbcType="BIGINT"/> <id column="id" property="id" jdbcType="BIGINT"/>
<result column="data_time" property="dataTime" jdbcType="DATE"/> <result column="data_time" property="dataTime" jdbcType="VARCHAR"/>
<result column="weather_icon" property="weatherIcon" jdbcType="VARCHAR"/> <result column="weather_icon" property="weatherIcon" jdbcType="VARCHAR"/>
<result column="air_temperature" property="airTemperature" jdbcType="DECIMAL"/> <result column="air_temperature" property="airTemperature" jdbcType="DECIMAL"/>
<result column="precipitation" property="precipitation" jdbcType="VARCHAR"/> <result column="precipitation" property="precipitation" jdbcType="VARCHAR"/>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="pps.core.base.entity.WindPredictionFutureView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.WindPredictionFutureView">
<id column="id" property="id" jdbcType="BIGINT"/> <id column="id" property="id" jdbcType="BIGINT"/>
<result column="station_id" property="stationId" jdbcType="VARCHAR"/> <result column="station_id" property="stationId" jdbcType="VARCHAR"/>
<result column="data_time" property="dataTime" jdbcType="DATE"/> <result column="data_time" property="dataTime" jdbcType="VARCHAR"/>
<result column="wind_direction" property="windDirection" jdbcType="INTEGER"/> <result column="wind_direction" property="windDirection" jdbcType="INTEGER"/>
<result column="wind_speed" property="windSpeed" jdbcType="DECIMAL"/> <result column="wind_speed" property="windSpeed" jdbcType="DECIMAL"/>
<result column="air_temperature" property="airTemperature" jdbcType="DECIMAL"/> <result column="air_temperature" property="airTemperature" jdbcType="DECIMAL"/>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="pps.core.base.entity.WindPredictionHistoryView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.WindPredictionHistoryView">
<id column="id" property="id" jdbcType="BIGINT"/> <id column="id" property="id" jdbcType="BIGINT"/>
<result column="station_id" property="stationId" jdbcType="VARCHAR"/> <result column="station_id" property="stationId" jdbcType="VARCHAR"/>
<result column="data_time" property="dataTime" jdbcType="DATE"/> <result column="data_time" property="dataTime" jdbcType="VARCHAR"/>
<result column="wind_direction" property="windDirection" jdbcType="INTEGER"/> <result column="wind_direction" property="windDirection" jdbcType="INTEGER"/>
<result column="wind_speed" property="windSpeed" jdbcType="DECIMAL"/> <result column="wind_speed" property="windSpeed" jdbcType="DECIMAL"/>
<result column="air_temperature" property="airTemperature" jdbcType="DECIMAL"/> <result column="air_temperature" property="airTemperature" jdbcType="DECIMAL"/>
......
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