From e36c1e2363e36a69a3cc8ccbc00d28b16f926abd Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 07 十一月 2024 14:38:57 +0800
Subject: [PATCH] 序号表操作
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 114 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 74 insertions(+), 40 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 30f77c7..4d11472 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
@@ -128,14 +128,13 @@
public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ Long rent_id = createReqVO.getId();
// 鏍囨敞璁惧 宸查鍙�
- Integer ret = markDevRecieved(createReqVO.getDevId());
+ Integer ret = markDevRecieved(createReqVO.getDevId(), rent_id);
if (null == ret || 0 == ret) {
throw exception(DEVICE_NOT_FREE);
}
-
- Long rent_id = createReqVO.getId();
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add( DevRentStateEnum.READY.getState());
@@ -195,14 +194,19 @@
public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
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());
+ Integer ret = markDevInUse(createReqVO.getDevId(), rent_id);
if (null == ret || 0 == ret) {
throw exception(DEVICE_NOT_RECEIVED);
}
-
- Long rent_id = createReqVO.getId();
// 妫�鏌� job_record 鐢ㄤ簬纭鏄惁鏄涓�娆″畨瑁呮搷浣�
List<Integer> jobTypeList = new ArrayList<Integer>();
@@ -264,12 +268,13 @@
public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
updateReqVO.setState( DevRentStateEnum.DISMANTLED.getState() );
updateDevRent( updateReqVO );
+ Long rentId = updateReqVO.getId();
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
// 璁惧鎭㈠鍒扮┖闂�
- resumeDevFree( updateReqVO.getDevId() );
+ markDevFree( updateReqVO.getDevId(), rentId );
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add( DevRentStateEnum.DISMANTLED.getState());
@@ -397,10 +402,11 @@
public CommonResult<Long> cancelReadyOperation(DevCancelReqVO cancelReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ Long rentId = cancelReqVO.getId();
// 鑻ヤ粠 瑁呮満 鏀逛负 鍙栨秷瑁呮満锛屾仮澶嶈澶囩姸鎬�
if (null != cancelReqVO.getDevId()) {
- resumeDevFree( cancelReqVO.getDevId() );
+ markDevFree( cancelReqVO.getDevId(), rentId );
}
DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
@@ -456,10 +462,11 @@
public CommonResult<Long> cancelInstallOperation(DevCancelReqVO cancelReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ Long rentId = cancelReqVO.getId();
// 鑻ヤ粠 瑁呮満 鏀逛负 鍙栨秷瑁呮満锛屾仮澶嶈澶囩姸鎬�
if (null != cancelReqVO.getDevId()) {
- resumeDevFree( cancelReqVO.getDevId() );
+ markDevFree( cancelReqVO.getDevId(), rentId );
}
DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
@@ -512,17 +519,31 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
- // 璁惧閬楀け鏃�, 鏍囨敞閬楀け
- markDevLost( updateReqVO.getDevId(), updateReqVO.getReturnTime().toLocalDate() );
+ public CommonResult<Long> dismantleExceptionOperation(DevRentSaveReqVO updateReqVO) {
+ DevStateEnum devStateEnum = null;
+ DevRentStateEnum devRentStateEnum = null;
+ if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState()) {
+ devStateEnum = DevStateEnum.DAMAGED;
+ devRentStateEnum = DevRentStateEnum.DAMAGED;
+ }
+ else if (updateReqVO.getState() == DevStateEnum.LOST.getState()) {
+ devStateEnum = DevStateEnum.LOST;
+ devRentStateEnum = DevRentStateEnum.LOST;
+ }
+ else
+ throw exception(DEV_DISMANTLE_EXCEPTION);
- updateReqVO.setState( DevRentStateEnum.LOST.getState() );
+ // 璁惧閬楀け鏃�, 鏍囨敞閬楀け
+ markDevDismantleException( updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum );
+
+ 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) {
@@ -534,13 +555,13 @@
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() );
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() );
@@ -628,49 +649,62 @@
return devRentMapper.getRentByState(searchReqVO);
}
- private Integer markDevRecieved(String devId) {
+ // 鏍囪 璁惧宸茶棰嗗彇
+ 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.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;
}
- private Integer markDevInUse(String devId) {
- // 璁惧鏍囨敞 鍦ㄤ娇鐢�
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO && (deviveDO.getState() == DevStateEnum.RECEIVED.getState() || deviveDO.getState() == DevStateEnum.FREE.getState())) {
- deviveDO.setState( DevStateEnum.INUSE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- return deviceMapper.updateById(deviveDO);
+ // 鏍囪 璁惧宸茶浣跨敤
+ private Integer markDevInUse(String devId, Long rentId) {
+ DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
+ if (null == deviceDO)
+ return 0;
+
+ if (DevStateEnum.RECEIVED.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
+ deviceDO.setState( DevStateEnum.INUSE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ return deviceMapper.updateById(deviceDO);
+ }
+
+ if (DevStateEnum.FREE.isEqual(deviceDO.getState())) {
+ deviceDO.setState( DevStateEnum.INUSE.getState() );
+ deviceDO.setStateDate( LocalDate.now() );
+ deviceDO.setRentId( rentId );
+ return deviceMapper.updateById(deviceDO);
}
return 0;
}
- private Integer markDevLost(String devId, LocalDate localDate) {
+ private Integer markDevDismantleException(String devId, Long rentId, LocalDate localDate, DevStateEnum devStateEnum) {
// 璁惧鏍囨敞閬楀け
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO) {
- deviveDO.setState( DevStateEnum.LOST.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;
}
- private Integer resumeDevFree(String devId) {
+ private Integer markDevFree(String devId, Long rentId) {
// 璁惧鏍囨敞閬楀け 鎭㈠涓虹┖闂�
- DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
- if (null != deviveDO) {
- deviveDO.setState( DevStateEnum.FREE.getState() );
- deviveDO.setStateDate( LocalDate.now() );
- 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