水利工程运行管理系统

.mybatis/index.json

@@ -1,6 +1,6 @@
 {
   "version": "1.0",
-  "timestamp": 1784560221776,
+  "timestamp": 1784690510254,
   "projectRoot": "d:\\guochan\\tba-gx-guochan",
   "entries": [
     {
@@ -30,13 +30,28 @@
     },
     {
       "path": "gw-common\\target\\classes\\com\\goldenwater\\common\\config\\RuoYiConfig.class",
-      "mtime": 1784560049282.296,
+      "mtime": 1784687174608.6216,
+      "size": 2656
+    },
+    {
+      "path": "..\\tba-gxpt-guochan\\gw-common\\target\\classes\\com\\goldenwater\\common\\config\\RuoYiConfig.class",
+      "mtime": 1784687175967.2544,
       "size": 2656
     },
     {
       "path": "gw-admin\\target\\classes\\com\\goldenwater\\web\\core\\config\\SwaggerConfig.class",
-      "mtime": 1784560177893.3743,
-      "size": 3793
+      "mtime": 1784687246370.303,
+      "size": 3787
+    },
+    {
+      "path": "..\\tba-gxpt-guochan\\gw-framework\\target\\classes\\com\\goldenwater\\framework\\config\\ThreadPoolConfig.class",
+      "mtime": 1784688213824.6934,
+      "size": 2442
+    },
+    {
+      "path": "..\\tba-gxpt-guochan\\gw-admin\\target\\classes\\com\\goldenwater\\web\\core\\config\\SwaggerConfig.class",
+      "mtime": 1784688490067.941,
+      "size": 3772
     }
   ]
 }

docs/init-yjjt-menu.sql

@@ -1,103 +1,144 @@
 -- ============================================================
 -- 引江济太(YJJT)菜单初始化SQL
--- 请在达梦数据库中执行此脚本
+-- 适配达梦数据库(DAMENG)版本
 -- ============================================================
 
+-- 设置当前模式
+SET SCHEMA PUBLIC;
+
 -- 一级菜单：引江济太管理
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
+INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
 VALUES ('引江济太管理', 0, 11, 'yjjt', NULL, NULL, 1, 0, 'M', '0', '0', '', 'skill', 'admin', SYSDATE, '引江济太管理目录');
 
