update

eight

2024-11-12 d8c1b8408ca24f3e02427c7885da8c87c90f16a0

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java

@@ -3,14 +3,17 @@
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.JobRecordSaveReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.mysql.devmanage.DeviceMapper;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +45,9 @@
public class DevRentServiceImpl implements DevRentService {

    @Resource
    QueueServiceTxFunctions queueServiceTxFunctions;

    @Resource
    private DevRentMapper devRentMapper;

    @Resource
@@ -60,18 +66,26 @@
    }

    @Override
    public CommonResult<Long> routineFinishOperation(DevRentSaveReqVO createReqVO) {
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> routineFinishOperation(RoutineFinishReqVO routineFinishReqVO) {
        DevRentSaveReqVO createReqVO = BeanUtils.toBean(routineFinishReqVO, DevRentSaveReqVO.class);

        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();

        // 同样 在预约确实时 就进入 [dev_rent] 表了
        Long rent_id = createReqVO.getId();
        if (null == rent_id) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());

        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
        jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
        if (null == jobRecordDO) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
            if (devRentDOList.size() == 0)
                return CommonResult.error(DEV_INSTALL_NOT_APPOINTMENT);
                throw  exception(DEV_INSTALL_NOT_APPOINTMENT);
            else if (devRentDOList.size() != 1) {
                return CommonResult.error(DEV_INSTALL_EXCEPTION);
                throw  exception(DEV_INSTALL_EXCEPTION);
            }

            rent_id = devRentDOList.getFirst().getId();
@@ -90,6 +104,7 @@
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
            jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
            jobRecordSaveReqVO.setSummary("");
            jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );

            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
@@ -99,47 +114,62 @@

            updateDevRent( createReqVO );

            List<Integer> jobTypeList = new ArrayList<Integer>();
            jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
            jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
            JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
            if (null != jobRecordDO) {
                jobRecordDO.setDevId(createReqVO.getDevId());
                jobRecordDO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
                jobRecordDO.setJobTime(createReqVO.getRentTime());
                jobRecordDO.setRemark(createReqVO.getRemark());
                jobRecordDO.setUpdater(String.valueOf(userId));
                jobRecordDO.setUpdateTime(LocalDateTime.now());
                jobRecordMapper.updateById(jobRecordDO);
            }
            jobRecordDO.setDevId(createReqVO.getDevId());
            jobRecordDO.setJobType( DevRentStateEnum.ROUTINE_FINISH.getState() );
            jobRecordDO.setJobTime(createReqVO.getRentTime());
            jobRecordDO.setRemark(createReqVO.getRemark());
            jobRecordDO.setUpdater(String.valueOf(userId));
            jobRecordDO.setUpdateTime(LocalDateTime.now());
            jobRecordMapper.updateById(jobRecordDO);
        }

        // 更新..队列状态
        queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
                QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
        //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
        //        QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());

        QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
                                            createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
        // QueueStatusEnum.ONSTAGE  =>  QueueStatusEnum.FINISH
        firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus());  // 默认状态 设置
        queueMapper.updateById( firstOnStageQueueItem );

        // 检查项目.亲和性 处理逻辑
        CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstOnStageQueueItem.getBookCheckType() );
        if (checkTypeDO.getAffinityCheckTypes().length > 0) {
            List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
            if (!affinityAffinityWaitingItems.isEmpty()) {
                QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
                tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
                queueMapper.updateById(tmpQueueDO);
            }
        }

        return CommonResult.success(rent_id);
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        Long rent_id = createReqVO.getId();

        // 标注设备 已领取
        Integer ret = markDevRecieved(createReqVO.getDevId());
        Integer ret = markDevRecieved(createReqVO.getDevId(), rent_id);
        if (null == ret || 0 == ret) {
            return CommonResult.error(DEVICE_NOT_FREE);
            throw exception(DEVICE_NOT_FREE);
        }

        Long rent_id = createReqVO.getId();
        if (null == rent_id) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());
        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.READY.getState());
        jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
        if (null == jobRecordDO) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
            if (devRentDOList.size() == 0)
                return CommonResult.error(DEV_INSTALL_NOT_APPOINTMENT);
                throw exception(DEV_INSTALL_NOT_APPOINTMENT);
            else if (devRentDOList.size() != 1) {
                return CommonResult.error(DEV_INSTALL_EXCEPTION);
                throw exception(DEV_INSTALL_EXCEPTION);
            }

            rent_id = devRentDOList.getFirst().getId();
@@ -158,6 +188,7 @@
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.READY.getState() );
            jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
            jobRecordSaveReqVO.setSummary("");
            jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );

            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
