From 69b755483f30a32bc79fea5d6e219161cc8e2f3b Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Fri, 26 Nov 2021 21:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E8=AD=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=A2=9E=E5=88=A0=E6=94=B9=E5=8A=9F=E8=83=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/model/biz/notify/NotifyReqDTO.java | 5 ++++ .../model/biz/notify/NotifyRespDTO.java | 5 ++++ .../service/biz/impl/NotifyServiceImpl.java | 26 ++++++++++++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java index 21b7a314..f97aa15e 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java @@ -11,6 +11,11 @@ import lombok.Data; @Data public class NotifyReqDTO { + /** + * id + */ + private String id; + /** * 租户id */ diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java index 4e10b9f3..c3cf7771 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java @@ -11,6 +11,11 @@ import lombok.Data; @Data public class NotifyRespDTO { + /** + * id + */ + private String id; + /** * 租户id */ diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java index d1267079..10212862 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java @@ -68,20 +68,18 @@ public class NotifyServiceImpl implements NotifyService { @Override public void save(NotifyReqDTO reqDTO) { - try { - notifyInfoMapper.insert(BeanUtil.convert(reqDTO, NotifyInfo.class)); - } catch (DuplicateKeyException ex) { + if (existNotify(reqDTO)) { throw new ServiceException("新增通知报警配置重复."); } + + notifyInfoMapper.insert(BeanUtil.convert(reqDTO, NotifyInfo.class)); } @Override public void update(NotifyReqDTO reqDTO) { NotifyInfo notifyInfo = BeanUtil.convert(reqDTO, NotifyInfo.class); LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(NotifyInfo.class) - .eq(NotifyInfo::getTenantId, reqDTO.getTenantId()) - .eq(NotifyInfo::getItemId, reqDTO.getItemId()) - .eq(NotifyInfo::getTpId, reqDTO.getTpId()); + .eq(NotifyInfo::getId, reqDTO.getId()); try { notifyInfoMapper.update(notifyInfo, updateWrapper); @@ -93,9 +91,7 @@ public class NotifyServiceImpl implements NotifyService { @Override public void delete(NotifyReqDTO reqDTO) { LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(NotifyInfo.class) - .eq(NotifyInfo::getTenantId, reqDTO.getTenantId()) - .eq(NotifyInfo::getItemId, reqDTO.getItemId()) - .eq(NotifyInfo::getTpId, reqDTO.getTpId()); + .eq(NotifyInfo::getId, reqDTO.getId()); notifyInfoMapper.delete(updateWrapper); } @@ -111,4 +107,16 @@ public class NotifyServiceImpl implements NotifyService { return notifyInfos; } + private boolean existNotify(NotifyReqDTO reqDTO) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(NotifyInfo.class) + .eq(NotifyInfo::getTenantId, reqDTO.getTenantId()) + .eq(NotifyInfo::getItemId, reqDTO.getItemId()) + .eq(NotifyInfo::getTpId, reqDTO.getTpId()) + .eq(NotifyInfo::getPlatform, reqDTO.getPlatform()) + .eq(NotifyInfo::getType, reqDTO.getType()); + + List existNotifyInfos = notifyInfoMapper.selectList(queryWrapper); + return CollUtil.isNotEmpty(existNotifyInfos); + } + }