From a0d9a1f591a85335917e8e15483edbe4589f81d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Wed, 9 Oct 2024 14:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=B6=88=E6=81=AF=E9=98=9F?=
 =?UTF-8?q?=E5=88=97=E6=96=B0=E5=A2=9E=E9=80=8F=E4=BC=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/utils/SecurityUtils.java  | 10 ++++++++++
 .../main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java  |  1 +
 .../main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java |  2 ++
 3 files changed, 13 insertions(+)

diff --git a/eladmin-common/src/main/java/cn/ysk/cashier/utils/SecurityUtils.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/SecurityUtils.java
index 4820a96c..a953b82c 100644
--- a/eladmin-common/src/main/java/cn/ysk/cashier/utils/SecurityUtils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/SecurityUtils.java
@@ -12,6 +12,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
+
 import java.util.List;
 
 /**
@@ -57,6 +58,15 @@ public class SecurityUtils {
         return new JSONObject(new JSONObject(userDetails).get("user")).get("id", Long.class);
     }
 
+    /**
+     * 获取系统用户nickName
+     * @return 系统用户NickName
+     */
+    public static String getCurrentUserNickName() {
+        UserDetails userDetails = getCurrentUser();
+        return new JSONObject(new JSONObject(userDetails).get("user")).get("nickName", String.class);
+    }
+
     /**
      * 获取当前用户的数据权限
      * @return /
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java
index 1fd4a808..8b7f9177 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java
@@ -9,4 +9,5 @@ public class CallNumPrintDTO {
 
     private Long currentUserId;
     private String currentUserName;
+    private String currentUserNickName;
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java b/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java
index 3328a9d2..5b2fe6c5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/utils/RabbitMsgUtils.java
@@ -83,6 +83,7 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback {
         try {
             printDTO.setCurrentUserId(SecurityUtils.getCurrentUserId());
             printDTO.setCurrentUserName(SecurityUtils.getCurrentUsername());
+            printDTO.setCurrentUserNickName(SecurityUtils.getCurrentUserNickName());
         }catch (Exception e){
             log.error("获取当前用户信息失败", e);
         }
@@ -102,6 +103,7 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback {
         try {
             jsonObject.put("currentUserId", SecurityUtils.getCurrentUserId());
             jsonObject.put("currentUserName", SecurityUtils.getCurrentUsername());
+            jsonObject.put("currentUserNickName", SecurityUtils.getCurrentUserNickName());
         }catch (Exception e){
             log.error("获取当前用户信息失败", e);
         }