From 43c631ad573535f4434caf19423824d4bd3f8ca7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 19 Jul 2023 13:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-job/src/main/java/com/moral/api/task/WeatherTask.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/WeatherTask.java b/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
index 0dc6cf4..841aa04 100644
--- a/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/WeatherTask.java
@@ -3,7 +3,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.moral.api.service.CityConfigService;
+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;
@@ -15,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) {
@@ -26,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;
+ }
}
--
Gitblit v1.8.0