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

Merge remote-tracking branch 'origin/feature/REQ-3201' into feature/REQ-3201

Browse Source
This commit is contained in:
yanglin 2024-12-20 16:54:32 +08:00
commit 203bb7199a
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package cn.axzo.msg.center.message.controller; package cn.axzo.msg.center.message.controller;
import cn.axzo.msg.center.message.domain.param.CardStyleSaveOrUpdateParam; import cn.axzo.msg.center.message.domain.param.CardStyleSaveOrUpdateParam;
import cn.axzo.msg.center.message.domain.param.MessageTemplateV3SaveOrUpdateParam;
import cn.axzo.msg.center.message.service.CardStyleService; import cn.axzo.msg.center.message.service.CardStyleService;
import cn.axzo.msg.center.service.card.request.CardStyleCreateRequest; import cn.axzo.msg.center.service.card.request.CardStyleCreateRequest;
import cn.axzo.msg.center.service.card.request.CardStyleDeleteRequest; import cn.axzo.msg.center.service.card.request.CardStyleDeleteRequest;
@ -10,15 +9,8 @@ import cn.axzo.msg.center.service.card.request.CardStyleUpdateRequest;
import cn.axzo.msg.center.service.card.response.CardStyleDetailResponse; import cn.axzo.msg.center.service.card.response.CardStyleDetailResponse;
import cn.axzo.msg.center.service.card.response.CardStylePageResponse; import cn.axzo.msg.center.service.card.response.CardStylePageResponse;
import cn.axzo.msg.center.service.template.client.CardStyleClient; import cn.axzo.msg.center.service.template.client.CardStyleClient;
import cn.axzo.msg.center.service.template.request.MessageTemplateV3CreateRequest;
import cn.axzo.msg.center.service.template.request.MessageTemplateV3DeleteRequest;
import cn.axzo.msg.center.service.template.request.MessageTemplateV3PageRequest;
import cn.axzo.msg.center.service.template.request.MessageTemplateV3UpdateRequest;
import cn.axzo.msg.center.service.template.response.MessageTemplateV3DetailResponse;
import cn.axzo.msg.center.service.template.response.MessageTemplateV3PageResponse;
import cn.azxo.framework.common.model.CommonResponse; import cn.azxo.framework.common.model.CommonResponse;
import cn.azxo.framework.common.model.Page; import cn.azxo.framework.common.model.Page;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -39,34 +31,29 @@ public class CardStyleController implements CardStyleClient {
@Override @Override
public CommonResponse<String> save(CardStyleCreateRequest request) { public CommonResponse<String> save(CardStyleCreateRequest request) {
log.info("CardStyleController#save,request:{}", JSON.toJSONString(request));
return CommonResponse.success( return CommonResponse.success(
cardStyleService.createCardStyle(CardStyleSaveOrUpdateParam.from(request))); cardStyleService.createCardStyle(CardStyleSaveOrUpdateParam.from(request)));
} }
@Override @Override
public CommonResponse<Void> update(CardStyleUpdateRequest request) { public CommonResponse<Void> update(CardStyleUpdateRequest request) {
log.info("CardStyleController#update,request:{}", JSON.toJSONString(request));
cardStyleService.updateCardStyle(CardStyleSaveOrUpdateParam.from(request)); cardStyleService.updateCardStyle(CardStyleSaveOrUpdateParam.from(request));
return CommonResponse.success(); return CommonResponse.success();
} }
@Override @Override
public CommonResponse<Void> delete(CardStyleDeleteRequest request) { public CommonResponse<Void> delete(CardStyleDeleteRequest request) {
log.info("CardStyleController#delete,request:{}", JSON.toJSONString(request));
cardStyleService.deleteCardStyle(CardStyleSaveOrUpdateParam.from(request)); cardStyleService.deleteCardStyle(CardStyleSaveOrUpdateParam.from(request));
return CommonResponse.success(); return CommonResponse.success();
} }
@Override @Override
public CommonResponse<CardStyleDetailResponse> detail(String code) { public CommonResponse<CardStyleDetailResponse> detail(String code) {
log.info("CardStyleController#detail,code:{}", code);
return CommonResponse.success(cardStyleService.detail(code)); return CommonResponse.success(cardStyleService.detail(code));
} }
@Override @Override
public CommonResponse<Page<CardStylePageResponse>> page(CardStylePageRequest request) { public CommonResponse<Page<CardStylePageResponse>> page(CardStylePageRequest request) {
log.info("CardStyleController#page,request:{}", JSON.toJSONString(request));
return CommonResponse.success(cardStyleService.page(request)); return CommonResponse.success(cardStyleService.page(request));
} }

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

@ -41,7 +41,6 @@ public class CardStyleServiceImpl implements CardStyleService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String createCardStyle(CardStyleSaveOrUpdateParam param) { public String createCardStyle(CardStyleSaveOrUpdateParam param) {
log.info("CardStyleServiceImpl#createCardStyle,param:{}", JSON.toJSONString(param));
String code = UUIDUtil.uuidString(); String code = UUIDUtil.uuidString();
CardStyle cardStyle = param.toEntityWhenCreate(code); CardStyle cardStyle = param.toEntityWhenCreate(code);
cardStyleDao.save(cardStyle); cardStyleDao.save(cardStyle);
@ -51,7 +50,6 @@ public class CardStyleServiceImpl implements CardStyleService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateCardStyle(CardStyleSaveOrUpdateParam param) { public void updateCardStyle(CardStyleSaveOrUpdateParam param) {
log.info("CardStyleServiceImpl#updateTemplate,param:{}", JSON.toJSONString(param));
//1 更新卡片样式 //1 更新卡片样式
doUpdateCardStyle(param); doUpdateCardStyle(param);
} }
@ -59,7 +57,6 @@ public class CardStyleServiceImpl implements CardStyleService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void deleteCardStyle(CardStyleSaveOrUpdateParam param) { public void deleteCardStyle(CardStyleSaveOrUpdateParam param) {
log.info("CardStyleServiceImpl#delete,param:{}", JSON.toJSONString(param));
if (Objects.isNull(param) || StringUtils.isBlank(param.getCode())) { if (Objects.isNull(param) || StringUtils.isBlank(param.getCode())) {
log.info("code is blank"); log.info("code is blank");
return; return;
@ -73,7 +70,6 @@ public class CardStyleServiceImpl implements CardStyleService {
@Override @Override
public CardStyleDetailResponse detail(String code) { public CardStyleDetailResponse detail(String code) {
log.info("MessageTemplateV3ServiceImpl#detail,code:{}", code);
if (StringUtils.isBlank(code)) { if (StringUtils.isBlank(code)) {
return null; return null;
} }