liding
2 天以前 4c33acfe648e9b008f91c5e2cf446550e6b0174d
main-business/src/main/java/com/ruoyi/business/service/impl/EquipmentManagementServiceImpl.java
@@ -11,11 +11,15 @@
import com.ruoyi.business.service.EquipmentManagementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.business.vo.EquipmentManagementVo;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.beans.Transient;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -66,7 +70,8 @@
                    // 查询该设备的使用总量(usageQuantity)
                    LambdaQueryWrapper<EquipmentUsageRecord> usageQueryWrapper = new LambdaQueryWrapper<>();
                    usageQueryWrapper.eq(EquipmentUsageRecord::getEquipmentId, entity.getId());
                    usageQueryWrapper.eq(EquipmentUsageRecord::getEquipmentId, entity.getId())
                            .eq(EquipmentUsageRecord::getEquipmentStatus, 1);
                    // 计算总使用量
                    Integer totalUsage = equipmentUsageRecordMapper.selectList(usageQueryWrapper).stream()
@@ -109,7 +114,18 @@
    }
    @Override
    @Transactional(isolation = Isolation.REPEATABLE_READ)
    public int delByIds(Long[] ids) {
        return equipmentManagementMapper.deleteByIds(Arrays.asList(ids));
        // 1. 检查设备是否正在使用(添加行锁 for update)
        List<EquipmentUsageRecord> records = equipmentUsageRecordMapper.selectList(
                new LambdaQueryWrapper<EquipmentUsageRecord>()
                        .in(EquipmentUsageRecord::getEquipmentId, Arrays.asList(ids))
                        .last("FOR UPDATE") // 添加行锁,锁定查询结果
        );
        if (!records.isEmpty()) {
            throw new BaseException("设备正在使用中,请核对!");
        } else {
            return equipmentManagementMapper.deleteByIds(Arrays.asList(ids));
        }
    }
}