From ced714a9fa16b8bb9344005a358fab93182737d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= <lilong@axzo.cn>
Date: Mon, 16 Dec 2024 17:31:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-3342)=20=E7=94=A8=E6=88=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=92=E8=89=B2=E6=97=B6=EF=BC=8CpersonId=E4=B8=BA0?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/RoleUserService.java  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
index be98ed25..e76a6d18 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
@@ -39,6 +39,7 @@ import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
 import cn.axzo.tyr.client.model.roleuser.req.SuperAdminParam;
 import cn.axzo.tyr.client.model.roleuser.req.WorkerManagerRoleUserReq;
 import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO;
+import cn.axzo.tyr.server.common.util.DingTalkUtil;
 import cn.axzo.tyr.server.config.MqProducer;
 import cn.axzo.tyr.server.event.payload.SaasRoleUserRelationUpsertPayload;
 import cn.axzo.tyr.server.model.RoleUserInfo;
@@ -58,6 +59,7 @@ import cn.axzo.tyr.server.service.SaasRoleGroupService;
 import cn.axzo.tyr.server.service.SaasRoleUserRelationService;
 import cn.axzo.tyr.server.service.SaasRoleUserService;
 import cn.axzo.tyr.server.utils.RpcExternalUtil;
+import cn.azxo.framework.common.constatns.Constants;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -69,6 +71,7 @@ import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
@@ -124,7 +127,12 @@ public class RoleUserService implements SaasRoleUserService {
 
     @Value("#{${axzo.role.superAdmin}}")
     private Map<Integer, String> superAdminCodes;
+    @Value("${spring.profiles.active}")
+    private String env;
 
+    // 更新角色时，personId = 0的情况，线上有很多这样的数据，要排查到原因
+    private static final String ACCESS_TOKEN = "11cdf26d77211ee887184844910bf249b94aa2675c7ce36d75a7aa87d619490f";
+    private static final String SECRET = "SEC3c1be9e4fe4cc09f16eb4b2eebf91659f21d5bdfb1d764b52f3e47825e6bed3f";
 	/**
 	 * 获取分包负责人等特殊角色
 	 * @return
@@ -305,6 +313,20 @@ public class RoleUserService implements SaasRoleUserService {
                         .build())
                 .build();
         mqProducer.send(event);
+
+        // 历史有的记录personId = 0，故加上告警，排查问题
+        if (Objects.isNull(req.getPersonId()) || Objects.equals(req.getPersonId(), 0L)) {
+            String traceId = MDC.get(Constants.CTX_LOG_ID_MDC);
+            StringBuilder sb = new StringBuilder()
+                    .append("环境:").append(env).append("\n")
+                    .append("添加用户角色时，personId异常")
+                    .append("personId:")
+                    .append(req.getPersonId())
+                    .append("\n")
+                    .append("traceId:")
+                    .append(traceId);
+            DingTalkUtil.sendMessage(sb.toString(), ACCESS_TOKEN, SECRET);
+        }
     }
 
     @Override