From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 d4fdfa3..df34391 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;
@@ -104,6 +106,7 @@
}
+
/**
* 通用上传请求（单个）
*/
@@ -163,8 +166,9 @@
public ResultData getWeather(@RequestParam(value = "code", required = false) String code) {
TestDate td = new TestDate();
Map weather;
- if (code == null) {
- return ResultData.success(redisTemplate.opsForValue().get("weather") + "");
+ if (code == null) {//默认为攀枝花 则从redis上获取redis上定时任务15分钟获取一次天气
+ HashMap weather1 = (HashMap) redisTemplate.opsForValue().get("weather");
+ return ResultData.success(weather1.get("lives"));
} else {
return ResultData.success(td.getWeather(code));
}
--
Gitblit v1.7.1