diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/MessageGroupService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/MessageGroupService.java index c620f24f..66dabe02 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/MessageGroupService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/MessageGroupService.java @@ -2,6 +2,7 @@ package cn.axzo.msg.center.message.service; import cn.axzo.msg.center.message.domain.dto.MessageGroupNodeDTO; +import java.util.Collection; import java.util.List; import java.util.Optional; @@ -29,4 +30,12 @@ public interface MessageGroupService { * @return 子节点列表信息 */ List listChildren(String nodeCode); + + /** + * 模板关联分类 + * + * @param templateNode 模板编码 + * @param pathList 分类path列表 + */ + void templateGroup(String templateNode, Collection pathList); } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageGroupServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageGroupServiceImpl.java index 85ce2449..0ca69898 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageGroupServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageGroupServiceImpl.java @@ -1,14 +1,18 @@ package cn.axzo.msg.center.message.service.impl; import cn.axzo.msg.center.dal.MessageGroupNodeDao; +import cn.axzo.msg.center.dal.MessageTemplateGroupDao; import cn.axzo.msg.center.domain.entity.MessageGroupNode; +import cn.axzo.msg.center.domain.entity.MessageTemplateGroup; import cn.axzo.msg.center.message.domain.dto.MessageGroupNodeDTO; import cn.axzo.msg.center.message.service.MessageGroupService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; @@ -24,6 +28,7 @@ import java.util.stream.Collectors; public class MessageGroupServiceImpl implements MessageGroupService { private final MessageGroupNodeDao messageGroupNodeDao; + private final MessageTemplateGroupDao messageTemplateGroupDao; @Override public Optional queryByNodeCode(String nodeCode) { @@ -46,4 +51,20 @@ public class MessageGroupServiceImpl implements MessageGroupService { .map(MessageGroupNodeDTO::from) .collect(Collectors.toList()); } + + @Override + public void templateGroup(String templateNode, Collection pathList) { + if (StringUtils.isBlank(templateNode) + || CollectionUtils.isEmpty(pathList)) { + return; + } + List rows = pathList.stream() + .map(e -> { + MessageTemplateGroup group = new MessageTemplateGroup(); + group.setTemplateCode(templateNode); + group.setPath(e); + return group; + }).collect(Collectors.toList()); + messageTemplateGroupDao.saveBatch(rows); + } } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java index bcd72b7c..5a149989 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java @@ -15,7 +15,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; @@ -94,10 +93,6 @@ public class MessageTemplateNewServiceImpl implements MessageTemplateNewService template.setCode(param.getTemplateCode()); template.setCreatorId(param.getOperatorId()); template.setUpdaterId(param.getOperatorId()); - Date now = new Date(); - template.setCreateAt(now); - template.setUpdateAt(now); - template.setIsDelete(0); return template; } } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java index 5fa2271c..079a52d6 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java @@ -44,7 +44,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -287,11 +286,6 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService { record.setSubBizCode(param.getSubBizCode()); record.setBizDesc(param.getBizDesc()); record.setBizCategory(param.getBizCategory()); - // TODO: [cold_blade] [P3] 默认字段需要传值的问题 - Date now = new Date(); - record.setCreateAt(now); - record.setUpdateAt(now); - record.setIsDelete(0); return record; } diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/GeneralMessageRecord.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/GeneralMessageRecord.java index b61b1195..dd744f9e 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/GeneralMessageRecord.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/GeneralMessageRecord.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.domain.entity; -import cn.axzo.core.persistence.BaseEntity; +import cn.axzo.msg.center.domain.persistence.BaseEntity; import cn.axzo.msg.center.service.enums.GeneralMessageStateEnum; import cn.axzo.msg.center.service.enums.IdentityTypeEnum; import cn.axzo.msg.center.service.enums.OrganizationTypeEnum; diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java index 9b282f8e..b652f869 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.domain.entity; -import cn.axzo.core.persistence.BaseEntity; +import cn.axzo.msg.center.domain.persistence.BaseEntity; import cn.axzo.msg.center.service.enums.MessageCategoryEnum; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageGroupNode.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageGroupNode.java index f535c45c..75509df6 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageGroupNode.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageGroupNode.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.domain.entity; -import cn.axzo.core.persistence.BaseEntity; +import cn.axzo.msg.center.domain.persistence.BaseEntity; import cn.axzo.msg.center.service.enums.MessageGroupNodeCategoryEnum; import cn.axzo.msg.center.service.enums.StatusEnum; import com.alibaba.fastjson.JSON; diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateGroup.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateGroup.java index 52cdbbb9..766c4f6a 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateGroup.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateGroup.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.domain.entity; -import cn.axzo.core.persistence.BaseEntity; +import cn.axzo.msg.center.domain.persistence.BaseEntity; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateRouter.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateRouter.java index b4ea388b..68215289 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateRouter.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateRouter.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.domain.entity; -import cn.axzo.core.persistence.BaseEntity; +import cn.axzo.msg.center.domain.persistence.BaseEntity; import cn.axzo.msg.center.service.enums.RouterCategoryEnum; import cn.axzo.msg.center.service.enums.TerminalTypeEnum; import com.alibaba.fastjson.JSON; diff --git a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/PendingMessageRecord.java b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/PendingMessageRecord.java index 8441c6a8..e519ed29 100644 --- a/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/PendingMessageRecord.java +++ b/msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/PendingMessageRecord.java @@ -1,6 +1,6 @@ package cn.axzo.msg.center.domain.entity; -import cn.axzo.core.persistence.BaseEntity; +import cn.axzo.msg.center.domain.persistence.BaseEntity; import cn.axzo.msg.center.service.enums.BizCategoryEnum; import cn.axzo.msg.center.service.enums.IdentityTypeEnum; import cn.axzo.msg.center.service.enums.OrganizationTypeEnum;