diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java index d47b287d..3ad312d2 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java @@ -18,13 +18,8 @@ package top.charles7c.continew.admin.monitor.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.NumberUtil; -import com.alicp.jetcache.anno.CachePenetrationProtect; -import com.alicp.jetcache.anno.CacheRefresh; -import com.alicp.jetcache.anno.CacheType; -import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.charles7c.continew.admin.common.constant.CacheConstants; import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp; import top.charles7c.continew.admin.monitor.model.resp.DashboardGeoDistributionResp; import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp; @@ -65,9 +60,6 @@ public class DashboardServiceImpl implements DashboardService { } @Override - @CachePenetrationProtect - @CacheRefresh(refresh = 7200) - @Cached(key = "#days", cacheType = CacheType.BOTH, name = CacheConstants.DASHBOARD_KEY_PREFIX) public List listAccessTrend(Integer days) { return logService.listDashboardAccessTrend(days); } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java index 8b09e03d..f5e553cf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java @@ -16,10 +16,7 @@ package top.charles7c.continew.admin.system.service; -import java.util.List; - import org.springframework.web.multipart.MultipartFile; - import top.charles7c.continew.admin.system.model.entity.UserDO; import top.charles7c.continew.admin.system.model.query.UserQuery; import top.charles7c.continew.admin.system.model.req.UserBasicInfoUpdateReq; @@ -29,6 +26,8 @@ import top.charles7c.continew.admin.system.model.resp.UserDetailResp; import top.charles7c.continew.admin.system.model.resp.UserResp; import top.charles7c.continew.starter.extension.crud.base.BaseService; +import java.util.List; + /** * 用户业务接口 * @@ -57,10 +56,10 @@ public interface UserService extends BaseService dictIds) { baseMapper.lambdaUpdate().in(DictItemDO::getDictId, dictIds).remove(); } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java index 9f37fb37..4a372aa0 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java @@ -56,7 +56,7 @@ public class MenuServiceImpl extends BaseServiceImpl ids) { baseMapper.lambdaUpdate().in(MenuDO::getParentId, ids).remove(); super.delete(ids); diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java index bb9902bc..70f2be18 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java @@ -50,7 +50,6 @@ public class OptionServiceImpl implements OptionService { } @Override - // @CacheInvalidate(key = "#req.code", name = CacheConstants.OPTION_KEY_PREFIX, multi = true) public void update(List req) { baseMapper.updateBatchById(BeanUtil.copyToList(req, OptionDO.class)); } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java index 6b9308c5..21c085b3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java @@ -78,8 +78,8 @@ public class RoleServiceImpl extends BaseServiceImpl ids) { CheckUtils.throwIf(CollUtil.contains(ids, LoginHelper.getUserId()), "不允许删除当前用户"); List list = baseMapper.lambdaQuery() @@ -178,11 +182,12 @@ public class UserServiceImpl extends BaseServiceImpl> listDict(@PathVariable String code) { Optional> enumClass = this.getEnumClassByName(code); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java index 3a0e1ace..209ebcb1 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java @@ -16,21 +16,21 @@ package top.charles7c.continew.admin.webapi.common; -import java.util.List; - -import lombok.RequiredArgsConstructor; - +import com.alicp.jetcache.anno.CachePenetrationProtect; +import com.alicp.jetcache.anno.CacheRefresh; +import com.alicp.jetcache.anno.CacheType; +import com.alicp.jetcache.anno.Cached; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; - +import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - +import top.charles7c.continew.admin.common.constant.CacheConstants; import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp; import top.charles7c.continew.admin.monitor.model.resp.DashboardGeoDistributionResp; import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp; @@ -41,6 +41,8 @@ import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.resp.R; import top.charles7c.continew.starter.log.common.annotation.Log; +import java.util.List; + /** * 仪表盘 API * @@ -66,6 +68,9 @@ public class DashboardController { @Operation(summary = "查询访问趋势信息", description = "查询访问趋势信息") @Parameter(name = "days", description = "日期数", example = "30", in = ParameterIn.PATH) @GetMapping("/access/trend/{days}") + @CachePenetrationProtect + @CacheRefresh(refresh = 7200) + @Cached(key = "#days", cacheType = CacheType.BOTH, name = CacheConstants.DASHBOARD_KEY_PREFIX, syncLocal = true) public R> listAccessTrend(@PathVariable Integer days) { ValidationUtils.throwIf(7 != days && 30 != days, "仅支持查询近 7/30 天访问趋势信息"); return R.ok(dashboardService.listAccessTrend(days)); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java index ca6bf221..d0fbc92c 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/UserCenterController.java @@ -16,26 +16,21 @@ package top.charles7c.continew.admin.webapi.system; -import java.util.List; -import java.util.stream.Collectors; - -import jakarta.validation.constraints.NotNull; - -import lombok.RequiredArgsConstructor; - +import cn.hutool.core.util.ReUtil; +import com.xkcoding.justauth.AuthRequestFactory; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.tags.Tag; - +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import me.zhyd.oauth.model.AuthCallback; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.request.AuthRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - -import com.xkcoding.justauth.AuthRequestFactory; - -import cn.hutool.core.util.ReUtil; - import top.charles7c.continew.admin.common.constant.CacheConstants; import top.charles7c.continew.admin.common.constant.RegexConstants; import top.charles7c.continew.admin.common.enums.SocialSourceEnum; @@ -55,10 +50,8 @@ import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.core.util.validate.ValidationUtils; import top.charles7c.continew.starter.extension.crud.model.resp.R; -import me.zhyd.oauth.model.AuthCallback; -import me.zhyd.oauth.model.AuthResponse; -import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.request.AuthRequest; +import java.util.List; +import java.util.stream.Collectors; /** * 个人中心 API @@ -87,8 +80,8 @@ public class UserCenterController { @Operation(summary = "修改基础信息", description = "修改用户基础信息") @PatchMapping("/basic/info") - public R updateBasicInfo(@Validated @RequestBody UserBasicInfoUpdateReq updateReq) { - userService.updateBasicInfo(updateReq, LoginHelper.getUserId()); + public R updateBasicInfo(@Validated @RequestBody UserBasicInfoUpdateReq req) { + userService.updateBasicInfo(req, LoginHelper.getUserId()); return R.ok("修改成功"); }