From b8a1b5edfdaa28efdcec58e49b62115164421068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Wed, 21 Jan 2026 10:14:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(ifs):=20=E5=AE=9E=E7=8E=B0IFS=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E7=94=A8=E6=97=B6=E6=9B=BF=E6=8D=A2domainUse?=
 =?UTF-8?q?rID=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入fastjson2库用于JSON解析操作
- 在重试调用IFS接口时传入当前登录用户名参数
- 添加JSON对象解析和domainUserID字段替换逻辑
- 实现异常捕获确保JSON解析失败时使用原始数据
- 添加调试日志输出替换前后用户信息对比
---
 .../impl/IfsCallErrorLogServiceImpl.java      | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
index d89aaa1..f99f8d0 100644
--- a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.gaotao.modules.api.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +28,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.alibaba.fastjson2.JSON.parseObject;
+
 /**
  * @Description IFS接口调用错误日志服务实现类 - rqrq
  * @Author rqrq
@@ -223,8 +226,8 @@ public class IfsCallErrorLogServiceImpl extends ServiceImpl<IfsCallErrorLogMappe
         }
 
         // 3. 调用IFS接口（独立实现，不影响原有逻辑）- rqrq
-        boolean success = retryCallIfsInterface(errorLog);
-
+        // 传入当前登录用户，用于替换请求中的domainUserID - rqrq
+        boolean success = retryCallIfsInterface(errorLog, processedBy);
         // 4. 更新记录状态 - rqrq
         if (success) {
             // 成功 - 标记为已处理 - rqrq
@@ -272,11 +275,12 @@ public class IfsCallErrorLogServiceImpl extends ServiceImpl<IfsCallErrorLogMappe
     /**
      * @Description 重试调用IFS接口（独立方法，复制自syncSingleGroupToIFSForPallet，不影响原有逻辑）- rqrq
      * @param errorLog 错误日志
+     * @param currentUsername 当前登录用户名（用于替换domainUserID）- rqrq
      * @return 是否成功
      * @author rqrq
      * @date 2025/10/08
      */
-    private boolean retryCallIfsInterface(IfsCallErrorLog errorLog) {
+    private boolean retryCallIfsInterface(IfsCallErrorLog errorLog, String currentUsername) {
         System.out.println("开始调用IFS接口 - " + errorLog.getInterfaceName());
 
         String jsonBody = null;
@@ -284,7 +288,23 @@ public class IfsCallErrorLogServiceImpl extends ServiceImpl<IfsCallErrorLogMappe
 
         try {
             jsonBody = errorLog.getRequestData();
-            System.out.println("请求数据: " + jsonBody);
+            
+            // 替换domainUserID为当前登录用户 - rqrq
+            if (jsonBody != null && currentUsername != null && !currentUsername.isEmpty()) {
+                try {
+                    JSONObject jsonObject = parseObject(jsonBody);
+                    if (jsonObject != null && jsonObject.containsKey("domainUserID")) {
+                        String originalUser = jsonObject.getString("domainUserID");
+                        jsonObject.put("domainUserID", currentUsername);
+                        jsonBody = jsonObject.toJSONString();
+                        System.out.println("已将domainUserID从 " + originalUser + " 替换为 " + currentUsername + " - rqrq");
+                    }
+                } catch (Exception e) {
+                    System.out.println("解析JSON替换domainUserID失败，使用原始数据: " + e.getMessage());
+                }
+            }
+            
+            System.out.println("重试ifs接口: " + jsonBody);
             // 2. 调用IFS接口 - rqrq
             ifsResponse = HttpUtils.doPost(ifsUrl + errorLog.getInterfaceName(), jsonBody, null);