Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot

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<List<RouteVO>> listRoutes() {
         Set<String> roles = SecurityUtils.getRoles();

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<SysMenu> {
 
+    /**
+     * 获取菜单路由列表
+     */
     List<RouteBO> listRoutes(Set<String> roles);
 
 }

src/main/java/com/youlai/system/service/SysMenuService.java

@@ -46,7 +46,7 @@ public interface SysMenuService extends IService<SysMenu> {
      * 修改菜单显示状态
      * 
      * @param menuId 菜单ID
-     * @param visible 是否显示(1-显示 2-隐藏)
+     * @param visible 是否显示(1-显示 0-隐藏)
      */
     boolean updateMenuVisible(Long menuId, Integer visible);
 

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.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -138,13 +135,13 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     }
 
     /**
-     * 获取路由列表
+     * 获取菜单路由列表
      */
     @Override
     public List<RouteVO> listRoutes(Set<String> roles) {
 
         if (CollectionUtil.isEmpty(roles)) {
-            return new ArrayList<>();
+            return Collections.emptyList();
         }
 
         List<RouteBO> menuList = this.baseMapper.listRoutes(roles);

src/main/resources/mapper/SysLogMapper.xml

@@ -77,11 +77,11 @@
             COUNT(*) AS totalCount,
             ROUND(
                 CASE
-                        WHEN COUNT(CASE WHEN DATE(create_time) = CURDATE() - INTERVAL 1 DAY THEN 1 END) = 0 THEN 0
+                    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 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 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
@@ -97,11 +97,11 @@
             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
+                    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 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 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