@@ -167,41 +198,71 @@

            updateDevRent( createReqVO );

            List<Integer> jobTypeList = new ArrayList<Integer>();
            jobTypeList.add( DevRentStateEnum.READY.getState());
            jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
            JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
            if (null != jobRecordDO) {
                jobRecordDO.setDevId(createReqVO.getDevId());
                jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
                jobRecordDO.setJobTime(createReqVO.getRentTime());
                jobRecordDO.setRemark(createReqVO.getRemark());
                jobRecordDO.setUpdater(String.valueOf(userId));
                jobRecordDO.setUpdateTime(LocalDateTime.now());
                jobRecordMapper.updateById(jobRecordDO);
            }
            jobRecordDO.setDevId(createReqVO.getDevId());
            jobRecordDO.setJobType( DevRentStateEnum.READY.getState() );
            jobRecordDO.setJobTime(createReqVO.getRentTime());
            jobRecordDO.setRemark(createReqVO.getRemark());
            jobRecordDO.setUpdater(String.valueOf(userId));
            jobRecordDO.setUpdateTime(LocalDateTime.now());
            jobRecordMapper.updateById(jobRecordDO);
        }

        // 更新..队列状态
        queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
                QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
        //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
        //        QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());

        QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
        CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstOnStageQueueItem.getBookCheckType() );

        // QueueStatusEnum.ONSTAGE  =>  QueueStatusEnum.RECEIVED
        firstOnStageQueueItem.setStatus(QueueStatusEnum.RECEIVED.getStatus());  // 默认状态 设置
        // 检查项目.亲和性 处理逻辑
        if (checkTypeDO.getAffinityCheckTypes().length > 0) {
            List<QueueDO> affinityInstallingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.INSTALLING.getStatus());
            if (!affinityInstallingItems.isEmpty()) {
                firstOnStageQueueItem.setStatus(QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
            }
        }
        queueMapper.updateById( firstOnStageQueueItem );

        // 检查项目.亲和性 处理逻辑
        if (checkTypeDO.getAffinityCheckTypes().length > 0) {
            List<QueueDO> affinityReadyItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.READY.getStatus());
            if (!affinityReadyItems.isEmpty()) {
                QueueDO tmpQueueDO = affinityReadyItems.get(0);
                tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
                queueMapper.updateById(tmpQueueDO);
            } else {
                List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
                if (!affinityAffinityWaitingItems.isEmpty()) {
                    QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
                    tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
                    queueMapper.updateById(tmpQueueDO);
                }
            }
        }

        return CommonResult.success(rent_id);
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        Long rent_id = createReqVO.getId();

        // 设置设备 使用中
        Integer ret = markDevInUse(createReqVO.getDevId());
        if (null == ret || 0 == ret) {
            return CommonResult.error(DEVICE_NOT_RECEIVED);
        // 对于已有领用，但是装机时使用的不是已领用设备，需释放 源领用 设备
        DevRentDO devRentDO = getDevRent(rent_id);
        if ( null != devRentDO.getDevId() && !createReqVO.getDevId().equals(devRentDO.getDevId()) ) {
            markDevFree( devRentDO.getDevId(), rent_id);
        }

        Long rent_id = createReqVO.getId();
        // 设置设备 使用中
        Integer ret = markDevInUse(createReqVO.getDevId(), rent_id);
        if (null == ret || 0 == ret) {
            throw exception(DEVICE_NOT_RECEIVED);
        }

        // 检查 job_record 用于确认是否是第一次安装操作
        List<Integer> jobTypeList = new ArrayList<Integer>();
@@ -211,11 +272,11 @@

        // 第一次 安装操作
        if (null == jobRecordDO) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
            if (devRentDOList.size() == 0)
                return CommonResult.error(DEV_INSTALL_NOT_RECEIVED);
                throw exception(DEV_INSTALL_NOT_RECEIVED);
            else if (devRentDOList.size() != 1) {
                return CommonResult.error(DEV_INSTALL_EXCEPTION);
                throw exception(DEV_INSTALL_EXCEPTION);
            }

            rent_id = devRentDOList.getFirst().getId();
@@ -234,6 +295,7 @@
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.INSTALLED.getState() );
            jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
            jobRecordSaveReqVO.setSummary("");
            jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );

            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
