From cabea4341bdb25a7779d11bd42ff595bb667979c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 11 九月 2024 17:32:13 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 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 bd79b4f..8e2dc08 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
@@ -1,5 +1,7 @@
package cn.lihu.jh.module.ecg.controller.admin.devrent;
+import cn.lihu.jh.framework.common.util.exception.ExceptionUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,12 +16,17 @@
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
+import static cn.lihu.jh.framework.common.util.exception.ExceptionUtils.formatException;
+import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.DEV_DISMANTLE_EXCEPTION;
+import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.DEV_INSTALL_EXCEPTION;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
@@ -33,21 +40,50 @@
@RestController
@RequestMapping("/ecg/dev-rent")
@Validated
+@Slf4j
public class DevRentController {
@Resource
private DevRentService devRentService;
+ @PostMapping("/dev-install")
+ @Operation(summary = "瑁呮満")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> devInstall(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+ try {
+ Long rent_id = devRentService.installOperation(createReqVO);
+ return success(rent_id);
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("devInstall: " + err);
+ return error(DEV_INSTALL_EXCEPTION);
+ }
+ }
+
+ @PostMapping("/dev-dismantle")
+ @Operation(summary = "鎷嗘満")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> devDismantle(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+ try {
+ devRentService.dismantleOperation(createReqVO);
+ return success(0L);
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("devDismantle: " + err);
+ return error(DEV_DISMANTLE_EXCEPTION);
+ }
+ }
+
@PostMapping("/create")
@Operation(summary = "鍒涘缓瑁呮満鎷嗘満")
- @PreAuthorize("@ss.hasPermission('ecg:dev-rent:create')")
- public CommonResult<Integer> createDevRent(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> createDevRent(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
return success(devRentService.createDevRent(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊瑁呮満鎷嗘満")
- @PreAuthorize("@ss.hasPermission('ecg:dev-rent:update')")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Boolean> updateDevRent(@Valid @RequestBody DevRentSaveReqVO updateReqVO) {
devRentService.updateDevRent(updateReqVO);
return success(true);
@@ -56,8 +92,8 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎瑁呮満鎷嗘満")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('ecg:dev-rent:delete')")
- public CommonResult<Boolean> deleteDevRent(@RequestParam("id") Integer id) {
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Boolean> deleteDevRent(@RequestParam("id") Long id) {
devRentService.deleteDevRent(id);
return success(true);
}
@@ -65,15 +101,15 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱瑁呮満鎷嗘満")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('ecg:dev-rent:query')")
- public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Integer id) {
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) {
DevRentDO devRent = devRentService.getDevRent(id);
return success(BeanUtils.toBean(devRent, DevRentRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱瑁呮満鎷嗘満鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('ecg:dev-rent:query')")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<PageResult<DevRentRespVO>> getDevRentPage(@Valid DevRentPageReqVO pageReqVO) {
PageResult<DevRentDO> pageResult = devRentService.getDevRentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DevRentRespVO.class));
@@ -92,4 +128,13 @@
BeanUtils.toBean(list, DevRentRespVO.class));
}
-}
\ No newline at end of file
+ @GetMapping("/get-latest-rent")
+ @Operation(summary = "鑾峰彇鎮ｈ�呰澶囩殑鏈�杩戠璧佹儏鍐�")
+ @Parameter(name = "dev-id", description = "璁惧缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<DevRentRespVO> getLatestRent( @RequestParam("dev-id") String devId )
+ {
+ DevRentDO devRent = devRentService.getLatestRent( devId );
+ return success(BeanUtils.toBean(devRent, DevRentRespVO.class));
+ }
+}
--
Gitblit v1.9.3