Skip to content

S
smart_gov_platform
Commit 0584fcd3 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改用户登录，数据库表,删除资源resource

parent a283f243
Hide whitespace changes
Inline Side-by-side
Showing with 800 additions and 799 deletions
portal-manager/db/db.sql
View file @ 0584fcd3
......@@ -35,7 +35,7 @@ CREATE TABLE mortals_xhx_role(
`roleSort` int(4) COMMENT '角色排序字段',
`roleType` tinyint(2) COMMENT '角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)',
`remark` varchar(256) COMMENT '备注',
`roleType` tinyint(2) COMMENT '角色状态（0.停用，1.启用）',
`status` tinyint(2) COMMENT '角色状态（0.停用，1.启用）',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`createUserName` varchar(50) COMMENT '创建用户名称',
......@@ -216,4 +216,5 @@ INSERT INTO `mortals_xhx_role` VALUES (1, '管理员', '类似admin', 0, now(),
-- ----------------------------
INSERT INTO `mortals_xhx_task` VALUES (2, '分表创建任务', 'tableIndexService', 0, 'tableIndexService', NULL, NULL, 1, 0, '00:30', NULL, '192.168.1.106', '2021-08-18 00:30:01', 0, '2021-08-12 11:07:23', 1, '系统管理员');
INSERT INTO `mortals_xhx_user` VALUES (1, 'admin', '43442676c74ae59f219c2d87fd6bad52', NULL, '系统管理员', '13808095770', NULL, NULL, 1,"","","", 1, 1, now(), 1, 'admin', now(), '127.0.0.1');
INSERT INTO `mortals_xhx_user` VALUES (1, 'admin', '43442676c74ae59f219c2d87fd6bad52', NULL, '系统管理员', '13808095770', NULL, NULL,NULL, 0,"","", 1, now(), 1, 'admin', now(), '127.0.0.1');
\ No newline at end of file
portal-manager/db/menu.sql
View file @ 0584fcd3
......@@ -37,8 +37,8 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '角色信息-菜单管理-维
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '0', '系统内置角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '1', '默认系统角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色类型', 'Role', 'roleType', '2', '普通角色', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'roleType', '0', '停用', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'roleType', '1', '启用', 1, 4, 0, 'roleType', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'status', '0', '停用', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '角色状态', 'Role', 'status', '1', '启用', 1, 4, 0, 'status', NULL, NULL, NULL);
-- ----------------------------
-- 角色用户关联菜单 SQL
-- ----------------------------
......
portal-manager/src/main/java/com/mortals/xhx/module/role/model/RoleEntity.java
View file @ 0584fcd3
......@@ -7,142 +7,142 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.role.model.vo.RoleVo;
/**
* 角色信息实体对象
*
* @author zxfei
* @date 2022-06-02
*/
* 角色信息实体对象
*
* @author zxfei
* @date 2022-06-02
*/
public class RoleEntity extends RoleVo {
private static final long serialVersionUID = 1L;
/**
* 角色名称
*/
* 角色名称
*/
private String name;
/**
* 角色编码
*/
* 角色编码
*/
private String roleCode;
/**
* 角色排序字段
*/
* 角色排序字段
*/
private Integer roleSort;
/**
* 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
*/
* 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
*/
private Integer roleType;
/**
* 备注
*/
* 备注
*/
private String remark;
/**
* 角色状态（0.停用，1.启用）
*/
private Integer roleType;
* 角色状态（0.停用，1.启用）
*/
private Integer status;
/**
* 创建用户名称
*/
* 创建用户名称
*/
private String createUserName;
public RoleEntity(){}
/**
* 获取 角色名称
* @return String
*/
* 获取 角色名称
* @return String
*/
public String getName(){
return name;
}
/**
* 设置 角色名称
* @param name
*/
* 设置 角色名称
* @param name
*/
public void setName(String name){
this.name = name;
}
/**
* 获取 角色编码
* @return String
*/
* 获取 角色编码
* @return String
*/
public String getRoleCode(){
return roleCode;
}
/**
* 设置 角色编码
* @param roleCode
*/
* 设置 角色编码
* @param roleCode
*/
public void setRoleCode(String roleCode){
this.roleCode = roleCode;
}
/**
* 获取 角色排序字段
* @return Integer
*/
* 获取 角色排序字段
* @return Integer
*/
public Integer getRoleSort(){
return roleSort;
}
/**
* 设置 角色排序字段
* @param roleSort
*/
* 设置 角色排序字段
* @param roleSort
*/
public void setRoleSort(Integer roleSort){
this.roleSort = roleSort;
}
/**
* 获取 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return Integer
*/
* 获取 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return Integer
*/
public Integer getRoleType(){
return roleType;
}
/**
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleType
*/
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleType
*/
public void setRoleType(Integer roleType){
this.roleType = roleType;
}
/**
* 获取 备注
* @return String
*/
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
/**
* 获取 角色状态（0.停用，1.启用）
* @return Integer
*/
public Integer getRoleType(){
return roleType;
* 获取 角色状态（0.停用，1.启用）
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 角色状态（0.停用，1.启用）
* @param roleType
*/
public void setRoleType(Integer roleType){
this.roleType = roleType;
* 设置 角色状态（0.停用，1.启用）
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 创建用户名称
* @return String
*/
* 获取 创建用户名称
* @return String
*/
public String getCreateUserName(){
return createUserName;
}
/**
* 设置 创建用户名称
* @param createUserName
*/
* 设置 创建用户名称
* @param createUserName
*/
public void setCreateUserName(String createUserName){
this.createUserName = createUserName;
}
......@@ -152,7 +152,7 @@ public class RoleEntity extends RoleVo {
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -160,7 +160,7 @@ public class RoleEntity extends RoleVo {
if (obj instanceof RoleEntity) {
RoleEntity tmp = (RoleEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
......@@ -173,25 +173,25 @@ public class RoleEntity extends RoleVo {
sb.append(",roleSort:").append(getRoleSort());
sb.append(",roleType:").append(getRoleType());
sb.append(",remark:").append(getRemark());
sb.append(",roleType:").append(getRoleType());
sb.append(",status:").append(getStatus());
sb.append(",createUserName:").append(getCreateUserName());
return sb.toString();
}
public void initAttrValue(){
this.name = "";
this.name = "";
this.roleCode = "";
this.roleCode = "";
this.roleSort = 0;
this.roleSort = 0;
this.roleType = 2;
this.roleType = 2;
this.remark = "";
this.remark = "";
this.roleType = 0;
this.status = 0;
this.createUserName = "";
this.createUserName = "";
}
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/role/model/RoleQuery.java
View file @ 0584fcd3
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.role.model;
import java.util.List;
import com.mortals.xhx.module.role.model.RoleEntity;
/**
* 角色信息查询对象
*
* @author zxfei
* @date 2022-06-02
*/
* 角色信息查询对象
*
* @author zxfei
* @date 2022-06-02
*/
public class RoleQuery extends RoleEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -55,16 +55,16 @@ public class RoleQuery extends RoleEntity {
private List<String> remarkList;
/** 开始 角色状态（0.停用，1.启用） */
private Integer roleTypeStart;
private Integer statusStart;
/** 结束 角色状态（0.停用，1.启用） */
private Integer roleTypeEnd;
private Integer statusEnd;
/** 增加 角色状态（0.停用，1.启用） */
private Integer roleTypeIncrement;
private Integer statusIncrement;
/** 角色状态（0.停用，1.启用）列表 */
private List <Integer> roleTypeList;
private List <Integer> statusList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -96,747 +96,747 @@ public class RoleQuery extends RoleEntity {
public RoleQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 角色名称
* @return nameList
*/
* 获取 角色名称
* @return nameList
*/
public List<String> getNameList(){
return this.nameList;
}
/**
* 设置 角色名称
* @param nameList
*/
* 设置 角色名称
* @param nameList
*/
public void setNameList(List<String> nameList){
this.nameList = nameList;
}
/**
* 获取 角色编码
* @return roleCodeList
*/
* 获取 角色编码
* @return roleCodeList
*/
public List<String> getRoleCodeList(){
return this.roleCodeList;
}
/**
* 设置 角色编码
* @param roleCodeList
*/
* 设置 角色编码
* @param roleCodeList
*/
public void setRoleCodeList(List<String> roleCodeList){
this.roleCodeList = roleCodeList;
}
/**
* 获取 开始 角色排序字段
* @return roleSortStart
*/
* 获取 开始 角色排序字段
* @return roleSortStart
*/
public Integer getRoleSortStart(){
return this.roleSortStart;
}
/**
* 设置 开始 角色排序字段
* @param roleSortStart
*/
* 设置 开始 角色排序字段
* @param roleSortStart
*/
public void setRoleSortStart(Integer roleSortStart){
this.roleSortStart = roleSortStart;
}
/**
* 获取 结束 角色排序字段
* @return $roleSortEnd
*/
* 获取 结束 角色排序字段
* @return $roleSortEnd
*/
public Integer getRoleSortEnd(){
return this.roleSortEnd;
}
/**
* 设置 结束 角色排序字段
* @param roleSortEnd
*/
* 设置 结束 角色排序字段
* @param roleSortEnd
*/
public void setRoleSortEnd(Integer roleSortEnd){
this.roleSortEnd = roleSortEnd;
}
/**
* 获取 增加 角色排序字段
* @return roleSortIncrement
*/
* 获取 增加 角色排序字段
* @return roleSortIncrement
*/
public Integer getRoleSortIncrement(){
return this.roleSortIncrement;
}
/**
* 设置 增加 角色排序字段
* @param roleSortIncrement
*/
* 设置 增加 角色排序字段
* @param roleSortIncrement
*/
public void setRoleSortIncrement(Integer roleSortIncrement){
this.roleSortIncrement = roleSortIncrement;
}
/**
* 获取 角色排序字段
* @return roleSortList
*/
* 获取 角色排序字段
* @return roleSortList
*/
public List<Integer> getRoleSortList(){
return this.roleSortList;
}
/**
* 设置 角色排序字段
* @param roleSortList
*/
* 设置 角色排序字段
* @param roleSortList
*/
public void setRoleSortList(List<Integer> roleSortList){
this.roleSortList = roleSortList;
}
/**
* 获取 开始 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return roleTypeStart
*/
* 获取 开始 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return roleTypeStart
*/
public Integer getRoleTypeStart(){
return this.roleTypeStart;
}
/**
* 设置 开始 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeStart
*/
* 设置 开始 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeStart
*/
public void setRoleTypeStart(Integer roleTypeStart){
this.roleTypeStart = roleTypeStart;
}
/**
* 获取 结束 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return $roleTypeEnd
*/
* 获取 结束 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return $roleTypeEnd
*/
public Integer getRoleTypeEnd(){
return this.roleTypeEnd;
}
/**
* 设置 结束 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeEnd
*/
* 设置 结束 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeEnd
*/
public void setRoleTypeEnd(Integer roleTypeEnd){
this.roleTypeEnd = roleTypeEnd;
}
/**
* 获取 增加 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return roleTypeIncrement
*/
* 获取 增加 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return roleTypeIncrement
*/
public Integer getRoleTypeIncrement(){
return this.roleTypeIncrement;
}
/**
* 设置 增加 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeIncrement
*/
* 设置 增加 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeIncrement
*/
public void setRoleTypeIncrement(Integer roleTypeIncrement){
this.roleTypeIncrement = roleTypeIncrement;
}
/**
* 获取 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return roleTypeList
*/
* 获取 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @return roleTypeList
*/
public List<Integer> getRoleTypeList(){
return this.roleTypeList;
}
/**
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeList
*/
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeList
*/
public void setRoleTypeList(List<Integer> roleTypeList){
this.roleTypeList = roleTypeList;
}
/**
* 获取 备注
* @return remarkList
*/
* 获取 备注
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 备注
* @param remarkList
*/
* 设置 备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 开始 角色状态（0.停用，1.启用）
* @return roleTypeStart
*/
public Integer getRoleTypeStart(){
return this.roleTypeStart;
* 获取 开始 角色状态（0.停用，1.启用）
* @return statusStart
*/
public Integer getStatusStart(){
return this.statusStart;
}
/**
* 设置 开始 角色状态（0.停用，1.启用）
* @param roleTypeStart
*/
public void setRoleTypeStart(Integer roleTypeStart){
this.roleTypeStart = roleTypeStart;
* 设置 开始 角色状态（0.停用，1.启用）
* @param statusStart
*/
public void setStatusStart(Integer statusStart){
this.statusStart = statusStart;
}
/**
* 获取 结束 角色状态（0.停用，1.启用）
* @return $roleTypeEnd
*/
public Integer getRoleTypeEnd(){
return this.roleTypeEnd;
* 获取 结束 角色状态（0.停用，1.启用）
* @return $statusEnd
*/
public Integer getStatusEnd(){
return this.statusEnd;
}
/**
* 设置 结束 角色状态（0.停用，1.启用）
* @param roleTypeEnd
*/
public void setRoleTypeEnd(Integer roleTypeEnd){
this.roleTypeEnd = roleTypeEnd;
* 设置 结束 角色状态（0.停用，1.启用）
* @param statusEnd
*/
public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
}
/**
* 获取 增加 角色状态（0.停用，1.启用）
* @return roleTypeIncrement
*/
public Integer getRoleTypeIncrement(){
return this.roleTypeIncrement;
* 获取 增加 角色状态（0.停用，1.启用）
* @return statusIncrement
*/
public Integer getStatusIncrement(){
return this.statusIncrement;
}
/**
* 设置 增加 角色状态（0.停用，1.启用）
* @param roleTypeIncrement
*/
public void setRoleTypeIncrement(Integer roleTypeIncrement){
this.roleTypeIncrement = roleTypeIncrement;
* 设置 增加 角色状态（0.停用，1.启用）
* @param statusIncrement
*/
public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
}
/**
* 获取 角色状态（0.停用，1.启用）
* @return roleTypeList
*/
public List<Integer> getRoleTypeList(){
return this.roleTypeList;
* 获取 角色状态（0.停用，1.启用）
* @return statusList
*/
public List<Integer> getStatusList(){
return this.statusList;
}
/**
* 设置 角色状态（0.停用，1.启用）
* @param roleTypeList
*/
public void setRoleTypeList(List<Integer> roleTypeList){
this.roleTypeList = roleTypeList;
* 设置 角色状态（0.停用，1.启用）
* @param statusList
*/
public void setStatusList(List<Integer> statusList){
this.statusList = statusList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户名称
* @return createUserNameList
*/
* 获取 创建用户名称
* @return createUserNameList
*/
public List<String> getCreateUserNameList(){
return this.createUserNameList;
}
/**
* 设置 创建用户名称
* @param createUserNameList
*/
* 设置 创建用户名称
* @param createUserNameList
*/
public void setCreateUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
* 设置 序号，主键，自增长
* @param id
*/
public RoleQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public RoleQuery idStart(Long idStart){
this.idStart = idStart;
return this;
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public RoleQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public RoleQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
* 设置 序号，主键，自增长
* @param idList
*/
public RoleQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
return this;
}
/**
* 设置 角色名称
* @param name
*/
/**
* 设置 角色名称
* @param name
*/
public RoleQuery name(String name){
setName(name);
return this;
return this;
}
/**
* 设置 角色名称
* @param nameList
*/
* 设置 角色名称
* @param nameList
*/
public RoleQuery nameList(List<String> nameList){
this.nameList = nameList;
return this;
return this;
}
/**
* 设置 角色编码
* @param roleCode
*/
/**
* 设置 角色编码
* @param roleCode
*/
public RoleQuery roleCode(String roleCode){
setRoleCode(roleCode);
return this;
return this;
}
/**
* 设置 角色编码
* @param roleCodeList
*/
* 设置 角色编码
* @param roleCodeList
*/
public RoleQuery roleCodeList(List<String> roleCodeList){
this.roleCodeList = roleCodeList;
return this;
return this;
}
/**
* 设置 角色排序字段
* @param roleSort
*/
* 设置 角色排序字段
* @param roleSort
*/
public RoleQuery roleSort(Integer roleSort){
setRoleSort(roleSort);
return this;
}
/**
* 设置 开始 角色排序字段
* @param roleSortStart
*/
setRoleSort(roleSort);
return this;
}
/**
* 设置 开始 角色排序字段
* @param roleSortStart
*/
public RoleQuery roleSortStart(Integer roleSortStart){
this.roleSortStart = roleSortStart;
return this;
this.roleSortStart = roleSortStart;
return this;
}
/**
* 设置 结束 角色排序字段
* @param roleSortEnd
*/
* 设置 结束 角色排序字段
* @param roleSortEnd
*/
public RoleQuery roleSortEnd(Integer roleSortEnd){
this.roleSortEnd = roleSortEnd;
return this;
this.roleSortEnd = roleSortEnd;
return this;
}
/**
* 设置 增加 角色排序字段
* @param roleSortIncrement
*/
* 设置 增加 角色排序字段
* @param roleSortIncrement
*/
public RoleQuery roleSortIncrement(Integer roleSortIncrement){
this.roleSortIncrement = roleSortIncrement;
return this;
this.roleSortIncrement = roleSortIncrement;
return this;
}
/**
* 设置 角色排序字段
* @param roleSortList
*/
* 设置 角色排序字段
* @param roleSortList
*/
public RoleQuery roleSortList(List<Integer> roleSortList){
this.roleSortList = roleSortList;
return this;
}
return this;
}
/**
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleType
*/
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleType
*/
public RoleQuery roleType(Integer roleType){
setRoleType(roleType);
return this;
}
/**
* 设置 开始 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeStart
*/
setRoleType(roleType);
return this;
}
/**
* 设置 开始 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeStart
*/
public RoleQuery roleTypeStart(Integer roleTypeStart){
this.roleTypeStart = roleTypeStart;
return this;
this.roleTypeStart = roleTypeStart;
return this;
}
/**
* 设置 结束 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeEnd
*/
* 设置 结束 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeEnd
*/
public RoleQuery roleTypeEnd(Integer roleTypeEnd){
this.roleTypeEnd = roleTypeEnd;
return this;
this.roleTypeEnd = roleTypeEnd;
return this;
}
/**
* 设置 增加 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeIncrement
*/
* 设置 增加 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeIncrement
*/
public RoleQuery roleTypeIncrement(Integer roleTypeIncrement){
this.roleTypeIncrement = roleTypeIncrement;
return this;
this.roleTypeIncrement = roleTypeIncrement;
return this;
}
/**
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeList
*/
* 设置 角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
* @param roleTypeList
*/
public RoleQuery roleTypeList(List<Integer> roleTypeList){
this.roleTypeList = roleTypeList;
return this;
}
return this;
}
/**
* 设置 备注
* @param remark
*/
/**
* 设置 备注
* @param remark
*/
public RoleQuery remark(String remark){
setRemark(remark);
return this;
return this;
}
/**
* 设置 备注
* @param remarkList
*/
* 设置 备注
* @param remarkList
*/
public RoleQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
return this;
}
/**
* 设置 角色状态（0.停用，1.启用）
* @param roleType
*/
public RoleQuery roleType(Integer roleType){
setRoleType(roleType);
return this;
}
/**
* 设置 开始 角色状态（0.停用，1.启用）
* @param roleTypeStart
*/
public RoleQuery roleTypeStart(Integer roleTypeStart){
this.roleTypeStart = roleTypeStart;
return this;
* 设置 角色状态（0.停用，1.启用）
* @param status
*/
public RoleQuery status(Integer status){
setStatus(status);
return this;
}
/**
* 设置 结束 角色状态（0.停用，1.启用）
* @param roleTypeEnd
*/
public RoleQuery roleTypeEnd(Integer roleTypeEnd){
this.roleTypeEnd = roleTypeEnd;
return this;
* 设置 开始 角色状态（0.停用，1.启用）
* @param statusStart
*/
public RoleQuery statusStart(Integer statusStart){
this.statusStart = statusStart;
return this;
}
/**
* 设置 增加 角色状态（0.停用，1.启用）
* @param roleTypeIncrement
*/
public RoleQuery roleTypeIncrement(Integer roleTypeIncrement){
this.roleTypeIncrement = roleTypeIncrement;
return this;
* 设置 结束 角色状态（0.停用，1.启用）
* @param statusEnd
*/
public RoleQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 角色状态（0.停用，1.启用）
* @param roleTypeList
*/
public RoleQuery roleTypeList(List<Integer> roleTypeList){
this.roleTypeList = roleTypeList;
return this;
}
* 设置 增加 角色状态（0.停用，1.启用）
* @param statusIncrement
*/
public RoleQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 角色状态（0.停用，1.启用）
* @param statusList
*/
public RoleQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
* 设置 创建用户
* @param createUserId
*/
public RoleQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public RoleQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public RoleQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public RoleQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
* 设置 创建用户
* @param createUserIdList
*/
public RoleQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
return this;
}
/**
* 设置 创建用户名称
* @param createUserName
*/
/**
* 设置 创建用户名称
* @param createUserName
*/
public RoleQuery createUserName(String createUserName){
setCreateUserName(createUserName);
return this;
return this;
}
/**
* 设置 创建用户名称
* @param createUserNameList
*/
* 设置 创建用户名称
* @param createUserNameList
*/
public RoleQuery createUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList;
return this;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<RoleQuery> getOrConditionList(){
return this.orConditionList;
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<RoleQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<RoleQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<RoleQuery> andConditionList){
this.andConditionList = andConditionList;
}
......
portal-manager/src/main/resources/sqlmap/module/role/RoleMapper.xml
View file @ 0584fcd3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.role.dao.ibatis.RoleDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="RoleEntity" id="RoleEntity-Map">
<id property="id" column="id" />
<result property="name" column="name" />
<result property="roleCode" column="roleCode" />
<result property="roleSort" column="roleSort" />
<result property="roleType" column="roleType" />
<result property="remark" column="remark" />
<result property="roleType" column="roleType" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" />
<id property="id" column="id" />
<result property="name" column="name" />
<result property="roleCode" column="roleCode" />
<result property="roleSort" column="roleSort" />
<result property="roleType" column="roleType" />
<result property="remark" column="remark" />
<result property="status" column="status" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleCode') or colPickMode == 1 and data.containsKey('roleCode')))">
a.roleCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleSort') or colPickMode == 1 and data.containsKey('roleSort')))">
a.roleSort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleType') or colPickMode == 1 and data.containsKey('roleType')))">
a.roleType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleType') or colPickMode == 1 and data.containsKey('roleType')))">
a.roleType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
a.createUserName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleCode') or colPickMode == 1 and data.containsKey('roleCode')))">
a.roleCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleSort') or colPickMode == 1 and data.containsKey('roleSort')))">
a.roleSort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('roleType') or colPickMode == 1 and data.containsKey('roleType')))">
a.roleType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
a.createUserName,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RoleEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_role
(name,roleCode,roleSort,roleType,remark,roleType,createTime,createUserId,createUserName)
(name,roleCode,roleSort,roleType,remark,status,createTime,createUserId,createUserName)
VALUES
(#{name},#{roleCode},#{roleSort},#{roleType},#{remark},#{roleType},#{createTime},#{createUserId},#{createUserName})
(#{name},#{roleCode},#{roleSort},#{roleType},#{remark},#{status},#{createTime},#{createUserId},#{createUserName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_role
(name,roleCode,roleSort,roleType,remark,roleType,createTime,createUserId,createUserName)
(name,roleCode,roleSort,roleType,remark,status,createTime,createUserId,createUserName)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.roleCode},#{item.roleSort},#{item.roleType},#{item.remark},#{item.roleType},#{item.createTime},#{item.createUserId},#{item.createUserName})
(#{item.name},#{item.roleCode},#{item.roleSort},#{item.roleType},#{item.remark},#{item.status},#{item.createTime},#{item.createUserId},#{item.createUserName})
</foreach>
</insert>
......@@ -99,11 +99,11 @@
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
<if test="(colPickMode==0 and data.containsKey('roleType')) or (colPickMode==1 and !data.containsKey('roleType'))">
a.roleType=#{data.roleType},
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('roleTypeIncrement')) or (colPickMode==1 and !data.containsKey('roleTypeIncrement'))">
a.roleType=ifnull(a.roleType,0) + #{data.roleTypeIncrement},
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
......@@ -129,89 +129,89 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_role as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="name=(case" suffix="ELSE name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
when a.id=#{item.id} then #{item.name}
</if>
</foreach>
</trim>
<trim prefix="roleCode=(case" suffix="ELSE roleCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('roleCode')) or (colPickMode==1 and !item.containsKey('roleCode'))">
when a.id=#{item.id} then #{item.roleCode}
</if>
</foreach>
</trim>
<trim prefix="roleSort=(case" suffix="ELSE roleSort end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('roleSort')) or (colPickMode==1 and !item.containsKey('roleSort'))">
when a.id=#{item.id} then #{item.roleSort}
</when>
<when test="(colPickMode==0 and item.containsKey('roleSortIncrement')) or (colPickMode==1 and !item.containsKey('roleSortIncrement'))">
when a.id=#{item.id} then ifnull(a.roleSort,0) + #{item.roleSortIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="roleType=(case" suffix="ELSE roleType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('roleType')) or (colPickMode==1 and !item.containsKey('roleType'))">
when a.id=#{item.id} then #{item.roleType}
</when>
<when test="(colPickMode==0 and item.containsKey('roleTypeIncrement')) or (colPickMode==1 and !item.containsKey('roleTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.roleType,0) + #{item.roleTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
<trim prefix="roleType=(case" suffix="ELSE roleType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('roleType')) or (colPickMode==1 and !item.containsKey('roleType'))">
when a.id=#{item.id} then #{item.roleType}
</when>
<when test="(colPickMode==0 and item.containsKey('roleTypeIncrement')) or (colPickMode==1 and !item.containsKey('roleTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.roleType,0) + #{item.roleTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
when a.id=#{item.id} then #{item.createUserName}
</if>
</foreach>
</trim>
<trim prefix="name=(case" suffix="ELSE name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
when a.id=#{item.id} then #{item.name}
</if>
</foreach>
</trim>
<trim prefix="roleCode=(case" suffix="ELSE roleCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('roleCode')) or (colPickMode==1 and !item.containsKey('roleCode'))">
when a.id=#{item.id} then #{item.roleCode}
</if>
</foreach>
</trim>
<trim prefix="roleSort=(case" suffix="ELSE roleSort end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('roleSort')) or (colPickMode==1 and !item.containsKey('roleSort'))">
when a.id=#{item.id} then #{item.roleSort}
</when>
<when test="(colPickMode==0 and item.containsKey('roleSortIncrement')) or (colPickMode==1 and !item.containsKey('roleSortIncrement'))">
when a.id=#{item.id} then ifnull(a.roleSort,0) + #{item.roleSortIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="roleType=(case" suffix="ELSE roleType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('roleType')) or (colPickMode==1 and !item.containsKey('roleType'))">
when a.id=#{item.id} then #{item.roleType}
</when>
<when test="(colPickMode==0 and item.containsKey('roleTypeIncrement')) or (colPickMode==1 and !item.containsKey('roleTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.roleType,0) + #{item.roleTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
<trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
when a.id=#{item.id} then #{item.status}
</when>
<when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
when a.id=#{item.id} then #{item.createUserName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -313,249 +313,249 @@
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''">
${_conditionType_} a.name like #{${_conditionParam_}.name}
</if>
<if test="conditionParamRef.name == null">
${_conditionType_} a.name is null
</if>
<if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''">
${_conditionType_} a.name like #{${_conditionParam_}.name}
</if>
<if test="conditionParamRef.containsKey('nameList')">
${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.name == null">
${_conditionType_} a.name is null
</if>
</if>
<if test="conditionParamRef.containsKey('nameList')">
${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleCode')">
<if test="conditionParamRef.roleCode != null and conditionParamRef.roleCode != ''">
${_conditionType_} a.roleCode like #{${_conditionParam_}.roleCode}
</if>
<if test="conditionParamRef.roleCode == null">
${_conditionType_} a.roleCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('roleCodeList')">
${_conditionType_} a.roleCode in
<foreach collection="conditionParamRef.roleCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleSort')">
<if test="conditionParamRef.roleSort != null ">
${_conditionType_} a.roleSort = #{${_conditionParam_}.roleSort}
</if>
<if test="conditionParamRef.roleSort == null">
${_conditionType_} a.roleSort is null
</if>
<if test="conditionParamRef.containsKey('roleCode')">
<if test="conditionParamRef.roleCode != null and conditionParamRef.roleCode != ''">
${_conditionType_} a.roleCode like #{${_conditionParam_}.roleCode}
</if>
<if test="conditionParamRef.containsKey('roleSortList')">
${_conditionType_} a.roleSort in
<foreach collection="conditionParamRef.roleSortList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.roleCode == null">
${_conditionType_} a.roleCode is null
</if>
<if test="conditionParamRef.containsKey('roleSortStart') and conditionParamRef.roleSortStart != null">
${_conditionType_} a.roleSort <![CDATA[ >= ]]> #{${_conditionParam_}.roleSortStart}
</if>
<if test="conditionParamRef.containsKey('roleCodeList')">
${_conditionType_} a.roleCode in
<foreach collection="conditionParamRef.roleCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleSort')">
<if test="conditionParamRef.roleSort != null ">
${_conditionType_} a.roleSort = #{${_conditionParam_}.roleSort}
</if>
<if test="conditionParamRef.containsKey('roleSortEnd') and conditionParamRef.roleSortEnd != null">
${_conditionType_} a.roleSort <![CDATA[ <= ]]> #{${_conditionParam_}.roleSortEnd}
<if test="conditionParamRef.roleSort == null">
${_conditionType_} a.roleSort is null
</if>
</if>
<if test="conditionParamRef.containsKey('roleSortList')">
${_conditionType_} a.roleSort in
<foreach collection="conditionParamRef.roleSortList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleSortStart') and conditionParamRef.roleSortStart != null">
${_conditionType_} a.roleSort <![CDATA[ >= ]]> #{${_conditionParam_}.roleSortStart}
</if>
<if test="conditionParamRef.containsKey('roleSortEnd') and conditionParamRef.roleSortEnd != null">
${_conditionType_} a.roleSort <![CDATA[ <= ]]> #{${_conditionParam_}.roleSortEnd}
</if>
<if test="conditionParamRef.containsKey('roleType')">
<if test="conditionParamRef.roleType != null ">
${_conditionType_} a.roleType = #{${_conditionParam_}.roleType}
</if>
<if test="conditionParamRef.roleType == null">
${_conditionType_} a.roleType is null
</if>
<if test="conditionParamRef.containsKey('roleType')">
<if test="conditionParamRef.roleType != null ">
${_conditionType_} a.roleType = #{${_conditionParam_}.roleType}
</if>
<if test="conditionParamRef.containsKey('roleTypeList')">
${_conditionType_} a.roleType in
<foreach collection="conditionParamRef.roleTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleTypeStart') and conditionParamRef.roleTypeStart != null">
${_conditionType_} a.roleType <![CDATA[ >= ]]> #{${_conditionParam_}.roleTypeStart}
</if>
<if test="conditionParamRef.containsKey('roleTypeEnd') and conditionParamRef.roleTypeEnd != null">
${_conditionType_} a.roleType <![CDATA[ <= ]]> #{${_conditionParam_}.roleTypeEnd}
<if test="conditionParamRef.roleType == null">
${_conditionType_} a.roleType is null
</if>
</if>
<if test="conditionParamRef.containsKey('roleTypeList')">
${_conditionType_} a.roleType in
<foreach collection="conditionParamRef.roleTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleTypeStart') and conditionParamRef.roleTypeStart != null">
${_conditionType_} a.roleType <![CDATA[ >= ]]> #{${_conditionParam_}.roleTypeStart}
</if>
<if test="conditionParamRef.containsKey('roleTypeEnd') and conditionParamRef.roleTypeEnd != null">
${_conditionType_} a.roleType <![CDATA[ <= ]]> #{${_conditionParam_}.roleTypeEnd}
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
<if test="conditionParamRef.containsKey('roleType')">
<if test="conditionParamRef.roleType != null ">
${_conditionType_} a.roleType = #{${_conditionParam_}.roleType}
</if>
<if test="conditionParamRef.roleType == null">
${_conditionType_} a.roleType is null
</if>
</if>
<if test="conditionParamRef.containsKey('roleTypeList')">
${_conditionType_} a.roleType in
<foreach collection="conditionParamRef.roleTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('roleTypeStart') and conditionParamRef.roleTypeStart != null">
${_conditionType_} a.roleType <![CDATA[ >= ]]> #{${_conditionParam_}.roleTypeStart}
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status}
</if>
<if test="conditionParamRef.containsKey('roleTypeEnd') and conditionParamRef.roleTypeEnd != null">
${_conditionType_} a.roleType <![CDATA[ <= ]]> #{${_conditionParam_}.roleTypeEnd}
<if test="conditionParamRef.status == null">
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createUserName')">
<if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
</if>
<if test="conditionParamRef.createUserName == null">
${_conditionType_} a.createUserName is null
</if>
<if test="conditionParamRef.containsKey('createUserName')">
<if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
</if>
<if test="conditionParamRef.containsKey('createUserNameList')">
${_conditionType_} a.createUserName in
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.createUserName == null">
${_conditionType_} a.createUserName is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserNameList')">
${_conditionType_} a.createUserName in
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('name')">
a.name
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('roleCode')">
a.roleCode
<if test='orderCol.roleCode != null and "DESC".equalsIgnoreCase(orderCol.roleCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('roleSort')">
a.roleSort
<if test='orderCol.roleSort != null and "DESC".equalsIgnoreCase(orderCol.roleSort)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('roleType')">
a.roleType
<if test='orderCol.roleType != null and "DESC".equalsIgnoreCase(orderCol.roleType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('roleType')">
a.roleType
<if test='orderCol.roleType != null and "DESC".equalsIgnoreCase(orderCol.roleType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserName')">
a.createUserName
<if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('name')">
a.name
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('roleCode')">
a.roleCode
<if test='orderCol.roleCode != null and "DESC".equalsIgnoreCase(orderCol.roleCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('roleSort')">
a.roleSort
<if test='orderCol.roleSort != null and "DESC".equalsIgnoreCase(orderCol.roleSort)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('roleType')">
a.roleType
<if test='orderCol.roleType != null and "DESC".equalsIgnoreCase(orderCol.roleType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')">
a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserName')">
a.createUserName
<if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
portal-manager/src/test/java/com/mortals/httpclient/role/RoleController.http
View file @ 0584fcd3
......@@ -5,8 +5,8 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"page":1,
"size":10
"page":1,
"size":10
}
......@@ -16,13 +16,13 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"name":"e9e4uu",
"roleCode":"tzulbs",
"roleSort":0,
"roleType":2,
"remark":"4345a1",
"roleType":0,
"createUserName":"78k9cx"
"name":"9h8jlh",
"roleCode":"beliak",
"roleSort":0,
"roleType":2,
"remark":"66tnax",
"status":0,
"createUserName":"6qo3fj"
}
> {%
......
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