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 |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 63 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 d04de5b..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
@@ -86,12 +86,39 @@
         }
     }
 
-    @PostMapping("/dev-cancel")
+    @PostMapping("/dev-data-entry")
+    @Operation(summary = "鏁版嵁褰曞叆")
+    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+    public CommonResult<Long> devDataEntry(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+        try {
+            devRentService.dataEntryOperation(createReqVO);
+            return CommonResult.success(0L);
+        } catch ( RuntimeException runtimeException ) {
+            String err = ExceptionUtils.formatException( runtimeException );
+            log.error("devDismantle: " + err);
+            return CommonResult.error(DEV_DISMANTLE_EXCEPTION);
+        }
+    }
+
+    @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);
@@ -142,7 +169,16 @@
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) {
         DevRentDO devRent = devRentService.getDevRent(id);
-        return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));
+
+        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
+        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
+        if (null != deviceDO) {
+            devRentRespVO.setCategory(deviceDO.getCategory());
+            devRentRespVO.setBrand(deviceDO.getBrand());
+            devRentRespVO.setModel(deviceDO.getModel());
+        }
+        return CommonResult.success(devRentRespVO);
     }
 
     @GetMapping("/page")
@@ -167,7 +203,7 @@
     }
 
     @GetMapping("/get-ready-rent")
-    @Operation(summary = "鑾峰彇鎮ｈ�呰澶囩殑鏈�杩戠璧佹儏鍐�")
+    @Operation(summary = "鑾峰彇宸查鍙栫璧佹儏鍐�")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
     public CommonResult<DevRentRespVO> getReadyRent( @Valid DevRentSearchReqVO searchReqVO )
     {
@@ -187,10 +223,10 @@
         return CommonResult.success(devRentRespVO);
     }
 
-    @GetMapping("/get-dismantle-rent")
-    @Operation(summary = "鑾峰彇鎮ｈ�呰澶囩殑鏈�杩戠璧佹儏鍐�")
+    @GetMapping("/get-installed-rent")
+    @Operation(summary = "鑾峰彇宸插畨瑁呯璧佹儏鍐�")
     @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
-    public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
+    public CommonResult<DevRentRespVO> getInstalledRent( @Valid DevRentSearchReqVO searchReqVO )
     {
         DevRentDO devRent = devRentService.getInstalledOrCancelledRent( searchReqVO );
         if (null == devRent) {
@@ -205,4 +241,23 @@
         devRentRespVO.setModel( deviceDO.getModel() );
         return CommonResult.success(devRentRespVO);
     }
+
+    @GetMapping("/get-dismantled-rent")
+    @Operation(summary = "鑾峰彇宸叉媶鍗哥璧佹儏鍐�")
+    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+    public CommonResult<DevRentRespVO> getDismantledRent( @Valid DevRentSearchReqVO searchReqVO )
+    {
+        DevRentDO devRent = devRentService.getDismantledRent( searchReqVO );
+        if (null == devRent) {
+            return CommonResult.success(null);
+        }
+
+        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
+
+        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+        devRentRespVO.setCategory( deviceDO.getCategory() );
+        devRentRespVO.setBrand( deviceDO.getBrand() );
+        devRentRespVO.setModel( deviceDO.getModel() );
+        return CommonResult.success(devRentRespVO);
+    }
 }

--
Gitblit v1.9.3