--- 二级菜单：YJJT站点管理
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT 'YJJT站点管理', id, 1, 'station', 'yjjt/station/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:station:list', 'server', 'admin', SYSDATE, '引江济太站点管理菜单'
-FROM sys_menu WHERE menu_name = '引江济太管理' AND parent_id = 0;
-
--- 二级菜单：水量数据
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水量数据', id, 2, 'sl', 'yjjt/sl/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:sl:list', 'chart', 'admin', SYSDATE, '引江济太水量数据菜单'
-FROM sys_menu WHERE menu_name = '引江济太管理' AND parent_id = 0;
-
--- 二级菜单：水质数据
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水质数据', id, 3, 'sz', 'yjjt/sz/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:sz:list', 'chart', 'admin', SYSDATE, '引江济太水质数据菜单'
-FROM sys_menu WHERE menu_name = '引江济太管理' AND parent_id = 0;
-
--- 二级菜单：文件管理
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT 'YJJT文件管理', id, 4, 'file', 'yjjt/file/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:file:list', 'upload', 'admin', SYSDATE, '引江济太文件管理菜单'
-FROM sys_menu WHERE menu_name = '引江济太管理' AND parent_id = 0;
-
--- 二级菜单：数据统计
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT 'YJJT数据统计', id, 5, 'statistics', 'yjjt/statistics/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:data:list', 'dashboard', 'admin', SYSDATE, '引江济太数据统计菜单'
-FROM sys_menu WHERE menu_name = '引江济太管理' AND parent_id = 0;
+-- 获取一级菜单ID
+DECLARE
+    V_PARENT_ID BIGINT;
+BEGIN
+    SELECT ID INTO V_PARENT_ID FROM SYS_MENU WHERE MENU_NAME = '引江济太管理' AND PARENT_ID = 0;
+    
+    -- 二级菜单：YJJT站点管理
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('YJJT站点管理', V_PARENT_ID, 1, 'station', 'yjjt/station/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:station:list', 'server', 'admin', SYSDATE, '引江济太站点管理菜单');
+    
+    -- 二级菜单：水量数据
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水量数据', V_PARENT_ID, 2, 'sl', 'yjjt/sl/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:sl:list', 'chart', 'admin', SYSDATE, '引江济太水量数据菜单');
+    
+    -- 二级菜单：水质数据
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水质数据', V_PARENT_ID, 3, 'sz', 'yjjt/sz/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:sz:list', 'chart', 'admin', SYSDATE, '引江济太水质数据菜单');
+    
+    -- 二级菜单：文件管理
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('YJJT文件管理', V_PARENT_ID, 4, 'file', 'yjjt/file/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:file:list', 'upload', 'admin', SYSDATE, '引江济太文件管理菜单');
+    
+    -- 二级菜单：数据统计
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('YJJT数据统计', V_PARENT_ID, 5, 'statistics', 'yjjt/statistics/index', NULL, 1, 0, 'C', '0', '0', 'yjjt:data:list', 'dashboard', 'admin', SYSDATE, '引江济太数据统计菜单');
+    
+EXCEPTION
+    WHEN NO_DATA_FOUND THEN
+        PRINT '未找到引江济太管理菜单';
+END;
+/
 
 -- ============================================================
 -- 按钮权限：YJJT站点管理
 -- ============================================================
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '站点查询', id, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:query', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT站点管理' AND perms = 'yjjt:station:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '站点新增', id, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:add', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT站点管理' AND perms = 'yjjt:station:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '站点修改', id, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:edit', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT站点管理' AND perms = 'yjjt:station:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '站点删除', id, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:remove', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT站点管理' AND perms = 'yjjt:station:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '站点导出', id, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:export', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT站点管理' AND perms = 'yjjt:station:list';
+DECLARE
+    V_PARENT_ID BIGINT;
+BEGIN
+    SELECT ID INTO V_PARENT_ID FROM SYS_MENU WHERE MENU_NAME = 'YJJT站点管理' AND PERMS = 'yjjt:station:list';
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('站点查询', V_PARENT_ID, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:query', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('站点新增', V_PARENT_ID, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:add', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('站点修改', V_PARENT_ID, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:edit', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('站点删除', V_PARENT_ID, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:remove', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('站点导出', V_PARENT_ID, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:station:export', '#', 'admin', SYSDATE, '');
+    
+EXCEPTION
+    WHEN NO_DATA_FOUND THEN
+        PRINT '未找到YJJT站点管理菜单';
+END;
+/
 
 -- ============================================================
 -- 按钮权限：水量数据
 -- ============================================================
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水量查询', id, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sl:query', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = '水量数据' AND perms = 'yjjt:sl:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水量删除', id, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sl:remove', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = '水量数据' AND perms = 'yjjt:sl:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水量导出', id, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sl:export', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = '水量数据' AND perms = 'yjjt:sl:list';
+DECLARE
+    V_PARENT_ID BIGINT;
+BEGIN
+    SELECT ID INTO V_PARENT_ID FROM SYS_MENU WHERE MENU_NAME = '水量数据' AND PERMS = 'yjjt:sl:list';
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水量查询', V_PARENT_ID, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sl:query', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水量删除', V_PARENT_ID, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sl:remove', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水量导出', V_PARENT_ID, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sl:export', '#', 'admin', SYSDATE, '');
+    
+EXCEPTION
+    WHEN NO_DATA_FOUND THEN
+        PRINT '未找到水量数据菜单';
+END;
+/
 
 -- ============================================================
 -- 按钮权限：水质数据
 -- ============================================================
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水质查询', id, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sz:query', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = '水质数据' AND perms = 'yjjt:sz:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水质删除', id, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sz:remove', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = '水质数据' AND perms = 'yjjt:sz:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '水质导出', id, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sz:export', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = '水质数据' AND perms = 'yjjt:sz:list';
+DECLARE
+    V_PARENT_ID BIGINT;
+BEGIN
+    SELECT ID INTO V_PARENT_ID FROM SYS_MENU WHERE MENU_NAME = '水质数据' AND PERMS = 'yjjt:sz:list';
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水质查询', V_PARENT_ID, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sz:query', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水质删除', V_PARENT_ID, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sz:remove', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('水质导出', V_PARENT_ID, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:sz:export', '#', 'admin', SYSDATE, '');
+    
+EXCEPTION
+    WHEN NO_DATA_FOUND THEN
+        PRINT '未找到水质数据菜单';
+END;
+/
 
 -- ============================================================
 -- 按钮权限：YJJT文件管理
 -- ============================================================
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '文件查询', id, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:file:query', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT文件管理' AND perms = 'yjjt:file:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '文件新增', id, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:file:add', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT文件管理' AND perms = 'yjjt:file:list';
-
-INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
-SELECT '文件删除', id, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:file:remove', '#', 'admin', SYSDATE, ''
-FROM sys_menu WHERE menu_name = 'YJJT文件管理' AND perms = 'yjjt:file:list';
+DECLARE
+    V_PARENT_ID BIGINT;
+BEGIN
+    SELECT ID INTO V_PARENT_ID FROM SYS_MENU WHERE MENU_NAME = 'YJJT文件管理' AND PERMS = 'yjjt:file:list';
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('文件查询', V_PARENT_ID, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:file:query', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('文件新增', V_PARENT_ID, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:file:add', '#', 'admin', SYSDATE, '');
+    
+    INSERT INTO SYS_MENU (MENU_NAME, PARENT_ID, ORDER_NUM, PATH, COMPONENT, QUERY, IS_FRAME, IS_CACHE, MENU_TYPE, VISIBLE, STATUS, PERMS, ICON, CREATE_BY, CREATE_TIME, REMARK)
+    VALUES ('文件删除', V_PARENT_ID, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'yjjt:file:remove', '#', 'admin', SYSDATE, '');
+    
+EXCEPTION
+    WHEN NO_DATA_FOUND THEN
+        PRINT '未找到YJJT文件管理菜单';
+END;
+/
 
 COMMIT;
+PRINT '引江济太菜单初始化完成';

gw-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -30,7 +30,7 @@
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, query, route_name, is_frame, is_cache, menu_type, visible, status, nvl(perms,'') as perms, icon, create_time
+        select menu_id, menu_name, parent_id, order_num, path, component, query, route_name, is_frame, is_cache, menu_type, visible, status, nvl(perms,'') as perms, icon,is_front, create_time
 		from sys_menu
     </sql>
     
@@ -47,7 +47,7 @@
 				AND status = #{status}
 			</if>
 		</where>
-		order by parent_id, order_num
+		order by parent_id, is_front desc, order_num
 	</select>
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">

gw-ui/src/views/system/menu/index.vue

@@ -86,6 +86,13 @@
          </el-table-column>
          <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true" />
          <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
+         <el-table-column prop="isFront" label="前端标识" width="100">
+            <template #default="scope">
+               <el-tag :type="scope.row.isFront === '1' ? 'success' : 'danger'" size="small">
+                  {{ scope.row.isFront === '1' ? '前端' : '否' }}
+               </el-tag>
+            </template>
+         </el-table-column>
          <el-table-column prop="status" label="状态" width="80">
             <template #default="scope">
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -274,6 +281,22 @@
                      </el-radio-group>
                   </el-form-item>
                </el-col>
+               <el-col :span="12" v-if="form.menuType != 'F'">
+                  <el-form-item>
+                     <template #label>
+                        <span>
+                           <el-tooltip content="选择是则该菜单显示在前端驾驶舱中" placement="top">
+                              <el-icon><question-filled /></el-icon>
+                           </el-tooltip>
+                           前端标识
+                        </span>
+                     </template>
+                     <el-radio-group v-model="form.isFront">
+                        <el-radio value="0">否</el-radio>
+                        <el-radio value="1">是前端</el-radio>
+                     </el-radio-group>
+                  </el-form-item>
+               </el-col>
                <el-col :span="12">
                   <el-form-item>
                      <template #label>
@@ -377,7 +400,8 @@ function reset() {
     isFrame: "1",
     isCache: "0",
     visible: "0",
-    status: "0"
+    status: "0",
+    isFront: "0"
   }
   proxy.resetForm("menuRef")
 }