From e8d835496ca0a82cbd291130ec3e4cc77baf738b Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 17 十月 2024 14:29:10 +0800
Subject: [PATCH] 大屏数据 update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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 bfe957c..54cb342 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
@@ -50,6 +50,21 @@
@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 = "璁惧棰嗙敤")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
@@ -105,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);
}
}
@@ -126,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);
}
}
@@ -207,6 +236,20 @@
BeanUtils.toBean(list, DevRentRespVO.class));
}
+ @GetMapping("/get-free-rent")
+ @Operation(summary = "鑾峰彇宸查鍙栫璧佹儏鍐�")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<DevRentRespVO> getFreeRent( @Valid DevRentSearchReqVO searchReqVO )
+ {
+ DevRentDO devRent = devRentService.getFreeRent( searchReqVO );
+ if (null == devRent) {
+ return CommonResult.success(null);
+ }
+
+ DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+ return CommonResult.success(devRentRespVO);
+ }
+
@GetMapping("/get-ready-rent")
@Operation(summary = "鑾峰彇宸查鍙栫璧佹儏鍐�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
--
Gitblit v1.9.3