From 54ef5ee9ef849e9635004c7101c7b88d23f6f716 Mon Sep 17 00:00:00 2001 From: 3y Date: Mon, 24 Jan 2022 19:38:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java3y/austin/domain/MessageParam.java | 3 ++ .../com/java3y/austin/domain/SendRequest.java | 2 ++ .../controller/MessageTemplateController.java | 33 ++++++++++++++++--- .../austin/vo/MessageTemplateParam.java | 16 ++++++++- 4 files changed, 49 insertions(+), 5 deletions(-) diff --git a/austin-service-api/src/main/java/com/java3y/austin/domain/MessageParam.java b/austin-service-api/src/main/java/com/java3y/austin/domain/MessageParam.java index b304f51..830fe2f 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/domain/MessageParam.java +++ b/austin-service-api/src/main/java/com/java3y/austin/domain/MessageParam.java @@ -1,5 +1,6 @@ package com.java3y.austin.domain; +import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,8 @@ import java.util.Map; */ @Data @Accessors(chain = true) +@Builder + public class MessageParam { /** diff --git a/austin-service-api/src/main/java/com/java3y/austin/domain/SendRequest.java b/austin-service-api/src/main/java/com/java3y/austin/domain/SendRequest.java index a09a33d..df2985f 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/domain/SendRequest.java +++ b/austin-service-api/src/main/java/com/java3y/austin/domain/SendRequest.java @@ -2,6 +2,7 @@ package com.java3y.austin.domain; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @AllArgsConstructor @NoArgsConstructor +@Builder public class SendRequest { /** diff --git a/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java b/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java index f68f5dd..9a64b60 100644 --- a/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java +++ b/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java @@ -1,8 +1,15 @@ package com.java3y.austin.controller; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.java3y.austin.domain.MessageParam; import com.java3y.austin.domain.MessageTemplate; +import com.java3y.austin.domain.SendRequest; +import com.java3y.austin.domain.SendResponse; +import com.java3y.austin.enums.BusinessCode; +import com.java3y.austin.enums.RespStatusEnum; import com.java3y.austin.service.MessageTemplateService; +import com.java3y.austin.service.SendService; import com.java3y.austin.utils.ConvertMap; import com.java3y.austin.vo.BasicResultVO; import com.java3y.austin.vo.MessageTemplateParam; @@ -28,14 +35,14 @@ import java.util.stream.Collectors; @Api("发送消息") @CrossOrigin(origins = "http://localhost:3000", allowCredentials = "true", allowedHeaders = "*") public class MessageTemplateController { - - private static final List flatFieldName = Arrays.asList("msgContent"); - @Autowired private MessageTemplateService messageTemplateService; + @Autowired + private SendService sendService; + /** * 如果Id存在，则修改 * 如果Id不存在，则保存 @@ -89,13 +96,31 @@ public class MessageTemplateController { @DeleteMapping("delete/{id}") @ApiOperation("/根据Ids删除") public BasicResultVO deleteByIds(@PathVariable("id") String id) { - if (StrUtil.isNotBlank(id)) { List idList = Arrays.stream(id.split(StrUtil.COMMA)).map(s -> Long.valueOf(s)).collect(Collectors.toList()); messageTemplateService.deleteByIds(idList); return BasicResultVO.success(); } return BasicResultVO.fail(); + } + + /** + * 测试发送接口 + */ + @PostMapping("test") + @ApiOperation("/测试发送接口") + public BasicResultVO test(@RequestBody MessageTemplateParam messageTemplateParam) { + + Map variables = JSON.parseObject(messageTemplateParam.getMsgContent(), Map.class); + MessageParam messageParam = MessageParam.builder().receiver(messageTemplateParam.getReceiver()).variables(variables).build(); + SendRequest sendRequest = SendRequest.builder().code(BusinessCode.COMMON_SEND.getCode()).messageTemplateId(messageTemplateParam.getId()).messageParam(messageParam).build(); + + SendResponse response = sendService.send(sendRequest); + if (response.getCode() != RespStatusEnum.SUCCESS.getCode()) { + return BasicResultVO.fail(response.getMsg()); + } + return BasicResultVO.success(response); } + } diff --git a/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateParam.java b/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateParam.java index d13c407..bb362a5 100644 --- a/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateParam.java +++ b/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateParam.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; /** * 消息模板管理 请求参数 + * * @author 3y * @date 2022/1/22 */ @@ -19,12 +20,25 @@ public class MessageTemplateParam { /** * 当前页码 */ - private Integer page ; + private Integer page; /** * 当前页大小 */ private Integer perPage; + /** + * 模板ID + */ + private Long id; + /** + * 消息接收者(测试发送时使用) + */ + private String receiver; + + /** + * 下发参数信息 + */ + private String msgContent; }