update

eight

2024-10-08 ddf772bc079de92ff4bcba8c0f1624b6398e0dad

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java

@@ -100,12 +100,25 @@
        }
    }

    @PostMapping("/dev-cancel")
    @PostMapping("/dev-ready-cancel")
    @Operation(summary = "取消装机")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> devCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
    public CommonResult<Long> devReadyCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
        try {
            return devRentService.cancelOperation(cancelReqVO);
            return devRentService.cancelReadyOperation(cancelReqVO);
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("devCancel: " + err);
            return CommonResult.error(DEV_CANCEL_EXCEPTION);
        }
    }

    @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("devCancel: " + err);