From 91c60b946e0d2e8abc2c350598aa6d47ed28e83c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 24 九月 2024 14:36:29 +0800
Subject: [PATCH] 装机&放弃 逻辑新增state
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 78 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 21 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..c6cf8dc 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,6 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.devrent;
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.enums.DevRentStateEnum;
+import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -17,16 +20,11 @@
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;
@@ -46,17 +44,19 @@
@Resource
private DevRentService devRentService;
+ @Resource
+ private DeviceService deviceService;
+
@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);
+ 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 +66,37 @@
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);
+ }
+ }
+
+ @PostMapping("/dev-lose")
+ @Operation(summary = "閬楀け")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Long> devLose(@Valid @RequestBody DevRentSaveReqVO loseReqVO) {
+ try {
+ return devRentService.loseOperation(loseReqVO);
+ } catch ( RuntimeException runtimeException ) {
+ String err = ExceptionUtils.formatException( runtimeException );
+ log.error("devLose: " + err);
+ return CommonResult.error(DEV_LOSE_EXCEPTION);
}
}
@@ -78,7 +104,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 +112,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 +121,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 +130,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 +138,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")
@@ -128,13 +154,23 @@
BeanUtils.toBean(list, DevRentRespVO.class));
}
- @GetMapping("/get-latest-rent")
+ @GetMapping("/get-dismantle-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 )
+ public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
{
- DevRentDO devRent = devRentService.getLatestRent( devId );
- return success(BeanUtils.toBean(devRent, DevRentRespVO.class));
+ searchReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
+ DevRentDO devRent = devRentService.getDismantleRent( 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