From eec1528a3c4f10c6096cbeadf2a7ef9104e8ec4b Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 23 十月 2024 22:13:37 +0800
Subject: [PATCH] 检查类型 简单列表接口

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java |   79 +++++++++++++++++++++++++++++++++++----
 1 files changed, 70 insertions(+), 9 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..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
@@ -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,43 @@
         }
     }
 
-    @PostMapping("/dev-cancel")
-    @Operation(summary = "鍙栨秷瑁呮満")
+
+    @PostMapping("/routine-check-cancel")
+    @Operation(summary = "鍙栨秷甯歌妫�鏌�")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
-    public CommonResult<Long> devCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+    public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
         try {
-            return devRentService.cancelOperation(cancelReqVO);
+            return devRentService.cancelRoutineOperation(cancelReqVO);
         } catch ( RuntimeException runtimeException ) {
             String err = ExceptionUtils.formatException( runtimeException );
-            log.error("devCancel: " + err);
-            return CommonResult.error(DEV_CANCEL_EXCEPTION);
+            log.error("routineCheckCancel: " + err);
+            return CommonResult.error(ROUTINE_CANCEL_EXCEPTION);
+        }
+    }
+
+    @PostMapping("/dev-ready-cancel")
+    @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("devReadyCancel: " + err);
+            return CommonResult.error(DEV_RECEIVE_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("devInstallCancel: " + err);
+            return CommonResult.error(DEV_INSTALL_CANCEL_EXCEPTION);
         }
     }
 
@@ -189,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