From 7716e46e6ecf8efece460bf5f154d2fc3508a815 Mon Sep 17 00:00:00 2001
From: wangfei <wangfei@91isoft.com>
Date: Wed, 27 Dec 2023 15:28:24 +0800
Subject: [PATCH 1/3] Refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、SysUserController 增加链路追踪。

Reference N/A
---
 .../controller/system/SysUserController.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index dc29d49..cc23b11 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -4,6 +4,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.skywalking.apm.toolkit.trace.Tag;
+import org.apache.skywalking.apm.toolkit.trace.Tags;
+import org.apache.skywalking.apm.toolkit.trace.Trace;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -56,6 +59,8 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)
@@ -65,6 +70,8 @@ public class SysUserController extends BaseController
         return getDataTable(list);
     }
 
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
@@ -75,6 +82,8 @@ public class SysUserController extends BaseController
         util.exportExcel(response, list, "用户数据");
     }
 
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
@@ -87,6 +96,8 @@ public class SysUserController extends BaseController
         return success(message);
     }
 
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response)
     {
@@ -97,6 +108,8 @@ public class SysUserController extends BaseController
     /**
      * 根据用户编号获取详细信息
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
@@ -119,6 +132,8 @@ public class SysUserController extends BaseController
     /**
      * 新增用户
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -144,6 +159,8 @@ public class SysUserController extends BaseController
     /**
      * 修改用户
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -170,6 +187,8 @@ public class SysUserController extends BaseController
     /**
      * 删除用户
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
@@ -185,6 +204,8 @@ public class SysUserController extends BaseController
     /**
      * 重置密码
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
@@ -200,6 +221,8 @@ public class SysUserController extends BaseController
     /**
      * 状态修改
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
@@ -214,6 +237,8 @@ public class SysUserController extends BaseController
     /**
      * 根据用户编号获取授权角色
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId)
@@ -229,6 +254,8 @@ public class SysUserController extends BaseController
     /**
      * 用户授权角色
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
@@ -242,6 +269,8 @@ public class SysUserController extends BaseController
     /**
      * 获取部门树列表
      */
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
-- 
2.22.0


From ac2261c31a4f9bb58a4b2a36c507ccad0a2b093f Mon Sep 17 00:00:00 2001
From: wangfei <wangfei@91isoft.com>
Date: Wed, 27 Dec 2023 15:34:15 +0800
Subject: [PATCH 2/3] Refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、SysUserController 增加链路追踪（处理多参数情况）

Reference N/A
---
 .../com/ruoyi/web/controller/system/SysUserController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index cc23b11..bc709da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -71,7 +71,7 @@ public class SysUserController extends BaseController
     }
 
     @Trace
-    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "param1", value = "arg[1]"), @Tag(key = "result", value = "returnedObj")})
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
@@ -83,7 +83,7 @@ public class SysUserController extends BaseController
     }
 
     @Trace
-    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "param1", value = "arg[1]"), @Tag(key = "result", value = "returnedObj")})
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
@@ -255,7 +255,7 @@ public class SysUserController extends BaseController
      * 用户授权角色
      */
     @Trace
-    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "param1", value = "arg[1]"), @Tag(key = "result", value = "returnedObj")})
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-- 
2.22.0


From 99f4e7a05f98fae17716c25ddc12e2f4aa82b121 Mon Sep 17 00:00:00 2001
From: wangfei <wangfei@91isoft.com>
Date: Wed, 27 Dec 2023 15:39:20 +0800
Subject: [PATCH 3/3] FIX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、修复查询变更通知时写死了任务id的问题。

Reference N/A
---
 .../src/main/resources/mapper/ReviewSceneChangeTaskMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quality-review/src/main/resources/mapper/ReviewSceneChangeTaskMapper.xml b/quality-review/src/main/resources/mapper/ReviewSceneChangeTaskMapper.xml
index bbe6200..79b505c 100644
--- a/quality-review/src/main/resources/mapper/ReviewSceneChangeTaskMapper.xml
+++ b/quality-review/src/main/resources/mapper/ReviewSceneChangeTaskMapper.xml
@@ -25,7 +25,7 @@
     <select id="findLastChangeByTaskId" resultType="com.ruoyi.domain.ReviewSceneChangeTask">
         SELECT * FROM t_review_scene_change_task WHERE id IN
            (
-               SELECT MAX(id) FROM t_review_scene_change_task WHERE task_status = 'FINISH' AND task_result = 'PASS' AND id IN (SELECT review_scene_change_task_id FROM t_system_review_task_inbox WHERE system_review_task_id = 1737668929502830594 AND is_confirm = 0) GROUP BY review_scene_id
+               SELECT MAX(id) FROM t_review_scene_change_task WHERE task_status = 'FINISH' AND task_result = 'PASS' AND id IN (SELECT review_scene_change_task_id FROM t_system_review_task_inbox WHERE system_review_task_id = #{taskId} AND is_confirm = 0) GROUP BY review_scene_id
            )
     </select>
 
-- 
2.22.0