From 8f777d784ee51a7e6ad99e16072c86fea0d39ae3 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 15 十一月 2022 18:04:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 7 +++++--
1 files changed, 5 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..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;
@@ -163,8 +165,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