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

feat:(REQ-3045) 模版管理V3-日志优化

Browse Source
This commit is contained in:
xudawei 2024-10-08 23:13:24 +08:00
parent c4b7e2280e
commit 4b01e5e414
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageTemplateV3Controller.java
View File

@ -25,6 +25,7 @@ import cn.azxo.framework.common.model.CommonResponse;
import cn.azxo.framework.common.model.Page;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.MediaType;
@ -55,29 +56,34 @@ public class MessageTemplateV3Controller implements MessageTemplateV3Client {
@Override
public CommonResponse<String> save(MessageTemplateV3CreateRequest request) {
log.info("MessageTemplateV3Controller#save,request:{}", JSON.toJSONString(request));
return CommonResponse.success(
messageTemplateV3Service.createTemplate(MessageTemplateV3SaveOrUpdateParam.from(request)));
}
@Override
public CommonResponse<Void> update(MessageTemplateV3UpdateRequest request) {
log.info("MessageTemplateV3Controller#update,request:{}", JSON.toJSONString(request));
messageTemplateV3Service.updateTemplate(MessageTemplateV3SaveOrUpdateParam.from(request));
return CommonResponse.success();
}
@Override
public CommonResponse<Void> delete(MessageTemplateV3DeleteRequest request) {
log.info("MessageTemplateV3Controller#delete,request:{}", JSON.toJSONString(request));
messageTemplateV3Service.deleteTemplate(MessageTemplateV3SaveOrUpdateParam.from(request));
return CommonResponse.success();
}
@Override
public CommonResponse<MessageTemplateV3DetailResponse> detail(String templateCode) {
log.info("MessageTemplateV3Controller#detail,templateCode:{}", templateCode);
return CommonResponse.success(messageTemplateV3Service.detail(templateCode));
}
@Override
public CommonResponse<Page<MessageTemplateV3PageResponse>> page(MessageTemplateV3PageRequest request) {
log.info("MessageTemplateV3Controller#detail,request:{}", JSON.toJSONString(request));
return CommonResponse.success(messageTemplateV3Service.page(request));
}

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

@ -2,10 +2,10 @@ package cn.axzo.msg.center.message.service.impl;
import cn.axzo.msg.center.dal.MessageTemplateButtonV3Dao;
import cn.axzo.msg.center.domain.entity.MessageTemplateButtonV3;
import cn.axzo.msg.center.domain.entity.MessageTemplateGroupV3;
import cn.axzo.msg.center.message.service.MessageTemplateButtonV3Service;
import cn.axzo.msg.center.service.dto.MessageTemplateButtonV3DTO;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@ -29,6 +29,7 @@ public class MessageTemplateButtonV3ServiceImpl implements MessageTemplateButton
@Override
public void saveTemplateButton(String messageTemplateCode, List<MessageTemplateButtonV3DTO> buttonV3List) {
log.info("ButtonV3#saveTemplateButton,code:{},buttonV3List:{}",messageTemplateCode, JSON.toJSONString(buttonV3List));
if (StringUtils.isBlank(messageTemplateCode) || CollectionUtils.isEmpty(buttonV3List)) {
return;
}
@ -38,12 +39,13 @@ public class MessageTemplateButtonV3ServiceImpl implements MessageTemplateButton
buttonV3.setTemplateCode(messageTemplateCode);
return buttonV3;
}).collect(Collectors.toList());
log.info("ButtonV3#saveTemplateButton,code:{},buttonV3s:{}",messageTemplateCode, JSON.toJSONString(buttonV3s));
messageTemplateButtonV3Dao.saveBatch(buttonV3s);
}
@Override
public void updateTemplateButton(String messageTemplateCode, List<MessageTemplateButtonV3DTO> buttonV3List) {
log.info("ButtonV3#updateTemplateButton,code:{},buttonV3List:{}",messageTemplateCode, JSON.toJSONString(buttonV3List));
//逻辑删除
this.deleteTemplateButton(messageTemplateCode);
// 保存
@ -52,6 +54,7 @@ public class MessageTemplateButtonV3ServiceImpl implements MessageTemplateButton
@Override
public void deleteTemplateButton(String templateNode) {
log.info("ButtonV3#deleteTemplateButton,code:{}",templateNode);
if (StringUtils.isBlank(templateNode)) {
log.info("the templateNode is blank.");
return;

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

@ -11,6 +11,7 @@ import cn.axzo.msg.center.message.service.MessageGroupNodeService;
import cn.axzo.msg.center.message.service.MessageTemplateGroupV3Service;
import cn.axzo.msg.center.service.template.request.MessageTemplateGroupV3CreateRequest;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import lombok.RequiredArgsConstructor;
@ -131,6 +132,7 @@ public class MessageTemplateGroupV3ServiceImpl implements MessageTemplateGroupV3
@Override
public void saveTemplateGroup(String messageTemplateCode, List<MessageTemplateGroupV3CreateRequest> groupV3List) {
log.info("groupV3#saveTemplateGroup,templateCode:{},groupV3List:{}", messageTemplateCode, JSON.toJSONString(groupV3List));
if (CollectionUtils.isEmpty(groupV3List)) {
log.info("groupV3List is empty.");
return;
@ -141,11 +143,13 @@ public class MessageTemplateGroupV3ServiceImpl implements MessageTemplateGroupV3
messageTemplateGroupV3.setTemplateCode(messageTemplateCode);
return messageTemplateGroupV3;
}).collect(Collectors.toList());
log.info("groupV3#saveTemplateGroup,templateCode:{},templateGroupV3List:{}", messageTemplateCode, JSON.toJSONString(templateGroupV3List));
messageTemplateGroupV3Dao.saveBatch(templateGroupV3List);
}
@Override
public void updateTemplateGroup(String messageTemplateCode, List<MessageTemplateGroupV3CreateRequest> groupV3List) {
log.info("groupV3#updateTemplateGroup,templateCode:{},groupV3List:{}", messageTemplateCode, JSON.toJSONString(groupV3List));
// 删除卡片分组
deleteTemplateGroup(messageTemplateCode);
// 插入新的分组

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

@ -95,6 +95,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
@Override
@Transactional(rollbackFor = Exception.class)
public String createTemplate(MessageTemplateV3SaveOrUpdateParam param) {
log.info("MessageTemplateV3ServiceImpl#createTemplate,param:{}", JSON.toJSONString(param));
//1 创建模板基础数据
String templateCode = saveTemplate(param);
//2 创建模板与分类的关联关系数据
@ -109,6 +110,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTemplate(MessageTemplateV3SaveOrUpdateParam param) {
log.info("MessageTemplateV3ServiceImpl#updateTemplate,param:{}", JSON.toJSONString(param));
//1 更新模板基础数据
updateMessageTemplate(param);
//2 更新分组
@ -122,6 +124,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteTemplate(MessageTemplateV3SaveOrUpdateParam param) {
log.info("MessageTemplateV3ServiceImpl#deleteTemplate,param:{}", JSON.toJSONString(param));
if (Objects.isNull(param) || StringUtils.isBlank(param.getTemplateCode())) {
log.info("messageTemplateCode is blank");
return;
@ -135,6 +138,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service {
@Override
public MessageTemplateV3DetailResponse detail(String templateCode) {
log.info("MessageTemplateV3ServiceImpl#deleteTemplate,templateCode:{}", templateCode);
if (StringUtils.isBlank(templateCode)) {
return null;
}

2
msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageTemplateCardJumpV3DTO.java
View File

@ -33,7 +33,7 @@ public class MessageTemplateCardJumpV3DTO implements Serializable {
/**
* 卡片跳转配置. 在links的基础上再包一层, 避免以后卡片增加自己的配置
*/
private CardUrlConfig cardUrConfig;
private CardUrlConfig cardUrlConfig;
@Override
public String toString() {