diff --git a/src/main/java/com/southern/power/grid/dao/NationalWeatherStationMapper.java b/src/main/java/com/southern/power/grid/dao/NationalWeatherStationMapper.java index 718d8f3..709b7ff 100644 --- a/src/main/java/com/southern/power/grid/dao/NationalWeatherStationMapper.java +++ b/src/main/java/com/southern/power/grid/dao/NationalWeatherStationMapper.java @@ -23,4 +23,6 @@ public interface NationalWeatherStationMapper extends BaseMapper getSyncData(@Param("prevHourDate") String prevHourDate); } diff --git a/src/main/java/com/southern/power/grid/dao/RegionalWeatherStationMapper.java b/src/main/java/com/southern/power/grid/dao/RegionalWeatherStationMapper.java index 5a15f81..b544a85 100644 --- a/src/main/java/com/southern/power/grid/dao/RegionalWeatherStationMapper.java +++ b/src/main/java/com/southern/power/grid/dao/RegionalWeatherStationMapper.java @@ -20,4 +20,6 @@ public interface RegionalWeatherStationMapper extends BaseMapper getSyncData(@Param("prevHourDate") String prevHourDate); } diff --git a/src/main/java/com/southern/power/grid/service/impl/RegionalWeatherDataServiceImpl.java b/src/main/java/com/southern/power/grid/service/impl/RegionalWeatherDataServiceImpl.java index 1516c1a..eb3a230 100644 --- a/src/main/java/com/southern/power/grid/service/impl/RegionalWeatherDataServiceImpl.java +++ b/src/main/java/com/southern/power/grid/service/impl/RegionalWeatherDataServiceImpl.java @@ -1,6 +1,5 @@ package com.southern.power.grid.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.southern.power.grid.dao.NationalWeatherStationMapper; import com.southern.power.grid.dao.RegionalWeatherDataMapper; @@ -40,11 +39,10 @@ public class RegionalWeatherDataServiceImpl extends ServiceImpl regionalWeatherStations = regionalWeatherStationMapper.selectList(new LambdaQueryWrapper() - .eq(RegionalWeatherStation::getDataTime, prevHourDate)); - List nationalWeatherStations = nationalWeatherStationMapper.selectList(new LambdaQueryWrapper() - .eq(NationalWeatherStation::getDataTime, prevHourDate)); + List regionalWeatherStations = regionalWeatherStationMapper.getSyncData(prevHourDate); + List nationalWeatherStations = nationalWeatherStationMapper.getSyncData(prevHourDate); if (CollectionUtils.isEmpty(regionalWeatherStations) && CollectionUtils.isEmpty(nationalWeatherStations)) { + log.warn("【区域天气数据同步任务】没有查询到天气数据:{}", prevHourDate); return; } loadWeatherAreaConfig(); diff --git a/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java b/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java index c4dfe0e..debb879 100644 --- a/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java +++ b/src/main/java/com/southern/power/grid/task/WeatherDataScheduleTask.java @@ -2,6 +2,7 @@ package com.southern.power.grid.task; import com.southern.power.grid.service.IRegionalWeatherDataService; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -17,12 +18,18 @@ public class WeatherDataScheduleTask { // 防止并发执行 private final AtomicBoolean running = new AtomicBoolean(false); +/* @PostConstruct + public void init(){ + log.info("【区域天气数据同步任务】项目启动触发"); + execute(); + }*/ + /** * 每小时第20分钟执行 */ - //@Scheduled(cron = "0 20 * * * ?") + @Scheduled(cron = "0 20 * * * ?") public void schedule() { - log.info("【区域天气数据同步任务】定时触发"); + log.info("【区域天气数据同步任务】定时触发--开始"); execute(); } @@ -37,6 +44,7 @@ public class WeatherDataScheduleTask { try { regionalWeatherDataService.scheduleSyncWeatherData(); + log.info("【区域天气数据同步任务】定时触发--结束"); } catch (Exception e) { log.error("【区域天气数据同步任务】执行异常", e); } finally { diff --git a/src/main/resources/mapper/NationalWeatherStationMapper.xml b/src/main/resources/mapper/NationalWeatherStationMapper.xml index 24d2028..e2f6e73 100644 --- a/src/main/resources/mapper/NationalWeatherStationMapper.xml +++ b/src/main/resources/mapper/NationalWeatherStationMapper.xml @@ -65,4 +65,32 @@ AND data_time <= #{endTime} ORDER BY data_time + + \ No newline at end of file diff --git a/src/main/resources/mapper/RegionalWeatherStationMapper.xml b/src/main/resources/mapper/RegionalWeatherStationMapper.xml index 0e99ece..04c3d1e 100644 --- a/src/main/resources/mapper/RegionalWeatherStationMapper.xml +++ b/src/main/resources/mapper/RegionalWeatherStationMapper.xml @@ -65,4 +65,31 @@ AND data_time <= #{endTime} ORDER BY data_time + + \ No newline at end of file