设备表 增加 rent_id

eight

2024-10-25 3d10cfa8882afcfa28a7623b45232aef54fe033d

设备表 增加 rent_id

设备表操作 加强逻辑控制

 jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/DevStateEnum.java

@@ -18,7 +18,10 @@
    FREE(0, "空闲"),
    RECEIVED(5, "已领取"),
    INUSE(10, "使用中"),
    LOST(20, "已遗失");
    LOST(20, "已遗失"),
    DAMAGED(30, "已损坏"),
    UNDER_MAINTENANCE(40, "维修中"),
    SCRAPPED(50, "已报废");

    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DevStateEnum::getState).toArray();


 jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java

@@ -42,9 +42,9 @@
    ErrorCode DEV_LOSE_EXCEPTION = new ErrorCode(1_010_006_004, "遗失内部错误");
    ErrorCode DEV_INSTALL_EXIST = new ErrorCode(1_010_006_005, "当天已有装机");
    ErrorCode DEV_DISMANTLE_EXIST = new ErrorCode(1_010_006_006, "当天已有拆机");
    ErrorCode DEV_INSTALL_NOT_APPOINTMENT = new ErrorCode(1_010_006_007, "请先预约确认");
    ErrorCode DEV_INSTALL_NOT_RECEIVED = new ErrorCode(1_010_006_008, "请先领用设备");
    ErrorCode ROUTINE_CHECK_EXIST = new ErrorCode(1_010_006_009, "当天已有检查");
    ErrorCode DEV_INSTALL_NOT_APPOINTMENT = new ErrorCode(1_010_006_014, "请先预约确认");
    ErrorCode DEV_INSTALL_NOT_RECEIVED = new ErrorCode(1_010_006_018, "请先领用设备");
    ErrorCode ROUTINE_CHECK_EXIST = new ErrorCode(1_010_006_022, "当天已有检查");

    ErrorCode JOB_RECORD_NOT_EXISTS = new ErrorCode(1_010_007_000, "工作记录不存在");


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

@@ -2,6 +2,7 @@

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.DevStateEnum;
import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
import lombok.extern.slf4j.Slf4j;
@@ -115,7 +116,16 @@
    @Operation(summary = "遗失")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> devLose(@Valid @RequestBody DevRentSaveReqVO loseReqVO) {
        return devRentService.loseOperation(loseReqVO);
        loseReqVO.setState( DevStateEnum.LOST.getState() );
        return devRentService.dismantleExceptionOperation(loseReqVO);
    }

    @PostMapping("/dev-damage")
    @Operation(summary = "损坏")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> devDamage(@Valid @RequestBody DevRentSaveReqVO damageReqVO) {
        damageReqVO.setState( DevStateEnum.DAMAGED.getState() );
        return devRentService.dismantleExceptionOperation(damageReqVO);
    }

    @PostMapping("/create")

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java

@@ -72,4 +72,7 @@
     * 0 - 空闲 10 - 使用中 20 - 已遗失
     */
    private Integer state;

    @TableField(updateStrategy = FieldStrategy.ALWAYS)
    private Long rentId;
}

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

@@ -93,7 +93,7 @@
     * @param createReqVO 创建信息
     * @return 编号
     */
    CommonResult<Long> loseOperation(@Valid DevRentSaveReqVO createReqVO);
    CommonResult<Long> dismantleExceptionOperation(@Valid DevRentSaveReqVO createReqVO);

    /**
     * 创建装机拆机

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

@@ -128,14 +128,13 @@
    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) {
            throw exception(DEVICE_NOT_FREE);
        }

        Long rent_id = createReqVO.getId();

        List<Integer> jobTypeList = new ArrayList<Integer>();
        jobTypeList.add( DevRentStateEnum.READY.getState());
@@ -195,14 +194,13 @@
    public CommonResult<Long> installOperation(DevRentSaveReqVO createReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        Long rent_id = createReqVO.getId();

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

        Long rent_id = createReqVO.getId();

        // 检查 job_record 用于确认是否是第一次安装操作
        List<Integer> jobTypeList = new ArrayList<Integer>();
@@ -264,12 +262,13 @@
    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());
@@ -397,10 +396,11 @@
    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);
@@ -456,10 +456,11 @@
    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);
@@ -512,9 +513,17 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> loseOperation(DevRentSaveReqVO updateReqVO) {
    public CommonResult<Long> dismantleExceptionOperation(DevRentSaveReqVO updateReqVO) {
        DevStateEnum devStateEnum = null;
        if (updateReqVO.getState() == DevStateEnum.DAMAGED.getState())
            devStateEnum = DevStateEnum.DAMAGED;
        else if (updateReqVO.getState() == DevStateEnum.LOST.getState())
            devStateEnum = DevStateEnum.LOST;
        else
            throw exception(DEV_DISMANTLE_EXCEPTION);

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

        updateReqVO.setState( DevRentStateEnum.LOST.getState() );
        updateDevRent( updateReqVO );
@@ -628,11 +637,13 @@
        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.setRentId( rentId );
            deviveDO.setStateDate( LocalDate.now() );
            return deviceMapper.updateById(deviveDO);
        }
@@ -640,23 +651,33 @@
        return 0;
    }

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

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

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

        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() );
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.INUSE.getState() && deviveDO.getRentId() == rentId) {
            deviveDO.setState( devStateEnum.getState() );
            deviveDO.setStateDate( localDate );
            return deviceMapper.updateById(deviveDO);
        }
@@ -664,12 +685,13 @@
        return 0;
    }

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