From 2f42985182cc9bdf1dc282096a8a3db6cd76a7f3 Mon Sep 17 00:00:00 2001 From: liejiu946 Date: Wed, 4 Feb 2026 20:53:21 +0800 Subject: [PATCH] =?UTF-8?q?opt:1.=E5=8E=BB=E9=99=A4=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=8F=96=E6=B6=88=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B3=A8=E8=A7=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/qrcode/controller/QRCodeController.java | 5 +++++ .../nl/sys/modular/qrcode/service/QRCodeService.java | 2 +- .../java/org/nl/task/service/impl/TaskServiceImpl.java | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/controller/QRCodeController.java b/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/controller/QRCodeController.java index 7895c20..ed904b6 100644 --- a/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/controller/QRCodeController.java +++ b/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/controller/QRCodeController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import jakarta.annotation.Resource; import org.nl.api.task.core.TaskRequestParam; import org.nl.logging.annotation.Log; +import org.nl.response.WebResponse; import org.nl.sys.modular.qrcode.dao.QRcodeInfo; import org.nl.sys.modular.qrcode.param.GenerateQRCodeParam; import org.nl.sys.modular.qrcode.param.QueryQRCodeParam; @@ -56,24 +57,28 @@ public class QRCodeController { return new ResponseEntity<>(qrCodeService.deleteQRCodeInfo(qRcodeInfo), HttpStatus.OK); } + @SaIgnore @GetMapping("/queryTaskInfoByRoom") @Log("获取当前队列信息") public ResponseEntity queryTaskInfoByRoom(@RequestParam String room){ return new ResponseEntity<>(qrCodeService.queryTaskInfoByRoom(room),HttpStatus.OK); } + @SaIgnore @PostMapping("/createTask") @Log("二维码创建任务") public ResponseEntity createTask(@RequestBody TaskRequestParam param){ return new ResponseEntity<>(qrCodeService.createTask(param),HttpStatus.OK); } + @SaIgnore @PostMapping("/cancelTask") @Log("二维码取消任务") public ResponseEntity cancelTask(@RequestParam String taskCode){ return new ResponseEntity<>(qrCodeService.cancelTask(taskCode),HttpStatus.OK); } + @SaIgnore @PostMapping("/taskOperationConfirm") @Log("二维码任务操作确认") public ResponseEntity taskOperationConfirm(@RequestParam String taskCode){ diff --git a/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/QRCodeService.java b/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/QRCodeService.java index 22f60fb..0470dbb 100644 --- a/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/QRCodeService.java +++ b/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/QRCodeService.java @@ -51,7 +51,7 @@ public interface QRCodeService { WebResponse createTask(TaskRequestParam qrCodeTaskRequestParam); /** - * 二维码创建任务 + * 二维码取消任务 * @return */ WebResponse cancelTask(String taskCode); diff --git a/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java b/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java index 81fd9de..2551d81 100644 --- a/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java +++ b/nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java @@ -182,11 +182,11 @@ public class TaskServiceImpl extends ServiceImpl implements Tas throw new BadRequestException(LangProcess.msg("task_code_empty")); } -// HttpResponse result = scheduleTaskAPI.cancelTask(cancelTaskRequestParam.getTask_code()); -// if (result == null || !result.isOk()){ -// log.info("取消调度任务失败"); -// throw new BadRequestException("取消调度任务失败"); -// } + HttpResponse result = scheduleTaskAPI.cancelTask(cancelTaskRequestParam.getTask_code()); + if (result == null || !result.isOk()){ + log.info("取消调度任务失败"); + throw new BadRequestException("取消调度任务失败"); + } taskMapper.update(new LambdaUpdateWrapper<>(Task.class) .set(Task::getStatus,TaskStatusEnum.CANCELED.getCode())