diff --git a/kernel-s-system/system-business-home/pom.xml b/kernel-s-system/system-business-home/pom.xml index 6e78e8c00..2e20037e3 100644 --- a/kernel-s-system/system-business-home/pom.xml +++ b/kernel-s-system/system-business-home/pom.xml @@ -106,6 +106,12 @@ ${roses.version} compile + + + cn.stylefeng.roses + system-business-menu + ${roses.version} + \ No newline at end of file diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/aop/InterfaceStatisticsAop.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java similarity index 92% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/aop/InterfaceStatisticsAop.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java index 2747bfd58..1926dcdbb 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/aop/InterfaceStatisticsAop.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java @@ -1,13 +1,13 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.aop; +package cn.stylefeng.roses.kernel.system.modular.home.aop; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; import cn.stylefeng.roses.kernel.system.api.constants.StatisticsCacheConstants; -import cn.stylefeng.roses.kernel.system.modular.statistic.context.StatisticsUrlContext; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsUrl; -import cn.stylefeng.roses.kernel.system.modular.statistic.service.SysStatisticsCountService; +import cn.stylefeng.roses.kernel.system.modular.home.context.StatisticsUrlContext; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsUrl; +import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsCountService; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/cache/InterfaceStatisticsMemoryCache.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java similarity index 92% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/cache/InterfaceStatisticsMemoryCache.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java index 14c8744fe..3fe37d02a 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/cache/InterfaceStatisticsMemoryCache.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.cache; +package cn.stylefeng.roses.kernel.system.modular.home.cache; import cn.hutool.cache.impl.TimedCache; import cn.stylefeng.roses.kernel.cache.memory.AbstractMemoryCacheOperator; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/cache/InterfaceStatisticsRedisCache.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java similarity index 91% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/cache/InterfaceStatisticsRedisCache.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java index b24ab91b0..4b2b040ef 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/cache/InterfaceStatisticsRedisCache.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.cache; +package cn.stylefeng.roses.kernel.system.modular.home.cache; import cn.stylefeng.roses.kernel.cache.redis.AbstractRedisCacheOperator; import cn.stylefeng.roses.kernel.system.api.constants.StatisticsCacheConstants; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/context/StatisticsUrlContext.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java similarity index 87% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/context/StatisticsUrlContext.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java index 4042f9f50..7baba56ae 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/context/StatisticsUrlContext.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java @@ -1,7 +1,7 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.context; +package cn.stylefeng.roses.kernel.system.modular.home.context; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsUrl; -import cn.stylefeng.roses.kernel.system.modular.statistic.service.SysStatisticsUrlService; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsUrl; +import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsUrlService; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java index 436628375..6977e8175 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java @@ -7,7 +7,10 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.system.api.pojo.home.HomeCompanyInfo; import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.OnlineUserDTO; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest; +import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; +import org.springframework.web.bind.annotation.RestController; import cn.stylefeng.roses.kernel.system.modular.home.service.HomePageService; import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.OnlineUserStat; import org.springframework.web.bind.annotation.RestController; @@ -68,7 +71,7 @@ public class HomePageController { * @date 2022/2/10 11:34 */ @GetResource(name = "获取常用功能接口", path = "/homePage/getCommonFunctions") - public ResponseData> getCommonFunctions() { + public ResponseData> getCommonFunctions() { return new SuccessResponseData<>(homePageService.getCommonFunctions()); } } diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/controller/SysStatisticsController.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java similarity index 92% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/controller/SysStatisticsController.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java index 08b0fe046..5c5107c54 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/controller/SysStatisticsController.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java @@ -1,12 +1,12 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.controller; +package cn.stylefeng.roses.kernel.system.modular.home.controller; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; -import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.request.SysStatisticsCountRequest; -import cn.stylefeng.roses.kernel.system.modular.statistic.service.SysStatisticsCountService; +import cn.stylefeng.roses.kernel.system.modular.home.pojo.request.SysStatisticsCountRequest; +import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsCountService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/InterfaceStatistics.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/InterfaceStatistics.java deleted file mode 100644 index c3b4be3cc..000000000 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/InterfaceStatistics.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.stylefeng.roses.kernel.system.modular.home.entity; - -import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; -import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 接口统计实体 - * - * @author xixiaowei - * @date 2022/2/10 9:59 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("interface_statistics") -public class InterfaceStatistics extends BaseEntity { - - /** - * 主键ID - */ - @TableId(value = "statistics_id", type = IdType.ASSIGN_ID) - @ChineseDescription("主键ID") - private Long statisticsId; - - /** - * 接口名称 - */ - @TableField("interface_name") - @ChineseDescription("接口名称") - private String interfaceName; - - /** - * 接口路径 - */ - @TableField("interface_url") - @ChineseDescription("接口路径") - private String interfaceUrl; - - /** - * 访问次数 - */ - @TableField("request_count") - @ChineseDescription("访问次数") - private Integer requestCount; -} diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/entity/SysStatisticsCount.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java similarity index 93% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/entity/SysStatisticsCount.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java index a633404c7..d1d068e68 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/entity/SysStatisticsCount.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.entity; +package cn.stylefeng.roses.kernel.system.modular.home.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/entity/SysStatisticsUrl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java similarity index 94% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/entity/SysStatisticsUrl.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java index c3d111f69..3a10fa9b4 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/entity/SysStatisticsUrl.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.entity; +package cn.stylefeng.roses.kernel.system.modular.home.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/enums/SysStatisticsCountExceptionEnum.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java similarity index 93% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/enums/SysStatisticsCountExceptionEnum.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java index 6995da356..969173067 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/enums/SysStatisticsCountExceptionEnum.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.enums; +package cn.stylefeng.roses.kernel.system.modular.home.enums; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/enums/SysStatisticsUrlExceptionEnum.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java similarity index 92% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/enums/SysStatisticsUrlExceptionEnum.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java index 3fc651d34..7e2eb2489 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/enums/SysStatisticsUrlExceptionEnum.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.enums; +package cn.stylefeng.roses.kernel.system.modular.home.enums; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/InterfaceStatisticsMapper.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/InterfaceStatisticsMapper.java deleted file mode 100644 index f1272aa0d..000000000 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/InterfaceStatisticsMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.stylefeng.roses.kernel.system.modular.home.mapper; - -import cn.stylefeng.roses.kernel.system.modular.home.entity.InterfaceStatistics; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * 接口统计mapper接口 - * - * @author xixiaowei - * @date 2022/2/10 10:08 - */ -public interface InterfaceStatisticsMapper extends BaseMapper { - -} diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/SysStatisticsCountMapper.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java similarity index 62% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/SysStatisticsCountMapper.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java index 2a8918a51..8af1b8265 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/SysStatisticsCountMapper.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.mapper; +package cn.stylefeng.roses.kernel.system.modular.home.mapper; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsCount; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsCount; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/SysStatisticsUrlMapper.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java similarity index 61% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/SysStatisticsUrlMapper.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java index f91107a7c..bb25eacfc 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/SysStatisticsUrlMapper.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.mapper; +package cn.stylefeng.roses.kernel.system.modular.home.mapper; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsUrl; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsUrl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/InterfaceStatisticsMapper.xml b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/InterfaceStatisticsMapper.xml deleted file mode 100644 index 9477fc0b3..000000000 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/InterfaceStatisticsMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/mapping/SysStatisticsCountMapper.xml b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsCountMapper.xml similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/mapping/SysStatisticsCountMapper.xml rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsCountMapper.xml diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/mapping/SysStatisticsUrlMapper.xml b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/mapper/mapping/SysStatisticsUrlMapper.xml rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/OnlineUserStat.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/OnlineUserStat.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/OnlineUserStat.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/OnlineUserStat.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/request/SysStatisticsCountRequest.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java similarity index 92% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/request/SysStatisticsCountRequest.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java index bfa151ec0..99bae617f 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/request/SysStatisticsCountRequest.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.pojo.request; +package cn.stylefeng.roses.kernel.system.modular.home.pojo.request; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/request/SysStatisticsUrlRequest.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java similarity index 93% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/request/SysStatisticsUrlRequest.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java index ca8d3806a..65ae42f48 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/pojo/request/SysStatisticsUrlRequest.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.pojo.request; +package cn.stylefeng.roses.kernel.system.modular.home.pojo.request; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java index 34c85bb43..999baa5bb 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java @@ -2,11 +2,14 @@ package cn.stylefeng.roses.kernel.system.modular.home.service; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; import cn.stylefeng.roses.kernel.system.api.pojo.home.HomeCompanyInfo; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO; import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.OnlineUserDTO; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest; import cn.stylefeng.roses.kernel.system.modular.home.entity.InterfaceStatistics; import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.OnlineUserStat; import com.baomidou.mybatisplus.extension.service.IService; +import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; import java.util.List; @@ -16,7 +19,7 @@ import java.util.List; * @author xixiaowei * @date 2022/1/25 9:43 */ -public interface HomePageService extends IService { +public interface HomePageService { /** * 查询动态列表 @@ -48,7 +51,7 @@ public interface HomePageService extends IService { * @author xixiaowei * @date 2022/2/10 11:19 */ - List getCommonFunctions(); + List getCommonFunctions(); /** * 数据统计 diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/SysStatisticsCountService.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java similarity index 88% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/SysStatisticsCountService.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java index 72492434b..dadb56e51 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/SysStatisticsCountService.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.service; +package cn.stylefeng.roses.kernel.system.modular.home.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsCount; -import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.request.SysStatisticsCountRequest; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsCount; +import cn.stylefeng.roses.kernel.system.modular.home.pojo.request.SysStatisticsCountRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/SysStatisticsUrlService.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java similarity index 87% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/SysStatisticsUrlService.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java index 43b6d21ee..1cfdff653 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/SysStatisticsUrlService.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java @@ -1,8 +1,8 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.service; +package cn.stylefeng.roses.kernel.system.modular.home.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsUrl; -import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.request.SysStatisticsUrlRequest; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsUrl; +import cn.stylefeng.roses.kernel.system.modular.home.pojo.request.SysStatisticsUrlRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java similarity index 69% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java index 7dae48603..192f36618 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.home.service.Impl; +package cn.stylefeng.roses.kernel.system.modular.home.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -13,14 +13,19 @@ import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceUrlParam; import cn.stylefeng.roses.kernel.system.api.*; import cn.stylefeng.roses.kernel.system.api.pojo.home.HomeCompanyInfo; +import cn.stylefeng.roses.kernel.system.api.pojo.menu.antd.AntdSysMenuDTO; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO; import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; import cn.stylefeng.roses.kernel.system.api.pojo.user.OnlineUserDTO; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.OnlineUserRequest; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.modular.home.entity.InterfaceStatistics; -import cn.stylefeng.roses.kernel.system.modular.home.mapper.InterfaceStatisticsMapper; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsUrl; import cn.stylefeng.roses.kernel.system.modular.home.service.HomePageService; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsCount; +import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsCountService; +import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsUrlService; +import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; +import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuService; import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsCount; import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.OnlineUserStat; import cn.stylefeng.roses.kernel.system.modular.statistic.service.SysStatisticsCountService; @@ -31,6 +36,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.Year; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import java.util.*; import java.util.stream.Collectors; @@ -41,7 +51,7 @@ import java.util.stream.Collectors; * @date 2022/1/25 9:45 */ @Service -public class HomePageServiceImpl extends ServiceImpl implements HomePageService, HomePageServiceApi { +public class HomePageServiceImpl implements HomePageService, HomePageServiceApi { @Resource private LogManagerApi logManagerApi; @@ -67,6 +77,12 @@ public class HomePageServiceImpl extends ServiceImpl getRecentLogs() { @@ -143,22 +159,24 @@ public class HomePageServiceImpl extends ServiceImpl getCommonFunctions() { - // 获取当前用户 - Long userId = LoginContext.me().getLoginUser().getUserId(); + public List getCommonFunctions() { + List sysStatisticsCounts = sysStatisticsCountService.list(Wrappers.lambdaQuery().orderByDesc(SysStatisticsCount::getStatCount)); + List statUrlIds = sysStatisticsCounts.stream().map(SysStatisticsCount::getStatUrlId).collect(Collectors.toList()); - List interfaceStatisticsList = this.list(Wrappers.lambdaQuery().eq(InterfaceStatistics::getCreateUser, userId)); - - List resourceRequestList = new ArrayList<>(); - for (InterfaceStatistics interfaceStatistics : interfaceStatisticsList) { - ResourceUrlParam resourceUrlParam = new ResourceUrlParam(); - resourceUrlParam.setUrl(interfaceStatistics.getInterfaceUrl()); - ResourceDefinition apiResourceByUrl = resourceServiceApi.getResourceByUrl(resourceUrlParam); - ResourceRequest resourceRequest = new ResourceRequest(); - BeanUtil.copyProperties(apiResourceByUrl, resourceRequest); - resourceRequestList.add(resourceRequest); + // 菜单ID集合 + List statMenuIds = new ArrayList<>(); + for (Long statUrlId : statUrlIds) { + SysStatisticsUrl sysStatisticsUrl = sysStatisticsUrlService.getOne(Wrappers.lambdaQuery().eq(SysStatisticsUrl::getStatUrl, statUrlId)); + String statMenuId = sysStatisticsUrl.getStatMenuId(); + statMenuIds.add(statMenuId); } - return resourceRequestList; + + List sysMenuList = new ArrayList<>(); + for (String statMenuId : statMenuIds) { + SysMenu sysMenu = sysMenuService.getOne(Wrappers.lambdaQuery().eq(SysMenu::getMenuId, statMenuId)); + sysMenuList.add(sysMenu); + } + return sysMenuList; } @Override @@ -166,10 +184,22 @@ public class HomePageServiceImpl extends ServiceImpl> userRequestStats = requestCountCacheApi.getAllKeyValues(); - // todo ArrayList sysStatisticsCounts = new ArrayList<>(); + // 遍历填充数据 + for (String userId : userRequestStats.keySet()) { + SysStatisticsCount sysStatisticsCount = new SysStatisticsCount(); + sysStatisticsCount.setUserId(Long.valueOf(userId)); + Map map = userRequestStats.get(userId); + for (Long statUrlId : map.keySet()) { + sysStatisticsCount.setStatUrlId(statUrlId); + sysStatisticsCount.setStatCount(map.get(statUrlId)); + } - // todo + // 存放到集合中 + sysStatisticsCounts.add(sysStatisticsCount); + } + + // 批量存入数据库 this.sysStatisticsCountService.saveBatch(sysStatisticsCounts); } diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/impl/SysStatisticsCountServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java similarity index 89% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/impl/SysStatisticsCountServiceImpl.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java index 70e971bf2..370aa9298 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/impl/SysStatisticsCountServiceImpl.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.service.impl; +package cn.stylefeng.roses.kernel.system.modular.home.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -7,11 +7,11 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsCount; -import cn.stylefeng.roses.kernel.system.modular.statistic.enums.SysStatisticsCountExceptionEnum; -import cn.stylefeng.roses.kernel.system.modular.statistic.mapper.SysStatisticsCountMapper; -import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.request.SysStatisticsCountRequest; -import cn.stylefeng.roses.kernel.system.modular.statistic.service.SysStatisticsCountService; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsCount; +import cn.stylefeng.roses.kernel.system.modular.home.enums.SysStatisticsCountExceptionEnum; +import cn.stylefeng.roses.kernel.system.modular.home.mapper.SysStatisticsCountMapper; +import cn.stylefeng.roses.kernel.system.modular.home.pojo.request.SysStatisticsCountRequest; +import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsCountService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/impl/SysStatisticsUrlServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java similarity index 88% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/impl/SysStatisticsUrlServiceImpl.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java index 769bb8f23..1f007654a 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/service/impl/SysStatisticsUrlServiceImpl.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.service.impl; +package cn.stylefeng.roses.kernel.system.modular.home.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,11 +6,11 @@ import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; -import cn.stylefeng.roses.kernel.system.modular.statistic.entity.SysStatisticsUrl; -import cn.stylefeng.roses.kernel.system.modular.statistic.enums.SysStatisticsUrlExceptionEnum; -import cn.stylefeng.roses.kernel.system.modular.statistic.mapper.SysStatisticsUrlMapper; -import cn.stylefeng.roses.kernel.system.modular.statistic.pojo.request.SysStatisticsUrlRequest; -import cn.stylefeng.roses.kernel.system.modular.statistic.service.SysStatisticsUrlService; +import cn.stylefeng.roses.kernel.system.modular.home.entity.SysStatisticsUrl; +import cn.stylefeng.roses.kernel.system.modular.home.enums.SysStatisticsUrlExceptionEnum; +import cn.stylefeng.roses.kernel.system.modular.home.mapper.SysStatisticsUrlMapper; +import cn.stylefeng.roses.kernel.system.modular.home.pojo.request.SysStatisticsUrlRequest; +import cn.stylefeng.roses.kernel.system.modular.home.service.SysStatisticsUrlService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/timer/InterfaceStatisticsTimer.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java similarity index 88% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/timer/InterfaceStatisticsTimer.java rename to kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java index a26fcc090..0a74672dd 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/statistic/timer/InterfaceStatisticsTimer.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.statistic.timer; +package cn.stylefeng.roses.kernel.system.modular.home.timer; import cn.stylefeng.roses.kernel.system.modular.home.service.HomePageService; import cn.stylefeng.roses.kernel.timer.api.TimerAction; diff --git a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemCacheAutoConfiguration.java b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemCacheAutoConfiguration.java index c753d996d..d92ca37bd 100644 --- a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemCacheAutoConfiguration.java +++ b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemCacheAutoConfiguration.java @@ -35,7 +35,7 @@ import cn.stylefeng.roses.kernel.system.modular.role.cache.RoleDataScopeMemoryCa import cn.stylefeng.roses.kernel.system.modular.role.cache.RoleMemoryCache; import cn.stylefeng.roses.kernel.system.modular.role.cache.RoleResourceMemoryCache; import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRole; -import cn.stylefeng.roses.kernel.system.modular.statistic.cache.InterfaceStatisticsMemoryCache; +import cn.stylefeng.roses.kernel.system.modular.home.cache.InterfaceStatisticsMemoryCache; import cn.stylefeng.roses.kernel.system.modular.theme.cache.ThemeMemoryCache; import cn.stylefeng.roses.kernel.system.modular.theme.pojo.DefaultTheme; import cn.stylefeng.roses.kernel.system.modular.user.cache.SysUserMemoryCache; diff --git a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemHomeStatisticsAutoConfiguration.java b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemHomeStatisticsAutoConfiguration.java index bf90f2b19..7fbe7f8ef 100644 --- a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemHomeStatisticsAutoConfiguration.java +++ b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/GunsSystemHomeStatisticsAutoConfiguration.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.system.starter; -import cn.stylefeng.roses.kernel.system.modular.statistic.aop.InterfaceStatisticsAop; -import cn.stylefeng.roses.kernel.system.modular.statistic.timer.InterfaceStatisticsTimer; +import cn.stylefeng.roses.kernel.system.modular.home.aop.InterfaceStatisticsAop; +import cn.stylefeng.roses.kernel.system.modular.home.timer.InterfaceStatisticsTimer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;