From 43ca77e786ea46fc7b76e9bea3681a8a174b107a Mon Sep 17 00:00:00 2001 From: xudawei Date: Tue, 8 Oct 2024 17:23:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-3045)=20=E6=A8=A1=E7=89=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86V3-=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MessageTemplateV3Controller.java | 5 ++- .../impl/MessageTemplateV3ServiceImpl.java | 10 ++--- .../client/MessageTemplateV3Client.java | 3 +- .../MessageTemplateV3UpdateStatusRequest.java | 45 +++++++++++++++++++ 4 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateV3UpdateStatusRequest.java diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageTemplateV3Controller.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageTemplateV3Controller.java index ef87eb82..d815d96f 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageTemplateV3Controller.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/MessageTemplateV3Controller.java @@ -19,6 +19,7 @@ import cn.axzo.msg.center.service.template.request.MessageTemplateUpdateStatusRe 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.request.MessageTemplateV3UpdateStatusRequest; import cn.axzo.msg.center.service.template.response.MessageDetailStyle; import cn.axzo.msg.center.service.template.response.MessageTemplateDetailResponse; import cn.axzo.msg.center.service.template.response.MessageTemplatePageResponse; @@ -90,8 +91,8 @@ public class MessageTemplateV3Controller implements MessageTemplateV3Client { } @Override - public CommonResponse updateStatus(MessageTemplateUpdateStatusRequest request) { - messageTemplateNewService.updateStatus(request.getOperatorId(), request.getTemplateCode(), request.getStatus()); + public CommonResponse updateStatus(MessageTemplateV3UpdateStatusRequest request) { + messageTemplateV3Service.updateStatus(request.getOperatorId(), request.getTemplateCode(), request.getStatus()); return CommonResponse.success(); } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java index e87c9e07..44b40785 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java @@ -157,11 +157,11 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service { log.info("the param is invalid. operatorId:[{}], code:[{}], status:[{}]", operatorId, templateCode, status); return; } - messageBaseTemplateDao.lambdaUpdate() - .eq(MessageBaseTemplate::getCode, templateCode) - .eq(MessageBaseTemplate::getIsDelete, TableIsDeleteEnum.NORMAL.value) - .set(MessageBaseTemplate::getStatus, status) - .set(MessageBaseTemplate::getUpdaterId, operatorId) + messageTemplateV3Dao.lambdaUpdate() + .eq(MessageTemplateV3::getCode, templateCode) + .eq(MessageTemplateV3::getIsDelete, TableIsDeleteEnum.NORMAL.value) + .set(MessageTemplateV3::getStatus, status) + .set(MessageTemplateV3::getUpdatePersonId, operatorId) .update(); } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/client/MessageTemplateV3Client.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/client/MessageTemplateV3Client.java index 9f5aecec..10f73d78 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/client/MessageTemplateV3Client.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/client/MessageTemplateV3Client.java @@ -9,6 +9,7 @@ import cn.axzo.msg.center.service.template.request.MessageTemplateUpdateStatusRe 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.request.MessageTemplateV3UpdateStatusRequest; import cn.axzo.msg.center.service.template.response.MessageDetailStyle; import cn.axzo.msg.center.service.template.response.MessageTemplateDetailResponse; import cn.axzo.msg.center.service.template.response.MessageTemplatePageResponse; @@ -93,7 +94,7 @@ public interface MessageTemplateV3Client { * @param request 模板状态 */ @PostMapping(value = "/message/template/update-status/v3", produces = {MediaType.APPLICATION_JSON_VALUE}) - CommonResponse updateStatus(@RequestBody @Valid MessageTemplateUpdateStatusRequest request); + CommonResponse updateStatus(@RequestBody @Valid MessageTemplateV3UpdateStatusRequest request); /** * 查询消息模板 diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateV3UpdateStatusRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateV3UpdateStatusRequest.java new file mode 100644 index 00000000..369a9426 --- /dev/null +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateV3UpdateStatusRequest.java @@ -0,0 +1,45 @@ +package cn.axzo.msg.center.service.template.request; + +import cn.axzo.msg.center.service.enums.StatusEnum; +import com.alibaba.fastjson.JSON; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @author cold_blade + * @date 2023/10/13 + * @version 1.0 + */ +@Setter +@Getter +public class MessageTemplateV3UpdateStatusRequest implements Serializable { + + private static final long serialVersionUID = 818483349559289586L; + + /** + * 操作者的自然人id + */ + @NotNull(message = "operatorId is required") + private Long operatorId; + /** + * 模板编码 + */ + @NotBlank(message = "templateCode is required") + private String templateCode; + /** + * 模板状态 + * ENABLE: 启用 + * DISABLE: 禁用 + */ + @NotNull(message = "status is required") + private StatusEnum status; + + @Override + public String toString() { + return JSON.toJSONString(this); + } +}