From 6dc11a081203cad18b2fc7835d7532e08801c707 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 11:31:06 +0800
Subject: [PATCH] Fix 事务Bug @DevRentService
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 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 63bfaf8..d29ea73 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
@@ -60,6 +60,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> routineFinishOperation(RoutineFinishReqVO routineFinishReqVO) {
DevRentSaveReqVO createReqVO = BeanUtils.toBean(routineFinishReqVO, DevRentSaveReqVO.class);
@@ -71,9 +72,9 @@
if (null == rent_id) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
- return CommonResult.error(DEV_INSTALL_NOT_APPOINTMENT);
+ throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
+ throw exception(DEV_INSTALL_EXCEPTION);
}
rent_id = devRentDOList.getFirst().getId();
@@ -124,7 +125,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -132,16 +133,16 @@
// 鏍囨敞璁惧 宸查鍙�
Integer ret = markDevRecieved(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_FREE);
+ throw exception(DEVICE_NOT_FREE);
}
Long rent_id = createReqVO.getId();
if (null == rent_id) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() == 0)
- return CommonResult.error(DEV_INSTALL_NOT_APPOINTMENT);
+ throw exception(DEV_INSTALL_NOT_APPOINTMENT);
else if (devRentDOList.size() != 1) {
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
+ throw exception(DEV_INSTALL_EXCEPTION);
}
rent_id = devRentDOList.getFirst().getId();
@@ -192,7 +193,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -200,7 +201,7 @@
// 璁剧疆璁惧 浣跨敤涓�
Integer ret = markDevInUse(createReqVO.getDevId());
if (null == ret || 0 == ret) {
- return CommonResult.error(DEVICE_NOT_RECEIVED);
+ throw exception(DEVICE_NOT_RECEIVED);
}
Long rent_id = createReqVO.getId();
@@ -215,9 +216,9 @@
if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() == 0)
- return CommonResult.error(DEV_INSTALL_NOT_RECEIVED);
+ throw exception(DEV_INSTALL_NOT_RECEIVED);
else if (devRentDOList.size() != 1) {
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
+ throw exception(DEV_INSTALL_EXCEPTION);
}
rent_id = devRentDOList.getFirst().getId();
@@ -261,7 +262,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
updateReqVO.setState( DevRentStateEnum.DISMANTLED.getState() );
updateDevRent( updateReqVO );
@@ -302,7 +303,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
updateDevRent( updateReqVO );
@@ -340,7 +341,7 @@
// 甯歌妫�鏌� 鍙栨秷
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> cancelRoutineOperation(DevCancelReqVO cancelReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -353,7 +354,7 @@
if (null == rent_id) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
- return CommonResult.error(ROUTINE_CHECK_EXIST);
+ throw exception(ROUTINE_CHECK_EXIST);
rent_id = devRentDOList.getFirst().getId();
createReqVO.setId( rent_id );
@@ -395,7 +396,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> cancelReadyOperation(DevCancelReqVO cancelReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -413,7 +414,7 @@
if (null == rent_id) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1)
- return CommonResult.error(DEV_INSTALL_EXIST);
+ throw exception(DEV_INSTALL_EXIST);
rent_id = devRentDOList.getFirst().getId();
createReqVO.setId( rent_id );
@@ -455,7 +456,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> cancelInstallOperation(DevCancelReqVO cancelReqVO) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
@@ -478,7 +479,7 @@
if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
if (devRentDOList.size() != 1)
- return CommonResult.error(DEV_INSTALL_EXIST);
+ throw exception(DEV_INSTALL_EXIST);
rent_id = devRentDOList.getFirst().getId();
createReqVO.setId( rent_id );
@@ -514,7 +515,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
// 璁惧閬楀け鏃�, 鏍囨敞閬楀け
markDevLost( updateReqVO.getDevId(), updateReqVO.getReturnTime().toLocalDate() );
@@ -557,8 +558,6 @@
@Override
public Long createDevRent(DevRentSaveReqVO createReqVO) {
- //
-
// 鎻掑叆
DevRentDO devRent = BeanUtils.toBean(createReqVO, DevRentDO.class);
devRentMapper.insert(devRent);
--
Gitblit v1.9.3