钉钉工作消息 接入各种的消息类型

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;
 
 }

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.setHead(JSON.parseObject(contentModel.getDingDingOaHead(), OapiMessageCorpconversationAsyncsendV2Request.Head.class));
-                oa.setBody(JSON.parseObject(contentModel.getBody(), OapiMessageCorpconversationAsyncsendV2Request.Body.class));
+                oa.setBody(JSON.parseObject(contentModel.getDingDingOaBody(), OapiMessageCorpconversationAsyncsendV2Request.Body.class));
                 message.setOa(oa);
             }
             req.setMsg(message);

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<String> 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<Map<String, Object>> result = ConvertMap.flatList(messageTemplateService.queryList(messageTemplateParam), FLAT_FIELD_NAME);
+        List<Map<String, Object>> 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<String, Object> result = ConvertMap.flatSingle(messageTemplateService.queryById(id), FLAT_FIELD_NAME);
+        Map<String, Object> result = ConvertMap.flatSingle(messageTemplateService.queryById(id));
         return BasicResultVO.success(result);
     }