Fix 事务Bug @DevRentService

eight

2024-10-24 6dc11a081203cad18b2fc7835d7532e08801c707

 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 )
    {