From 86d5f8ceb14d6b1212660dfe4ddeb2c327cccec8 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 15 Oct 2025 00:00:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(notify):=20=E9=87=8D=E6=9E=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=80=9A=E7=9F=A5=E6=8E=88=E6=9D=83=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=99=A8=E4=BB=A5=E9=80=82=E5=BA=94=E6=96=B0=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E6=96=87=E5=A4=84=E7=90=86=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 JwtInfo 替换为 BaseContextHandler 来获取用户ID
- 更新 ResponseData 类型为 ApiResponse
- 修改 member ID 的获取方式为从 BaseContextHandler 中解析
- 使用 Jakarta Validation 注解替换旧的校验注解
- 调整 import 包路径以匹配新架构
---
 .../notify/UserNotificationAuthController.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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<NotificationAuthRecordResp> recordAuthorization(
-            @JwtInfo Long memberId,
+    public ApiResponse<NotificationAuthRecordResp> 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