From 39e106b7fa8e40df73bfb0f4d727aaf43bc58971 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Thu, 9 May 2024 16:55:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E7=9F=A5=E4=BA=BA=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=94=B9=E4=B8=BA=E7=BB=9F=E4=B8=80=E7=9A=84?= =?UTF-8?q?recipientIds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/model/request/NotifyConfigRequestVO.java | 8 +++----- .../web/service/convert/NotifyConfigConverter.java | 10 +++++----- .../web/service/impl/NotifyConfigServiceImpl.java | 12 +++--------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java index 752f6b29..edf7ba96 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java @@ -1,13 +1,11 @@ package com.aizuda.snailjob.server.web.model.request; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; - import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; +import lombok.Data; -import java.util.List; import java.util.Set; /** @@ -40,7 +38,7 @@ public class NotifyConfigRequestVO { private Integer notifyStatus; @NotEmpty(message = "通知人列表") - private Set notifyRecipientIds; + private Set recipientIds; private Integer notifyThreshold; diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java index 9fc6c431..71e79a14 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/convert/NotifyConfigConverter.java @@ -20,11 +20,6 @@ public interface NotifyConfigConverter { NotifyConfigConverter INSTANCE = Mappers.getMapper(NotifyConfigConverter.class); - @Mappings({ - @Mapping(target = "recipientIds", expression = "java(NotifyConfigConverter.toNotifyRecipientIdsStr(notifyConfigVO.getNotifyRecipientIds()))") - }) - NotifyConfig toNotifyConfig(NotifyConfigRequestVO notifyConfigVO); - static String toNotifyRecipientIdsStr(Set notifyRecipientIds) { if (CollectionUtils.isEmpty(notifyRecipientIds)) { return null; @@ -32,4 +27,9 @@ public interface NotifyConfigConverter { return JsonUtil.toJsonString(notifyRecipientIds); } + + @Mappings({ + @Mapping(target = "recipientIds", expression = "java(NotifyConfigConverter.toNotifyRecipientIdsStr(notifyConfigVO.getRecipientIds()))") + }) + NotifyConfig toNotifyConfig(NotifyConfigRequestVO notifyConfigVO); } 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 9240bae7..b086afc6 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 @@ -20,7 +20,6 @@ import com.aizuda.snailjob.template.datasource.access.ConfigAccess; import com.aizuda.snailjob.template.datasource.persistence.mapper.JobMapper; import com.aizuda.snailjob.template.datasource.persistence.mapper.NotifyRecipientMapper; import com.aizuda.snailjob.template.datasource.persistence.mapper.WorkflowMapper; -import com.aizuda.snailjob.template.datasource.persistence.po.GroupConfig; import com.aizuda.snailjob.template.datasource.persistence.po.Job; import com.aizuda.snailjob.template.datasource.persistence.po.NotifyConfig; import com.aizuda.snailjob.template.datasource.persistence.po.NotifyRecipient; @@ -37,12 +36,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -161,7 +155,7 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { public Boolean saveNotify(NotifyConfigRequestVO requestVO) { NotifyConfig notifyConfig = NotifyConfigConverter.INSTANCE.toNotifyConfig(requestVO); notifyConfig.setCreateDt(LocalDateTime.now()); - notifyConfig.setRecipientIds(JsonUtil.toJsonString(requestVO.getNotifyRecipientIds())); + notifyConfig.setRecipientIds(JsonUtil.toJsonString(requestVO.getRecipientIds())); notifyConfig.setNamespaceId(UserSessionUtils.currentUserSession().getNamespaceId()); ConfigAccess notifyConfigAccess = accessTemplate.getNotifyConfigAccess(); @@ -175,7 +169,7 @@ public class NotifyConfigServiceImpl implements NotifyConfigService { public Boolean updateNotify(NotifyConfigRequestVO requestVO) { Assert.notNull(requestVO.getId(), () -> new SnailJobServerException("参数异常")); NotifyConfig notifyConfig = NotifyConfigConverter.INSTANCE.toNotifyConfig(requestVO); - notifyConfig.setRecipientIds(JsonUtil.toJsonString(requestVO.getNotifyRecipientIds())); + notifyConfig.setRecipientIds(JsonUtil.toJsonString(requestVO.getRecipientIds())); // 防止被覆盖 notifyConfig.setNamespaceId(null);