From 2f55cebbad3dea187a5f91d16ec80a9677dab699 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 十一月 2024 11:16:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/WeatherController.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WeatherController.java b/src/main/java/com/yssh/controller/WeatherController.java
index f84a16a..a6527e6 100644
--- a/src/main/java/com/yssh/controller/WeatherController.java
+++ b/src/main/java/com/yssh/controller/WeatherController.java
@@ -1,7 +1,8 @@
package com.yssh.controller;
import com.yssh.entity.Weather;
-import com.yssh.service.IWeatherService;
+import com.yssh.service.WeatherService;
+import com.yssh.utils.CacheUtils;
import com.yssh.utils.Result;
import io.swagger.annotations.Api;
@@ -9,28 +10,21 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
-/**
- * @author wMeng
- * @ClassName YsshWeatherController
- * @Description TODO
- * @date 2022/10/30 13:21
- * @Version 1.0
- */
@Api(tags="澶╂皵")
@RestController
@RequestMapping("/weather")
@SuppressWarnings("rawtypes")
public class WeatherController {
- @Autowired
- private IWeatherService weatherService;
+ @Resource
+ private WeatherService weatherService;
private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH:00:00");
@@ -41,7 +35,6 @@
})
@GetMapping("/query/{begin}/{end}")
public Result query(@PathVariable("begin") String begin, @PathVariable("end") String end) {
- List<Weather> data = new ArrayList<>();
try {
if (null != begin && begin.length() != 19) {
begin = null;
@@ -49,15 +42,27 @@
if (null != end && end.length() != 19) {
end = null;
}
- if (null == begin && null == end) {
- begin = dateFormat.format(new Date());
+ if (null == begin) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, -30);
+ begin = dateFormat.format(calendar.getTime());
+ }
+ if (null == end) {
+ end = dateFormat.format(new Date());
}
- data = weatherService.query(begin, end);
+ //List<Weather> list = weatherService.query(begin, end);
+ String key = CacheUtils.getMd5("weatherService.query." + begin + "." + end);
+ List<Weather> list = CacheUtils.getListByKey(key);
+ if (null == list) {
+ list = weatherService.query(begin, end);
+ CacheUtils.putListByKey(key, list);
+ }
+
+ return Result.OK(list);
} catch (Exception e) {
return Result.error(e.getMessage());
}
- return Result.OK(data);
}
@GetMapping("/getAll")
--
Gitblit v1.9.3