@@ -252,28 +314,46 @@
        }

        // 更新..队列状态
        queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
                QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
        //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
        //        QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());

        QueueDO firstInstallingQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
                                                    createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
        // QueueStatusEnum.INSTALLING  =>  QueueStatusEnum.FINISH
        firstInstallingQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus());  // 默认状态 设置
        queueMapper.updateById( firstInstallingQueueItem );

        // 检查项目.亲和性 处理逻辑
        CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( firstInstallingQueueItem.getBookCheckType() );
        if (checkTypeDO.getAffinityCheckTypes().length > 0) {
            List<QueueDO> affinityAffinityReceivedItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstInstallingQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
            if (!affinityAffinityReceivedItems.isEmpty()) {
                QueueDO tmpQueueDO = affinityAffinityReceivedItems.get(0);
                tmpQueueDO.setStatus(QueueStatusEnum.INSTALLING.getStatus());
                queueMapper.updateById(tmpQueueDO);
            }
        }

        return CommonResult.success(rent_id);
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public Long dismantleOperation(DevRentSaveReqVO updateReqVO) {
        updateReqVO.setState( DevRentStateEnum.DISMANTLED.getState() );
        updateDevRent( updateReqVO );
        Long rentId = updateReqVO.getId();

        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();

        // 设备恢复到空闲
        resumeDevFree( updateReqVO.getDevId() );
        markDevFree( updateReqVO.getDevId(), rentId );

        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.DISMANTLED.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
        if (jobRecordDO == null) {
        if (null == jobRecordDO) {
            JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
            jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
            jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -285,6 +365,7 @@
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.DISMANTLED.getState() );
            jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
            jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
            jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
        } else {
@@ -300,7 +381,7 @@
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public Long dataEntryOperation(DevRentSaveReqVO updateReqVO) {
        updateReqVO.setState( DevRentStateEnum.DATAENTERED.getState() );
        updateDevRent( updateReqVO );
@@ -311,7 +392,7 @@
        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.DATAENTERED.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
        if (jobRecordDO == null) {
        if (null == jobRecordDO) {
            JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
            jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
            jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -323,6 +404,7 @@
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() );
            jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
            jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
            jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
        } else {
@@ -336,15 +418,72 @@
        return updateReqVO.getId();
    }

    // 常规检查 取消
    @Override
    @Transactional
    public CommonResult<Long> cancelReadyOperation(DevCancelReqVO cancelReqVO) {
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> cancelRoutineOperation(DevCancelReqVO cancelReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();

        DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
        createReqVO.setDevId(null);
        createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState());

        Long rent_id = createReqVO.getId();

        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.ROUTINE_FINISH.getState());
        jobTypeList.add( DevRentStateEnum.ROUTINE_CANCELLED.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
        if (null == jobRecordDO) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
            if (devRentDOList.size() != 1)
                throw exception(ROUTINE_CHECK_EXIST);

            rent_id = devRentDOList.getFirst().getId();
            createReqVO.setId( rent_id );
            createReqVO.setState( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
            updateDevRent( createReqVO );

            JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
            jobRecordSaveReqVO.setRentId(rent_id);
            jobRecordSaveReqVO.setDevId(null);
            jobRecordSaveReqVO.setDocId(userId);
            jobRecordSaveReqVO.setDocName(userNickname);
            jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
            jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.ROUTINE_CANCELLED.getState() );
            jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
            jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
            jobRecordSaveReqVO.setSummary("");
            jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );

            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
        } else {
            updateDevRent( createReqVO );

            jobRecordDO.setDevId(null);
            jobRecordDO.setJobType(DevRentStateEnum.ROUTINE_CANCELLED.getState());
            jobRecordDO.setJobTime(createReqVO.getRentTime());
            jobRecordDO.setRemark(createReqVO.getRemark());
            jobRecordDO.setUpdater(String.valueOf(userId));
            jobRecordDO.setUpdateTime(LocalDateTime.now());
            jobRecordMapper.updateById(jobRecordDO);
        }
        return CommonResult.success(rent_id);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> cancelReadyOperation(DevCancelReqVO cancelReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        Long rentId = cancelReqVO.getId();

        // 若从 装机 改为 取消装机，恢复设备状态
        if (null != cancelReqVO.getDevId()) {
            resumeDevFree( cancelReqVO.getDevId() );
            markDevFree( cancelReqVO.getDevId(),  rentId );
        }

        DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
@@ -352,10 +491,15 @@
        createReqVO.setState( DevRentStateEnum.READY_CANCELLED.getState());

        Long rent_id = createReqVO.getId();
        if (null == rent_id) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.FREE.getState());

        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.READY.getState());
        jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
        if (null == jobRecordDO) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
            if (devRentDOList.size() != 1)
                return CommonResult.error(DEV_INSTALL_EXIST);
                throw exception(DEV_INSTALL_EXIST);

            rent_id = devRentDOList.getFirst().getId();
            createReqVO.setId( rent_id );
@@ -373,38 +517,34 @@
            jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
            jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
            jobRecordSaveReqVO.setSummary("");
            jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );

            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
        } else {
            updateDevRent( createReqVO );

            List<Integer> jobTypeList = new ArrayList<Integer>();
            jobTypeList.add( DevRentStateEnum.READY.getState());
            jobTypeList.add( DevRentStateEnum.READY_CANCELLED.getState());
            JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
            if (null != jobRecordDO) {
                jobRecordDO.setDevId(null);
                jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
                jobRecordDO.setJobTime(createReqVO.getRentTime());
                jobRecordDO.setRemark(createReqVO.getRemark());
                jobRecordDO.setUpdater(String.valueOf(userId));
                jobRecordDO.setUpdateTime(LocalDateTime.now());
                jobRecordMapper.updateById(jobRecordDO);
            }
            jobRecordDO.setDevId(null);
            jobRecordDO.setJobType(DevRentStateEnum.READY_CANCELLED.getState());
            jobRecordDO.setJobTime(createReqVO.getRentTime());
            jobRecordDO.setRemark(createReqVO.getRemark());
            jobRecordDO.setUpdater(String.valueOf(userId));
            jobRecordDO.setUpdateTime(LocalDateTime.now());
            jobRecordMapper.updateById(jobRecordDO);
        }
        return CommonResult.success(rent_id);
    }

    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> cancelInstallOperation(DevCancelReqVO cancelReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        Long rentId = cancelReqVO.getId();

        // 若从 装机 改为 取消装机，恢复设备状态
        if (null != cancelReqVO.getDevId()) {
            resumeDevFree( cancelReqVO.getDevId() );
            markDevFree( cancelReqVO.getDevId(), rentId );
        }

        DevRentSaveReqVO createReqVO = BeanUtils.toBean(cancelReqVO, DevRentSaveReqVO.class);
@@ -418,9 +558,9 @@
        jobTypeList.add( DevRentStateEnum.INSTALL_CANCELLED.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
        if (null == jobRecordDO) {
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatIdAndState(createReqVO.getPatId(), DevRentStateEnum.READY.getState());
            List<DevRentDO>  devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.READY.getState());
            if (devRentDOList.size() != 1)
                return CommonResult.error(DEV_INSTALL_EXIST);
                throw exception(DEV_INSTALL_EXIST);

            rent_id = devRentDOList.getFirst().getId();
            createReqVO.setId( rent_id );
@@ -438,6 +578,7 @@
            jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
            jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
            jobRecordSaveReqVO.setSummary("");
            jobRecordSaveReqVO.setCheckType( createReqVO.getCheckType() );

            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
@@ -456,21 +597,35 @@
    }

    @Override
    @Transactional
    public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
        // 设备遗失时, 标注遗失
        markDevLost( updateReqVO.getDevId(), updateReqVO.getReturnTime().toLocalDate() );
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> dismantleExceptionOperation(DevRentSaveReqVO updateReqVO) {
        DevStateEnum devStateEnum = null;
        DevRentStateEnum devRentStateEnum = null;
        if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState()) {
            devStateEnum = DevStateEnum.DAMAGED;
            devRentStateEnum = DevRentStateEnum.DAMAGED;
        }
        else if (updateReqVO.getState() == DevStateEnum.LOST.getState()) {
            devStateEnum = DevStateEnum.LOST;
            devRentStateEnum = DevRentStateEnum.LOST;
        }
        else
            throw exception(DEV_DISMANTLE_EXCEPTION);

        updateReqVO.setState( DevRentStateEnum.LOST.getState() );
        // 设备遗失时, 标注遗失
        markDevDismantleException( updateReqVO.getDevId(), updateReqVO.getId(), updateReqVO.getReturnTime().toLocalDate(), devStateEnum );

        updateReqVO.setState( devRentStateEnum.getState() );
        updateDevRent( updateReqVO );

        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();

        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.DAMAGED.getState());
        jobTypeList.add( DevRentStateEnum.LOST.getState());
        JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(updateReqVO.getId(), userId, jobTypeList);
        if (jobRecordDO == null) {
        if (null == jobRecordDO) {
            JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
            jobRecordSaveReqVO.setRentId( updateReqVO.getId() );
            jobRecordSaveReqVO.setDevId( updateReqVO.getDevId() );
@@ -479,13 +634,14 @@
            jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() );
            jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() );
            jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() );
            jobRecordSaveReqVO.setJobType( DevRentStateEnum.LOST.getState() );
            jobRecordSaveReqVO.setJobType( devRentStateEnum.getState() );
            jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() );
            jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
            jobRecordSaveReqVO.setCheckType( updateReqVO.getCheckType() );
            JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
            jobRecordMapper.insert(jobRecord);
        } else {
            jobRecordDO.setJobType( DevRentStateEnum.LOST.getState() );
            jobRecordDO.setJobType( devRentStateEnum.getState() );
            jobRecordDO.setJobTime( updateReqVO.getReturnTime() );
            jobRecordDO.setRemark( updateReqVO.getRemark() );
            jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() );
