From f30726a9a7646e595ebd6a388c68e6b1ed2f0085 Mon Sep 17 00:00:00 2001 From: ws Date: Wed, 29 Apr 2026 16:37:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=AE=BF=E5=AE=A2?= =?UTF-8?q?=E5=88=B0=E8=BE=BE=E6=A0=B8=E9=AA=8C=E7=94=B3=E8=AF=B7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=80=9A=E7=9F=A5=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=92=8C=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VisitorApprovalController.java | 15 +++++++++++++-- .../mapper/VisitApplicationMapper.java | 7 ++++--- .../service/VisitorApprovalService.java | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/mini_program/controller/VisitorApprovalController.java b/src/main/java/com/example/mini_program/controller/VisitorApprovalController.java index 3a5a5b8..ec1951b 100644 --- a/src/main/java/com/example/mini_program/controller/VisitorApprovalController.java +++ b/src/main/java/com/example/mini_program/controller/VisitorApprovalController.java @@ -1,5 +1,6 @@ package com.example.mini_program.controller; +import com.example.mini_program.common.Result; import com.example.mini_program.service.VisitorApprovalService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,11 +21,21 @@ public class VisitorApprovalController { * 通知受访者访客已到达 * * @param id 预约记录ID + * @return 操作结果 */ @GetMapping("/notify-host") - public void notifyHostArrival(@RequestParam String id) { + public Result notifyHostArrival(@RequestParam String id) { log.info("通知受访者访客已到达, id={}", id); - visitorApprovalService.notifyHostArrival(id); + if (id == null || id.trim().isEmpty()) { + return Result.error("预约记录ID不能为空"); + } + try { + visitorApprovalService.notifyHostArrival(id); + return Result.success("通知发送成功"); + } catch (Exception e) { + log.error("通知发送失败, id={}", id, e); + return Result.error("通知发送失败: " + e.getMessage()); + } } /** diff --git a/src/main/java/com/example/mini_program/mapper/VisitApplicationMapper.java b/src/main/java/com/example/mini_program/mapper/VisitApplicationMapper.java index e5ece1d..3a9ebc9 100644 --- a/src/main/java/com/example/mini_program/mapper/VisitApplicationMapper.java +++ b/src/main/java/com/example/mini_program/mapper/VisitApplicationMapper.java @@ -72,11 +72,12 @@ public interface VisitApplicationMapper { */ int updateStatus(@Param("id") String id, @Param("status") String status, @Param("statusText") String statusText); + /** - * 更新审批状态 + * 根据ID更新预约记录的核验状态 * - * @param id 记录ID - * @return 影响行数 + * @param id 预约记录ID + * @param checkStatus 核验状态 */ void updateCheckStatusById(@Param("id") String id, @Param("checkStatus") String checkStatus); diff --git a/src/main/java/com/example/mini_program/service/VisitorApprovalService.java b/src/main/java/com/example/mini_program/service/VisitorApprovalService.java index 691b6df..9b89e4e 100644 --- a/src/main/java/com/example/mini_program/service/VisitorApprovalService.java +++ b/src/main/java/com/example/mini_program/service/VisitorApprovalService.java @@ -111,7 +111,7 @@ public class VisitorApprovalService { } /** - * 通知受访者访客已到达 + * 通知受访者访客已到达 核销记录 * 根据预约ID查询企微用户ID,发送应用消息 * * @param id 预约记录ID