提交代码

唐耀东

2022-05-18 41e8084ef826dc8d98d4d25bf891965ce2af3ad3

 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgReserveIpServiceImpl.java

@@ -1,6 +1,8 @@
package com.ruoyi.oa.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.http.HttpStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
@@ -14,6 +16,7 @@
import com.ruoyi.oa.domain.SgReserveIp;
import com.ruoyi.oa.mapper.SgReserveIpMapper;
import com.ruoyi.oa.service.ISgReserveIpService;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
@@ -50,11 +53,23 @@
        lqw.like(StringUtils.isNotBlank(bo.getIp()), SgReserveIp::getIp, bo.getIp());
        lqw.eq(bo.getBuildingId() != null, SgReserveIp::getBuildingId, bo.getBuildingId());
        lqw.eq(SgReserveIp::getSchoolId, bo.getSchoolId());
        lqw.orderByDesc(SgReserveIp::getUpdateTime);
        return lqw;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean insertByBo(SgReserveIpBo bo) {
        List<SgReserveIp> ipList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
            .eq(SgReserveIp::getIp, bo.getIp()).eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
        if (ipList.size() > 0) {
            throw new ServiceException("IP地址重复", HttpStatus.HTTP_PARTIAL);
        }
        List<SgReserveIp> macList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
            .eq(SgReserveIp::getMac, bo.getMac()).eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
        if (macList.size() > 0) {
            throw new ServiceException("MAC地址重复", HttpStatus.HTTP_PARTIAL);
        }
        SgReserveIp add = BeanUtil.toBean(bo, SgReserveIp.class);
        validEntityBeforeSave(add);
        boolean flag = save(add);
@@ -65,7 +80,22 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean updateByBo(SgReserveIpBo bo) {
        List<SgReserveIp> ipList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
            .ne(SgReserveIp::getId, bo.getId())
            .eq(SgReserveIp::getIp, bo.getIp())
            .eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
        if (ipList.size() > 0) {
            throw new ServiceException("IP地址重复", HttpStatus.HTTP_PARTIAL);
        }
        List<SgReserveIp> macList = baseMapper.selectList(new LambdaQueryWrapper<SgReserveIp>()
            .ne(SgReserveIp::getId, bo.getId())
            .eq(SgReserveIp::getMac, bo.getMac())
            .eq(SgReserveIp::getSchoolId, bo.getSchoolId()));
        if (macList.size() > 0) {
            throw new ServiceException("MAC地址重复", HttpStatus.HTTP_PARTIAL);
        }
        SgReserveIp update = BeanUtil.toBean(bo, SgReserveIp.class);
        validEntityBeforeSave(update);
        return updateById(update);
@@ -81,6 +111,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
        if(isValid){
            //TODO 做一些业务上的校验,判断是否需要校验