From 41d44451ac8f2c33d42da127070c62a089441e6e Mon Sep 17 00:00:00 2001 From: 3y Date: Tue, 7 Jun 2022 20:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=89=E9=92=89=E5=B7=A5=E4=BD=9C=E6=B6=88?= =?UTF-8?q?=E6=81=AF=20=E6=8E=A5=E5=85=A5=E5=90=84=E7=A7=8D=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../austin/common/dto/model/DingDingWorkContentModel.java | 8 ++------ .../handler/handler/impl/DingDingWorkNoticeHandler.java | 8 ++++---- .../austin/web/controller/MessageTemplateController.java | 5 ++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/austin-common/src/main/java/com/java3y/austin/common/dto/model/DingDingWorkContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/model/DingDingWorkContentModel.java index cc461c3..c0dd520 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/dto/model/DingDingWorkContentModel.java +++ b/austin-common/src/main/java/com/java3y/austin/common/dto/model/DingDingWorkContentModel.java @@ -49,10 +49,6 @@ public class DingDingWorkContentModel extends ContentModel { */ private String url; - /** - * 【链接消息】图片URL， - */ - private String picUrl; /** * 图片、文件、语音消息 需要发送使用的素材ID字段 @@ -68,12 +64,12 @@ public class DingDingWorkContentModel extends ContentModel { * OA消息头 * {"bgcolor":"FFBBBBBB","text":"头部标题"} */ - private String head; + private String dingDingOaHead; /** * OA消息内容 * {"title":"正文标题","form":[{"key":"姓名:","value":"张三"},{"key":"年龄:","value":"20"},{"key":"身高:","value":"1.8米"},{"key":"体重:","value":"130斤"},{"key":"学历:","value":"本科"},{"key":"爱好:","value":"打球、听音乐"}],"rich":{"num":"15.6","unit":"元"},"content":"大段文本大段文本大段文本大段文本大段文本大段文本","image":"@lADOADmaWMzazQKA","file_count":"3","author":"李四 "} */ - private String body; + private String dingDingOaBody; } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java index fe60d1e..11b5b87 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java @@ -118,7 +118,7 @@ public class DingDingWorkNoticeHandler extends BaseHandler implements Handler { OapiMessageCorpconversationAsyncsendV2Request.Link link = new OapiMessageCorpconversationAsyncsendV2Request.Link(); link.setText(contentModel.getContent()); link.setTitle(contentModel.getTitle()); - link.setPicUrl(contentModel.getPicUrl()); + link.setPicUrl(contentModel.getMediaId()); link.setMessageUrl(contentModel.getUrl()); message.setLink(link); } @@ -139,11 +139,11 @@ public class DingDingWorkNoticeHandler extends BaseHandler implements Handler { message.setActionCard(actionCard); } - if (SendMessageType.ACTION_CARD.getCode().equals(contentModel.getSendType())) { + if (SendMessageType.OA.getCode().equals(contentModel.getSendType())) { OapiMessageCorpconversationAsyncsendV2Request.OA oa = new OapiMessageCorpconversationAsyncsendV2Request.OA(); oa.setMessageUrl(contentModel.getUrl()); - oa.setHead(JSON.parseObject(contentModel.getHead(), OapiMessageCorpconversationAsyncsendV2Request.Head.class)); - oa.setBody(JSON.parseObject(contentModel.getBody(), OapiMessageCorpconversationAsyncsendV2Request.Body.class)); + oa.setHead(JSON.parseObject(contentModel.getDingDingOaHead(), OapiMessageCorpconversationAsyncsendV2Request.Head.class)); + oa.setBody(JSON.parseObject(contentModel.getDingDingOaBody(), OapiMessageCorpconversationAsyncsendV2Request.Body.class)); message.setOa(oa); } req.setMsg(message); diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java index 9f919c9..6c7940f 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java @@ -43,7 +43,6 @@ import java.util.stream.Collectors; @Api("发送消息") @CrossOrigin(origins = "http://localhost:3000", allowCredentials = "true", allowedHeaders = "*") public class MessageTemplateController { - private static final List FLAT_FIELD_NAME = Arrays.asList("msgContent"); @Autowired private MessageTemplateService messageTemplateService; @@ -71,7 +70,7 @@ public class MessageTemplateController { @GetMapping("/list") @ApiOperation("/列表页") public BasicResultVO queryList(MessageTemplateParam messageTemplateParam) { - List> result = ConvertMap.flatList(messageTemplateService.queryList(messageTemplateParam), FLAT_FIELD_NAME); + List> result = ConvertMap.flatList(messageTemplateService.queryList(messageTemplateParam)); long count = messageTemplateService.count(); MessageTemplateVo messageTemplateVo = MessageTemplateVo.builder().count(count).rows(result).build(); @@ -84,7 +83,7 @@ public class MessageTemplateController { @GetMapping("query/{id}") @ApiOperation("/根据Id查找") public BasicResultVO queryById(@PathVariable("id") Long id) { - Map result = ConvertMap.flatSingle(messageTemplateService.queryById(id), FLAT_FIELD_NAME); + Map result = ConvertMap.flatSingle(messageTemplateService.queryById(id)); return BasicResultVO.success(result); }