From ddf772bc079de92ff4bcba8c0f1624b6398e0dad Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 十月 2024 15:14:30 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index bbfc4ab..3b15946 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -100,12 +100,25 @@
}
}
- @PostMapping("/dev-cancel")
+ @PostMapping("/dev-ready-cancel")
@Operation(summary = "鍙栨秷瑁呮満")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<Long> devCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+ public CommonResult<Long> devReadyCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
try {
- return devRentService.cancelOperation(cancelReqVO);
+ return devRentService.cancelReadyOperation(cancelReqVO);
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("devCancel: " + err);
+ return CommonResult.error(DEV_CANCEL_EXCEPTION);
+ }
+ }
+
+ @PostMapping("/dev-install-cancel")
+ @Operation(summary = "鍙栨秷瑁呮満")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> devInstallCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+ try {
+ return devRentService.cancelInstallOperation(cancelReqVO);
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
log.error("devCancel: " + err);
--
Gitblit v1.9.3