update

eight

2024-10-11 111ded437886aa10072434f8b0a459da24f8545a

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

@@ -2,8 +2,8 @@

import cn.lihu.jh.framework.common.util.exception.ExceptionUtils;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -47,15 +47,20 @@
    @Resource
    private DeviceService deviceService;

    @Resource
    private QueueService queueService;

    @PostMapping("/dev-ready")
    @Operation(summary = "设备准备")
    @Operation(summary = "设备领用")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
        try {
            return devRentService.readyOperation(createReqVO);
            CommonResult<Long> result = devRentService.readyOperation(createReqVO);
            queueService.startHurryUpOneBed(createReqVO.getRoomId(), createReqVO.getBedNo());
            return result;
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("devInstall: " + err);
            log.error("devReady: " + err);
            return CommonResult.error(DEV_INSTALL_EXCEPTION);
        }
    }
@@ -87,12 +92,39 @@
        }
    }

    @PostMapping("/dev-cancel")
    @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);
        }
    }

    @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);
@@ -143,7 +175,16 @@
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) {
        DevRentDO devRent = devRentService.getDevRent(id);
        return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));

        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);

        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
        if (null != deviceDO) {
            devRentRespVO.setCategory(deviceDO.getCategory());
            devRentRespVO.setBrand(deviceDO.getBrand());
            devRentRespVO.setModel(deviceDO.getModel());
        }
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/page")
@@ -167,13 +208,52 @@
                        BeanUtils.toBean(list, DevRentRespVO.class));
    }

    @GetMapping("/get-dismantle-rent")
    @Operation(summary = "获取患者设备的最近租赁情况")
    @GetMapping("/get-ready-rent")
    @Operation(summary = "获取已领取租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
    public CommonResult<DevRentRespVO> getReadyRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        searchReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
        DevRentDO devRent = devRentService.getDismantleRent( searchReqVO );
        DevRentDO devRent = devRentService.getReadyOrCancelledRent( searchReqVO );
        if (null == devRent) {
            return CommonResult.success(null);
        }

        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);

        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
        if (null != deviceDO) {
            devRentRespVO.setCategory(deviceDO.getCategory());
            devRentRespVO.setBrand(deviceDO.getBrand());
            devRentRespVO.setModel(deviceDO.getModel());
        }
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/get-installed-rent")
    @Operation(summary = "获取已安装租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getInstalledRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        DevRentDO devRent = devRentService.getInstalledOrCancelledRent( searchReqVO );
        if (null == devRent) {
            return CommonResult.success(null);
        }

        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );

        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
        devRentRespVO.setCategory( deviceDO.getCategory() );
        devRentRespVO.setBrand( deviceDO.getBrand() );
        devRentRespVO.setModel( deviceDO.getModel() );
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/get-dismantled-rent")
    @Operation(summary = "获取已拆卸租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getDismantledRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        DevRentDO devRent = devRentService.getDismantledRent( searchReqVO );
        if (null == devRent) {
            return CommonResult.success(null);
        }