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); }