From 50765d4a02bbe1eddc6802697c6f89433afef565 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 12 十一月 2024 14:07:50 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 182 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 137 insertions(+), 45 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..d1b9401 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
@@ -3,14 +3,17 @@
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordSaveReqVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.mysql.devmanage.DeviceMapper;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +43,9 @@
@Service
@Validated
public class DevRentServiceImpl implements DevRentService {
+
+ @Resource
+ QueueServiceTxFunctions queueServiceTxFunctions;
@Resource
private DevRentMapper devRentMapper;
@@ -75,7 +81,7 @@
jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
@@ -98,6 +104,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -117,8 +124,25 @@
}
// 鏇存柊..闃熷垪鐘舵��
- queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
- QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+ //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+ QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
+ createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
+ firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
+ queueMapper.updateById( firstOnStageQueueItem );
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstOnStageQueueItem.getBookCheckType() );
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
+ if (!affinityAffinityWaitingItems.isEmpty()) {
+ QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
+ tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
+ queueMapper.updateById(tmpQueueDO);
+ }
+ }
return CommonResult.success(rent_id);
}
@@ -141,7 +165,7 @@
jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
@@ -164,6 +188,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -183,8 +208,39 @@
}
// 鏇存柊..闃熷垪鐘舵��
- queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
- QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+ //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ // QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
+
+ QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstOnStageQueueItem.getBookCheckType() );
+
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.RECEIVED
+ firstOnStageQueueItem.setStatus(QueueStatusEnum.RECEIVED.getStatus()); // 榛樿鐘舵�� 璁剧疆
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityInstallingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.INSTALLING.getStatus());
+ if (!affinityInstallingItems.isEmpty()) {
+ firstOnStageQueueItem.setStatus(QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
+ }
+ }
+ queueMapper.updateById( firstOnStageQueueItem );
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityReadyItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.READY.getStatus());
+ if (!affinityReadyItems.isEmpty()) {
+ QueueDO tmpQueueDO = affinityReadyItems.get(0);
+ tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
+ queueMapper.updateById(tmpQueueDO);
+ } else {
+ List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
+ if (!affinityAffinityWaitingItems.isEmpty()) {
+ QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
+ tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
+ queueMapper.updateById(tmpQueueDO);
+ }
+ }
+ }
return CommonResult.success(rent_id);
}
@@ -195,6 +251,12 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
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);
@@ -210,7 +272,7 @@
// 绗竴娆� 瀹夎鎿嶄綔
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_RECEIVED);
else if (devRentDOList.size() != 1) {
@@ -233,6 +295,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALLED.getState() );
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -251,8 +314,25 @@
}
// 鏇存柊..闃熷垪鐘舵��
- queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
- QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+ //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
+ // QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+ QueueDO firstInstallingQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
+ createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
+ // QueueStatusEnum.INSTALLING => QueueStatusEnum.FINISH
+ firstInstallingQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
+ queueMapper.updateById( firstInstallingQueueItem );
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstInstallingQueueItem.getBookCheckType() );
+ if (checkTypeDO.getAffinityCheckTypes().length > 0) {
+ List<QueueDO> affinityAffinityReceivedItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstInstallingQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
+ if (!affinityAffinityReceivedItems.isEmpty()) {
+ QueueDO tmpQueueDO = affinityAffinityReceivedItems.get(0);
+ tmpQueueDO.setStatus(QueueStatusEnum.INSTALLING.getStatus());
+ queueMapper.updateById(tmpQueueDO);
+ }
+ }
return CommonResult.success(rent_id);
}
@@ -285,6 +365,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
@@ -323,6 +404,7 @@
jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
@@ -354,7 +436,7 @@
jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
throw exception(ROUTINE_CHECK_EXIST);
@@ -374,6 +456,7 @@
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -414,7 +497,7 @@
jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
throw exception(DEV_INSTALL_EXIST);
@@ -434,6 +517,7 @@
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -474,7 +558,7 @@
jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
- List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
+ List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() != 1)
throw exception(DEV_INSTALL_EXIST);
@@ -494,6 +578,7 @@
jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
@@ -515,23 +600,29 @@
@Transactional(rollbackFor = Exception.class)
public CommonResult<Long> dismantleExceptionOperation(DevRentSaveReqVO updateReqVO) {
DevStateEnum devStateEnum = null;
- if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState())
+ DevRentStateEnum devRentStateEnum = null;
+ if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState()) {
devStateEnum = DevStateEnum.DAMAGED;
- else if (updateReqVO.getState() == DevStateEnum.LOST.getState())
+ devRentStateEnum = DevRentStateEnum.DAMAGED;
+ }
+ else if (updateReqVO.getState() == DevStateEnum.LOST.getState()) {
devStateEnum = DevStateEnum.LOST;
+ devRentStateEnum = DevRentStateEnum.LOST;
+ }
else
throw exception(DEV_DISMANTLE_EXCEPTION);
// 璁惧閬楀け鏃�, 鏍囨敞閬楀け
markDevDismantleException( updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum );
- updateReqVO.setState( DevRentStateEnum.LOST.getState() );
+ updateReqVO.setState( devRentStateEnum.getState() );
updateDevRent( updateReqVO );
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.DAMAGED.getState());
jobTypeList.add( DevRentStateEnum.LOST.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
if (null == jobRecordDO) {
@@ -543,13 +634,14 @@
jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
- jobRecordSaveReqVO.setJobType( DevRentStateEnum.LOST.getState() );
+ jobRecordSaveReqVO.setJobType( devRentStateEnum.getState() );
jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
+ jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
jobRecordMapper.insert(jobRecord);
} else {
- jobRecordDO.setJobType( DevRentStateEnum.LOST.getState() );
+ jobRecordDO.setJobType( devRentStateEnum.getState() );
jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
jobRecordDO.setRemark( updateReqVO.getRemark() );
jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -640,12 +732,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 +745,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 +767,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 +779,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