From 22cb0ddec260bb5c5868543e8fe27d67625e8951 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 11:34:14 +0800
Subject: [PATCH] feat(menu): 更新安全数据驾驶舱菜单挂载位置并完善库存记录字段
---
doc/20261026_add_safety_dashboard_menu.sql | 17 ++---
doc/20261027_add_oil_fields_to_stock_in_out_record.sql | 70 +++++++++++++++++++++++
src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | 37 +++++++++++-
src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 4 +
4 files changed, 114 insertions(+), 14 deletions(-)
diff --git a/doc/20261026_add_safety_dashboard_menu.sql b/doc/20261026_add_safety_dashboard_menu.sql
index bade1ad..77ae12f 100644
--- a/doc/20261026_add_safety_dashboard_menu.sql
+++ b/doc/20261026_add_safety_dashboard_menu.sql
@@ -1,6 +1,6 @@
-- ============================================================
-- 瀹夊叏鏁版嵁椹鹃┒鑸� 鑿滃崟
--- 鎸傝浇浣嶇疆锛氭櫤鎱ч┚椹惰埍锛堢埗鑿滃崟锛変笅
+-- 鎸傝浇浣嶇疆锛氱鐞嗛┚椹惰埍锛坮eportAnalysis锛変笅锛屼笌銆屾櫤鎱ч┚椹惰埍銆嶅悓绾�
-- 椤甸潰缁勪欢锛歳eportAnalysis/safetyDashboard/index
-- 鍙噸澶嶆墽琛岋細鐖惰彍鍗曚笉瀛樺湪涓嶆彃鍏ワ紱鍚� path/name 宸插瓨鍦ㄤ笉閲嶅鎻掑叆
-- 娉ㄦ剰锛氭墍鏈夎鍙ラ渶鍦ㄥ悓涓�涓暟鎹簱杩炴帴涓緷娆℃墽琛岋紝鐢ㄦ埛鍙橀噺鎵嶄細淇濈暀
@@ -8,11 +8,11 @@
-- 鎵ц鍓嶅彲鍏堢‘璁ょ埗鑿滃崟涓庢槸鍚﹀凡瀛樺湪锛�
-- SELECT menu_id, menu_name, parent_id, path, component, menu_type, visible, status
--- FROM sys_menu WHERE menu_name = '鏅烘収椹鹃┒鑸�';
+-- FROM sys_menu WHERE menu_name = '绠$悊椹鹃┒鑸�';
-SET @parent_name := '鏅烘収椹鹃┒鑸�';
+SET @parent_name := '绠$悊椹鹃┒鑸�';
-- 濡傛灉鎸夊悕绉版壘涓嶅埌鐖惰彍鍗曪紝鍙妸鐖惰彍鍗曠殑璺敱鍦板潃濉湪杩欓噷浣滀负鍏滃簳锛堢暀 NULL 琛ㄧず涓嶅惎鐢級
-SET @parent_path := NULL;
+SET @parent_path := 'reportAnalysis';
SET @menu_name := '瀹夊叏鏁版嵁椹鹃┒鑸�';
SET @menu_path := 'safetyDashboard';
@@ -36,11 +36,8 @@
LIMIT 1
);
--- 3. 鎺掑簭鍙锋帓鍒扮埗鑿滃崟鏈�鍚�
-SET @order_num := COALESCE(
- (SELECT MAX(order_num) FROM sys_menu WHERE parent_id = @parent_id),
- 0
-) + 1;
+-- 3. 鎺掑簭鍙风疆椤讹紙涓庡凡钀藉簱鏁版嵁涓�鑷达級
+SET @order_num := 1;
-- 4. 鎻掑叆鑿滃崟锛堢埗鑿滃崟瀛樺湪涓旇彍鍗曚笉瀛樺湪鏃讹級
INSERT INTO sys_menu (
@@ -86,7 +83,7 @@
-- ============================================================
-- 鍥炴粴锛堟寜闇�鎵ц锛�
-- ============================================================
--- SET @parent_id := (SELECT menu_id FROM sys_menu WHERE menu_name = '鏅烘収椹鹃┒鑸�' ORDER BY menu_id LIMIT 1);
+-- SET @parent_id := (SELECT menu_id FROM sys_menu WHERE menu_name = '绠$悊椹鹃┒鑸�' ORDER BY menu_id LIMIT 1);
-- SET @menu_id := (SELECT menu_id FROM sys_menu
-- WHERE parent_id = @parent_id AND path = 'safetyDashboard' LIMIT 1);
-- DELETE FROM sys_role_menu WHERE menu_id = @menu_id;
diff --git a/doc/20261027_add_oil_fields_to_stock_in_out_record.sql b/doc/20261027_add_oil_fields_to_stock_in_out_record.sql
new file mode 100644
index 0000000..e5b4863
--- /dev/null
+++ b/doc/20261027_add_oil_fields_to_stock_in_out_record.sql
@@ -0,0 +1,70 @@
+-- 涓哄叆搴�/鍑哄簱璁板綍琛ラ綈娌瑰搧銆佹补搴撱�佸偍缃愩�佽溅杈嗐�佸嵏杞�/瑁呰溅銆佽繃纾呯瓑瀛楁
+-- 鑳屾櫙锛歋tockInventoryMapper.xml 鏃犳潯浠舵煡璇㈣繖浜涘垪锛岄潪娌瑰搧绉熸埛搴撶己鍒椾細瀵艰嚧
+-- 搴撳瓨姹囨�绘帴鍙f姤 Unknown column 'sir.oil_product'
+-- 鎵ц搴擄細product-inventory-management-yxhj锛堝凡鎵ц锛�2026-10-27锛�
+-- 璇存槑锛氬叏閮ㄤ负鍙┖鍒楋紝涓嶅奖鍝嶇幇鏈夋暟鎹紱濡傞渶鍦ㄥ叾浠栫鎴峰簱鎵ц锛屾敼搴撳悕鍗冲彲
+
+ALTER TABLE `stock_in_record`
+ ADD COLUMN `oil_depot_id` bigint DEFAULT NULL COMMENT '鍏ュ簱娌瑰簱id',
+ ADD COLUMN `oil_depot_name` varchar(128) DEFAULT NULL COMMENT '鍏ュ簱娌瑰簱鍚嶇О',
+ ADD COLUMN `inbound_category` varchar(50) DEFAULT NULL COMMENT '鍏ュ簱绫诲埆锛氳嚜璐叆搴�/浠e偍鍏ュ簱',
+ ADD COLUMN `sales_ledger_id` bigint DEFAULT NULL COMMENT '缁戝畾鐨勯攢鍞彴璐d锛堜唬鍌ㄥ叆搴撳繀濉級',
+ ADD COLUMN `tank_id` bigint DEFAULT NULL COMMENT '鍌ㄧ綈id',
+ ADD COLUMN `tank_no` varchar(64) DEFAULT NULL COMMENT '鍌ㄧ綈鍙�',
+ ADD COLUMN `inbound_time` datetime DEFAULT NULL COMMENT '鍏ュ簱鏃堕棿',
+ ADD COLUMN `oil_product` varchar(20) DEFAULT NULL COMMENT '娌瑰搧',
+ ADD COLUMN `original_quantity` decimal(18,2) DEFAULT NULL COMMENT '鍘熷巶鏁伴噺锛堝惃锛�',
+ ADD COLUMN `customer_id` bigint DEFAULT NULL COMMENT '瀹㈡埛id',
+ ADD COLUMN `customer_name` varchar(128) DEFAULT NULL COMMENT '瀹㈡埛鍚嶇О',
+ ADD COLUMN `contact_person` varchar(64) DEFAULT NULL COMMENT '瀹㈡埛瀵规帴浜�',
+ ADD COLUMN `contact_phone` varchar(20) DEFAULT NULL COMMENT '瀵规帴浜虹數璇�',
+ ADD COLUMN `driver_name` varchar(50) DEFAULT NULL COMMENT '鍙告満濮撳悕',
+ ADD COLUMN `driver_phone` varchar(20) DEFAULT NULL COMMENT '鍙告満鐢佃瘽',
+ ADD COLUMN `escort_name` varchar(50) DEFAULT NULL COMMENT '鎶艰繍鍛樺鍚�',
+ ADD COLUMN `escort_phone` varchar(20) DEFAULT NULL COMMENT '鎶艰繍鍛樼數璇�',
+ ADD COLUMN `truck_plate_no` varchar(20) DEFAULT NULL COMMENT '杞︾墝鍙�',
+ ADD COLUMN `trailer_plate_no` varchar(20) DEFAULT NULL COMMENT '鎸傝溅鍙�',
+ ADD COLUMN `tank_inspection_status` varchar(20) DEFAULT NULL COMMENT '杞︿綋/閾呭皝妫�楠屾槸鍚︽甯�',
+ ADD COLUMN `unloading_crane_position` varchar(20) DEFAULT NULL COMMENT '鍗歌溅楣や綅',
+ ADD COLUMN `density` varchar(20) DEFAULT NULL COMMENT '瀵嗗害锛坘g/L锛�',
+ ADD COLUMN `unload_photos` text COMMENT '鍗告补鍏抽敭鐜妭鎷嶇収锛圝SON鏁扮粍锛�',
+ ADD COLUMN `gross_weight` decimal(14,2) DEFAULT NULL COMMENT '姣涢噸锛堝惃锛�',
+ ADD COLUMN `tare_weight` decimal(14,2) DEFAULT NULL COMMENT '鐨噸锛堝惃锛�',
+ ADD COLUMN `net_weight` decimal(14,2) DEFAULT NULL COMMENT '鍑�閲嶏紙鍚級',
+ ADD COLUMN `loss_quantity` decimal(14,2) DEFAULT NULL COMMENT '浜忛噺锛堝惃锛�',
+ ADD COLUMN `actual_volume` decimal(14,2) DEFAULT NULL COMMENT '瀹為檯鍏ュ簱浣撶Н锛堝崌锛�',
+ ADD COLUMN `pound_photos` text COMMENT '纾呭崟涓婁紶锛圝SON鏁扮粍锛�';
+
+ALTER TABLE `stock_out_record`
+ ADD COLUMN `sales_ledger_id` bigint DEFAULT NULL COMMENT '閿�鍞彴璐d',
+ ADD COLUMN `out_category` varchar(20) DEFAULT NULL COMMENT '鍑哄簱绫诲埆',
+ ADD COLUMN `oil_depot_id` bigint DEFAULT NULL COMMENT '鍑哄簱娌瑰簱id',
+ ADD COLUMN `oil_depot_name` varchar(100) DEFAULT NULL COMMENT '鍑哄簱娌瑰簱鍚嶇О',
+ ADD COLUMN `tank_id` bigint DEFAULT NULL COMMENT '鍌ㄧ綈id',
+ ADD COLUMN `tank_no` varchar(50) DEFAULT NULL COMMENT '鍌ㄧ綈鍙�',
+ ADD COLUMN `out_date` date DEFAULT NULL COMMENT '鍑哄簱鏃ユ湡',
+ ADD COLUMN `oil_product` varchar(20) DEFAULT NULL COMMENT '娌瑰搧',
+ ADD COLUMN `out_tonnage` decimal(14,2) DEFAULT NULL COMMENT '鍑哄簱鍚ㄤ綅锛堝惃锛�',
+ ADD COLUMN `customer_id` bigint DEFAULT NULL COMMENT '瀹㈡埛id',
+ ADD COLUMN `customer_name` varchar(100) DEFAULT NULL COMMENT '瀹㈡埛鍚嶇О',
+ ADD COLUMN `contact_person` varchar(50) DEFAULT NULL COMMENT '瀹㈡埛瀵规帴浜�',
+ ADD COLUMN `contact_phone` varchar(20) DEFAULT NULL COMMENT '瀵规帴浜虹數璇�',
+ ADD COLUMN `loading_inspection_status` varchar(20) DEFAULT NULL COMMENT '杞︿綋/閾呭皝妫�楠屾槸鍚︽甯�',
+ ADD COLUMN `loading_crane_position` varchar(20) DEFAULT NULL COMMENT '瑁呰溅楣や綅',
+ ADD COLUMN `loading_photos` text COMMENT '瑁呮补鍏抽敭鐜妭鎷嶇収锛圝SON鏁扮粍锛�',
+ ADD COLUMN `density` varchar(20) DEFAULT NULL COMMENT '瀵嗗害锛坘g/L锛�',
+ ADD COLUMN `gross_weight` decimal(14,2) DEFAULT NULL COMMENT '姣涢噸锛堝惃锛�',
+ ADD COLUMN `tare_weight` decimal(14,2) DEFAULT NULL COMMENT '鐨噸锛堝惃锛�',
+ ADD COLUMN `net_weight` decimal(14,2) DEFAULT NULL COMMENT '鍑�閲嶏紙鍚級',
+ ADD COLUMN `loss_quantity` decimal(14,2) DEFAULT NULL COMMENT '浜忛噺锛堝惃锛�',
+ ADD COLUMN `actual_volume` decimal(14,2) DEFAULT NULL COMMENT '瀹為檯鍑哄簱浣撶Н锛堝崌锛�',
+ ADD COLUMN `pound_photos` text COMMENT '纾呭崟涓婁紶锛圝SON鏁扮粍锛�',
+ ADD COLUMN `driver_name` varchar(50) DEFAULT NULL COMMENT '鍙告満濮撳悕',
+ ADD COLUMN `driver_phone` varchar(20) DEFAULT NULL COMMENT '鍙告満鐢佃瘽',
+ ADD COLUMN `escort_name` varchar(50) DEFAULT NULL COMMENT '鎶艰繍鍛樺鍚�',
+ ADD COLUMN `escort_phone` varchar(20) DEFAULT NULL COMMENT '鎶艰繍鍛樼數璇�',
+ ADD COLUMN `truck_plate_no` varchar(20) DEFAULT NULL COMMENT '杞︾墝鍙�',
+ ADD COLUMN `vehicle_id` bigint DEFAULT NULL COMMENT '杞﹁締id',
+ ADD COLUMN `residual_oil` decimal(16,4) DEFAULT NULL COMMENT '娈嬬暀娌归噺锛堝惃锛�',
+ ADD COLUMN `deduct_quantity` decimal(16,4) DEFAULT NULL COMMENT '鎵e噺鏁伴噺锛堝惃锛�',
+ ADD COLUMN `trailer_plate_no` varchar(20) DEFAULT NULL COMMENT '鎸傝溅鍙�';
diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 9b9e1dc..850c12f 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -98,8 +98,10 @@
operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
if (loginUser != null)
{
- operLog.setOperName(loginUser.getUsername());
SysUser currentUser = loginUser.getUser();
+ // 鎿嶄綔浜哄憳璁板綍鏄电О锛屾樀绉颁负绌烘椂鍥為��鐧诲綍璐﹀彿
+ operLog.setOperName(StringUtils.isNotNull(currentUser) && StringUtils.isNotEmpty(currentUser.getNickName())
+ ? currentUser.getNickName() : loginUser.getUsername());
if (StringUtils.isNotNull(currentUser) && StringUtils.isNotNull(currentUser.getDept()))
{
operLog.setDeptName(currentUser.getDept().getDeptName());
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 49c907e..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;
/**
@@ -44,11 +46,13 @@
@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