From 0fd05805e138bcd29f75a17f0fbde15a8292238c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 11 九月 2024 15:02:56 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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 7b1766e..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,10 +40,39 @@
@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 = "鍒涘缓瑁呮満鎷嗘満")
@@ -94,13 +130,11 @@
@GetMapping("/get-latest-rent")
@Operation(summary = "鑾峰彇鎮ｈ�呰澶囩殑鏈�杩戠璧佹儏鍐�")
- @Parameter(name = "pat-id", description = "鎮ｈ�呯紪鍙�", required = true, example = "1024")
@Parameter(name = "dev-id", description = "璁惧缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<DevRentRespVO> getLatestRent(
- @RequestParam("pat-id") String patId, @RequestParam("dev-id") String devId)
+ public CommonResult<DevRentRespVO> getLatestRent( @RequestParam("dev-id") String devId )
{
- DevRentDO devRent = devRentService.getLatestRent(patId, devId);
+ DevRentDO devRent = devRentService.getLatestRent( devId );
return success(BeanUtils.toBean(devRent, DevRentRespVO.class));
}
}
--
Gitblit v1.9.3