From 3d10cfa8882afcfa28a7623b45232aef54fe033d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 25 十月 2024 15:51:08 +0800
Subject: [PATCH] 设备表 增加 rent_id
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 174 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 96 insertions(+), 78 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 d29ea73..a22dacf 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
@@ -69,7 +69,12 @@
// 鍚屾牱 鍦ㄩ绾︾‘瀹炴椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
+ 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());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
@@ -102,19 +107,13 @@
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
- jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
// 鏇存柊..闃熷垪鐘舵��
@@ -129,15 +128,19 @@
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();
- if (null == rent_id) {
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.READY.getState());
+ 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());
if (devRentDOList.size() == 0)
throw exception(DEV_INSTALL_NOT_APPOINTMENT);
@@ -170,19 +173,13 @@
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.getState());
- jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(createReqVO.getDevId());
- jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(createReqVO.getDevId());
+ jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
// 鏇存柊..闃熷垪鐘舵��
@@ -197,14 +194,13 @@
public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+ Long rent_id = createReqVO.getId();
// 璁剧疆璁惧 浣跨敤涓�
- 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>();
@@ -266,17 +262,18 @@
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());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
- if (jobRecordDO == null) {
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -314,7 +311,7 @@
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add( DevRentStateEnum.DATAENTERED.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
- if (jobRecordDO == null) {
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -351,7 +348,12 @@
createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState());
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
+ 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());
if (devRentDOList.size() != 1)
throw exception(ROUTINE_CHECK_EXIST);
@@ -378,19 +380,13 @@
} else {
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
- jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(null);
- jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
return CommonResult.success(rent_id);
}
@@ -400,10 +396,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);
@@ -411,7 +408,12 @@
createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState());
Long rent_id = createReqVO.getId();
- if (null == rent_id) {
+
+ List<Integer> jobTypeList = new ArrayList<Integer>();
+ jobTypeList.add( DevRentStateEnum.READY.getState());
+ 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());
if (devRentDOList.size() != 1)
throw exception(DEV_INSTALL_EXIST);
@@ -438,19 +440,13 @@
} else {
updateDevRent( createReqVO );
- List<Integer> jobTypeList = new ArrayList<Integer>();
- jobTypeList.add( DevRentStateEnum.READY.getState());
- jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
- JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
- if (null != jobRecordDO) {
- jobRecordDO.setDevId(null);
- jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
- jobRecordDO.setJobTime(createReqVO.getRentTime());
- jobRecordDO.setRemark(createReqVO.getRemark());
- jobRecordDO.setUpdater(String.valueOf(userId));
- jobRecordDO.setUpdateTime(LocalDateTime.now());
- jobRecordMapper.updateById(jobRecordDO);
- }
+ jobRecordDO.setDevId(null);
+ jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
+ jobRecordDO.setJobTime(createReqVO.getRentTime());
+ jobRecordDO.setRemark(createReqVO.getRemark());
+ jobRecordDO.setUpdater(String.valueOf(userId));
+ jobRecordDO.setUpdateTime(LocalDateTime.now());
+ jobRecordMapper.updateById(jobRecordDO);
}
return CommonResult.success(rent_id);
}
@@ -460,10 +456,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);
@@ -516,9 +513,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
+ public CommonResult<Long> dismantleExceptionOperation(DevRentSaveReqVO updateReqVO) {
+ DevStateEnum devStateEnum = null;
+ if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState())
+ devStateEnum = DevStateEnum.DAMAGED;
+ else if (updateReqVO.getState() == DevStateEnum.LOST.getState())
+ devStateEnum = DevStateEnum.LOST;
+ else
+ throw exception(DEV_DISMANTLE_EXCEPTION);
+
// 璁惧閬楀け鏃�, 鏍囨敞閬楀け
- markDevLost( updateReqVO.getDevId(), updateReqVO.getReturnTime().toLocalDate() );
+ markDevDismantleException( updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum );
updateReqVO.setState( DevRentStateEnum.LOST.getState() );
updateDevRent( updateReqVO );
@@ -529,7 +534,7 @@
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add( DevRentStateEnum.LOST.getState());
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
- if (jobRecordDO == null) {
+ if (null == jobRecordDO) {
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -632,11 +637,13 @@
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.setRentId( rentId );
deviveDO.setStateDate( LocalDate.now() );
return deviceMapper.updateById(deviveDO);
}
@@ -644,23 +651,33 @@
return 0;
}
- private Integer markDevInUse(String devId) {
- // 璁惧鏍囨敞 鍦ㄤ娇鐢�
+ // 鏍囪 璁惧宸茶浣跨敤
+ private Integer markDevInUse(String devId, Long rentId) {
DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
- if (null != deviveDO && (deviveDO.getState() == DevStateEnum.RECEIVED.getState() || deviveDO.getState() == DevStateEnum.FREE.getState())) {
+ if (null == deviveDO)
+ 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 (deviveDO.getState() == DevStateEnum.FREE.getState()) {
+ deviveDO.setState( DevStateEnum.INUSE.getState() );
+ deviveDO.setStateDate( LocalDate.now() );
+ deviveDO.setRentId( rentId );
+ return deviceMapper.updateById(deviveDO);
+ }
+
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() );
+ if (null != deviveDO && deviveDO.getState() == DevStateEnum.INUSE.getState() && deviveDO.getRentId() == rentId) {
+ deviveDO.setState( devStateEnum.getState() );
deviveDO.setStateDate( localDate );
return deviceMapper.updateById(deviveDO);
}
@@ -668,12 +685,13 @@
return 0;
}
- private Integer resumeDevFree(String devId) {
+ private Integer markDevFree(String devId, Long rentId) {
// 璁惧鏍囨敞閬楀け 鎭㈠涓虹┖闂�
DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
- if (null != deviveDO) {
+ if (null != deviveDO && deviveDO.getRentId() == rentId) {
deviveDO.setState( DevStateEnum.FREE.getState() );
deviveDO.setStateDate( LocalDate.now() );
+ deviveDO.setRentId(null);
return deviceMapper.updateById(deviveDO);
}
--
Gitblit v1.9.3