From a9bfa2051eba0f8f1d1a8430292a89113f62b35f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 17:49:38 +0800
Subject: [PATCH] 拆机界面 设备详情显示
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 f153b61..ede8494 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,8 @@
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.service.devmanage.DeviceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -21,7 +23,6 @@
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.*;
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
@@ -41,6 +42,9 @@
@Resource
private DevRentService devRentService;
+
+ @Resource
+ private DeviceService deviceService;
@PostMapping("/dev-install")
@Operation(summary = "瑁呮満")
@@ -155,6 +159,16 @@
public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
{
DevRentDO devRent = devRentService.getLatestRent( searchReqVO );
- return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));
+ 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