root/nl-Frebot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:1.去除取消任务时取消调度任务注解。

Browse Source
This commit is contained in:
liejiu946
2026-02-04 20:53:21 +08:00
parent 587308951a
commit 2f42985182
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/controller/QRCodeController.java
View File

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.nl.api.task.core.TaskRequestParam; import org.nl.api.task.core.TaskRequestParam;
import org.nl.logging.annotation.Log; 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.dao.QRcodeInfo;
import org.nl.sys.modular.qrcode.param.GenerateQRCodeParam; import org.nl.sys.modular.qrcode.param.GenerateQRCodeParam;
import org.nl.sys.modular.qrcode.param.QueryQRCodeParam; import org.nl.sys.modular.qrcode.param.QueryQRCodeParam;
@@ -56,24 +57,28 @@ public class QRCodeController {
return new ResponseEntity<>(qrCodeService.deleteQRCodeInfo(qRcodeInfo), HttpStatus.OK); return new ResponseEntity<>(qrCodeService.deleteQRCodeInfo(qRcodeInfo), HttpStatus.OK);
} }
@SaIgnore
@GetMapping("/queryTaskInfoByRoom") @GetMapping("/queryTaskInfoByRoom")
@Log("获取当前队列信息") @Log("获取当前队列信息")
public ResponseEntity<Object> queryTaskInfoByRoom(@RequestParam String room){ public ResponseEntity<Object> queryTaskInfoByRoom(@RequestParam String room){
return new ResponseEntity<>(qrCodeService.queryTaskInfoByRoom(room),HttpStatus.OK); return new ResponseEntity<>(qrCodeService.queryTaskInfoByRoom(room),HttpStatus.OK);
} }
@SaIgnore
@PostMapping("/createTask") @PostMapping("/createTask")
@Log("二维码创建任务") @Log("二维码创建任务")
public ResponseEntity<Object> createTask(@RequestBody TaskRequestParam param){ public ResponseEntity<Object> createTask(@RequestBody TaskRequestParam param){
return new ResponseEntity<>(qrCodeService.createTask(param),HttpStatus.OK); return new ResponseEntity<>(qrCodeService.createTask(param),HttpStatus.OK);
} }
@SaIgnore
@PostMapping("/cancelTask") @PostMapping("/cancelTask")
@Log("二维码取消任务") @Log("二维码取消任务")
public ResponseEntity<Object> cancelTask(@RequestParam String taskCode){ public ResponseEntity<Object> cancelTask(@RequestParam String taskCode){
return new ResponseEntity<>(qrCodeService.cancelTask(taskCode),HttpStatus.OK); return new ResponseEntity<>(qrCodeService.cancelTask(taskCode),HttpStatus.OK);
} }
@SaIgnore
@PostMapping("/taskOperationConfirm") @PostMapping("/taskOperationConfirm")
@Log("二维码任务操作确认") @Log("二维码任务操作确认")
public ResponseEntity<Object> taskOperationConfirm(@RequestParam String taskCode){ public ResponseEntity<Object> taskOperationConfirm(@RequestParam String taskCode){

2
nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/QRCodeService.java
View File

@@ -51,7 +51,7 @@ public interface QRCodeService {
WebResponse createTask(TaskRequestParam qrCodeTaskRequestParam); WebResponse createTask(TaskRequestParam qrCodeTaskRequestParam);
/** /**
* 二维码创建任务 * 二维码取消任务
* @return * @return
*/ */
WebResponse cancelTask(String taskCode); WebResponse cancelTask(String taskCode);

10
nl-business-task/src/main/java/org/nl/task/service/impl/TaskServiceImpl.java
View File

@@ -182,11 +182,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper,Task> implements Tas
throw new BadRequestException(LangProcess.msg("task_code_empty")); throw new BadRequestException(LangProcess.msg("task_code_empty"));
} }
// HttpResponse result = scheduleTaskAPI.cancelTask(cancelTaskRequestParam.getTask_code()); HttpResponse result = scheduleTaskAPI.cancelTask(cancelTaskRequestParam.getTask_code());
// if (result == null || !result.isOk()){ if (result == null || !result.isOk()){
// log.info("取消调度任务失败"); log.info("取消调度任务失败");
// throw new BadRequestException("取消调度任务失败"); throw new BadRequestException("取消调度任务失败");
// } }
taskMapper.update(new LambdaUpdateWrapper<>(Task.class) taskMapper.update(new LambdaUpdateWrapper<>(Task.class)
.set(Task::getStatus,TaskStatusEnum.CANCELED.getCode()) .set(Task::getStatus,TaskStatusEnum.CANCELED.getCode())