From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 135 +++-----------------------------------------
1 files changed, 11 insertions(+), 124 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index f31f8b2..d441c73 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -12,7 +12,8 @@
<result property="orderNum" column="order_num"/>
<result property="path" column="path"/>
<result property="component" column="component"/>
- <result property="isFrame" column="is_frame"/>
+ <result property="query" column="query"/>
+ <result property="isFrame" column="is_frame"/>
<result property="isCache" column="is_cache"/>
<result property="menuType" column="menu_type"/>
<result property="visible" column="visible"/>
@@ -26,47 +27,14 @@
<result property="remark" column="remark"/>
</resultMap>
- <sql id="selectMenuVo">
- select menu_id,
- menu_name,
- parent_id,
- order_num,
- path,
- component,
- is_frame,
- is_cache,
- menu_type,
- visible,
- status,
- ifnull(perms, '') as perms,
- icon,
- create_time
- from sys_menu
- </sql>
-
- <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- <where>
- <if test="menuName != null and menuName != ''">
- AND menu_name like concat('%', #{menuName}, '%')
- </if>
- <if test="visible != null and visible != ''">
- AND visible = #{visible}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- </where>
- order by parent_id, order_num
- </select>
-
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id,
m.parent_id,
m.menu_name,
m.path,
m.component,
- m.visible,
+ m.`query`,
+ m.visible,
m.status,
ifnull(m.perms, '') as perms,
m.is_frame,
@@ -82,7 +50,7 @@
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status,
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -90,13 +58,13 @@
left join sys_role ro on ur.role_id = ro.role_id
where ur.user_id = #{params.userId}
<if test="menuName != null and menuName != ''">
- AND menu_name like concat('%', #{menuName}, '%')
+ AND m.menu_name like concat('%', #{menuName}, '%')
</if>
<if test="visible != null and visible != ''">
- AND visible = #{visible}
+ AND m.visible = #{visible}
</if>
<if test="status != null and status != ''">
- AND status = #{status}
+ AND m.status = #{status}
</if>
order by m.parent_id, m.order_num
</select>
@@ -107,6 +75,7 @@
m.menu_name,
m.path,
m.component,
+ m.`query`,
m.visible,
m.status,
ifnull(m.perms, '') as perms,
@@ -128,7 +97,7 @@
order by m.parent_id, m.order_num
</select>
- <select id="selectMenuListByRoleId" resultType="Integer">
+ <select id="selectMenuListByRoleId" resultType="Long">
select m.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -158,86 +127,4 @@
and ur.user_id = #{userId}
</select>
- <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_id = #{menuId}
- </select>
-
- <select id="hasChildByMenuId" resultType="Integer">
- select count(1)
- from sys_menu
- where parent_id = #{menuId}
- </select>
-
- <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_name=#{menuName} and parent_id = #{parentId} limit 1
- </select>
-
- <update id="updateMenu" parameterType="SysMenu">
- update sys_menu
- <set>
- <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
- <if test="parentId != null">parent_id = #{parentId},</if>
- <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
- <if test="path != null and path != ''">path = #{path},</if>
- <if test="component != null">component = #{component},</if>
- <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
- <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
- <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
- <if test="visible != null">visible = #{visible},</if>
- <if test="status != null">status = #{status},</if>
- <if test="perms !=null">perms = #{perms},</if>
- <if test="icon !=null and icon != ''">icon = #{icon},</if>
- <if test="remark != null and remark != ''">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where menu_id = #{menuId}
- </update>
-
- <insert id="insertMenu" parameterType="SysMenu">
- insert into sys_menu(
- <if test="menuId != null and menuId != 0">menu_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="menuName != null and menuName != ''">menu_name,</if>
- <if test="orderNum != null and orderNum != ''">order_num,</if>
- <if test="path != null and path != ''">path,</if>
- <if test="component != null and component != ''">component,</if>
- <if test="isFrame != null and isFrame != ''">is_frame,</if>
- <if test="isCache != null and isCache != ''">is_cache,</if>
- <if test="menuType != null and menuType != ''">menu_type,</if>
- <if test="visible != null">visible,</if>
- <if test="status != null">status,</if>
- <if test="perms !=null and perms != ''">perms,</if>
- <if test="icon != null and icon != ''">icon,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="menuId != null and menuId != 0">#{menuId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="menuName != null and menuName != ''">#{menuName},</if>
- <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
- <if test="path != null and path != ''">#{path},</if>
- <if test="component != null and component != ''">#{component},</if>
- <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
- <if test="isCache != null and isCache != ''">#{isCache},</if>
- <if test="menuType != null and menuType != ''">#{menuType},</if>
- <if test="visible != null">#{visible},</if>
- <if test="status != null">#{status},</if>
- <if test="perms !=null and perms != ''">#{perms},</if>
- <if test="icon != null and icon != ''">#{icon},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <delete id="deleteMenuById" parameterType="Long">
- delete
- from sys_menu
- where menu_id = #{menuId}
- </delete>
-
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3