From 84284b827ba1276eb8a4291e330e724a6561d0ab Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 26 九月 2024 18:12:02 +0800
Subject: [PATCH] 设备准备时 - 增加设置状态检查
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 12bcbc7..ac1ed72 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
@@ -62,7 +62,7 @@
// 鏍囨敞璁惧 宸查鍙�
Integer ret = markDevRecieved(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_EXISTS);
+ return CommonResult.error(DEVICE_NOT_FREE);
}
Long rent_id = createReqVO.getId();
@@ -122,7 +122,7 @@
// 璁剧疆璁惧 浣跨敤涓�
Integer ret = markDevInUse(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_EXISTS);
+ return CommonResult.error(DEVICE_NOT_RECEIVED);
}
Long rent_id = createReqVO.getId();
@@ -418,7 +418,7 @@
private Integer markDevRecieved(String devId) {
// 璁惧鏍囨敞 宸查鍙�
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO) {
+ if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
deviveDO.setState( DevStateEnum.RECEIVED.getState() );
return deviceMapper.updateById(deviveDO);
}
@@ -429,7 +429,7 @@
private Integer markDevInUse(String devId) {
// 璁惧鏍囨敞 鍦ㄤ娇鐢�
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO) {
+ if (null != deviveDO && deviveDO.getState() == DevStateEnum.RECEIVED.getState()) {
deviveDO.setState( DevStateEnum.INUSE.getState() );
return deviceMapper.updateById(deviveDO);
}
--
Gitblit v1.9.3