Merge remote-tracking branch 'origin/master'

edu-common/src/main/java/com/keao/edu/common/enums/YesOrNoEnum.java

@@ -0,0 +1,31 @@
+package com.keao.edu.common.enums;
+
+public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
+    YES(1,"是"),
+    NO(0,"否");
+
+    private Integer code;
+    private String msg;
+
+    YesOrNoEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/LoginEntity.java

@@ -1,43 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-public class LoginEntity {
-    private String smsCode;
-
-    private String clientId;
-
-    private String clientSecret;
-
-    private String phone;
-
-    public String getSmsCode() {
-        return smsCode;
-    }
-
-    public void setSmsCode(String smsCode) {
-        this.smsCode = smsCode;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    public void setClientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysMenu.java

@@ -1,205 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import java.util.List;
-
-/**
- * 对应数据库表(sys_menu):
- */
-public class SysMenu {
-
-	/** 菜单ID */
-	@ApiModelProperty(value = "菜单ID",required = false)
-	private Integer id;
-
-	/** 菜单名称 */
-	@ApiModelProperty(value = "菜单名称",required = false)
-	private String name;
-
-	/** 菜单权限标识 */
-	@ApiModelProperty(value = "菜单权限标识",required = false)
-	private String permission;
-
-	/** 菜单权限标识 */
-	@ApiModelProperty(value = "顶级菜单权限标识",required = false)
-	private String parentPermission;
-
-	/** 接口路径 */
-	@ApiModelProperty(value = "接口路径",required = false)
-	private String path;
-
-	/** 父菜单ID */
-	@ApiModelProperty(value = "父菜单ID",required = false)
-	private Integer parentId;
-
-	/** 图标 */
-	@ApiModelProperty(value = "图标 */",required = false)
-	private String icon;
-
-	/** 前端页面地址 */
-	@ApiModelProperty(value = "前端页面地址",required = false)
-	private String component;
-
-	/** 排序值 */
-	@ApiModelProperty(value = "排序值",required = false)
-	private Integer sort;
-
-	/** 0-开启，1- 关闭 */
-	@ApiModelProperty(value = "0-开启，1- 关闭",required = false)
-	private String keepAlive;
-
-	/** 菜单类型 （0菜单 1按钮） */
-	@ApiModelProperty(value = "菜单类型 （0菜单 1按钮）",required = false)
-	private String type;
-
-	/** 创建时间 */
-	private java.util.Date createTime;
-
-	/** 更新时间 */
-	private java.util.Date updateTime;
-
-	/** 逻辑删除标记(0--正常 1--删除) */
-	@ApiModelProperty(value = "逻辑删除标记(0--正常 1--删除)",required = false)
-	private String delFlag;
-
-	private Integer hid;
-
-	@ApiModelProperty(value = "子节点列表",required = false)
-	private List<com.keao.edu.auth.api.entity.SysMenu> sysMenus;
-
-	public String getParentPermission() {
-		return parentPermission;
-	}
-
-	public void setParentPermission(String parentPermission) {
-		this.parentPermission = parentPermission;
-	}
-
-	public Integer getHid() {
-		return hid;
-	}
-
-	public void setHid(Integer hid) {
-		this.hid = hid;
-	}
-
-	public List<com.keao.edu.auth.api.entity.SysMenu> getSysMenus() {
-		return sysMenus;
-	}
-
-	public void setSysMenus(List<com.keao.edu.auth.api.entity.SysMenu> sysMenus) {
-		this.sysMenus = sysMenus;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setPermission(String permission) {
-		this.permission = permission;
-	}
-
-	public String getPermission() {
-		return this.permission;
-	}
-
-	public void setPath(String path) {
-		this.path = path;
-	}
-
-	public String getPath() {
-		return this.path;
-	}
-
-	public void setParentId(Integer parentId) {
-		this.parentId = parentId;
-	}
-
-	public Integer getParentId() {
-		return this.parentId;
-	}
-
-	public void setIcon(String icon) {
-		this.icon = icon;
-	}
-
-	public String getIcon() {
-		return this.icon;
-	}
-
-	public String getComponent() {
-		return component;
-	}
-
-	public void setComponent(String component) {
-		this.component = component;
-	}
-
-	public void setSort(Integer sort) {
-		this.sort = sort;
-	}
-
-	public Integer getSort() {
-		return this.sort;
-	}
-
-	public void setKeepAlive(String keepAlive) {
-		this.keepAlive = keepAlive;
-	}
-
-	public String getKeepAlive() {
-		return this.keepAlive;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getType() {
-		return this.type;
-	}
-
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
-	public void setUpdateTime(java.util.Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public java.util.Date getUpdateTime() {
-		return this.updateTime;
-	}
-
-	public void setDelFlag(String delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public String getDelFlag() {
-		return this.delFlag;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysOauthClientDetails.java

@@ -1,146 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_oauth_client_details):
- */
-public class SysOauthClientDetails {
-
-	/** 客户端ID */
-	@ApiModelProperty(value = "客户端ID",required = false)
-	private String id;
-	
-	/** 资源ID */
-	@ApiModelProperty(value = "资源ID",required = false)
-	private String resourceIds;
-	
-	/** 客户端密钥 */
-	@ApiModelProperty(value = "客户端密钥",required = false)
-	private String clientSecret;
-	
-	/** 作用域 */
-	@ApiModelProperty(value = "作用域",required = false)
-	private String scope;
-	
-	/** 授权方式 */
-	@ApiModelProperty(value = "授权方式",required = false)
-	private String authorizedGrantTypes;
-	
-	/**  */
-	private String webServerRedirectUri;
-	
-	/**  */
-	private String authorities;
-	
-	/** 请求令牌有效时间 */
-	@ApiModelProperty(value = "请求令牌有效时间",required = false)
-	private Integer accessTokenValidity;
-	
-	/** 刷新令牌有效时间 */
-	@ApiModelProperty(value = "刷新令牌有效时间",required = false)
-	private Integer refreshTokenValidity;
-	
-	/** 扩展信息 */
-	@ApiModelProperty(value = "扩展信息",required = false)
-	private String additionalInformation;
-	
-	/** 是否自动放行 */
-	@ApiModelProperty(value = "是否自动放行",required = false)
-	private String autoapprove;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public void setResourceIds(String resourceIds){
-		this.resourceIds = resourceIds;
-	}
-	
-	public String getResourceIds(){
-		return this.resourceIds;
-	}
-			
-	public void setClientSecret(String clientSecret){
-		this.clientSecret = clientSecret;
-	}
-	
-	public String getClientSecret(){
-		return this.clientSecret;
-	}
-			
-	public void setScope(String scope){
-		this.scope = scope;
-	}
-	
-	public String getScope(){
-		return this.scope;
-	}
-			
-	public void setAuthorizedGrantTypes(String authorizedGrantTypes){
-		this.authorizedGrantTypes = authorizedGrantTypes;
-	}
-	
-	public String getAuthorizedGrantTypes(){
-		return this.authorizedGrantTypes;
-	}
-			
-	public void setWebServerRedirectUri(String webServerRedirectUri){
-		this.webServerRedirectUri = webServerRedirectUri;
-	}
-	
-	public String getWebServerRedirectUri(){
-		return this.webServerRedirectUri;
-	}
-			
-	public void setAuthorities(String authorities){
-		this.authorities = authorities;
-	}
-	
-	public String getAuthorities(){
-		return this.authorities;
-	}
-			
-	public void setAccessTokenValidity(Integer accessTokenValidity){
-		this.accessTokenValidity = accessTokenValidity;
-	}
-	
-	public Integer getAccessTokenValidity(){
-		return this.accessTokenValidity;
-	}
-			
-	public void setRefreshTokenValidity(Integer refreshTokenValidity){
-		this.refreshTokenValidity = refreshTokenValidity;
-	}
-	
-	public Integer getRefreshTokenValidity(){
-		return this.refreshTokenValidity;
-	}
-			
-	public void setAdditionalInformation(String additionalInformation){
-		this.additionalInformation = additionalInformation;
-	}
-	
-	public String getAdditionalInformation(){
-		return this.additionalInformation;
-	}
-			
-	public void setAutoapprove(String autoapprove){
-		this.autoapprove = autoapprove;
-	}
-	
-	public String getAutoapprove(){
-		return this.autoapprove;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysRole.java

@@ -1,131 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_role):
- */
-public class SysRole {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	@ApiModelProperty(value = "角色名称",required = false)
-	private String roleName;
-	
-	/**  */
-	@ApiModelProperty(value = "角色编码",required = false)
-	private String roleCode;
-	
-	/**  */
-	@ApiModelProperty(value = "角色描述",required = false)
-	private String roleDesc;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-
-	private String tenantId;
-	
-	/** 删除标识（0-正常,1-删除） */
-	@ApiModelProperty(value = "删除标识（0-正常,1-删除）",required = false)
-	private String delFlag;
-	
-	private Integer organId;
-
-	@ApiModelProperty(value = "菜单列表",required = false)
-	private List<Integer> menuIds;
-
-	public String getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(String tenantId) {
-		this.tenantId = tenantId;
-	}
-
-	public List<Integer> getMenuIds() {
-		return menuIds;
-	}
-
-	public void setMenuIds(List<Integer> menuIds) {
-		this.menuIds = menuIds;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public void setRoleName(String roleName){
-		this.roleName = roleName;
-	}
-	
-	public String getRoleName(){
-		return this.roleName;
-	}
-			
-	public void setRoleCode(String roleCode){
-		this.roleCode = roleCode;
-	}
-	
-	public String getRoleCode(){
-		return this.roleCode;
-	}
-			
-	public void setRoleDesc(String roleDesc){
-		this.roleDesc = roleDesc;
-	}
-	
-	public String getRoleDesc(){
-		return this.roleDesc;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
-	}
-			
-	public Integer getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(Integer organId) {
-		this.organId = organId;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysRoleDept.java

@@ -1,51 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_role_dept):
- */
-public class SysRoleDept {
-
-	/**  */
-	private Integer id;
-	
-	/** 角色ID */
-	@ApiModelProperty(value = "角色ID",required = false)
-	private Integer roleId;
-	
-	/** 部门ID */
-	@ApiModelProperty(value = "部门ID",required = false)
-	private Integer deptId;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setRoleId(Integer roleId){
-		this.roleId = roleId;
-	}
-	
-	public Integer getRoleId(){
-		return this.roleId;
-	}
-			
-	public void setDeptId(Integer deptId){
-		this.deptId = deptId;
-	}
-	
-	public Integer getDeptId(){
-		return this.deptId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysRoleMenu.java

@@ -1,58 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_role_menu):
- */
-public class SysRoleMenu {
-
-	/** 角色ID */
-	@ApiModelProperty(value = "角色ID",required = false)
-	private Integer roleId;
-	
-	/** 菜单ID */
-	@ApiModelProperty(value = "菜单ID",required = false)
-	private Integer menuId;
-
-	private String tenantId;
-
-	public SysRoleMenu(Integer roleId, Integer menuId) {
-		this.roleId = roleId;
-		this.menuId = menuId;
-	}
-
-	public String getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(String tenantId) {
-		this.tenantId = tenantId;
-	}
-
-	public SysRoleMenu() {
-	}
-
-	public void setRoleId(Integer roleId){
-		this.roleId = roleId;
-	}
-	
-	public Integer getRoleId(){
-		return this.roleId;
-	}
-			
-	public void setMenuId(Integer menuId){
-		this.menuId = menuId;
-	}
-	
-	public Integer getMenuId(){
-		return this.menuId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUser.java

@@ -1,307 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user):
- */
-public class SysUser implements Serializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1374403507360017093L;
-
-	/** 主键ID */
-	private Integer id;
-
-	/** 用户名 */
-	@ApiModelProperty(value = "用户名",required = false)
-	private String username;
-
-	/**  */
-	@ApiModelProperty(value = "密码",required = false)
-	private String password;
-
-	/** 随机盐 */
-	@ApiModelProperty(value = "随机盐",required = false)
-	private String salt;
-
-	@ApiModelProperty(value = "手机号",required = false)
-	private String phone;
-
-	/** 头像 */
-	@ApiModelProperty(value = "头像",required = false)
-	private String avatar;
-
-	/** 创建时间 */
-	private java.util.Date createTime;
-
-	/** 修改时间 */
-	private java.util.Date updateTime;
-
-	/** 0-正常，9-锁定 */
-	@ApiModelProperty(value = "0-正常，9-锁定",required = false)
-	private Integer lockFlag;
-
-	/** 0-正常，1-删除 */
-	@ApiModelProperty(value = "0-正常，1-删除",required = false)
-	private Integer delFlag;
-
-	/** 微信openid */
-	@ApiModelProperty(value = "微信openid",required = false)
-	private String wxOpenid;
-
-	/** QQ openid */
-	@ApiModelProperty(value = "QQ openid",required = false)
-	private String qqOpenid;
-
-	/** 用户类型 */
-//	@ApiModelProperty(value = "用户类型",required = false)
-	//STUDENT("学生"), EDU_TEACHER("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员")
-	private String userType;
-
-	@ApiModelProperty(value = "性别0女1男",required = false)
-	private Integer gender;
-
-	@ApiModelProperty(value = "民族",required = false)
-	private String nation;
-
-	@ApiModelProperty(value = "生日",required = false)
-	private Date birthdate;
-
-	@ApiModelProperty(value = "邮箱",required = false)
-	private String email;
-
-	@ApiModelProperty(value = "融云token",required = false)
-	private String imToken;
-
-	@ApiModelProperty(value = "身份证号",required = false)
-	private String idCardNo;
-
-	@ApiModelProperty(value = "真实姓名",required = false)
-	private String realName;
-
-	@ApiModelProperty(value = "微信号",required = false)
-	private String wechatId;
-	
-	@ApiModelProperty(value = "是否是超管",required = false)
-	private Boolean isSuperAdmin = false;
-
-	@ApiModelProperty(value = "用户角色",required = false)
-	private List<Integer> roles;
-
-	private String tenantId;
-
-	public String getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(String tenantId) {
-		this.tenantId = tenantId;
-	}
-
-	public String getRealName() {
-		return realName;
-	}
-
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-
-	public String getImToken() {
-		return imToken;
-	}
-
-	public void setImToken(String imToken) {
-		this.imToken = imToken;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getUsername() {
-		return this.username;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getPassword() {
-		return this.password;
-	}
-
-	public void setSalt(String salt) {
-		this.salt = salt;
-	}
-
-	public String getSalt() {
-		return this.salt;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public String getPhone() {
-		return this.phone;
-	}
-
-	public void setAvatar(String avatar) {
-		this.avatar = avatar;
-	}
-
-	public String getAvatar() {
-		return this.avatar;
-	}
-
-	public void setCreateTime(java.util.Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public java.util.Date getCreateTime() {
-		return this.createTime;
-	}
-
-	public void setUpdateTime(java.util.Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public java.util.Date getUpdateTime() {
-		return this.updateTime;
-	}
-
-	public Integer getLockFlag() {
-		return lockFlag;
-	}
-
-	public void setLockFlag(Integer lockFlag) {
-		this.lockFlag = lockFlag;
-	}
-
-	public Boolean getSuperAdmin() {
-		return isSuperAdmin;
-	}
-
-	public void setSuperAdmin(Boolean superAdmin) {
-		isSuperAdmin = superAdmin;
-	}
-
-	public Integer getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(Integer delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public void setWxOpenid(String wxOpenid) {
-		this.wxOpenid = wxOpenid;
-	}
-
-	public String getWxOpenid() {
-		return this.wxOpenid;
-	}
-
-	public void setQqOpenid(String qqOpenid) {
-		this.qqOpenid = qqOpenid;
-	}
-
-	public String getQqOpenid() {
-		return this.qqOpenid;
-	}
-
-	public String getUserType() {
-		return userType;
-	}
-
-	public void setUserType(String userType) {
-		this.userType = userType;
-	}
-
-	public Integer getGender() {
-		return gender;
-	}
-
-	public void setGender(Integer gender) {
-		this.gender = gender;
-	}
-
-	public String getNation() {
-		return nation;
-	}
-
-	public void setNation(String nation) {
-		this.nation = nation;
-	}
-
-	public Date getBirthdate() {
-		return birthdate;
-	}
-
-	public void setBirthdate(Date birthdate) {
-		this.birthdate = birthdate;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getIdCardNo() {
-		return idCardNo;
-	}
-
-	public void setIdCardNo(String idCardNo) {
-		this.idCardNo = idCardNo;
-	}
-
-	public String getWechatId() {
-		return wechatId;
-	}
-
-	public void setWechatId(String wechatId) {
-		this.wechatId = wechatId;
-	}
-
-	public Boolean getIsSuperAdmin() {
-		return isSuperAdmin;
-	}
-
-	public void setIsSuperAdmin(Boolean isSuperAdmin) {
-		this.isSuperAdmin = isSuperAdmin;
-	}
-
-	public List<Integer> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(List<Integer> roles) {
-		this.roles = roles;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUserLogin.java

@@ -1,100 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_login):
- */
-public class SysUserLogin {
-
-	/**  */
-	@ApiModelProperty(value = "用户编号",required = false)
-	private Integer userId;
-	
-	/** 用户登录总次数 */
-	@ApiModelProperty(value = "用户登录总次数",required = false)
-	private Integer loginCount;
-	
-	/** 最后登录时间 */
-	@ApiModelProperty(value = "最后登录时间",required = false)
-	private java.util.Date lastLoginTime;
-	
-	/** 最后登录IP */
-	@ApiModelProperty(value = "最后登录IP",required = false)
-	private String lastLoginIp;
-	
-	/** 连续登陆失败的次数 */
-	@ApiModelProperty(value = "连续登陆失败的次数",required = false)
-	private Integer failCount;
-	
-	/** 锁定时间 单位：分钟(超过锁定时间自动解锁) */
-	@ApiModelProperty(value = "锁定时间 单位：分钟",required = false)
-	private Integer lockTime;
-	
-	/** 锁定日期 */
-	@ApiModelProperty(value = "锁定日期",required = false)
-	private java.util.Date lockDate;
-
-	public Integer getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public void setLoginCount(Integer loginCount){
-		this.loginCount = loginCount;
-	}
-	
-	public Integer getLoginCount(){
-		return this.loginCount;
-	}
-			
-	public void setLastLoginTime(java.util.Date lastLoginTime){
-		this.lastLoginTime = lastLoginTime;
-	}
-	
-	public java.util.Date getLastLoginTime(){
-		return this.lastLoginTime;
-	}
-			
-	public void setLastLoginIp(String lastLoginIp){
-		this.lastLoginIp = lastLoginIp;
-	}
-	
-	public String getLastLoginIp(){
-		return this.lastLoginIp;
-	}
-			
-	public void setFailCount(Integer failCount){
-		this.failCount = failCount;
-	}
-	
-	public Integer getFailCount(){
-		return this.failCount;
-	}
-			
-	public void setLockTime(Integer lockTime){
-		this.lockTime = lockTime;
-	}
-	
-	public Integer getLockTime(){
-		return this.lockTime;
-	}
-			
-	public void setLockDate(java.util.Date lockDate){
-		this.lockDate = lockDate;
-	}
-	
-	public java.util.Date getLockDate(){
-		return this.lockDate;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUserLoginLog.java

@@ -1,74 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_login_log):
- */
-public class SysUserLoginLog {
-
-	private Long id;
-
-	/** 会员ID */
-	@ApiModelProperty(value = "会员ID",required = false)
-	private Integer userId;
-
-	/** 登录IP */
-	@ApiModelProperty(value = "登录IP",required = false)
-	private String loginIp;
-
-	/** 登录时间 */
-	@ApiModelProperty(value = "登录时间",required = false)
-	private java.util.Date loginTime;
-
-	/** 终端类型(0,pc端;1,人工;2,移动端;3,自动) */
-	@ApiModelProperty(value = "终端类型(0,pc端;1,人工;2,移动端;3,自动)",required = false)
-	private Integer source;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Integer getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public void setLoginIp(String loginIp) {
-		this.loginIp = loginIp;
-	}
-
-	public String getLoginIp() {
-		return this.loginIp;
-	}
-
-	public void setLoginTime(java.util.Date loginTime) {
-		this.loginTime = loginTime;
-	}
-
-	public java.util.Date getLoginTime() {
-		return this.loginTime;
-	}
-
-	public void setSource(Integer source) {
-		this.source = source;
-	}
-
-	public Integer getSource() {
-		return this.source;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUserRole.java

@@ -1,52 +0,0 @@
-package com.keao.edu.user.api.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_role):
- */
-public class SysUserRole {
-	//分部经理
-	public static Integer SECTION_MANAGER = 3;
-	//教务老师
-	public static Integer EDUCATIONAL_TEACHER = 4;
-	//运营主管
-	public static Integer OPERATION_EXECUTIVE = 5;
-	//招生主管
-	public static Integer ADMISSIONS_DIRECTOR = 6;
-	//教学主任
-	public static Integer DEAN_OF_STUDIES = 7;
-	//总部管理员
-	public static Integer ADMINISTRATOR = 25;
-
-	/** 用户ID */
-	@ApiModelProperty(value = "用户ID",required = false)
-	private Integer userId;
-	
-	/** 角色ID */
-	@ApiModelProperty(value = "角色ID",required = false)
-	private Integer roleId;
-	
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setRoleId(Integer roleId){
-		this.roleId = roleId;
-	}
-	
-	public Integer getRoleId(){
-		return this.roleId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/enums/SysUserType.java

@@ -1,36 +0,0 @@
-package com.keao.edu.user.api.enums;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.keao.edu.common.enums.BaseEnum;
-
-public enum SysUserType implements BaseEnum<String, com.keao.edu.auth.api.enums.SysUserType> {
-
-	STUDENT("学生"), EDUCATION("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员");
-
-	private String desc;
-
-	private SysUserType(String desc) {
-	}
-
-	@Override
-	public String getCode() {
-		return name();
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public static com.keao.edu.auth.api.enums.SysUserType queryByName(String name) {
-		if (StringUtils.isBlank(name)) {
-			return null;
-		}
-		for (com.keao.edu.auth.api.enums.SysUserType sysUserType : com.keao.edu.auth.api.enums.SysUserType.values()) {
-			if (name.equals(sysUserType.getCode())) {
-				return sysUserType;
-			}
-		}
-		return null;
-	}
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/enums/UserLockFlag.java

@@ -1,42 +0,0 @@
-package com.keao.edu.user.api.enums;
-
-import com.keao.edu.common.enums.BaseEnum;
-
-public enum UserLockFlag implements BaseEnum<Integer, com.keao.edu.auth.api.enums.UserLockFlag> {
-
-	NORMAL(0, "正常"), LOCKED(9, "锁定"), CANCELLED(1, "冻结");
-
-	private int code;
-
-	UserLockFlag(int code, String remark) {
-		this.code = code;
-		this.remark = remark;
-	}
-
-	private String remark;
-
-	public Integer getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public static com.keao.edu.auth.api.enums.UserLockFlag codeOf(int code) {
-		for (com.keao.edu.auth.api.enums.UserLockFlag userStatus : com.keao.edu.auth.api.enums.UserLockFlag.values()) {
-			if (code == userStatus.getCode()) {
-				return userStatus;
-			}
-		}
-		return null;
-	}
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/util/SecurityConstants.java

@@ -1,12 +0,0 @@
-package com.keao.edu.user.api.util;
-
-public interface SecurityConstants {
-
-	public static final String USERNAME_PRINCIPAL_PREFIX = "username:";
-
-	public static final String PHONE_PRINCIPAL_PREFIX = "phone:";
-
-	String PARAM_VERIFY_EXCEPTION = "参数校验异常";
-
-	String VERIFY_FAILURE = "校验失败";
-}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/util/SecurityUtils.java

@@ -1,55 +0,0 @@
-package com.keao.edu.user.api.util;
-
-import com.alibaba.fastjson.JSON;
-import com.keao.edu.auth.api.dto.AuthUser;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import java.util.Map;
-
-public class SecurityUtils {
-	/**
-	 * 获取Authentication
-	 */
-	public static Authentication getAuthentication() {
-		return SecurityContextHolder.getContext().getAuthentication();
-	}
-
-	/**
-	 * 获取用户
-	 */
-	public static AuthUser getUser(Authentication authentication) {
-		Object principal = authentication.getPrincipal();
-		if (principal instanceof AuthUser) {
-			return (AuthUser) principal;
-		}
-		return null;
-	}
-
-	/**
-	 * 获取用户
-	 */
-	public static Object getPrincipal() {
-		Authentication authentication = getAuthentication();
-		if (authentication == null) {
-			return null;
-		}
-		return authentication.getPrincipal();
-	}
-
-	/**
-	 * 获取用户
-	 */
-	public static AuthUser getUser() {
-		Authentication authentication = getAuthentication();
-		return getUser(authentication);
-	}
-
-	public static String getAuthenticationValue(){
-		return "bearer " + JSON.parseObject(JSON.toJSONString(getAuthentication().getDetails()), Map.class).get("tokenValue").toString();
-	}
-
-	public static String getToken(){
-		return JSON.parseObject(JSON.toJSONString(getAuthentication().getDetails()), Map.class).get("tokenValue").toString();
-	}
-}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/AgencyController.java

@@ -11,10 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 代理商服务
@@ -37,7 +34,7 @@ public class AgencyController extends BaseController {
 	@ApiOperation(value = "修改代理商")
 	@PostMapping(value = "update")
     @PreAuthorize("@pcs.hasPermissions('agency/update')")
-	public HttpResponseResult updateAgency(Agency agency) {
+	public HttpResponseResult updateAgency(@RequestBody Agency agency) {
 		agencyService.updateAgency(agency);
 		return succeed();
 	}
@@ -45,7 +42,7 @@ public class AgencyController extends BaseController {
 	@ApiOperation(value = "新增代理商")
 	@PostMapping(value = "add")
     @PreAuthorize("@pcs.hasPermissions('agency/add')")
-	public HttpResponseResult addConfig(Agency agency) {
+	public HttpResponseResult addConfig(@RequestBody Agency agency) {
 		agencyService.add(agency);
 		return succeed();
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -3,35 +3,32 @@ package com.keao.edu.user.controller;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.dto.ExamRoomDto;
+import com.keao.edu.user.page.ExamRoomQueryInfo;
 import com.keao.edu.user.service.ExamRoomService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-/**
- * @Author Joburgess
- * @Date 2020.06.18
- */
 @RestController
 @RequestMapping("examRoom")
-@Api(tags = "考级项目代理商服务")
+@Api(tags = "考场服务")
 public class ExamRoomController extends BaseController {
 
     @Autowired
     private ExamRoomService examRoomService;
 
-    @ApiOperation("分页查询")
+    @ApiOperation("分页查询监考列表")
     @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamRoom>> getList(QueryInfo queryInfo) {
-        return succeed(examRoomService.queryPage(queryInfo));
+    public HttpResponseResult<PageInfo<ExamRoomDto>> getList(ExamRoomQueryInfo queryInfo) {
+        return succeed(examRoomService.queryExamRoomPage(queryInfo));
     }
 
-    @ApiOperation("更新考级项目与代理商关联信息")
-    @PostMapping(value = "/updateExamAgencyRelation")
-    public HttpResponseResult updateExamAgencyRelation(@RequestBody ExamRoom examRoom){
+    @ApiOperation("更新考场")
+    @PostMapping(value = "/update")
+    public HttpResponseResult update(@RequestBody ExamRoom examRoom){
         examRoomService.update(examRoom);
         return succeed();
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRoomDao.java

@@ -3,8 +3,25 @@ package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.dto.ExamRoomDto;
+
+import java.util.List;
+import java.util.Map;
 
 public interface ExamRoomDao extends BaseDAO<Long, ExamRoom> {
 
-	
+
+    /**
+     * COUNT教师考试列表
+     * @param params
+     * @return
+     */
+    int countExamRoomPage(Map<String, Object> params);
+
+    /**
+     * 获取教师考试列表（未完待续）
+     * @param params
+     * @return
+     */
+    List<ExamRoomDto> queryExamRoomPage(Map<String, Object> params);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamRoomDto.java

@@ -0,0 +1,28 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.entity.ExamLocation;
+import com.keao.edu.user.entity.ExaminationBasic;
+
+public class ExamRoomDto extends ExamRoom {
+
+    private ExamLocation examLocation;
+
+    private ExaminationBasic examinationBasic;
+
+    public ExamLocation getExamLocation() {
+        return examLocation;
+    }
+
+    public void setExamLocation(ExamLocation examLocation) {
+        this.examLocation = examLocation;
+    }
+
+    public ExaminationBasic getExaminationBasic() {
+        return examinationBasic;
+    }
+
+    public void setExaminationBasic(ExaminationBasic examinationBasic) {
+        this.examinationBasic = examinationBasic;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRoomQueryInfo.java

@@ -0,0 +1,65 @@
+package com.keao.edu.user.page;
+
+import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.enums.ExamStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class ExamRoomQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "考试开始时间")
+    private Date StartTime;
+
+    @ApiModelProperty(value = "考试结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "考试项目编号")
+    private Integer examinationBaseId;
+
+    @ApiModelProperty(value = "考试项目状态")
+    private ExamStatusEnum examStatusEnum;
+
+    @ApiModelProperty(value = "主考官")
+    private Integer teacherId;
+
+    public Date getStartTime() {
+        return StartTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        StartTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getExaminationBaseId() {
+        return examinationBaseId;
+    }
+
+    public void setExaminationBaseId(Integer examinationBaseId) {
+        this.examinationBaseId = examinationBaseId;
+    }
+
+    public ExamStatusEnum getExamStatusEnum() {
+        return examStatusEnum;
+    }
+
+    public void setExamStatusEnum(ExamStatusEnum examStatusEnum) {
+        this.examStatusEnum = examStatusEnum;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRoomService.java

@@ -1,9 +1,18 @@
 package com.keao.edu.user.service;
 
 
+import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.api.entity.ExamRoom;
+import com.keao.edu.user.dto.ExamRoomDto;
+import com.keao.edu.user.page.ExamRoomQueryInfo;
 
 public interface ExamRoomService extends BaseService<Long, ExamRoom> {
 
+    /**
+     * 获取教师考试列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<ExamRoomDto> queryExamRoomPage(ExamRoomQueryInfo queryInfo);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/AgencyServiceImpl.java

@@ -5,6 +5,7 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
@@ -37,6 +38,9 @@ public class AgencyServiceImpl extends BaseServiceImpl<Integer, Agency> implemen
 	@Transactional(rollbackFor = Exception.class)
 	public void add(Agency agency) {
 		SysUser sysUser = agency.getSysUser();
+		String tenantId = TenantContextHolder.getTenantId().toString();
+		agency.setTenantId(tenantId);
+		sysUser.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		if(user != null && user.getId() != null){
 			Agency agency1 = agencyDao.get(user.getId());
@@ -67,9 +71,11 @@ public class AgencyServiceImpl extends BaseServiceImpl<Integer, Agency> implemen
 		agencyDao.insert(agency);
 		//新增用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
-		sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
+			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+		}
 		ImResult imResult = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getRealName(),null));
-		user.setImToken(imResult.getToken());
+        sysUser.setImToken(imResult.getToken());
 		sysUserDao.update(sysUser);
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -2,13 +2,22 @@ package com.keao.edu.user.service.impl;
 
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.dao.ExamRoomDao;
+import com.keao.edu.user.dto.ExamRoomDto;
+import com.keao.edu.user.page.ExamRoomQueryInfo;
 import com.keao.edu.user.service.ExamRoomService;
+import com.keao.edu.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> implements ExamRoomService {
 	
@@ -19,5 +28,24 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 	public BaseDAO<Long, ExamRoom> getDAO() {
 		return examRoomDao;
 	}
-	
+
+	@Override
+	public PageInfo<ExamRoomDto> queryExamRoomPage(ExamRoomQueryInfo queryInfo) {
+		PageInfo<ExamRoomDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<ExamRoomDto> dataList = null;
+		int count = examRoomDao.countExamRoomPage(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = examRoomDao.queryExamRoomPage(params);
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
 }

edu-user/edu-user-server/src/main/resources/config/mybatis/AgencyMapper.xml

@@ -12,7 +12,7 @@
 		<result column="contact_name_" property="contactName" />
 		<result column="contact_phone_" property="contactPhone" />
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
-		<result column="share_profit_amount" property="shareProfitAmount" />
+		<result column="share_profit_amount_" property="shareProfitAmount" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -44,7 +44,7 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Agency" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO agency (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount,create_time_,update_time_,tenant_id_)
+		INSERT INTO agency (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 		#{shareProfitAmount},NOW(),NOW(),#{tenantId})
 	</insert>
@@ -65,7 +65,7 @@
 		contact_name_ = #{contactName},
 		</if>
 		<if test="shareProfitAmount != null">
-		share_profit_amount = #{shareProfitAmount},
+		share_profit_amount_ = #{shareProfitAmount},
 		</if>
 		<if test="name != null">
 		name_ = #{name},

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRoomMapper.xml

@@ -85,4 +85,20 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM exam_room
 	</select>
+
+	<resultMap type="com.keao.edu.user.dto.ExamRoomDto" id="ExamRoomDto" extends="ExamRoom">
+		<association property="examLocation" javaType="com.keao.edu.user.entity.ExamLocation" resultMap="com.keao.edu.user.dao.ExamLocationDao.ExamLocation"/>
+		<association property="examinationBasic" javaType="com.keao.edu.user.entity.ExaminationBasic" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
+	</resultMap>
+
+    <select id="countExamRoomPage" resultType="java.lang.Integer">
+
+	</select>
+	<select id="queryExamRoomPage" resultMap="ExamRoomDto">
+		SELECT er.*,eb.* FROM exam_room er
+		LEFT JOIN exam_location el ON er.exam_location_id_ = el.id_ AND er.tenant_id_ = el.tenant_id_
+		LEFT JOIN examination_basic eb ON FIND_IN_SET(er.exam_location_id_,eb.exam_location_id_list_) AND er.tenant_id_ = eb.tenant_id_
+		WHERE er.tenant_id_ = 1 AND eb.expect_exam_start_time_ >= #{startTime} AND eb.expect_exam_end_time_ &lt;= '' AND eb.name_ LIKE CONCAT('%','','%')
+		AND eb.status_ = ''
+	</select>
 </mapper>