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/controller/admin/devrent/DevRentController.java | 85 +++++++-----------------------------------
1 files changed, 15 insertions(+), 70 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index 54cb342..05e731b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -34,7 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-@Tag(name = "绠＄悊鍚庡彴 - 瑁呮満鎷嗘満")
+@Tag(name = "瑁呮満鎷嗘満")
@RestController
@RequestMapping("/ecg/dev-rent")
@Validated
@@ -55,122 +55,67 @@
@Operation(summary = "")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
- try {
- CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
- return result;
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("routineFinish: " + err);
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
- }
+ CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
+ return result;
}
@PostMapping("/dev-ready")
@Operation(summary = "璁惧棰嗙敤")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
- try {
- CommonResult<Long> result = devRentService.readyOperation(createReqVO);
- return result;
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("devReady: " + err);
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
- }
+ CommonResult<Long> result = devRentService.readyOperation(createReqVO);
+ return result;
}
@PostMapping("/dev-install")
@Operation(summary = "瑁呮満")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devInstall(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
- try {
- return devRentService.installOperation(createReqVO);
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("devInstall: " + err);
- return CommonResult.error(DEV_INSTALL_EXCEPTION);
- }
+ return devRentService.installOperation(createReqVO);
}
@PostMapping("/dev-dismantle")
@Operation(summary = "鎷嗘満")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devDismantle(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
- try {
- devRentService.dismantleOperation(createReqVO);
- return CommonResult.success(0L);
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("devDismantle: " + err);
- return CommonResult.error(DEV_DISMANTLE_EXCEPTION);
- }
+ devRentService.dismantleOperation(createReqVO);
+ return CommonResult.success(0L);
}
@PostMapping("/dev-data-entry")
@Operation(summary = "鏁版嵁褰曞叆")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devDataEntry(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
- try {
- devRentService.dataEntryOperation(createReqVO);
- return CommonResult.success(0L);
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("devDismantle: " + err);
- return CommonResult.error(DEV_DISMANTLE_EXCEPTION);
- }
+ devRentService.dataEntryOperation(createReqVO);
+ return CommonResult.success(0L);
}
-
@PostMapping("/routine-check-cancel")
@Operation(summary = "鍙栨秷甯歌妫�鏌�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
- try {
- return devRentService.cancelRoutineOperation(cancelReqVO);
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("routineCheckCancel: " + err);
- return CommonResult.error(ROUTINE_CANCEL_EXCEPTION);
- }
+ return devRentService.cancelRoutineOperation(cancelReqVO);
}
@PostMapping("/dev-ready-cancel")
@Operation(summary = "鍙栨秷棰嗙敤")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devReadyCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
- try {
- return devRentService.cancelReadyOperation(cancelReqVO);
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("devReadyCancel: " + err);
- return CommonResult.error(DEV_RECEIVE_CANCEL_EXCEPTION);
- }
+ return devRentService.cancelReadyOperation(cancelReqVO);
}
@PostMapping("/dev-install-cancel")
@Operation(summary = "鍙栨秷瑁呮満")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devInstallCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
- try {
- return devRentService.cancelInstallOperation(cancelReqVO);
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("devInstallCancel: " + err);
- return CommonResult.error(DEV_INSTALL_CANCEL_EXCEPTION);
- }
+ return devRentService.cancelInstallOperation(cancelReqVO);
}
@PostMapping("/dev-lose")
@Operation(summary = "閬楀け")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<Long> devLose(@Valid @RequestBody DevRentSaveReqVO loseReqVO) {
- try {
- return devRentService.loseOperation(loseReqVO);
- } catch ( RuntimeException runtimeException ) {
- String err = ExceptionUtils.formatException( runtimeException );
- log.error("devLose: " + err);
- return CommonResult.error(DEV_LOSE_EXCEPTION);
- }
+ return devRentService.loseOperation(loseReqVO);
}
@PostMapping("/create")
@@ -237,7 +182,7 @@
}
@GetMapping("/get-free-rent")
- @Operation(summary = "鑾峰彇宸查鍙栫璧佹儏鍐�")
+ @Operation(summary = "鏍规嵁鎮ｈ�呮垨璁惧, 鑾峰彇宸查鍙栫璧佹儏鍐�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
public CommonResult<DevRentRespVO> getFreeRent( @Valid DevRentSearchReqVO searchReqVO )
{
--
Gitblit v1.9.3