From 6852f124618c8541d82f3de3cfbc1b11ad86fbbc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 22:50:36 +0800
Subject: [PATCH] feat: 分页默认20条，销售台账导出去掉项目名称，生产订单关联优化
---
src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
index cee6db9..281769e 100644
--- a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
+++ b/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
@@ -14,6 +14,8 @@
import com.ruoyi.project.monitor.domain.SysOperLog;
import com.ruoyi.project.monitor.service.ISysLogininforService;
import com.ruoyi.project.monitor.service.ISysOperLogService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
import eu.bitwalker.useragentutils.UserAgent;
/**
@@ -38,17 +40,19 @@
final Object... args)
{
final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
- final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+ final String ip = IpUtils.getIpAddr();
return new TimerTask()
{
@Override
public void run()
{
+ // 鐧诲綍鏃ュ織鐢ㄦ埛鍚嶇О璁板綍鏄电О锛屾樀绉颁负绌烘椂鍥為��鐧诲綍璐﹀彿
+ String displayName = resolveNickName(username);
String address = AddressUtils.getRealAddressByIP(ip);
StringBuilder s = new StringBuilder();
s.append(LogUtils.getBlock(ip));
s.append(address);
- s.append(LogUtils.getBlock(username));
+ s.append(LogUtils.getBlock(displayName));
s.append(LogUtils.getBlock(status));
s.append(LogUtils.getBlock(message));
// 鎵撳嵃淇℃伅鍒版棩蹇�
@@ -59,7 +63,7 @@
String browser = userAgent.getBrowser().getName();
// 灏佽瀵硅薄
SysLogininfor logininfor = new SysLogininfor();
- logininfor.setUserName(username);
+ logininfor.setUserName(displayName);
logininfor.setIpaddr(ip);
logininfor.setLoginLocation(address);
logininfor.setBrowser(browser);
@@ -81,8 +85,35 @@
}
/**
+ * 鎸夌櫥褰曡处鍙锋煡璇㈡樀绉帮紝鏌ヨ涓嶅埌鏃跺洖閫�涓哄師璐﹀彿
+ *
+ * @param username 鐧诲綍璐﹀彿
+ * @return 鏄电О
+ */
+ private static String resolveNickName(String username)
+ {
+ if (StringUtils.isEmpty(username))
+ {
+ return username;
+ }
+ try
+ {
+ SysUser user = SpringUtils.getBean(ISysUserService.class).selectUserByUserName(username);
+ if (user != null && StringUtils.isNotEmpty(user.getNickName()))
+ {
+ return user.getNickName();
+ }
+ }
+ catch (Exception e)
+ {
+ // 鏌ヨ鏄电О澶辫触涓嶅奖鍝嶇櫥褰曟棩蹇楀啓鍏ワ紝鍥為��涓虹櫥褰曡处鍙�
+ }
+ return username;
+ }
+
+ /**
* 鎿嶄綔鏃ュ織璁板綍
- *
+ *
* @param operLog 鎿嶄綔鏃ュ織淇℃伅
* @return 浠诲姟task
*/
--
Gitblit v1.9.3