From d0c503def6157820caa70c3ccf2d79af63cddbb6 Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Sat, 6 Jul 2024 14:24:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E5=A2=9E=E9=95=BF=E7=8E=87?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E5=90=8C=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/SysLogMapper.xml | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/mapper/SysLogMapper.xml b/src/main/resources/mapper/SysLogMapper.xml index f8611f55..1494e6ab 100644 --- a/src/main/resources/mapper/SysLogMapper.xml +++ b/src/main/resources/mapper/SysLogMapper.xml @@ -76,14 +76,14 @@ COUNT(CASE WHEN DATE(create_time) = CURDATE() THEN 1 END) AS todayCount, COUNT(*) AS totalCount, ROUND( - CASE - WHEN COUNT(CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY THEN 1 END) = 0 THEN 0 - ELSE - (COUNT(CASE WHEN DATE(create_time) = CURDATE() THEN 1 END) - - COUNT(CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY THEN 1 END)) / - COUNT(CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY THEN 1 END) - END, - 2) AS growthRate + CASE + WHEN COUNT(CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY AND TIME(create_time) <= TIME(NOW()) THEN 1 END) = 0 THEN 0 + ELSE + (COUNT(CASE WHEN DATE(create_time) = CURDATE() THEN 1 END) - + COUNT(CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY AND TIME(create_time) <= TIME(NOW()) THEN 1 END)) / + COUNT(CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY AND TIME(create_time) <= TIME(NOW()) THEN 1 END) + END, + 2) AS growthRate FROM sys_log WHERE @@ -96,14 +96,14 @@ COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() THEN ip END) AS todayCount, COUNT(DISTINCT ip) AS totalCount, ROUND( - CASE - WHEN COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY THEN ip END) = 0 THEN 0 - ELSE - (COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() THEN ip END) - - COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY THEN ip END)) / - COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY THEN ip END) - END, - 2) AS growthRate + CASE + WHEN COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY AND TIME(create_time) <= TIME(NOW()) THEN ip END) = 0 THEN 0 + ELSE + (COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() THEN ip END) - + COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY AND TIME(create_time) <= TIME(NOW()) THEN ip END)) / + COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY AND TIME(create_time) <= TIME(NOW()) THEN ip END) + END, + 2) AS growthRate FROM sys_log WHERE From 07e5fd8c1c907bba6c8d22455aa0d11fe058c469 Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Wed, 10 Jul 2024 08:29:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E6=B3=A8=E9=87=8A=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysMenuController.java | 2 +- .../com/youlai/system/mapper/SysMenuMapper.java | 17 ++++++++++------- .../youlai/system/service/SysMenuService.java | 2 +- .../system/service/impl/SysMenuServiceImpl.java | 9 +++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/system/controller/SysMenuController.java index 2707e9df..db10e971 100644 --- a/src/main/java/com/youlai/system/controller/SysMenuController.java +++ b/src/main/java/com/youlai/system/controller/SysMenuController.java @@ -52,7 +52,7 @@ public class SysMenuController { return Result.success(menus); } - @Operation(summary = "路由列表") + @Operation(summary = "菜单路由列表") @GetMapping("/routes") public Result> listRoutes() { Set roles = SecurityUtils.getRoles(); diff --git a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java b/src/main/java/com/youlai/system/mapper/SysMenuMapper.java index 6a745257..3cd3aa41 100644 --- a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/youlai/system/mapper/SysMenuMapper.java @@ -1,12 +1,5 @@ package com.youlai.system.mapper; -/* - * 菜单 访问层 - * - * @author Ray - * @since 2022/1/24 - */ - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.youlai.system.model.entity.SysMenu; import com.youlai.system.model.bo.RouteBO; @@ -15,9 +8,19 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; import java.util.Set; +/** + * 菜单访问层 + * + * @author Ray + * @since 2022/1/24 + */ + @Mapper public interface SysMenuMapper extends BaseMapper { + /** + * 获取菜单路由列表 + */ List listRoutes(Set roles); } diff --git a/src/main/java/com/youlai/system/service/SysMenuService.java b/src/main/java/com/youlai/system/service/SysMenuService.java index b15d9f51..26f359c3 100644 --- a/src/main/java/com/youlai/system/service/SysMenuService.java +++ b/src/main/java/com/youlai/system/service/SysMenuService.java @@ -46,7 +46,7 @@ public interface SysMenuService extends IService { * 修改菜单显示状态 * * @param menuId 菜单ID - * @param visible 是否显示(1-显示 2-隐藏) + * @param visible 是否显示(1-显示 0-隐藏) */ boolean updateMenuVisible(Long menuId, Integer visible); diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index 0875466c..c98e565c 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java @@ -31,10 +31,7 @@ import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -138,13 +135,13 @@ public class SysMenuServiceImpl extends ServiceImpl impl } /** - * 获取路由列表 + * 获取菜单路由列表 */ @Override public List listRoutes(Set roles) { if (CollectionUtil.isEmpty(roles)) { - return new ArrayList<>(); + return Collections.emptyList(); } List menuList = this.baseMapper.listRoutes(roles);