设备准备时 - 增加设置状态检查

eight

2024-09-26 84284b827ba1276eb8a4291e330e724a6561d0ab

设备准备时 - 增加设置状态检查

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

@@ -28,6 +28,8 @@

    ErrorCode DEV_MODEL_NOT_EXISTS = new ErrorCode(1_010_005_000, "设备型号不存在");
    ErrorCode DEVICE_NOT_EXISTS = new ErrorCode(1_010_005_001,  "设备不存在");
    ErrorCode DEVICE_NOT_FREE = new ErrorCode(1_010_005_002,  "设备非空闲或不存在");
    ErrorCode DEVICE_NOT_RECEIVED = new ErrorCode(1_010_005_003,  "设备未领用或不存在");

    ErrorCode DEV_INSTALL_NOT_EXISTS = new ErrorCode(1_010_006_000, "装机不存在");
    ErrorCode DEV_INSTALL_EXCEPTION = new ErrorCode(1_010_006_001, "装机内部错误");

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

@@ -62,7 +62,7 @@
        // 标注设备 已领取
        Integer ret = markDevRecieved(createReqVO.getDevId());
        if (null == ret || 0 == ret) {
            return CommonResult.error(DEVICE_NOT_EXISTS);
            return CommonResult.error(DEVICE_NOT_FREE);
        }

        Long rent_id = createReqVO.getId();
@@ -122,7 +122,7 @@
        // 设置设备 使用中
        Integer ret = markDevInUse(createReqVO.getDevId());
        if (null == ret || 0 == ret) {
            return CommonResult.error(DEVICE_NOT_EXISTS);
            return CommonResult.error(DEVICE_NOT_RECEIVED);
        }

        Long rent_id = createReqVO.getId();
@@ -418,7 +418,7 @@
    private Integer markDevRecieved(String devId) {
        // 设备标注 已领取
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO) {
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) {
            deviveDO.setState( DevStateEnum.RECEIVED.getState() );
            return deviceMapper.updateById(deviveDO);
        }
@@ -429,7 +429,7 @@
    private Integer markDevInUse(String devId) {
        // 设备标注 在使用
        DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId);
        if (null != deviveDO) {
        if (null != deviveDO && deviveDO.getState() == DevStateEnum.RECEIVED.getState()) {
            deviveDO.setState( DevStateEnum.INUSE.getState() );
            return deviceMapper.updateById(deviveDO);
        }