From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
index 12fa193..7dc6602 100644
--- a/flower_city/src/main/java/com/dg/core/controller/CommonController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -2,6 +2,8 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
import com.dg.core.CorsConfig;
import com.dg.core.ResultData;
import com.dg.core.db.gen.AjaxResult;
@@ -17,6 +19,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -54,6 +57,9 @@
private int port;
@Value("${ftp.url}")
private String url;
+
+ @Resource
+ RedisTemplate<String, Object> redisTemplate;
@RequestMapping("/hello")
@@ -151,7 +157,6 @@
return success("工作日");
}
-
/**
* 获取天气默认为攀枝花
*/
@@ -160,12 +165,12 @@
public ResultData getWeather(@RequestParam(value = "code", required = false) String code) {
TestDate td = new TestDate();
Map weather;
- if (code == null) {
- weather = td.getWeather("510400");
+ if (code == null) {//默认为攀枝花 则从redis上获取redis上定时任务15分钟获取一次天气
+ HashMap weather1 = (HashMap) redisTemplate.opsForValue().get("weather");
+ return ResultData.success(weather1.get("lives"));
} else {
- weather = td.getWeather(code);
+ return ResultData.success(td.getWeather(code));
}
- return ResultData.success(weather);
}
--
Gitblit v1.7.1