From 472979c8d2339ab8f4f22a4a04a11cebbeded7ac Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 九月 2024 17:51:20 +0800
Subject: [PATCH] 撤销装机功能
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 8e2dc08..a1bca10 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
@@ -17,16 +17,12 @@
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 static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
@@ -51,12 +47,11 @@
@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);
+ return devRentService.installOperation(createReqVO);
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
log.error("devInstall: " + err);
- return error(DEV_INSTALL_EXCEPTION);
+ return CommonResult.error(DEV_INSTALL_EXCEPTION);
}
}
@@ -66,11 +61,24 @@
public CommonResult<Long> devDismantle(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
try {
devRentService.dismantleOperation(createReqVO);
- return success(0L);
+ return CommonResult.success(0L);
} catch ( RuntimeException runtimeException ) {
String err = ExceptionUtils.formatException( runtimeException );
log.error("devDismantle: " + err);
- return error(DEV_DISMANTLE_EXCEPTION);
+ return CommonResult.error(DEV_DISMANTLE_EXCEPTION);
+ }
+ }
+
+ @PostMapping("/dev-cancel")
+ @Operation(summary = "鍙栨秷瑁呮満")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> devCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+ try {
+ return devRentService.cancelOperation(cancelReqVO);
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("devCancel: " + err);
+ return CommonResult.error(DEV_CANCEL_EXCEPTION);
}
}
@@ -78,7 +86,7 @@
@Operation(summary = "鍒涘缓瑁呮満鎷嗘満")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> createDevRent(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
- return success(devRentService.createDevRent(createReqVO));
+ return CommonResult.success(devRentService.createDevRent(createReqVO));
}
@PutMapping("/update")
@@ -86,7 +94,7 @@
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Boolean> updateDevRent(@Valid @RequestBody DevRentSaveReqVO updateReqVO) {
devRentService.updateDevRent(updateReqVO);
- return success(true);
+ return CommonResult.success(true);
}
@DeleteMapping("/delete")
@@ -95,7 +103,7 @@
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Boolean> deleteDevRent(@RequestParam("id") Long id) {
devRentService.deleteDevRent(id);
- return success(true);
+ return CommonResult.success(true);
}
@GetMapping("/get")
@@ -104,7 +112,7 @@
@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));
+ return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));
}
@GetMapping("/page")
@@ -112,7 +120,7 @@
@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));
+ return CommonResult.success(BeanUtils.toBean(pageResult, DevRentRespVO.class));
}
@GetMapping("/export-excel")
@@ -135,6 +143,6 @@
public CommonResult<DevRentRespVO> getLatestRent( @RequestParam("dev-id") String devId )
{
DevRentDO devRent = devRentService.getLatestRent( devId );
- return success(BeanUtils.toBean(devRent, DevRentRespVO.class));
+ return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));
}
}
--
Gitblit v1.9.3