From e667b280a7fd77dd7fad81c66dba2cef9936d422 Mon Sep 17 00:00:00 2001 From: 唐耀东 <18861537@qq.com> Date: 星期六, 16 七月 2022 13:18:45 +0800 Subject: [PATCH] 提交代码 --- ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java index a6170d8..0f76985 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SgNvrServiceImpl.java @@ -1,10 +1,13 @@ 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; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.oa.domain.SgReserveIp; import org.springframework.stereotype.Service; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -14,7 +17,9 @@ import com.ruoyi.oa.domain.SgNvr; import com.ruoyi.oa.mapper.SgNvrMapper; import com.ruoyi.oa.service.ISgNvrService; +import org.springframework.transaction.annotation.Transactional; +import javax.swing.text.html.HTML; import java.util.List; import java.util.Map; import java.util.Collection; @@ -53,11 +58,19 @@ lqw.eq(bo.getConstructionBatchId() != null, SgNvr::getConstructionBatchId, bo.getConstructionBatchId()); lqw.like(StringUtils.isNotBlank(bo.getModel()), SgNvr::getModel, bo.getModel()); lqw.eq(SgNvr::getSchoolId, bo.getSchoolId()); + lqw.orderByDesc(SgNvr::getUpdateTime); return lqw; } @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SgNvrBo bo) { + List<SgNvr> list = baseMapper.selectList(new LambdaQueryWrapper<SgNvr>() + .eq(SgNvr::getDeploymentName, bo.getDeploymentName()) + .eq(SgNvr::getSchoolId, bo.getSchoolId())); + if (list.size() > 0) { + throw new ServiceException("閮ㄧ讲鍚嶇О閲嶅", HttpStatus.HTTP_PARTIAL); + } SgNvr add = BeanUtil.toBean(bo, SgNvr.class); validEntityBeforeSave(add); boolean flag = save(add); @@ -68,7 +81,15 @@ } @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(SgNvrBo bo) { + List<SgNvr> list = baseMapper.selectList(new LambdaQueryWrapper<SgNvr>() + .ne(SgNvr::getId, bo.getId()) + .eq(SgNvr::getDeploymentName, bo.getDeploymentName()) + .eq(SgNvr::getSchoolId, bo.getSchoolId())); + if (list.size() > 0) { + throw new ServiceException("閮ㄧ讲鍚嶇О閲嶅", HttpStatus.HTTP_PARTIAL); + } SgNvr update = BeanUtil.toBean(bo, SgNvr.class); validEntityBeforeSave(update); return updateById(update); -- Gitblit v1.9.1