From 3db7456c9271fd35ee706263428866b3e3c97ea3 Mon Sep 17 00:00:00 2001
From: zhongpeng <zhongpeng@axzo.cn>
Date: Wed, 20 Nov 2024 16:12:16 +0800
Subject: [PATCH] =?UTF-8?q?Req-3117=20=E4=BF=AE=E6=94=B9=E9=92=89=E9=92=89?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/req/DingDingSendRebootGroupMsgReq.java      |  6 +++---
 .../cn/axzo/riven/config/DingDingRebootMainConfig.java |  4 ++--
 .../cn/axzo/riven/service/DingDingRebootService.java   | 10 +++++-----
 riven-server/src/main/resources/application-local.yml  |  6 ++++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/riven-api/src/main/java/cn/axzo/riven/client/req/DingDingSendRebootGroupMsgReq.java b/riven-api/src/main/java/cn/axzo/riven/client/req/DingDingSendRebootGroupMsgReq.java
index 659e8b4..40d5d2a 100644
--- a/riven-api/src/main/java/cn/axzo/riven/client/req/DingDingSendRebootGroupMsgReq.java
+++ b/riven-api/src/main/java/cn/axzo/riven/client/req/DingDingSendRebootGroupMsgReq.java
@@ -25,9 +25,9 @@ public class DingDingSendRebootGroupMsgReq {
     private ReplyMessage replyMessage;
 
     /**
-     * 业务场景
-     * 不同的业务场景对应后端配置不同的密钥和接受的群
+     * 业务场景code,为了灵活支持多个消息发送，此处直接采用字符串，与nacos中的钉钉群配置一一对应
+     * 对应nacos：reboot.group.list[].dingDingScene
      * 暂时不支持对多个群发送，如有需求，可以进行改造
      */
-    private DingDingSceneEnum dingDingSceneEnum;
+    private String dingDingScene;
 }
diff --git a/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java b/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java
index 40e8780..d36799b 100644
--- a/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java
+++ b/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java
@@ -32,8 +32,8 @@ public class DingDingRebootMainConfig {
         private String rebootCode;
         //群的ID，可以升级为支持多个群
         private String openConversationId;
-
-        private DingDingSceneEnum dingDingSceneEnum;
+        //场景字符串，唯一
+        private String dingDingScene;
     }
 
 }
diff --git a/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java b/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java
index 4d213d0..1cc071c 100644
--- a/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java
+++ b/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java
@@ -96,7 +96,7 @@ public class DingDingRebootService {
     public void sendCorpRebootGroupMsg(DingDingSendRebootGroupMsgReq req) {
 
         //根据场景选择对应的配置
-        DingDingRebootMainConfig.DingDingConfigDTO dto = getByEnum(req.getDingDingSceneEnum());
+        DingDingRebootMainConfig.DingDingConfigDTO dto = getByScene(req.getDingDingScene());
         //获取token
         GetAccessTokenResponseBody accessToken = dingDingNewSdkManger.getAccessToken(dto.getAppKey(), dto.getAppSecret());
         //发送消息
@@ -106,14 +106,14 @@ public class DingDingRebootService {
 
     /**
      * 根据业务场景匹配对应的发送钉钉配置
-     * @param dingDingSceneEnum
+     * @param dingDingScene
      * @return
      */
-    private DingDingRebootMainConfig.DingDingConfigDTO getByEnum(DingDingSceneEnum dingDingSceneEnum) {
+    private DingDingRebootMainConfig.DingDingConfigDTO getByScene(String dingDingScene) {
 
-        if (Objects.nonNull(dingDingSceneEnum) && !CollectionUtils.isEmpty(dingDingRebootMainConfig.getList())) {
+        if (Objects.nonNull(dingDingScene) && !CollectionUtils.isEmpty(dingDingRebootMainConfig.getList())) {
             for (DingDingRebootMainConfig.DingDingConfigDTO dto : dingDingRebootMainConfig.getList()) {
-                if (dingDingSceneEnum == dto.getDingDingSceneEnum()) {
+                if (dingDingScene.equals(dto.getDingDingScene())) {
                     return dto;
                 }
             }
diff --git a/riven-server/src/main/resources/application-local.yml b/riven-server/src/main/resources/application-local.yml
index a5b4a2a..422bd73 100644
--- a/riven-server/src/main/resources/application-local.yml
+++ b/riven-server/src/main/resources/application-local.yml
@@ -4,16 +4,18 @@ reboot:
   group:
     list:
       #场景-运营通知
-      - dingDingSceneEnum: WORK_OPERATION
+      - #dingDingScene必须唯一，其他随意
+      - dingDingScene: WORK_OPERATION
         appKey: dingx9pejjkh8whnaqkw
         appSecret: IViT8sL_VVZ03gRc3oIvbtzS0DsTKUI9pLgXSNh9FErHgzFR_97liY5g6SpmJpjk
+        #暂时未使用
         agentId: 3286362019
         #机器人ID
         rebootCode: dingx9pejjkh8whnaqkw
         #群ID
         openConversationId: cidAy86bIrB513xUaCOmvD/Hg==
       #场景-公用告警通知，待补充
-      - dingDingSceneEnum: COMMON_ALERT
+      - dingDingScene: COMMON_ALERT
         appKey: 待补充
         appSecret: 待补充
         agentId: 0