装机&放弃 逻辑新增state

eight

2024-09-24 91c60b946e0d2e8abc2c350598aa6d47ed28e83c

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

@@ -1,6 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.devrent;

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 lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -21,7 +24,6 @@

import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
import static cn.lihu.jh.framework.common.util.exception.ExceptionUtils.formatException;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;

import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
@@ -41,6 +43,9 @@

    @Resource
    private DevRentService devRentService;

    @Resource
    private DeviceService deviceService;

    @PostMapping("/dev-install")
    @Operation(summary = "装机")
@@ -79,6 +84,19 @@
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("devCancel: " + err);
            return CommonResult.error(DEV_CANCEL_EXCEPTION);
        }
    }

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

@@ -136,12 +154,23 @@
                        BeanUtils.toBean(list, DevRentRespVO.class));
    }

    @GetMapping("/get-latest-rent")
    @GetMapping("/get-dismantle-rent")
    @Operation(summary = "获取患者设备的最近租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        DevRentDO devRent = devRentService.getLatestRent( searchReqVO );
        return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));
        searchReqVO.setState( DevRentStateEnum.INSTALLED.getState() );
        DevRentDO devRent = devRentService.getDismantleRent( 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);
    }
}