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/service/devrent/DevRentServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index f3bf2aa..b37420b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -12,11 +12,10 @@
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
-import java.util.*;
+
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
@@ -49,6 +48,12 @@
public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ // 妫�鏌ヨ澶囩紪鍙�
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId( createReqVO.getDevId() );
+ if (null == deviceDO ) {
+ return CommonResult.error(DEVICE_NOT_EXISTS);
+ }
Long rent_id = createReqVO.getId();
if (null == rent_id) {
@@ -261,7 +266,7 @@
private void validateDevRentExists(Long id) {
if (devRentMapper.selectById(id) == null) {
- throw exception(DEV_RENT_NOT_EXISTS);
+ throw exception(DEV_INSTALL_NOT_EXISTS);
}
}
@@ -282,7 +287,7 @@
private void markDevLost(DevRentSaveReqVO createReqVO) {
// 璁惧鏍囨敞閬楀け
- DeviceDO deviveDO = deviceMapper.selectById(createReqVO.getDevId());
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(createReqVO.getDevId());
if (null != deviveDO) {
deviveDO.setLost(1);
deviveDO.setLoseDate( createReqVO.getReturnTime().toLocalDate() );
@@ -292,7 +297,7 @@
private void resumeDevLost(DevRentSaveReqVO createReqVO) {
// 璁惧鏍囨敞閬楀け 鎭㈠涓烘甯�
- DeviceDO deviveDO = deviceMapper.selectById(createReqVO.getDevId());
+ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(createReqVO.getDevId());
if (null != deviveDO) {
deviveDO.setLost(0);
deviveDO.setLoseDate( null );
@@ -300,4 +305,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3