diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java index 46a2c688..cc1d554c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java @@ -16,17 +16,15 @@ package top.charles7c.continew.admin.common.config.mybatis; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; - +import org.apache.ibatis.annotations.Param; import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermission; +import java.util.List; + /** * 数据权限 Mapper 基类 * @@ -37,10 +35,23 @@ import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermi */ public interface DataPermissionMapper extends BaseMapper { + /** + * 根据 entity 条件,查询全部记录 + * + * @param queryWrapper 实体对象封装操作类(可以为 null) + * @return 全部记录 + */ @Override @DataPermission List selectList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + /** + * 根据 entity 条件,查询全部记录(并翻页) + * + * @param page 分页查询条件 + * @param queryWrapper 实体对象封装操作类(可以为 null) + * @return 全部记录(并翻页) + */ @Override @DataPermission List selectList(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UIConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UIConstants.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java index 0d8ff720..74ee8ebb 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UIConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UiConstants.java @@ -22,9 +22,9 @@ package top.charles7c.continew.admin.common.constant; * @author Charles7c * @since 2023/9/17 14:12 */ -public class UIConstants { +public class UiConstants { - private UIConstants() { + private UiConstants() { } /** diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java index fb705ffc..65b15cce 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.admin.common.constant.UIConstants; +import top.charles7c.continew.admin.common.constant.UiConstants; import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -33,10 +33,10 @@ import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; public enum DisEnableStatusEnum implements IBaseEnum { /** 启用 */ - ENABLE(1, "启用", UIConstants.COLOR_SUCCESS), + ENABLE(1, "启用", UiConstants.COLOR_SUCCESS), /** 禁用 */ - DISABLE(2, "禁用", UIConstants.COLOR_ERROR),; + DISABLE(2, "禁用", UiConstants.COLOR_ERROR),; private final Integer value; private final String description; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java index 3c771a80..252ac71e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.admin.common.constant.UIConstants; +import top.charles7c.continew.admin.common.constant.UiConstants; import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -33,7 +33,7 @@ import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; public enum MessageTypeEnum implements IBaseEnum { /** 系统消息 */ - SYSTEM(1, "系统消息", UIConstants.COLOR_PRIMARY),; + SYSTEM(1, "系统消息", UiConstants.COLOR_PRIMARY),; private final Integer value; private final String description; diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java index 1e75d534..11a5242d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.admin.common.constant.UIConstants; +import top.charles7c.continew.admin.common.constant.UiConstants; import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -33,10 +33,10 @@ import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; public enum SuccessFailureStatusEnum implements IBaseEnum { /** 成功 */ - SUCCESS(1, "成功", UIConstants.COLOR_SUCCESS), + SUCCESS(1, "成功", UiConstants.COLOR_SUCCESS), /** 失败 */ - FAILURE(2, "失败", UIConstants.COLOR_ERROR),; + FAILURE(2, "失败", UiConstants.COLOR_ERROR),; private final Integer value; private final String description; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java index 7f1bf017..8527a0a5 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java @@ -79,6 +79,7 @@ public interface LogService { /** * 查询仪表盘访问趋势信息 * + * @param days 日期数 * @return 仪表盘访问趋势信息 */ List listDashboardAccessTrend(Integer days); diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java index 99b65199..a48e0f08 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/enums/AnnouncementStatusEnum.java @@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.continew.admin.common.constant.UIConstants; +import top.charles7c.continew.admin.common.constant.UiConstants; import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; /** @@ -33,13 +33,13 @@ import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; public enum AnnouncementStatusEnum implements IBaseEnum { /** 待发布 */ - PENDING_RELEASE(1, "待发布", UIConstants.COLOR_PRIMARY), + PENDING_RELEASE(1, "待发布", UiConstants.COLOR_PRIMARY), /** 已发布 */ - PUBLISHED(2, "已发布", UIConstants.COLOR_SUCCESS), + PUBLISHED(2, "已发布", UiConstants.COLOR_SUCCESS), /** 已过期 */ - EXPIRED(3, "已过期", UIConstants.COLOR_ERROR),; + EXPIRED(3, "已过期", UiConstants.COLOR_ERROR),; private final Integer value; private final String description; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java index 48418ba9..ae153598 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java @@ -49,11 +49,4 @@ public interface MenuService extends BaseService listByRoleCode(String roleCode); - - /** - * 查询所有菜单 - * - * @return 菜单列表 - */ - List list(); }