update

eight

2024-10-15 647095a34d62db02533cf9c121436900b51c757c

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

@@ -50,13 +50,27 @@
    @Resource
    private QueueService queueService;

    // 常规检查 完成
    @PostMapping("/routine-finish")
    @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);
        }
    }

    @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);
            queueService.startHurryUpOneBed(createReqVO.getRoomId(), createReqVO.getBedNo());
            return result;
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
@@ -106,16 +120,30 @@
        }
    }


    @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);
        }
    }

    @PostMapping("/dev-ready-cancel")
    @Operation(summary = "取消装机")
    @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("devCancel: " + err);
            return CommonResult.error(DEV_CANCEL_EXCEPTION);
            log.error("devReadyCancel: " + err);
            return CommonResult.error(DEV_RECEIVE_CANCEL_EXCEPTION);
        }
    }

@@ -127,8 +155,8 @@
            return devRentService.cancelInstallOperation(cancelReqVO);
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("devCancel: " + err);
            return CommonResult.error(DEV_CANCEL_EXCEPTION);
            log.error("devInstallCancel: " + err);
            return CommonResult.error(DEV_INSTALL_CANCEL_EXCEPTION);
        }
    }