diff --git a/src/main/java/com/ycwl/basic/controller/mobile/notify/UserNotificationAuthController.java b/src/main/java/com/ycwl/basic/controller/mobile/notify/UserNotificationAuthController.java index c52af008..17d44f20 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/notify/UserNotificationAuthController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/notify/UserNotificationAuthController.java @@ -1,17 +1,17 @@ package com.ycwl.basic.controller.mobile.notify; -import com.ycwl.basic.config.JwtInfo; +import com.ycwl.basic.constant.BaseContextHandler; import com.ycwl.basic.model.mobile.notify.req.NotificationAuthRecordReq; import com.ycwl.basic.model.mobile.notify.resp.NotificationAuthRecordResp; import com.ycwl.basic.model.pc.notify.entity.UserNotificationAuthorizationEntity; import com.ycwl.basic.service.UserNotificationAuthorizationService; -import com.ycwl.basic.utils.ResponseData; +import com.ycwl.basic.utils.ApiResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import jakarta.validation.Valid; /** * 用户通知授权记录Controller (移动端API) @@ -33,9 +33,9 @@ public class UserNotificationAuthController { * 用户主动同意通知授权时调用 */ @PostMapping("/record") - public ResponseData recordAuthorization( - @JwtInfo Long memberId, + public ApiResponse recordAuthorization( @Valid @RequestBody NotificationAuthRecordReq req) { + Long memberId = Long.parseLong(BaseContextHandler.getUserId()); log.info("记录用户通知授权: memberId={}, templateId={}, scenicId={}", memberId, req.getTemplateId(), req.getScenicId()); @@ -46,10 +46,10 @@ public class UserNotificationAuthController { NotificationAuthRecordResp resp = new NotificationAuthRecordResp(); BeanUtils.copyProperties(record, resp); - return ResponseData.success(resp); + return ApiResponse.success(resp); } catch (Exception e) { log.error("记录用户通知授权失败", e); - return ResponseData.fail("记录授权失败: " + e.getMessage()); + return ApiResponse.fail("记录授权失败: " + e.getMessage()); } } } \ No newline at end of file