From 1722133ac4872b40d6d47f65f359dea8a354b91a Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 9 Sep 2023 22:12:18 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=AF=B9=E6=9F=A5=E8=AF=A2=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E8=AE=BF=E9=97=AE=E8=B6=8B=E5=8A=BF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../top/charles7c/cnadmin/common/constant/CacheConsts.java | 5 +++++
 .../cnadmin/monitor/service/impl/DashboardServiceImpl.java | 7 +++++--
 .../src/main/resources/mapper/LogMapper.xml                | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java
index 49f3a085..b5ad4459 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java
@@ -52,4 +52,9 @@ public class CacheConsts {
      * 菜单缓存键前缀
      */
     public static final String MENU_KEY_PREFIX = "MENU";
+
+    /**
+     * 仪表盘缓存键前缀
+     */
+    public static final String DASHBOARD_KEY_PREFIX = "DASHBOARD";
 }
diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java
index 09a8eb57..797ed2be 100644
--- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java
+++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java
@@ -22,13 +22,15 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
 
+import top.charles7c.cnadmin.common.constant.CacheConsts;
 import top.charles7c.cnadmin.monitor.model.vo.DashboardAccessTrendVO;
 import top.charles7c.cnadmin.monitor.model.vo.DashboardGeoDistributionVO;
 import top.charles7c.cnadmin.monitor.model.vo.DashboardPopularModuleVO;
@@ -44,9 +46,9 @@ import top.charles7c.cnadmin.system.service.AnnouncementService;
  * @author Charles7c
  * @since 2023/9/8 21:32
  */
-@Slf4j
 @Service
 @RequiredArgsConstructor
+@CacheConfig(cacheNames = CacheConsts.DASHBOARD_KEY_PREFIX)
 public class DashboardServiceImpl implements DashboardService {
 
     private final LogService logService;
@@ -65,6 +67,7 @@ public class DashboardServiceImpl implements DashboardService {
     }
 
     @Override
+    @Cacheable(key = "#days")
     public List<DashboardAccessTrendVO> listAccessTrend(Integer days) {
         return logService.listDashboardAccessTrend(days);
     }
diff --git a/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml b/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml
index 353a7841..3ec3efce 100644
--- a/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml
+++ b/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml
@@ -17,6 +17,7 @@
             COUNT(DISTINCT `client_ip`) AS ipCount
         FROM `sys_log`
         GROUP BY DATE(`create_time`)
+        HAVING `date` != CURDATE()
         ORDER BY DATE(`create_time`) DESC
         LIMIT #{days}
     </select>