From cd5ad843a881952b710ec5cfc6a42509cc1c4ff3 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 25 十月 2024 16:55:38 +0800
Subject: [PATCH] bug fix
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 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 a22dacf..abbdbea 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
@@ -196,6 +196,12 @@
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
Long rent_id = createReqVO.getId();
+ // 瀵逛簬宸叉湁棰嗙敤锛屼絾鏄鏈烘椂浣跨敤鐨勪笉鏄凡棰嗙敤璁惧锛岄渶閲婃斁 婧愰鐢� 璁惧
+ DevRentDO devRentDO = getDevRent(rent_id);
+ if ( null != devRentDO.getDevId() && !createReqVO.getDevId().equals(devRentDO.getDevId()) ) {
+ markDevFree( devRentDO.getDevId(), rent_id);
+ }
+
// 璁剧疆璁惧 浣跨敤涓�
Integer ret = markDevInUse(createReqVO.getDevId(), rent_id);
if (null == ret || 0 == ret) {
@@ -640,12 +646,12 @@
// 鏍囪 璁惧宸茶棰嗗彇
private Integer markDevRecieved(String devId, Long rentId) {
// 璁惧鏍囨敞 宸查鍙�
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
- deviveDO.setState( DevStateEnum.RECEIVED.getState() );
- deviveDO.setRentId( rentId );
- deviveDO.setStateDate( LocalDate.now() );
- return deviceMapper.updateById(deviveDO);
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
+ if (null != deviceDO && DevStateEnum.FREE.isEqual(deviceDO.getState())) {
+ deviceDO.setState( DevStateEnum.RECEIVED.getState() );
+ deviceDO.setRentId( rentId );
+ deviceDO.setStateDate( LocalDate.now() );
+ return deviceMapper.updateById(deviceDO);
}
return 0;
@@ -653,21 +659,21 @@
// 鏍囪 璁惧宸茶浣跨敤
private Integer markDevInUse(String devId, Long rentId) {
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null == deviveDO)
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
+ if (null == deviceDO)
return 0;
- if (deviveDO.getState() == DevStateEnum.RECEIVED.getState() && deviveDO.getRentId() == rentId) {
- deviveDO.setState( DevStateEnum.INUSE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- return deviceMapper.updateById(deviveDO);
+ if (DevStateEnum.RECEIVED.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
+ deviceDO.setState( DevStateEnum.INUSE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ return deviceMapper.updateById(deviceDO);
}
- if (deviveDO.getState() == DevStateEnum.FREE.getState()) {
- deviveDO.setState( DevStateEnum.INUSE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- deviveDO.setRentId( rentId );
- return deviceMapper.updateById(deviveDO);
+ if (DevStateEnum.FREE.isEqual(deviceDO.getState())) {
+ deviceDO.setState( DevStateEnum.INUSE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setRentId( rentId );
+ return deviceMapper.updateById(deviceDO);
}
return 0;
@@ -675,11 +681,11 @@
private Integer markDevDismantleException(String devId, Long rentId, LocalDate localDate, DevStateEnum devStateEnum) {
// 璁惧鏍囨敞閬楀け
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO && deviveDO.getState() == DevStateEnum.INUSE.getState() && deviveDO.getRentId() == rentId) {
- deviveDO.setState( devStateEnum.getState() );
- deviveDO.setStateDate( localDate );
- return deviceMapper.updateById(deviveDO);
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
+ if (null != deviceDO && DevStateEnum.INUSE.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
+ deviceDO.setState( devStateEnum.getState() );
+ deviceDO.setStateDate( localDate );
+ return deviceMapper.updateById(deviceDO);
}
return 0;
@@ -687,12 +693,12 @@
private Integer markDevFree(String devId, Long rentId) {
// 璁惧鏍囨敞閬楀け 鎭㈠涓虹┖闂�
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
- if (null != deviveDO && deviveDO.getRentId() == rentId) {
- deviveDO.setState( DevStateEnum.FREE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- deviveDO.setRentId(null);
- return deviceMapper.updateById(deviveDO);
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId( devId );
+ if (null != deviceDO && rentId.equals(deviceDO.getRentId())) {
+ deviceDO.setState( DevStateEnum.FREE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setRentId(null);
+ return deviceMapper.updateById(deviceDO);
}
return 0;
--
Gitblit v1.9.3