From 6e3d8e950e7dec3551bee3512673e1fc2d384d2b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 20:25:55 +0800
Subject: [PATCH] fix(mes): 修复能耗抄表控制器启动时的 bean 名称冲突

---
 sql/mysql/mes_em_energy_init.sql |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/sql/mysql/mes_em_energy_init.sql b/sql/mysql/mes_em_energy_init.sql
index 8aad803..6401603 100644
--- a/sql/mysql/mes_em_energy_init.sql
+++ b/sql/mysql/mes_em_energy_init.sql
@@ -191,6 +191,13 @@
 (2, '宸插鐞�', '1', 'mes_em_alert_status', 0, 'success', '', '宸插鐞�', '1', NOW(), '1', NOW(), b'0');
 
 -- 4. 鑿滃崟锛堢埗鑿滃崟 1065864 鑳借�楃鐞嗭級
+--    璇ョ洰褰曞彲鑳藉凡琚�昏緫鍒犻櫎锛坉eleted = b'1'锛夛紝姝ゆ椂瀛愯彍鍗曚細鍥犵埗鑺傜偣涓嶅彲瑙佽�屾暣妫垫爲閮戒笉鏄剧ず锛�
+--    鍥犳鍏堟寜涓婚敭琛ユ彃鐖剁洰褰曪紱宸插瓨鍦ㄦ椂浠呮仮澶嶅垹闄ゆ爣璁帮紝涓嶆敼鍔ㄥ師鏈夊悕绉板拰璺緞銆�
+INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES
+(1065864, '鑳借�楃鐞�', '', 1, 16, 0, '/energyManagement', 'monitor', NULL, NULL, 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0')
+ON DUPLICATE KEY UPDATE `deleted` = b'0', `status` = 0, `visible` = b'1', `updater` = '1', `update_time` = NOW();
+
 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
 VALUES
 (1065865, '鑳借�楁�昏', '', 2, 1, 1065864, 'overview', 'ep:data-analysis', 'energy/overview/index', 'EnergyOverview', 0, b'1', b'1', b'1', '1', NOW(), '1', NOW(), b'0'),

--
Gitblit v1.9.3