From be5e5dd019c89cf586b9b4c8aa07954065d80b0c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 18:52:44 +0800
Subject: [PATCH] 装机 过号 召回
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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 3b15946..757f2d8 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
@@ -3,6 +3,7 @@
import cn.lihu.jh.framework.common.util.exception.ExceptionUtils;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
+import cn.lihu.jh.module.ecg.service.queue.QueueService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -46,15 +47,34 @@
@Resource
private DeviceService deviceService;
+ @Resource
+ private QueueService queueService;
+
+ // 甯歌妫�鏌� 瀹屾垚
+ @PostMapping("/routine-finish")
+ @Operation(summary = "")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
+ try {
+ CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
+ return result;
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("routineFinish: " + err);
+ return CommonResult.error(DEV_INSTALL_EXCEPTION);
+ }
+ }
+
@PostMapping("/dev-ready")
- @Operation(summary = "璁惧鍑嗗")
+ @Operation(summary = "璁惧棰嗙敤")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
try {
- return devRentService.readyOperation(createReqVO);
+ CommonResult<Long> result = devRentService.readyOperation(createReqVO);
+ return result;
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
- log.error("devInstall: " + err);
+ log.error("devReady: " + err);
return CommonResult.error(DEV_INSTALL_EXCEPTION);
}
}
@@ -100,16 +120,30 @@
}
}
+
+ @PostMapping("/routine-check-cancel")
+ @Operation(summary = "鍙栨秷甯歌妫�鏌�")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+ try {
+ return devRentService.cancelRoutineOperation(cancelReqVO);
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("routineCheckCancel: " + err);
+ return CommonResult.error(ROUTINE_CANCEL_EXCEPTION);
+ }
+ }
+
@PostMapping("/dev-ready-cancel")
- @Operation(summary = "鍙栨秷瑁呮満")
+ @Operation(summary = "鍙栨秷棰嗙敤")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devReadyCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
try {
return devRentService.cancelReadyOperation(cancelReqVO);
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
- log.error("devCancel: " + err);
- return CommonResult.error(DEV_CANCEL_EXCEPTION);
+ log.error("devReadyCancel: " + err);
+ return CommonResult.error(DEV_RECEIVE_CANCEL_EXCEPTION);
}
}
@@ -121,8 +155,8 @@
return devRentService.cancelInstallOperation(cancelReqVO);
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
- log.error("devCancel: " + err);
- return CommonResult.error(DEV_CANCEL_EXCEPTION);
+ log.error("devInstallCancel: " + err);
+ return CommonResult.error(DEV_INSTALL_CANCEL_EXCEPTION);
}
}
--
Gitblit v1.9.3