Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000

 screen-job/src/main/java/com/moral/api/task/WeatherTask.java

@@ -3,6 +3,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.moral.api.service.CityWeatherForecastService;
import com.moral.api.service.CityWeatherService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.context.XxlJobHelper;
@@ -14,9 +15,12 @@
    @Autowired
    private CityWeatherService cityWeatherService;

    //城市气象实测数据insert
    @Autowired
    private CityWeatherForecastService cityWeatherForecastService;

    //城市逐小时气象实测数据insert
    @XxlJob("insertCityWeather")
    public ReturnT insertCityWeather(){
    public ReturnT insertCityWeather() {
        try {
            cityWeatherService.insertCityWeather();
        } catch (Exception e) {
@@ -25,4 +29,16 @@
        }
        return ReturnT.SUCCESS;
    }

    //城市明日逐小时预测气象预测数据insert
    @XxlJob("insertCityWeatherForecast")
    public ReturnT insertCityWeatherForecast() {
        try {
            cityWeatherForecastService.insertCityWeatherForecast();
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
        }
        return ReturnT.SUCCESS;
    }
}