From 05c9c06bd07e85dddd4304e4e2dfdee8490f159e Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sun, 5 May 2024 10:10:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202=E3=80=81=E4=BF=AE=E5=A4=8D=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E4=BA=BA=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aizuda/snailjob/server/common/alarm/AbstractAlarm.java | 6 ++++-- .../server/web/service/impl/NotifyConfigServiceImpl.java | 5 +++++ .../server/web/service/impl/SystemUserServiceImpl.java | 7 +++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java index dd1f8db9..0496eefa 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/alarm/AbstractAlarm.java @@ -16,7 +16,6 @@ import com.aizuda.snailjob.server.common.enums.SyetemTaskTypeEnum; import com.aizuda.snailjob.server.common.triple.ImmutableTriple; import com.aizuda.snailjob.server.common.triple.Triple; import com.aizuda.snailjob.template.datasource.access.AccessTemplate; -import com.aizuda.snailjob.server.common.triple.Triple; import com.aizuda.snailjob.template.datasource.persistence.mapper.NotifyRecipientMapper; import com.aizuda.snailjob.template.datasource.persistence.po.NotifyConfig; import com.aizuda.snailjob.template.datasource.persistence.po.NotifyRecipient; @@ -31,7 +30,6 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.util.CollectionUtils; -import java.text.MessageFormat; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -123,6 +121,10 @@ public abstract class AbstractAlarm recipientMap = notifyRecipients.stream() .collect(Collectors.toMap(NotifyRecipient::getId, i->i)); + if (CollectionUtils.isEmpty(recipientIds)) { + return Maps.newHashMap(); + } + List notifyConfigInfos = AlarmInfoConverter.INSTANCE.retryToNotifyConfigInfos(notifyConfigs); return notifyConfigInfos.stream() diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java index 2a67dee1..b123aaf7 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/NotifyConfigServiceImpl.java @@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; @@ -145,6 +146,10 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { set.addAll(b); return set; }).orElse(new HashSet<>()); + if (CollectionUtils.isEmpty(recipientIds)) { + return Maps.newHashMap(); + } + List notifyRecipients = notifyRecipientMapper.selectBatchIds(recipientIds); return notifyRecipients.stream() .collect(Collectors.toMap(NotifyRecipient::getId, NotifyRecipient::getRecipientName)); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java index 5043f167..32805196 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SystemUserServiceImpl.java @@ -215,10 +215,13 @@ public class SystemUserServiceImpl implements SystemUserService { .map(SystemUserPermission::getNamespaceId) .collect(Collectors.toSet()); - // TODO: uniqueIds可能为空 - List namespaces = namespaceMapper.selectList(Wrappers.lambdaQuery() + List namespaces = Lists.newArrayList(); + if (!CollectionUtils.isEmpty(uniqueIds)) { + namespaces = namespaceMapper.selectList(Wrappers.lambdaQuery() .select(Namespace::getId, Namespace::getUniqueId, Namespace::getName) .in(Namespace::getUniqueId, uniqueIds)); + } + Map namespaceMap = namespaces.stream().collect(Collectors.toMap(Namespace::getUniqueId, Namespace::getName)); Map> userPermissionsMap = userPermissions.stream()