Commit 26ab28b3 authored by 赵啸非's avatar 赵啸非

添加菜单资源配置

parent 10b6bfe8
...@@ -358,17 +358,21 @@ CREATE TABLE mortals_xhx_menu( ...@@ -358,17 +358,21 @@ CREATE TABLE mortals_xhx_menu(
`menuType` tinyint(2) DEFAULT '0' COMMENT '菜单类型 (0.目录,1.菜单,2.按钮)', `menuType` tinyint(2) DEFAULT '0' COMMENT '菜单类型 (0.目录,1.菜单,2.按钮)',
`authType` tinyint(2) DEFAULT '3' COMMENT '权限类型 (0.无限制,1.无需登录查看,2.需要登录查看,3.需要角色权限查看)', `authType` tinyint(2) DEFAULT '3' COMMENT '权限类型 (0.无限制,1.无需登录查看,2.需要登录查看,3.需要角色权限查看)',
`visible` tinyint(2) DEFAULT '0' COMMENT '菜单显示状态 (0.显示,1.隐藏)', `visible` tinyint(2) DEFAULT '0' COMMENT '菜单显示状态 (0.显示,1.隐藏)',
`perms` varchar(512) COMMENT '权限标识,多个逗号分割', `perms` varchar(128) COMMENT '权限标识,多个逗号分割',
`remark` varchar(512) COMMENT '备注信息',
`orderId` int(4) COMMENT '排序编号', `orderId` int(4) COMMENT '排序编号',
`status` tinyint(2) DEFAULT '1' COMMENT '菜单状态 (0.停用,1.启用)', `status` tinyint(2) DEFAULT '1' COMMENT '菜单状态 (0.停用,1.启用)',
`cache` tinyint(2) DEFAULT '0' COMMENT '是否启用缓存 (0.否,1.是)',
`activeDir` varchar(128) COMMENT '激活目录',
`hideChildrenInMenu` tinyint(2) DEFAULT '0' COMMENT '是否隐藏(0.否,1.是)',
`remark` varchar(512) COMMENT '备注信息',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称', `createUserName` varchar(50) COMMENT '创建用户名称',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateUserName` varchar(50) COMMENT '创建用户名称', `updateUserName` varchar(50) COMMENT '创建用户名称',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单信息业务';
...@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -10,11 +10,11 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.base.system.menu.model.vo.MenuVo; import com.mortals.xhx.base.system.menu.model.vo.MenuVo;
import lombok.Data; import lombok.Data;
/** /**
* 菜单信息业务实体对象 * 菜单信息业务实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-09-06 * @date 2024-09-11
*/ */
@Data @Data
public class MenuEntity extends MenuVo { public class MenuEntity extends MenuVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -95,6 +95,18 @@ public class MenuEntity extends MenuVo { ...@@ -95,6 +95,18 @@ public class MenuEntity extends MenuVo {
* 创建用户名称 * 创建用户名称
*/ */
private String updateUserName; private String updateUserName;
/**
* 是否启用缓存 (0.否,1.是)
*/
private Integer cache;
/**
* 激活目录
*/
private String activeDir;
/**
* 是否隐藏(0.否,1.是)
*/
private Integer hideChildrenInMenu;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -131,5 +143,8 @@ public class MenuEntity extends MenuVo { ...@@ -131,5 +143,8 @@ public class MenuEntity extends MenuVo {
this.status = 1; this.status = 1;
this.createUserName = ""; this.createUserName = "";
this.updateUserName = ""; this.updateUserName = "";
this.cache = 0;
this.activeDir = "";
this.hideChildrenInMenu = 0;
} }
} }
\ No newline at end of file
...@@ -3,11 +3,11 @@ package com.mortals.xhx.base.system.menu.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.base.system.menu.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.base.system.menu.model.MenuEntity; import com.mortals.xhx.base.system.menu.model.MenuEntity;
/** /**
* 菜单信息业务查询对象 * 菜单信息业务查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-09-06 * @date 2024-09-11
*/ */
public class MenuQuery extends MenuEntity { public class MenuQuery extends MenuEntity {
/** 开始 菜单ID,主键,自增长 */ /** 开始 菜单ID,主键,自增长 */
private Long idStart; private Long idStart;
...@@ -241,6 +241,41 @@ public class MenuQuery extends MenuEntity { ...@@ -241,6 +241,41 @@ public class MenuQuery extends MenuEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 是否启用缓存 (0.否,1.是) */
private Integer cacheStart;
/** 结束 是否启用缓存 (0.否,1.是) */
private Integer cacheEnd;
/** 增加 是否启用缓存 (0.否,1.是) */
private Integer cacheIncrement;
/** 是否启用缓存 (0.否,1.是)列表 */
private List <Integer> cacheList;
/** 是否启用缓存 (0.否,1.是)排除列表 */
private List <Integer> cacheNotList;
/** 激活目录 */
private List<String> activeDirList;
/** 激活目录排除列表 */
private List <String> activeDirNotList;
/** 开始 是否隐藏(0.否,1.是) */
private Integer hideChildrenInMenuStart;
/** 结束 是否隐藏(0.否,1.是) */
private Integer hideChildrenInMenuEnd;
/** 增加 是否隐藏(0.否,1.是) */
private Integer hideChildrenInMenuIncrement;
/** 是否隐藏(0.否,1.是)列表 */
private List <Integer> hideChildrenInMenuList;
/** 是否隐藏(0.否,1.是)排除列表 */
private List <Integer> hideChildrenInMenuNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<MenuQuery> orConditionList; private List<MenuQuery> orConditionList;
...@@ -1556,6 +1591,200 @@ public class MenuQuery extends MenuEntity { ...@@ -1556,6 +1591,200 @@ public class MenuQuery extends MenuEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 是否启用缓存 (0.否,1.是)
* @return cacheStart
*/
public Integer getCacheStart(){
return this.cacheStart;
}
/**
* 设置 开始 是否启用缓存 (0.否,1.是)
* @param cacheStart
*/
public void setCacheStart(Integer cacheStart){
this.cacheStart = cacheStart;
}
/**
* 获取 结束 是否启用缓存 (0.否,1.是)
* @return $cacheEnd
*/
public Integer getCacheEnd(){
return this.cacheEnd;
}
/**
* 设置 结束 是否启用缓存 (0.否,1.是)
* @param cacheEnd
*/
public void setCacheEnd(Integer cacheEnd){
this.cacheEnd = cacheEnd;
}
/**
* 获取 增加 是否启用缓存 (0.否,1.是)
* @return cacheIncrement
*/
public Integer getCacheIncrement(){
return this.cacheIncrement;
}
/**
* 设置 增加 是否启用缓存 (0.否,1.是)
* @param cacheIncrement
*/
public void setCacheIncrement(Integer cacheIncrement){
this.cacheIncrement = cacheIncrement;
}
/**
* 获取 是否启用缓存 (0.否,1.是)
* @return cacheList
*/
public List<Integer> getCacheList(){
return this.cacheList;
}
/**
* 设置 是否启用缓存 (0.否,1.是)
* @param cacheList
*/
public void setCacheList(List<Integer> cacheList){
this.cacheList = cacheList;
}
/**
* 获取 是否启用缓存 (0.否,1.是)
* @return cacheNotList
*/
public List<Integer> getCacheNotList(){
return this.cacheNotList;
}
/**
* 设置 是否启用缓存 (0.否,1.是)
* @param cacheNotList
*/
public void setCacheNotList(List<Integer> cacheNotList){
this.cacheNotList = cacheNotList;
}
/**
* 获取 激活目录
* @return activeDirList
*/
public List<String> getActiveDirList(){
return this.activeDirList;
}
/**
* 设置 激活目录
* @param activeDirList
*/
public void setActiveDirList(List<String> activeDirList){
this.activeDirList = activeDirList;
}
/**
* 获取 激活目录
* @return activeDirNotList
*/
public List<String> getActiveDirNotList(){
return this.activeDirNotList;
}
/**
* 设置 激活目录
* @param activeDirNotList
*/
public void setActiveDirNotList(List<String> activeDirNotList){
this.activeDirNotList = activeDirNotList;
}
/**
* 获取 开始 是否隐藏(0.否,1.是)
* @return hideChildrenInMenuStart
*/
public Integer getHideChildrenInMenuStart(){
return this.hideChildrenInMenuStart;
}
/**
* 设置 开始 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuStart
*/
public void setHideChildrenInMenuStart(Integer hideChildrenInMenuStart){
this.hideChildrenInMenuStart = hideChildrenInMenuStart;
}
/**
* 获取 结束 是否隐藏(0.否,1.是)
* @return $hideChildrenInMenuEnd
*/
public Integer getHideChildrenInMenuEnd(){
return this.hideChildrenInMenuEnd;
}
/**
* 设置 结束 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuEnd
*/
public void setHideChildrenInMenuEnd(Integer hideChildrenInMenuEnd){
this.hideChildrenInMenuEnd = hideChildrenInMenuEnd;
}
/**
* 获取 增加 是否隐藏(0.否,1.是)
* @return hideChildrenInMenuIncrement
*/
public Integer getHideChildrenInMenuIncrement(){
return this.hideChildrenInMenuIncrement;
}
/**
* 设置 增加 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuIncrement
*/
public void setHideChildrenInMenuIncrement(Integer hideChildrenInMenuIncrement){
this.hideChildrenInMenuIncrement = hideChildrenInMenuIncrement;
}
/**
* 获取 是否隐藏(0.否,1.是)
* @return hideChildrenInMenuList
*/
public List<Integer> getHideChildrenInMenuList(){
return this.hideChildrenInMenuList;
}
/**
* 设置 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuList
*/
public void setHideChildrenInMenuList(List<Integer> hideChildrenInMenuList){
this.hideChildrenInMenuList = hideChildrenInMenuList;
}
/**
* 获取 是否隐藏(0.否,1.是)
* @return hideChildrenInMenuNotList
*/
public List<Integer> getHideChildrenInMenuNotList(){
return this.hideChildrenInMenuNotList;
}
/**
* 设置 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuNotList
*/
public void setHideChildrenInMenuNotList(List<Integer> hideChildrenInMenuNotList){
this.hideChildrenInMenuNotList = hideChildrenInMenuNotList;
}
/** /**
* 设置 菜单ID,主键,自增长 * 设置 菜单ID,主键,自增长
* @param id * @param id
...@@ -2361,6 +2590,133 @@ public class MenuQuery extends MenuEntity { ...@@ -2361,6 +2590,133 @@ public class MenuQuery extends MenuEntity {
} }
/**
* 设置 是否启用缓存 (0.否,1.是)
* @param cache
*/
public MenuQuery cache(Integer cache){
setCache(cache);
return this;
}
/**
* 设置 开始 是否启用缓存 (0.否,1.是)
* @param cacheStart
*/
public MenuQuery cacheStart(Integer cacheStart){
this.cacheStart = cacheStart;
return this;
}
/**
* 设置 结束 是否启用缓存 (0.否,1.是)
* @param cacheEnd
*/
public MenuQuery cacheEnd(Integer cacheEnd){
this.cacheEnd = cacheEnd;
return this;
}
/**
* 设置 增加 是否启用缓存 (0.否,1.是)
* @param cacheIncrement
*/
public MenuQuery cacheIncrement(Integer cacheIncrement){
this.cacheIncrement = cacheIncrement;
return this;
}
/**
* 设置 是否启用缓存 (0.否,1.是)
* @param cacheList
*/
public MenuQuery cacheList(List<Integer> cacheList){
this.cacheList = cacheList;
return this;
}
/**
* 设置 是否启用缓存 (0.否,1.是)
* @param cacheNotList
*/
public MenuQuery cacheNotList(List<Integer> cacheNotList){
this.cacheNotList = cacheNotList;
return this;
}
/**
* 设置 激活目录
* @param activeDir
*/
public MenuQuery activeDir(String activeDir){
setActiveDir(activeDir);
return this;
}
/**
* 设置 激活目录
* @param activeDirList
*/
public MenuQuery activeDirList(List<String> activeDirList){
this.activeDirList = activeDirList;
return this;
}
/**
* 设置 是否隐藏(0.否,1.是)
* @param hideChildrenInMenu
*/
public MenuQuery hideChildrenInMenu(Integer hideChildrenInMenu){
setHideChildrenInMenu(hideChildrenInMenu);
return this;
}
/**
* 设置 开始 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuStart
*/
public MenuQuery hideChildrenInMenuStart(Integer hideChildrenInMenuStart){
this.hideChildrenInMenuStart = hideChildrenInMenuStart;
return this;
}
/**
* 设置 结束 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuEnd
*/
public MenuQuery hideChildrenInMenuEnd(Integer hideChildrenInMenuEnd){
this.hideChildrenInMenuEnd = hideChildrenInMenuEnd;
return this;
}
/**
* 设置 增加 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuIncrement
*/
public MenuQuery hideChildrenInMenuIncrement(Integer hideChildrenInMenuIncrement){
this.hideChildrenInMenuIncrement = hideChildrenInMenuIncrement;
return this;
}
/**
* 设置 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuList
*/
public MenuQuery hideChildrenInMenuList(List<Integer> hideChildrenInMenuList){
this.hideChildrenInMenuList = hideChildrenInMenuList;
return this;
}
/**
* 设置 是否隐藏(0.否,1.是)
* @param hideChildrenInMenuNotList
*/
public MenuQuery hideChildrenInMenuNotList(List<Integer> hideChildrenInMenuNotList){
this.hideChildrenInMenuNotList = hideChildrenInMenuNotList;
return this;
}
/** /**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.base.system.menu.dao.ibatis.MenuDaoImpl"> <mapper namespace="com.mortals.xhx.base.system.menu.dao.ibatis.MenuDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateUserName" column="updateUserName" /> <result property="updateUserName" column="updateUserName" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="cache" column="cache" />
<result property="activeDir" column="activeDir" />
<result property="hideChildrenInMenu" column="hideChildrenInMenu" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -106,23 +109,32 @@ ...@@ -106,23 +109,32 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('cache') or colPickMode == 1 and data.containsKey('cache')))">
a.cache,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('activeDir') or colPickMode == 1 and data.containsKey('activeDir')))">
a.activeDir,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hideChildrenInMenu') or colPickMode == 1 and data.containsKey('hideChildrenInMenu')))">
a.hideChildrenInMenu,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MenuEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MenuEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_menu insert into mortals_xhx_menu
(name,url,ancestors,parentId,linkType,imgPath,buttonImgPath,imgCommPath,commMenu,component,menuType,authType,visible,perms,remark,orderId,status,createTime,createUserId,createUserName,updateUserId,updateUserName,updateTime) (name,url,ancestors,parentId,linkType,imgPath,buttonImgPath,imgCommPath,commMenu,component,menuType,authType,visible,perms,remark,orderId,status,createTime,createUserId,createUserName,updateUserId,updateUserName,updateTime,cache,activeDir,hideChildrenInMenu)
VALUES VALUES
(#{name},#{url},#{ancestors},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{commMenu},#{component},#{menuType},#{authType},#{visible},#{perms},#{remark},#{orderId},#{status},#{createTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName},#{updateTime}) (#{name},#{url},#{ancestors},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{commMenu},#{component},#{menuType},#{authType},#{visible},#{perms},#{remark},#{orderId},#{status},#{createTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName},#{updateTime},#{cache},#{activeDir},#{hideChildrenInMenu})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_menu insert into mortals_xhx_menu
(name,url,ancestors,parentId,linkType,imgPath,buttonImgPath,imgCommPath,commMenu,component,menuType,authType,visible,perms,remark,orderId,status,createTime,createUserId,createUserName,updateUserId,updateUserName,updateTime) (name,url,ancestors,parentId,linkType,imgPath,buttonImgPath,imgCommPath,commMenu,component,menuType,authType,visible,perms,remark,orderId,status,createTime,createUserId,createUserName,updateUserId,updateUserName,updateTime,cache,activeDir,hideChildrenInMenu)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.url},#{item.ancestors},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.commMenu},#{item.component},#{item.menuType},#{item.authType},#{item.visible},#{item.perms},#{item.remark},#{item.orderId},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.updateUserId},#{item.updateUserName},#{item.updateTime}) (#{item.name},#{item.url},#{item.ancestors},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.commMenu},#{item.component},#{item.menuType},#{item.authType},#{item.visible},#{item.perms},#{item.remark},#{item.orderId},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.updateUserId},#{item.updateUserName},#{item.updateTime},#{item.cache},#{item.activeDir},#{item.hideChildrenInMenu})
</foreach> </foreach>
</insert> </insert>
...@@ -231,6 +243,21 @@ ...@@ -231,6 +243,21 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('cache')) or (colPickMode==1 and !data.containsKey('cache'))">
a.cache=#{data.cache},
</if>
<if test="(colPickMode==0 and data.containsKey('cacheIncrement')) or (colPickMode==1 and !data.containsKey('cacheIncrement'))">
a.cache=ifnull(a.cache,0) + #{data.cacheIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('activeDir')) or (colPickMode==1 and !data.containsKey('activeDir'))">
a.activeDir=#{data.activeDir},
</if>
<if test="(colPickMode==0 and data.containsKey('hideChildrenInMenu')) or (colPickMode==1 and !data.containsKey('hideChildrenInMenu'))">
a.hideChildrenInMenu=#{data.hideChildrenInMenu},
</if>
<if test="(colPickMode==0 and data.containsKey('hideChildrenInMenuIncrement')) or (colPickMode==1 and !data.containsKey('hideChildrenInMenuIncrement'))">
a.hideChildrenInMenu=ifnull(a.hideChildrenInMenu,0) + #{data.hideChildrenInMenuIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -454,6 +481,37 @@ ...@@ -454,6 +481,37 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="cache=(case" suffix="ELSE cache end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('cache')) or (colPickMode==1 and !item.containsKey('cache'))">
when a.id=#{item.id} then #{item.cache}
</when>
<when test="(colPickMode==0 and item.containsKey('cacheIncrement')) or (colPickMode==1 and !item.containsKey('cacheIncrement'))">
when a.id=#{item.id} then ifnull(a.cache,0) + #{item.cacheIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="activeDir=(case" suffix="ELSE activeDir end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('activeDir')) or (colPickMode==1 and !item.containsKey('activeDir'))">
when a.id=#{item.id} then #{item.activeDir}
</if>
</foreach>
</trim>
<trim prefix="hideChildrenInMenu=(case" suffix="ELSE hideChildrenInMenu end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('hideChildrenInMenu')) or (colPickMode==1 and !item.containsKey('hideChildrenInMenu'))">
when a.id=#{item.id} then #{item.hideChildrenInMenu}
</when>
<when test="(colPickMode==0 and item.containsKey('hideChildrenInMenuIncrement')) or (colPickMode==1 and !item.containsKey('hideChildrenInMenuIncrement'))">
when a.id=#{item.id} then ifnull(a.hideChildrenInMenu,0) + #{item.hideChildrenInMenuIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1136,6 +1194,81 @@ ...@@ -1136,6 +1194,81 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('cache')">
<if test="conditionParamRef.cache != null ">
${_conditionType_} a.cache = #{${_conditionParam_}.cache}
</if>
<if test="conditionParamRef.cache == null">
${_conditionType_} a.cache is null
</if>
</if>
<if test="conditionParamRef.containsKey('cacheList') and conditionParamRef.cacheList.size() > 0">
${_conditionType_} a.cache in
<foreach collection="conditionParamRef.cacheList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cacheNotList') and conditionParamRef.cacheNotList.size() > 0">
${_conditionType_} a.cache not in
<foreach collection="conditionParamRef.cacheNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cacheStart') and conditionParamRef.cacheStart != null">
${_conditionType_} a.cache <![CDATA[ >= ]]> #{${_conditionParam_}.cacheStart}
</if>
<if test="conditionParamRef.containsKey('cacheEnd') and conditionParamRef.cacheEnd != null">
${_conditionType_} a.cache <![CDATA[ <= ]]> #{${_conditionParam_}.cacheEnd}
</if>
<if test="conditionParamRef.containsKey('activeDir')">
<if test="conditionParamRef.activeDir != null and conditionParamRef.activeDir != ''">
${_conditionType_} a.activeDir like #{${_conditionParam_}.activeDir}
</if>
<if test="conditionParamRef.activeDir == null">
${_conditionType_} a.activeDir is null
</if>
</if>
<if test="conditionParamRef.containsKey('activeDirList') and conditionParamRef.activeDirList.size() > 0">
${_conditionType_} a.activeDir in
<foreach collection="conditionParamRef.activeDirList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('activeDirNotList') and conditionParamRef.activeDirNotList.size() > 0">
${_conditionType_} a.activeDir not in
<foreach collection="conditionParamRef.activeDirNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hideChildrenInMenu')">
<if test="conditionParamRef.hideChildrenInMenu != null ">
${_conditionType_} a.hideChildrenInMenu = #{${_conditionParam_}.hideChildrenInMenu}
</if>
<if test="conditionParamRef.hideChildrenInMenu == null">
${_conditionType_} a.hideChildrenInMenu is null
</if>
</if>
<if test="conditionParamRef.containsKey('hideChildrenInMenuList') and conditionParamRef.hideChildrenInMenuList.size() > 0">
${_conditionType_} a.hideChildrenInMenu in
<foreach collection="conditionParamRef.hideChildrenInMenuList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hideChildrenInMenuNotList') and conditionParamRef.hideChildrenInMenuNotList.size() > 0">
${_conditionType_} a.hideChildrenInMenu not in
<foreach collection="conditionParamRef.hideChildrenInMenuNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hideChildrenInMenuStart') and conditionParamRef.hideChildrenInMenuStart != null">
${_conditionType_} a.hideChildrenInMenu <![CDATA[ >= ]]> #{${_conditionParam_}.hideChildrenInMenuStart}
</if>
<if test="conditionParamRef.containsKey('hideChildrenInMenuEnd') and conditionParamRef.hideChildrenInMenuEnd != null">
${_conditionType_} a.hideChildrenInMenu <![CDATA[ <= ]]> #{${_conditionParam_}.hideChildrenInMenuEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1217,6 +1350,20 @@ ...@@ -1217,6 +1350,20 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('cacheList') and conditionParamRef.cacheList.size() > 0">
field(a.cache,
<foreach collection="conditionParamRef.cacheList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('hideChildrenInMenuList') and conditionParamRef.hideChildrenInMenuList.size() > 0">
field(a.hideChildrenInMenu,
<foreach collection="conditionParamRef.hideChildrenInMenuList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
a.${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
...@@ -1302,6 +1449,20 @@ ...@@ -1302,6 +1449,20 @@
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('cacheList') and conditionParamRef.cacheList.size() > 0">
field(a.cache,
<foreach collection="conditionParamRef.cacheList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('hideChildrenInMenuList') and conditionParamRef.hideChildrenInMenuList.size() > 0">
field(a.hideChildrenInMenu,
<foreach collection="conditionParamRef.hideChildrenInMenuList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
...@@ -1423,6 +1584,21 @@ ...@@ -1423,6 +1584,21 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('cache')">
a.cache
<if test='orderCol.cache != null and "DESC".equalsIgnoreCase(orderCol.cache)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('activeDir')">
a.activeDir
<if test='orderCol.activeDir != null and "DESC".equalsIgnoreCase(orderCol.activeDir)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('hideChildrenInMenu')">
a.hideChildrenInMenu
<if test='orderCol.hideChildrenInMenu != null and "DESC".equalsIgnoreCase(orderCol.hideChildrenInMenu)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment