From aa86cb57b09c5300db3c33d75d91d8b51a4b636f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 六月 2023 09:27:45 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/controller/WarningAnalyseController.java |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index eb9d9e4..4fd7aca 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.entity.Qxsh;
 import com.yssh.utils.CacheUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -78,14 +79,15 @@
         Object obj = CacheUtils.get(key);
         Map<String, List<Double>> map;
 
-        if (null != obj) {
-            map = (Map<String, List<Double>>) obj;
-        } else {
-            map = warningService.selectEachLocationDataChange();
-            if (null != map && map.size() > 0) {
-                CacheUtils.put(key, map);
-            }
-        }
+        //if (null != obj) {
+        //    map = (Map<String, List<Double>>) obj;
+        //} else {
+            //map = warningService.selectEachLocationDataChange();
+            map = warningService.select3Hours();
+        //    if (null != map && map.size() > 0) {
+        //        CacheUtils.put(key, map);
+        //    }
+        //}
 
         return Result.ok(map);
     }
@@ -96,18 +98,19 @@
     public Result monthTop10() {
         //return Result.OK(warningService.selectThisMonthLocationValueDataTop10());
 
-        String key = dateFormat.format(new Date()) + "_top10";
-        Object obj = CacheUtils.get(key);
-        List<Map<String, Object>> list;
+        //String key = dateFormat.format(new Date()) + "_top10";
+        //Object obj = CacheUtils.get(key);
+        List<Qxsh> list;
 
-        if (null != obj) {
-            list = (List<Map<String, Object>>) obj;
-        } else {
-            list = warningService.selectThisMonthLocationValueDataTop10();
-            if (null != list && list.size() > 0) {
-                CacheUtils.put(key, list);
-            }
-        }
+        //if (null != obj) {
+        //    list = (List<Qxsh>) obj;
+        //} else {
+            //list = warningService.selectThisMonthLocationValueDataTop10();
+            list = warningService.selectMonthTop10();
+        //    if (null != list && list.size() > 0) {
+        //        CacheUtils.put(key, list);
+        //    }
+        //}
 
         return Result.ok(list);
     }

--
Gitblit v1.9.3