From 16278ec6df52c7775134b1657e5ddc7060be0208 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 四月 2023 14:45:48 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/WarningAnalyseController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index 8360a42..eb9d9e4 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -1,5 +1,6 @@
package com.yssh.controller;
+import com.yssh.utils.CacheUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-@Api(tags="鍛婅鍒嗘瀽")
+@Api(tags = "鍛婅鍒嗘瀽")
@RequestMapping("/warning")
@RestController
@SuppressWarnings("rawtypes")
@@ -29,11 +30,7 @@
@Autowired
private IWarningAnalyseService warningService;
- private static ConcurrentHashMap<String, Object> cache = new ConcurrentHashMap<>(5);
-
private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-
- public static final long CACHE_HOLD_TIME_24H = 24 * 60 * 60 * 1000L;
/**
* 1.鏌ヨ褰撳墠鏃堕棿鐨勬墍鏈夌偣浣峷alue鍊硷紙浠�47.dat鏌ヨ鍗冲彲锛�
@@ -78,13 +75,15 @@
//return Result.OK(warningService.selectEachLocationDataChange());
String key = dateFormat.format(new Date()) + "_local";
+ Object obj = CacheUtils.get(key);
Map<String, List<Double>> map;
- if (cache.containsKey(key)) {
- map = (Map<String, List<Double>>) cache.get(key);
+
+ if (null != obj) {
+ map = (Map<String, List<Double>>) obj;
} else {
map = warningService.selectEachLocationDataChange();
if (null != map && map.size() > 0) {
- cache.put(key, map);
+ CacheUtils.put(key, map);
}
}
@@ -98,17 +97,19 @@
//return Result.OK(warningService.selectThisMonthLocationValueDataTop10());
String key = dateFormat.format(new Date()) + "_top10";
+ Object obj = CacheUtils.get(key);
List<Map<String, Object>> list;
- if (cache.containsKey(key)) {
- list = (List<Map<String, Object>>) cache.get(key);
+
+ if (null != obj) {
+ list = (List<Map<String, Object>>) obj;
} else {
list = warningService.selectThisMonthLocationValueDataTop10();
if (null != list && list.size() > 0) {
- cache.put(key, list);
+ CacheUtils.put(key, list);
}
}
- return Result.OK(list);
+ return Result.ok(list);
}
@ApiOperationSupport(order = 5)
--
Gitblit v1.9.3