wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1309' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-10-10 14:58:27 +08:00
commit c1e12153a1
10 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inside-notices/src/main/java/cn/axzo/msg/center/message/service/MessageGroupService.java
View File

@ -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<MessageGroupNodeDTO> listChildren(String nodeCode);
/**
* 模板关联分类
*
* @param templateNode 模板编码
* @param pathList 分类path列表
*/
void templateGroup(String templateNode, Collection<String> pathList);
}

21
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageGroupServiceImpl.java
View File

@ -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<MessageGroupNodeDTO> 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<String> pathList) {
if (StringUtils.isBlank(templateNode)
|| CollectionUtils.isEmpty(pathList)) {
return;
}
List<MessageTemplateGroup> rows = pathList.stream()
.map(e -> {
MessageTemplateGroup group = new MessageTemplateGroup();
group.setTemplateCode(templateNode);
group.setPath(e);
return group;
}).collect(Collectors.toList());
messageTemplateGroupDao.saveBatch(rows);
}
}

5
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
View File

@ -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;
}
}

6
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -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;
}

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/GeneralMessageRecord.java
View File

@ -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;

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageBaseTemplate.java
View File

@ -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;

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageGroupNode.java
View File

@ -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;

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateGroup.java
View File

@ -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;

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MessageTemplateRouter.java
View File

@ -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;

2
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/PendingMessageRecord.java
View File

@ -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;