@@ -499,8 +655,6 @@

    @Override
    public Long createDevRent(DevRentSaveReqVO createReqVO) {
        //

        // 插入
        DevRentDO devRent = BeanUtils.toBean(createReqVO, DevRentDO.class);
        devRentMapper.insert(devRent);
@@ -551,6 +705,14 @@
    }

    @Override
    public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) {
        List<Integer> stateList = new ArrayList<>();
        stateList.add( DevRentStateEnum.FREE.getState() );
        searchReqVO.setStateList( stateList );
        return devRentMapper.getRentByState(searchReqVO);
    }

    @Override
    public DevRentDO getReadyOrCancelledRent(DevRentSearchReqVO searchReqVO) {
        List<Integer> stateList = new ArrayList<>();
        stateList.add( DevRentStateEnum.READY.getState() );
@@ -567,49 +729,62 @@
        return devRentMapper.getRentByState(searchReqVO);
    }

    private Integer markDevRecieved(String devId) {
    // 标记 设备已被领取
    private Integer markDevRecieved(String devId, Long rentId) {
        // 设备标注 已领取
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
            deviveDO.setState( DevStateEnum.RECEIVED.getState() );
            deviveDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviveDO);
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviceDO && DevStateEnum.FREE.isEqual(deviceDO.getState())) {
            deviceDO.setState( DevStateEnum.RECEIVED.getState() );
            deviceDO.setRentId( rentId );
            deviceDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviceDO);
        }

        return 0;
    }

    private Integer markDevInUse(String devId) {
        // 设备标注 在使用
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO && (deviveDO.getState() == DevStateEnum.RECEIVED.getState() || deviveDO.getState() == DevStateEnum.FREE.getState())) {
            deviveDO.setState( DevStateEnum.INUSE.getState() );
            deviveDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviveDO);
    // 标记 设备已被使用
    private Integer markDevInUse(String devId, Long rentId) {
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
        if (null == deviceDO)
            return 0;

        if (DevStateEnum.RECEIVED.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
            deviceDO.setState( DevStateEnum.INUSE.getState() );
            deviceDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviceDO);
        }

        if (DevStateEnum.FREE.isEqual(deviceDO.getState())) {
            deviceDO.setState( DevStateEnum.INUSE.getState() );
            deviceDO.setStateDate( LocalDate.now() );
            deviceDO.setRentId( rentId );
            return deviceMapper.updateById(deviceDO);
        }

        return 0;
    }

    private Integer markDevLost(String devId, LocalDate localDate) {
    private Integer markDevDismantleException(String devId, Long rentId, LocalDate localDate, DevStateEnum devStateEnum) {
        // 设备标注遗失
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO) {
            deviveDO.setState( DevStateEnum.LOST.getState() );
            deviveDO.setStateDate( localDate );
            return deviceMapper.updateById(deviveDO);
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviceDO && DevStateEnum.INUSE.isEqual(deviceDO.getState()) && rentId.equals(deviceDO.getRentId())) {
            deviceDO.setState( devStateEnum.getState() );
            deviceDO.setStateDate( localDate );
            return deviceMapper.updateById(deviceDO);
        }

        return 0;
    }

    private Integer resumeDevFree(String devId) {
    private Integer markDevFree(String devId, Long rentId) {
        // 设备标注遗失 恢复为空闲
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId );
        if (null != deviveDO) {
            deviveDO.setState( DevStateEnum.FREE.getState() );
            deviveDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviveDO);
        DeviceDO deviceDO = deviceMapper.getDeviceByDevId( devId );
        if (null != deviceDO && rentId.equals(deviceDO.getRentId())) {
            deviceDO.setState( DevStateEnum.FREE.getState() );
            deviceDO.setStateDate( LocalDate.now() );
            deviceDO.setRentId(null);
            return deviceMapper.updateById(deviceDO);
        }
        
        return 0;