修改id为Long类型

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -18,7 +18,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 public interface SysUserFeignService {
 
 	@GetMapping(value = "user/queryUserById/{userId}")
-	public SysUser queryUserById(@PathVariable("userId") Integer userId);
+	public SysUser queryUserById(@PathVariable("userId") Long userId);
 
 	@GetMapping(value = "user/queryUserByPhone")
 	public SysUser queryUserByMobile(@RequestParam("mobile") String mobile);
@@ -30,7 +30,7 @@ public interface SysUserFeignService {
 	public SysUser queryUserInfo();
 
 	@GetMapping(value = "role/queryRoleCodeListByUserId")
-	public List<String> queryRoleCodeListByUserId(@RequestParam("userId") Integer userId);
+	public List<String> queryRoleCodeListByUserId(@RequestParam("userId") Long userId);
 
 	@PostMapping(value = "user/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Boolean updateSysUser(SysUser user);

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -12,7 +12,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 public class SysUserFeignServiceFallback implements SysUserFeignService {
 
 	@Override
-	public SysUser queryUserById(Integer userId) {
+	public SysUser queryUserById(Long userId) {
 		return null;
 	}
 
@@ -31,7 +31,7 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 	}
 
 	@Override
-	public List<String> queryRoleCodeListByUserId(Integer userId) {
+	public List<String> queryRoleCodeListByUserId(Long userId) {
 		return null;
 	}
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/MenuQueryInfo.java

@@ -6,7 +6,7 @@ import com.yonge.cooleshow.common.page.QueryInfo;
 
 public class MenuQueryInfo extends QueryInfo{
     @ApiModelProperty(value = "父节点编号，默认0",required = false)
-    private Integer parentId = 0;
+    private Long parentId = 0L;
 
     @ApiModelProperty(value = "节点状态，默认0未删除，1删除",required = false)
     private String delFlag = "0";
@@ -17,7 +17,7 @@ public class MenuQueryInfo extends QueryInfo{
     @ApiModelProperty(value = "科目编号",required = false)
     private Integer subjectId;
 
-    private Integer userId;
+    private Long userId;
 
     public Integer getSubjectId() {
         return subjectId;
@@ -35,11 +35,11 @@ public class MenuQueryInfo extends QueryInfo{
         this.hid = hid;
     }
 
-    public Integer getParentId() {
+    public Long getParentId() {
         return parentId;
     }
 
-    public void setParentId(Integer parentId) {
+    public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 
@@ -51,11 +51,11 @@ public class MenuQueryInfo extends QueryInfo{
         this.delFlag = delFlag;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 }

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysMenu.java

@@ -13,7 +13,7 @@ public class SysMenu {
 
 	/** 菜单ID */
 	@ApiModelProperty(value = "菜单ID",required = false)
-	private Integer id;
+	private Long id;
 
 	/** 菜单名称 */
 	@ApiModelProperty(value = "菜单名称",required = false)
@@ -33,7 +33,7 @@ public class SysMenu {
 
 	/** 父菜单ID */
 	@ApiModelProperty(value = "父菜单ID",required = false)
-	private Integer parentId;
+	private Long parentId;
 
 	/** 图标 */
 	@ApiModelProperty(value = "图标 */",required = false)
@@ -104,11 +104,11 @@ public class SysMenu {
 		this.sysMenus = sysMenus;
 	}
 
-	public Integer getId() {
+	public Long getId() {
 		return id;
 	}
 
-	public void setId(Integer id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 
@@ -136,11 +136,11 @@ public class SysMenu {
 		return this.path;
 	}
 
-	public void setParentId(Integer parentId) {
+	public void setParentId(Long parentId) {
 		this.parentId = parentId;
 	}
 
-	public Integer getParentId() {
+	public Long getParentId() {
 		return this.parentId;
 	}
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRole.java

@@ -12,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysRole {
 
 	/**  */
-	private Integer id;
+	private Long id;
 	
 	/**  */
 	@ApiModelProperty(value = "角色名称",required = false)
@@ -37,21 +37,21 @@ public class SysRole {
 	private String delFlag;
 
 	@ApiModelProperty(value = "菜单列表",required = false)
-	private List<Integer> menuIds;
+	private List<Long> menuIds;
 
-	public List<Integer> getMenuIds() {
+	public List<Long> getMenuIds() {
 		return menuIds;
 	}
 
-	public void setMenuIds(List<Integer> menuIds) {
+	public void setMenuIds(List<Long> menuIds) {
 		this.menuIds = menuIds;
 	}
 
-	public Integer getId() {
+	public Long getId() {
 		return id;
 	}
 
-	public void setId(Integer id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRoleMenu.java

@@ -11,13 +11,13 @@ public class SysRoleMenu {
 
 	/** 角色ID */
 	@ApiModelProperty(value = "角色ID",required = false)
-	private Integer roleId;
+	private Long roleId;
 	
 	/** 菜单ID */
 	@ApiModelProperty(value = "菜单ID",required = false)
-	private Integer menuId;
+	private Long menuId;
 
-	public SysRoleMenu(Integer roleId, Integer menuId) {
+	public SysRoleMenu(Long roleId, Long menuId) {
 		this.roleId = roleId;
 		this.menuId = menuId;
 	}
@@ -25,19 +25,19 @@ public class SysRoleMenu {
 	public SysRoleMenu() {
 	}
 
-	public void setRoleId(Integer roleId){
+	public void setRoleId(Long roleId){
 		this.roleId = roleId;
 	}
 	
-	public Integer getRoleId(){
+	public Long getRoleId(){
 		return this.roleId;
 	}
 			
-	public void setMenuId(Integer menuId){
+	public void setMenuId(Long menuId){
 		this.menuId = menuId;
 	}
 	
-	public Integer getMenuId(){
+	public Long getMenuId(){
 		return this.menuId;
 	}
 			

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -22,7 +22,7 @@ public class SysUser implements Serializable{
 	private static final long serialVersionUID = -1374403507360017093L;
 
 	/** 主键ID */
-	private Integer id;
+	private Long id;
 	
 	/** 用户名 */
 	@ApiModelProperty(value = "用户名",required = false)
@@ -98,7 +98,7 @@ public class SysUser implements Serializable{
 	private Boolean isSuperAdmin = false;
 
 	@ApiModelProperty(value = "用户角色",required = false)
-	private List<Integer> roles;
+	private List<Long> roles;
 
 	private String certificateType;
 
@@ -126,11 +126,11 @@ public class SysUser implements Serializable{
 		this.imToken = imToken;
 	}
 
-	public Integer getId() {
+	public Long getId() {
 		return id;
 	}
 
-	public void setId(Integer id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 
@@ -297,11 +297,11 @@ public class SysUser implements Serializable{
 		this.isSuperAdmin = isSuperAdmin;
 	}
 
-	public List<Integer> getRoles() {
+	public List<Long> getRoles() {
 		return roles;
 	}
 
-	public void setRoles(List<Integer> roles) {
+	public void setRoles(List<Long> roles) {
 		this.roles = roles;
 	}
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserDevice.java

@@ -10,10 +10,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysUserDevice {
 
 	/**  */
-	private Integer id;
+	private Long id;
 	
 	/** 用户编号 */
-	private Integer userId;
+	private Long userId;
 	
 	/** 设备号 */
 	private String deviceNum;
@@ -32,19 +32,19 @@ public class SysUserDevice {
 	
 	private SysUser user;
 	
-	public void setId(Integer id){
+	public void setId(Long id){
 		this.id = id;
 	}
 	
-	public Integer getId(){
+	public Long getId(){
 		return this.id;
 	}
 			
-	public void setUserId(Integer userId){
+	public void setUserId(Long userId){
 		this.userId = userId;
 	}
 	
-	public Integer getUserId(){
+	public Long getUserId(){
 		return this.userId;
 	}
 			

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserLogin.java

@@ -11,7 +11,7 @@ public class SysUserLogin {
 
 	/**  */
 	@ApiModelProperty(value = "用户编号",required = false)
-	private Integer userId;
+	private Long userId;
 	
 	/** 用户登录总次数 */
 	@ApiModelProperty(value = "用户登录总次数",required = false)
@@ -37,11 +37,11 @@ public class SysUserLogin {
 	@ApiModelProperty(value = "锁定日期",required = false)
 	private java.util.Date lockDate;
 
-	public Integer getUserId() {
+	public Long getUserId() {
 		return userId;
 	}
 
-	public void setUserId(Integer userId) {
+	public void setUserId(Long userId) {
 		this.userId = userId;
 	}
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserLoginLog.java

@@ -13,7 +13,7 @@ public class SysUserLoginLog {
 
 	/** 会员ID */
 	@ApiModelProperty(value = "会员ID",required = false)
-	private Integer userId;
+	private Long userId;
 	
 	@ApiModelProperty(value = "客户端",required = false)
 	private String clientId;
@@ -34,11 +34,11 @@ public class SysUserLoginLog {
 		this.id = id;
 	}
 
-	public Integer getUserId() {
+	public Long getUserId() {
 		return userId;
 	}
 
-	public void setUserId(Integer userId) {
+	public void setUserId(Long userId) {
 		this.userId = userId;
 	}
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserRole.java

@@ -10,24 +10,24 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysUserRole {
 	/** 用户ID */
 	@ApiModelProperty(value = "用户ID",required = false)
-	private Integer userId;
+	private Long userId;
 	/** 角色ID */
 	@ApiModelProperty(value = "角色ID",required = false)
-	private Integer roleId;
+	private Long roleId;
 	
-	public void setUserId(Integer userId){
+	public void setUserId(Long userId){
 		this.userId = userId;
 	}
 	
-	public Integer getUserId(){
+	public Long getUserId(){
 		return this.userId;
 	}
 			
-	public void setRoleId(Integer roleId){
+	public void setRoleId(Long roleId){
 		this.roleId = roleId;
 	}
 	
-	public Integer getRoleId(){
+	public Long getRoleId(){
 		return this.roleId;
 	}
 			

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysMenuDao.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.auth.api.entity.SysMenu;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
+public interface SysMenuDao extends BaseDAO<Long, SysMenu> {
 
 
     /**
@@ -15,14 +15,14 @@ public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
      * @param roleId
      * @return
      */
-    List<SysMenu> getMenusByRoleId(Integer roleId);
+    List<SysMenu> getMenusByRoleId(Long roleId);
 
     /**
      * 根据用户编号查询用户可访问菜单
      * @param userId
      * @return
      */
-    List<SysMenu> findByUser(Integer userId);
+    List<SysMenu> findByUser(Long userId);
 
     /**
      * 根据权限标识查菜单
@@ -37,7 +37,7 @@ public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
      * @param userId
      * @return
      */
-    List<SysMenu> findByParentId(@Param("parentId") Integer menuId,@Param("delFlag") String delFlag,@Param("userId") Integer userId,@Param("hid") Integer hid);
+    List<SysMenu> findByParentId(@Param("parentId") Long menuId,@Param("delFlag") String delFlag,@Param("userId") Long userId,@Param("hid") Integer hid);
 
     /**
      * 获取所有菜单列表
@@ -45,11 +45,11 @@ public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
      * @param delFlag
      * @return
      */
-    List<SysMenu> findList(@Param("parentId") Integer menuId,@Param("delFlag") String delFlag,@Param("hid") Integer hid);
+    List<SysMenu> findList(@Param("parentId") Long menuId,@Param("delFlag") String delFlag,@Param("hid") Integer hid);
 
     /**
      * 批量删除菜单列表
      * @param collect
      */
-    void batchDel(List<Integer> collect);
+    void batchDel(List<Long> collect);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysRoleDao.java

@@ -7,14 +7,14 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SysRoleDao extends BaseDAO<Integer, SysRole> {
+public interface SysRoleDao extends BaseDAO<Long, SysRole> {
 
     /**
      * 根据userId查询角色列表
      * @param userId 用户编号
      * @return
      */
-    List<SysRole> findRoleByUserId(Integer userId);
+    List<SysRole> findRoleByUserId(Long userId);
 
     /**
      * 根据role_code 查询角色

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysRoleMenuDao.java

@@ -7,21 +7,21 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SysRoleMenuDao extends BaseDAO<Integer, SysRoleMenu> {
+public interface SysRoleMenuDao extends BaseDAO<Long, SysRoleMenu> {
 
 	/**
 	 * 根据角色查询权限列表
 	 * @param roleId
 	 * @return
 	 */
-	List<String> queryPermissionsByRoleId(Integer roleId);
+	List<String> queryPermissionsByRoleId(Long roleId);
 
 	/**
 	 * 根据角色查询权限列表
 	 * @param roleId
 	 * @return
 	 */
-	List<Integer> queryMenuIdByRoleId(Integer roleId);
+	List<Long> queryMenuIdByRoleId(Long roleId);
 
 	/**
 	 * 删除角色菜单权限
@@ -34,12 +34,12 @@ public interface SysRoleMenuDao extends BaseDAO<Integer, SysRoleMenu> {
 	 * 删除角色所有的菜单权限
 	 * @param id
 	 */
-	void deleteAllMenu(Integer id);
+	void deleteAllMenu(Long id);
 
 	/**
 	 * 批量插入角色菜单
 	 * @param roleId
 	 * @param menuIds
 	 */
-    void batchAdd(@Param("roleId") Integer roleId,@Param("menuIds")  List<Integer> menuIds);
+    void batchAdd(@Param("roleId") Long roleId,@Param("menuIds")  List<Long> menuIds);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.auth.api.enums.UserLockFlag;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 
-public interface SysUserDao extends BaseDAO<Integer, SysUser> {
+public interface SysUserDao extends BaseDAO<Long, SysUser> {
 
 	/**
 	 * 根据用户名查询对象
@@ -51,7 +51,7 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param userId
 	 * @return
 	 */
-	ImUserModel getBasic(Integer userId);
+	ImUserModel getBasic(Long userId);
 
 	/**
 	 * 根据状态查询
@@ -72,25 +72,25 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @param userId
 	 * @param lesseeOrganId
 	 */
-	void insertTeacher(@Param("userId") Integer userId);
+	void insertTeacher(@Param("userId") Long userId);
 
 	/**
 	 * 获取教师分部编号
 	 * @param userId
 	 * @return
 	 */
-	Integer getTeacherOrganId(Integer userId);
+	Integer getTeacherOrganId(Long userId);
 
 	/**
 	 * 刷新用户token
 	 * @param userId
 	 * @param imToken
 	 */
-	void refreshImToken(@Param("userId") Integer userId, @Param("imToken") String imToken);
+	void refreshImToken(@Param("userId") Long userId, @Param("imToken") String imToken);
 
 	/**
 	 * 保存student
 	 * @param userId
 	 */
-    void saveStudent(@Param("userId") Integer userId);
+    void saveStudent(@Param("userId") Long userId);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDeviceDao.java

@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SysUserDeviceDao extends BaseDAO<Integer, SysUserDevice> {
+public interface SysUserDeviceDao extends BaseDAO<Long, SysUserDevice> {
 
-	List<SysUserDevice> queryByUserId(@Param("clientId") String clientId, @Param("userId") Integer userId);
+	List<SysUserDevice> queryByUserId(@Param("clientId") String clientId, @Param("userId") Long userId);
 
 	List<SysUserDevice> queryByDeviceNum(@Param("clientId") String clientId, @Param("deviceNum") String deviceNum);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserLoginDao.java

@@ -3,12 +3,12 @@ package com.yonge.cooleshow.auth.dal.dao;
 import com.yonge.cooleshow.auth.api.entity.SysUserLogin;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SysUserLoginDao extends BaseDAO<Integer, SysUserLogin> {
+public interface SysUserLoginDao extends BaseDAO<Long, SysUserLogin> {
 
     /**
      * 根据用户查询登录信息
      * @param userId
      * @return
      */
-    SysUserLogin findLoginByUserId(Integer userId);
+    SysUserLogin findLoginByUserId(Long userId);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserRoleDao.java

@@ -4,22 +4,23 @@ import java.util.List;
 
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
 import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
-public interface SysUserRoleDao extends BaseDAO<Integer, SysUserRole> {
+public interface SysUserRoleDao extends BaseDAO<Long, SysUserRole> {
 
 	/**
 	 * 查询指定用户具有的角色编号
 	 * @param userId 用户编号
 	 * @return
 	 */
-	List<Integer> queryRoleIdListByUserId(Integer userId);
+	List<Long> queryRoleIdListByUserId(@Param("userId") Long userId);
 	
 	/**
 	 * 查询指定用户的角色编码
 	 * @param userId
 	 * @return
 	 */
-	List<String> queryRoleCodeListByUserId(Integer userId);
+	List<String> queryRoleCodeListByUserId(Long userId);
 
 
 	/**

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysMenuService.java

@@ -6,14 +6,14 @@ import com.yonge.cooleshow.auth.api.dto.MenuQueryInfo;
 import com.yonge.cooleshow.auth.api.entity.SysMenu;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysMenuService extends BaseService<Integer, SysMenu> {
+public interface SysMenuService extends BaseService<Long, SysMenu> {
 
     /**
      * 根据角色编号查询拥有的菜单列表
      * @param roleId
      * @return
      */
-    List<SysMenu> getMenusByRoleId(Integer roleId);
+    List<SysMenu> getMenusByRoleId(Long roleId);
 
     /**
      * 根据用户编号查询用户可访问菜单
@@ -33,5 +33,5 @@ public interface SysMenuService extends BaseService<Integer, SysMenu> {
      * 删除菜单列表，包含所有子节点
      * @param id
      */
-    void recursiveDel(Integer id);
+    void recursiveDel(Long id);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysRoleMenuService.java

@@ -5,21 +5,21 @@ import java.util.List;
 import com.yonge.cooleshow.auth.api.entity.SysRoleMenu;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysRoleMenuService extends BaseService<Integer, SysRoleMenu> {
+public interface SysRoleMenuService extends BaseService<Long, SysRoleMenu> {
 
 	/**
 	 * 根据角色查询权限列表
 	 * @param roleId
 	 * @return
 	 */
-	List<String> queryPermissionsByRoleId(Integer roleId);
+	List<String> queryPermissionsByRoleId(Long roleId);
 
 	/**
 	 * 根据角色查询权限列表
 	 * @param roleIdList
 	 * @return
 	 */
-	List<String> queryPermissionsByRoleIdList(List<Integer> roleIdList);
+	List<String> queryPermissionsByRoleIdList(List<Long> roleIdList);
 
 	/**
 	 * 角色添加菜单访问权限
@@ -27,7 +27,7 @@ public interface SysRoleMenuService extends BaseService<Integer, SysRoleMenu> {
 	 * @param menuIds
 	 * @return
 	 */
-    boolean batchInsert(Integer roleId, String menuIds);
+    boolean batchInsert(Long roleId, String menuIds);
 
 	/**
 	 * 角色删除菜单访问权限
@@ -35,5 +35,5 @@ public interface SysRoleMenuService extends BaseService<Integer, SysRoleMenu> {
 	 * @param menuIds
 	 * @return
 	 */
-    boolean batchdel(Integer roleId, String menuIds);
+    boolean batchdel(Long roleId, String menuIds);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysRoleService.java

@@ -5,14 +5,14 @@ import java.util.List;
 import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysRoleService extends BaseService<Integer, SysRole> {
+public interface SysRoleService extends BaseService<Long, SysRole> {
 
     /**
      * 根据userId查询角色列表
      * @param userId 用户编号
      * @return
      */
-    List<SysRole> findRoleByUserId(Integer userId);
+    List<SysRole> findRoleByUserId(Long userId);
 
     /**
      * 根据角色标识查询角色
@@ -37,7 +37,7 @@ public interface SysRoleService extends BaseService<Integer, SysRole> {
      * 删除角色
      * @param id
      */
-    void delRole(Integer id);
+    void delRole(Long id);
 
-    SysRole getRole(Integer id);
+    SysRole getRole(Long id);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserDeviceService.java

@@ -5,9 +5,9 @@ import java.util.List;
 import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysUserDeviceService extends BaseService<Integer, SysUserDevice> {
+public interface SysUserDeviceService extends BaseService<Long, SysUserDevice> {
 
-	List<SysUserDevice> queryByUserId(String clientId, Integer userId);
+	List<SysUserDevice> queryByUserId(String clientId, Long userId);
 
 	List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum);
 
@@ -18,12 +18,12 @@ public interface SysUserDeviceService extends BaseService<Integer, SysUserDevice
 	 * @param deviceNum
 	 * @return
 	 */
-	boolean bindDevice(String clientId, Integer userId, String deviceNum);
+	boolean bindDevice(String clientId, Long userId, String deviceNum);
 
 	/**
 	 * 逻辑删除
 	 * @param id
 	 * @return
 	 */
-	boolean deleteWithLogic(Integer id);
+	boolean deleteWithLogic(Long id);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserLoginService.java

@@ -3,14 +3,14 @@ package com.yonge.cooleshow.auth.service;
 import com.yonge.cooleshow.auth.api.entity.SysUserLogin;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysUserLoginService extends BaseService<Integer, SysUserLogin> {
+public interface SysUserLoginService extends BaseService<Long, SysUserLogin> {
 
 	/**
 	 * 根据用户查询登录信息
 	 * @param userId
 	 * @return
 	 */
-	SysUserLogin findLoginByUserId(Integer userId);
+	SysUserLogin findLoginByUserId(Long userId);
 
 	/**
 	 * 自动解锁

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserRoleService.java

@@ -5,28 +5,28 @@ import java.util.List;
 import com.yonge.cooleshow.auth.api.entity.SysUserRole;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysUserRoleService extends BaseService<Integer, SysUserRole> {
+public interface SysUserRoleService extends BaseService<Long, SysUserRole> {
 
 	/**
 	 * 查询指定用户具有的角色编号
 	 * @param userId 用户编号
 	 * @return
 	 */
-	List<Integer> queryRoleIdListByUserId(Integer userId);
+	List<Long> queryRoleIdListByUserId(Long userId);
 
 	/**
 	 * 查询指定用户的角色编码
 	 * @param userId
 	 * @return
 	 */
-	List<String> queryRoleCodeListByUserId(Integer userId);
+	List<String> queryRoleCodeListByUserId(Long userId);
 	/**
 	 * 新增用户角色(批量)
 	 * @param userId
 	 * @param roleIds
 	 * @return
 	 */
-	boolean batchInsert(Integer userId, String roleIds);
+	boolean batchInsert(Long userId, String roleIds);
 
 	/**
 	 * 删除用户角色(批量)
@@ -34,5 +34,5 @@ public interface SysUserRoleService extends BaseService<Integer, SysUserRole> {
 	 * @param roleIds
 	 * @return
 	 */
-	boolean batchDel(Integer userId, String roleIds);
+	boolean batchDel(Long userId, String roleIds);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -5,7 +5,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysUserService extends BaseService<Integer, SysUser> {
+public interface SysUserService extends BaseService<Long, SysUser> {
 
 	/**
 	 * 根据用户名查询对象
@@ -61,7 +61,7 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param id
 	 * @return
 	 */
-	boolean deleteById(Integer id);
+	boolean deleteById(Long id);
 
 	/**
 	 * 根据用户手机号修改密码
@@ -75,14 +75,14 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param sysUser
 	 * @return
 	 */
-    Integer add(SysUser sysUser);
+    Long add(SysUser sysUser);
 
 	/**
 	 * 获取用户基本信息
 	 * @param userId
 	 * @return
 	 */
-	ImUserModel getBasic(Integer userId);
+	ImUserModel getBasic(Long userId);
 
 	/**
 	 * 修改用户基本信息
@@ -95,7 +95,7 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param userId
 	 * @return
 	 */
-	SysUser queryUserInfo(Integer userId);
+	SysUser queryUserInfo(Long userId);
 
 	/**
 	 * 用户注册
@@ -115,12 +115,12 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * 保存student数据
 	 * @param userId
 	 */
-	void saveStudent(Integer userId);
+	void saveStudent(Long userId);
 	
 	/**
 	 * 保存teacher数据
 	 * @param userId
 	 */
-	void saveTeacher(Integer userId);
+	void saveTeacher(Long userId);
 	
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysMenuServiceImpl.java

@@ -16,7 +16,7 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  implements SysMenuService {
+public class SysMenuServiceImpl extends BaseServiceImpl<Long, SysMenu>  implements SysMenuService {
 	
 	@Autowired
 	private SysMenuDao sysMenuDao;
@@ -24,12 +24,12 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	private SysUserDao sysUserDao;
 
 	@Override
-	public BaseDAO<Integer, SysMenu> getDAO() {
+	public BaseDAO<Long, SysMenu> getDAO() {
 		return sysMenuDao;
 	}
 
 	@Override
-	public List<SysMenu> getMenusByRoleId(Integer roleId) {
+	public List<SysMenu> getMenusByRoleId(Long roleId) {
 		return sysMenuDao.getMenusByRoleId(roleId);
 	}
 
@@ -83,7 +83,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 		return menu;
 	}
 
-	private SysMenu getTree(SysMenu menu, String delFlag,Integer userId,Integer hid){
+	private SysMenu getTree(SysMenu menu, String delFlag,Long userId,Integer hid){
 		//得到根节点对象
 		//获取子节点list
 		List<SysMenu> sysMenus = null;
@@ -110,12 +110,12 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	}
 
 	@Override
-	public void recursiveDel(Integer parentId) {
+	public void recursiveDel(Long parentId) {
 		List<SysMenu> sysMenus = sysMenuDao.findList(parentId, "0",0);
 		for (SysMenu menu:sysMenus) {
 			menu = getTree(menu,"0",null,null);
 		}
-		List<Integer> collect = sysMenus.stream().map(sysMenu -> sysMenu.getId()).collect(Collectors.toList());
+		List<Long> collect = sysMenus.stream().map(sysMenu -> sysMenu.getId()).collect(Collectors.toList());
 		if(collect == null || collect.size() <= 0){
 			sysMenuDao.delete(parentId);
 			return;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysRoleMenuServiceImpl.java

@@ -13,51 +13,51 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysRoleMenuServiceImpl extends BaseServiceImpl<Integer, SysRoleMenu> implements SysRoleMenuService {
+public class SysRoleMenuServiceImpl extends BaseServiceImpl<Long, SysRoleMenu> implements SysRoleMenuService {
 
 	@Autowired
 	private SysRoleMenuDao sysRoleMenuDao;
 
 	@Override
-	public BaseDAO<Integer, SysRoleMenu> getDAO() {
+	public BaseDAO<Long, SysRoleMenu> getDAO() {
 		return sysRoleMenuDao;
 	}
 
 	@Override
-	public List<String> queryPermissionsByRoleId(Integer roleId) {
+	public List<String> queryPermissionsByRoleId(Long roleId) {
 		return sysRoleMenuDao.queryPermissionsByRoleId(roleId);
 	}
 
 	@Override
-	public List<String> queryPermissionsByRoleIdList(List<Integer> roleIdList) {
+	public List<String> queryPermissionsByRoleIdList(List<Long> roleIdList) {
 
 		List<String> list = new ArrayList<String>();
 
-		for (Integer roleId : roleIdList) {
+		for (Long roleId : roleIdList) {
 			list.addAll(queryPermissionsByRoleId(roleId));
 		}
 		return list;
 	}
 
 	@Override
-	public boolean batchInsert(Integer roleId, String menuIds) {
+	public boolean batchInsert(Long roleId, String menuIds) {
 		SysRoleMenu sysRoleMenu = new SysRoleMenu();
 		sysRoleMenu.setRoleId(roleId);
 		String[] split = menuIds.split(",");
 		for (String string:split) {
-			sysRoleMenu.setMenuId(Integer.parseInt(string));
+			sysRoleMenu.setMenuId(Long.parseLong(string));
 			sysRoleMenuDao.delete(sysRoleMenu);
 		}
 		return true;
 	}
 
 	@Override
-	public boolean batchdel(Integer roleId, String menuIds) {
+	public boolean batchdel(Long roleId, String menuIds) {
 		SysRoleMenu sysRoleMenu = new SysRoleMenu();
 		sysRoleMenu.setRoleId(roleId);
 		String[] split = menuIds.split(",");
 		for (String string:split) {
-			sysRoleMenu.setMenuId(Integer.parseInt(string));
+			sysRoleMenu.setMenuId(Long.parseLong(string));
 			sysRoleMenuDao.insert(sysRoleMenu);
 		}
 		return true;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysRoleServiceImpl.java

@@ -16,7 +16,7 @@ import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  implements SysRoleService {
+public class SysRoleServiceImpl extends BaseServiceImpl<Long, SysRole>  implements SysRoleService {
 	
 	@Autowired
 	private SysRoleDao sysRoleDao;
@@ -24,12 +24,12 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	private SysRoleMenuDao sysRoleMenuDao;
 
 	@Override
-	public BaseDAO<Integer, SysRole> getDAO() {
+	public BaseDAO<Long, SysRole> getDAO() {
 		return sysRoleDao;
 	}
 
 	@Override
-	public List<SysRole> findRoleByUserId(Integer userId) {
+	public List<SysRole> findRoleByUserId(Long userId) {
 		return sysRoleDao.findRoleByUserId(userId);
 	}
 
@@ -64,20 +64,20 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void delRole(Integer id) {
+	public void delRole(Long id) {
 		sysRoleDao.delete(id);
 		sysRoleMenuDao.deleteAllMenu(id);
 	}
 
 	@Override
-	public SysRole getRole(Integer id) {
+	public SysRole getRole(Long id) {
 		SysRole sysRole = sysRoleDao.get(id);
 		sysRole.setMenuIds(sysRoleMenuDao.queryMenuIdByRoleId(id));
 		return sysRole;
 	}
 
 	private void batchSave(SysRole sysRole){
-		List<Integer> menuIds = sysRole.getMenuIds();
+		List<Long> menuIds = sysRole.getMenuIds();
 		if(menuIds != null && menuIds.size() > 0){
 //			SysRoleMenu sysRoleMenu = new SysRoleMenu(sysRole.getId(),null);
 			sysRoleMenuDao.batchAdd(sysRole.getId(),menuIds);

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserDeviceServiceImpl.java

@@ -17,18 +17,18 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDevice>  implements SysUserDeviceService {
+public class SysUserDeviceServiceImpl extends BaseServiceImpl<Long, SysUserDevice>  implements SysUserDeviceService {
 	
 	@Autowired
 	private SysUserDeviceDao sysUserDeviceDao;
 
 	@Override
-	public BaseDAO<Integer, SysUserDevice> getDAO() {
+	public BaseDAO<Long, SysUserDevice> getDAO() {
 		return sysUserDeviceDao;
 	}
 
 	@Override
-	public List<SysUserDevice> queryByUserId(String clientId, Integer userId) {
+	public List<SysUserDevice> queryByUserId(String clientId, Long userId) {
 		return sysUserDeviceDao.queryByUserId(clientId, userId);
 	}
 
@@ -38,7 +38,7 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDe
 	}
 
 	@Override
-	public boolean bindDevice(String clientId, Integer userId, String deviceNum) {
+	public boolean bindDevice(String clientId, Long userId, String deviceNum) {
 
 		if (StringUtils.equals(clientId, "STUDENT")) {
 			// 检查学生是否绑定了多个设备号
@@ -93,7 +93,7 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDe
 	}
 
 	@Override
-	public boolean deleteWithLogic(Integer id) {
+	public boolean deleteWithLogic(Long id) {
 		
 		SysUserDevice sysUserDevice = sysUserDeviceDao.get(id);
 		if(sysUserDevice != null){

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserLoginServiceImpl.java

@@ -19,7 +19,7 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysUserLoginServiceImpl extends BaseServiceImpl<Integer, SysUserLogin> implements SysUserLoginService {
+public class SysUserLoginServiceImpl extends BaseServiceImpl<Long, SysUserLogin> implements SysUserLoginService {
 
 	@Autowired
 	private SysUserLoginDao sysUserLoginDao;
@@ -28,12 +28,12 @@ public class SysUserLoginServiceImpl extends BaseServiceImpl<Integer, SysUserLog
 	private SysUserDao sysUserDao;
 
 	@Override
-	public BaseDAO<Integer, SysUserLogin> getDAO() {
+	public BaseDAO<Long, SysUserLogin> getDAO() {
 		return sysUserLoginDao;
 	}
 
 	@Override
-	public SysUserLogin findLoginByUserId(Integer userId) {
+	public SysUserLogin findLoginByUserId(Long userId) {
 		return sysUserLoginDao.findLoginByUserId(userId);
 	}
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserRoleServiceImpl.java

@@ -12,44 +12,44 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysUserRoleServiceImpl extends BaseServiceImpl<Integer, SysUserRole>  implements SysUserRoleService {
+public class SysUserRoleServiceImpl extends BaseServiceImpl<Long, SysUserRole>  implements SysUserRoleService {
 	
 	@Autowired
 	private SysUserRoleDao sysUserRoleDao;
 
 	@Override
-	public BaseDAO<Integer, SysUserRole> getDAO() {
+	public BaseDAO<Long, SysUserRole> getDAO() {
 		return sysUserRoleDao;
 	}
 
 	@Override
-	public List<Integer> queryRoleIdListByUserId(Integer userId) {
+	public List<Long> queryRoleIdListByUserId(Long userId) {
 		return sysUserRoleDao.queryRoleIdListByUserId(userId);
 	}
 	@Override
-	public List<String> queryRoleCodeListByUserId(Integer userId) {
+	public List<String> queryRoleCodeListByUserId(Long userId) {
 		return sysUserRoleDao.queryRoleCodeListByUserId(userId);
 	}
 
 	@Override
-	public boolean batchInsert(Integer userId, String roleIds) {
+	public boolean batchInsert(Long userId, String roleIds) {
 		SysUserRole sysUserRole = new SysUserRole();
 		sysUserRole.setUserId(userId);
 		String[] split = roleIds.split(",");
 		for (String string:split) {
-			sysUserRole.setRoleId(Integer.parseInt(string));
+			sysUserRole.setRoleId(Long.parseLong(string));
 			sysUserRoleDao.insert(sysUserRole);
 		}
 		return true;
 	}
 
 	@Override
-	public boolean batchDel(Integer userId, String roleIds) {
+	public boolean batchDel(Long userId, String roleIds) {
 		SysUserRole sysUserRole = new SysUserRole();
 		sysUserRole.setUserId(userId);
 		String[] split = roleIds.split(",");
 		for (String string:split) {
-			sysUserRole.setRoleId(Integer.parseInt(string));
+			sysUserRole.setRoleId(Long.parseLong(string));
 			sysUserRoleDao.delete(sysUserRole);
 		}
 		return true;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -22,7 +22,7 @@ import com.yonge.cooleshow.common.service.IdGeneratorService;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implements SysUserService {
+public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implements SysUserService {
 
 	@Autowired
 	private SysUserDao sysUserDao;
@@ -38,7 +38,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	private IdGeneratorService smsCodeService;
 
 	@Override
-	public BaseDAO<Integer, SysUser> getDAO() {
+	public BaseDAO<Long, SysUser> getDAO() {
 		return sysUserDao;
 	}
 
@@ -86,7 +86,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		List<String> roleCodeList = sysUserRoleService.queryRoleCodeListByUserId(sysUser.getId());
 		userInfo.setRoles(roleCodeList.toArray(new String[roleCodeList.size()]));
 
-		List<Integer> roleIdList = sysUserRoleService.queryRoleIdListByUserId(sysUser.getId());
+		List<Long> roleIdList = sysUserRoleService.queryRoleIdListByUserId(sysUser.getId());
 		List<String> permissionList = sysRoleMenuService.queryPermissionsByRoleIdList(roleIdList);
 
 		userInfo.setPermissions(permissionList.toArray(new String[permissionList.size()]));
@@ -95,7 +95,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	}
 
 	@Override
-	public boolean deleteById(Integer id) {
+	public boolean deleteById(Long id) {
 		SysUser user = get(id);
 
 		if (user == null) {
@@ -116,14 +116,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	}
 
 	@Override
-	public Integer add(SysUser sysUser) {
+	public Long add(SysUser sysUser) {
 		sysUserDao.insert(sysUser);
 		sysUserDao.update(sysUser);
 		return sysUser.getId();
 	}
 
 	@Override
-	public ImUserModel getBasic(Integer userId) {
+	public ImUserModel getBasic(Long userId) {
 		return sysUserDao.getBasic(userId);
 	}
 
@@ -133,7 +133,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	}
 
 	@Override
-	public SysUser queryUserInfo(Integer userId) {
+	public SysUser queryUserInfo(Long userId) {
 		return sysUserDao.get(userId);
 	}
 
@@ -171,12 +171,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	}
 
 	@Override
-	public void saveStudent(Integer userId) {
+	public void saveStudent(Long userId) {
 		sysUserDao.saveStudent(userId);
 	}
 
 	@Override
-	public void saveTeacher(Integer userId) {
+	public void saveTeacher(Long userId) {
 		sysUserDao.insertTeacher(userId);
 	}
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/MenuController.java

@@ -46,7 +46,7 @@ public class MenuController extends BaseController {
     @ApiOperation("根据菜单id删除菜单")
     @DeleteMapping("/del/{id}")
     @PreAuthorize("@pcs.hasPermissions('menu/del')")
-    public Object delMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Integer id) {
+    public Object delMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Long id) {
         sysMenuService.recursiveDel(id);
         return succeed();
     }
@@ -67,7 +67,7 @@ public class MenuController extends BaseController {
     @ApiOperation("根据菜单id查询菜单")
     @GetMapping(value = "/{id}",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     @PreAuthorize("@pcs.hasPermissions('menu')")
-    public Object getMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Integer id) {
+    public Object getMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Long id) {
         return succeed(sysMenuService.get(id));
     }
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/RoleController.java

@@ -43,21 +43,21 @@ public class RoleController extends BaseController {
 	private SysUserRoleService sysUserRoleService;
 
 	@GetMapping(value = "/queryRoleCodeListByUserId")
-	public Object queryRoleCodeListByUserId(Integer userId) {
+	public Object queryRoleCodeListByUserId(Long userId) {
 		return sysUserRoleService.queryRoleCodeListByUserId(userId);
 	}
 
 	@ApiOperation("根据权限id查询角色")
 	@GetMapping(value = "/{id}")
     @PreAuthorize("@pcs.hasPermissions('role')")
-	public Object getRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Integer id) {
+	public Object getRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Long id) {
 		return succeed(sysRoleService.getRole(id));
 	}
 
 	@ApiOperation("删除角色")
 	@PostMapping(value = "/del")
     @PreAuthorize("@pcs.hasPermissions('role/del')")
-	public Object delRole(Integer id) {
+	public Object delRole(Long id) {
 		sysRoleService.delRole(id);
 		return succeed();
 	}
@@ -95,7 +95,7 @@ public class RoleController extends BaseController {
 		if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(menuIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
 		}
-		sysRoleMenuService.batchInsert(Integer.parseInt(roleId), menuIds);
+		sysRoleMenuService.batchInsert(Long.parseLong(roleId), menuIds);
 		return succeed();
 	}
 
@@ -108,7 +108,7 @@ public class RoleController extends BaseController {
 		if (StringUtils.isEmpty(roleId) || StringUtils.isEmpty(menuIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
 		}
-		sysRoleMenuService.batchdel(Integer.parseInt(roleId), menuIds);
+		sysRoleMenuService.batchdel(Long.parseLong(roleId), menuIds);
 		return succeed();
 	}
 
@@ -116,7 +116,7 @@ public class RoleController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer") })
 	@GetMapping(value = "/getMenus")
     @PreAuthorize("@pcs.hasPermissions('role/getMenus')")
-	public Object getMenus(Integer roleId) {
+	public Object getMenus(Long roleId) {
 		if (roleId == null) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
 		}

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -76,7 +76,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "根据用户编号获取用户基本信息")
 	@GetMapping("/getBasic")
-	public Object getBasic(Integer userId) {
+	public Object getBasic(Long userId) {
 		if (userId == null) {
 			return failed("参数校验异常");
 		}
@@ -103,7 +103,7 @@ public class UserController extends BaseController {
 	}
 
 	@GetMapping(value = "/queryUserById/{userId}")
-	public SysUser queryUserById(@PathVariable("userId") Integer userId) {
+	public SysUser queryUserById(@PathVariable("userId") Long userId) {
 		return sysUserService.get(userId);
 	}
 
@@ -116,7 +116,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "新增用户")
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
-	public HttpResponseResult<Integer> add(@RequestBody SysUser sysUser) {
+	public HttpResponseResult<Long> add(@RequestBody SysUser sysUser) {
 		return succeed(sysUserService.add(sysUser));
 	}
 
@@ -211,7 +211,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
 			@ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "newPassword", value = "新密码", required = true, dataType = "String") })
-	public Object updatePassword2(Integer userId, String mobile, String newPassword) {
+	public Object updatePassword2(Long userId, String mobile, String newPassword) {
 		if (StringUtils.isEmpty(mobile) || userId == null || StringUtils.isEmpty(newPassword)) {
 			return failed("参数校验异常");
 		}
@@ -321,7 +321,7 @@ public class UserController extends BaseController {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
 		}
-		sysUserRoleService.batchInsert(Integer.parseInt(userId), roleIds);
+		sysUserRoleService.batchInsert(Long.parseLong(userId), roleIds);
 		return succeed();
 	}
 
@@ -334,7 +334,7 @@ public class UserController extends BaseController {
 		if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(roleIds)) {
 			return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
 		}
-		sysUserRoleService.batchDel(Integer.parseInt(userId), roleIds);
+		sysUserRoleService.batchDel(Long.parseLong(userId), roleIds);
 		return succeed();
 	}
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserDeviceController.java

@@ -35,7 +35,7 @@ public class UserDeviceController extends BaseController {
 	@ApiOperation(value = "设备号解除绑定")
 	@PostMapping(value = "/unbind")
 	@AuditLogAnnotation(operateName = "设备号解除绑定",interfaceURL = "userDevice/unbind")
-	public Object unbind(Integer id) {
+	public Object unbind(Long id) {
 		return succeed(sysUserDeviceService.deleteWithLogic(id));
 	}
 

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysRoleMenuMapper.xml

@@ -55,11 +55,11 @@
 		SELECT COUNT(*) FROM sys_role_menu
 	</select>
 	
-	<select id="queryPermissionsByRoleId" resultType="string" parameterType="int">
+	<select id="queryPermissionsByRoleId" resultType="string" parameterType="long">
 		SELECT m.permission_ FROM sys_role_menu rm left join sys_menu m on rm.menu_id_ = m.id_ where rm.role_id_ = #{roleId} and m.del_flag_ = 0
 	</select>
 
-	<select id="queryMenuIdByRoleId" resultType="integer" parameterType="int">
+	<select id="queryMenuIdByRoleId" resultType="integer" parameterType="long">
 		SELECT m.id_ FROM sys_role_menu rm left join sys_menu m on rm.menu_id_ = m.id_ where rm.role_id_ = #{roleId} and m.del_flag_ = 0
 	</select>
 </mapper>

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -67,7 +67,7 @@
     </insert>
     <insert id="insertTeacher">
         INSERT INTO teacher
-        (id_,create_time_,update_time_)VALUES(#{userId},NOW(),NOW())
+        (user_id_,create_time_,update_time_)VALUES(#{userId},NOW(),NOW())
     </insert>
     <insert id="saveStudent">
         INSERT INTO student (user_id_,create_time_,update_time_) VALUES(#{userId},NOW(),NOW())

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserRoleMapper.xml

@@ -48,11 +48,11 @@
 		SELECT COUNT(*) FROM sys_user_role
 	</select>
 
-    <select id="queryRoleIdListByUserId" resultType="int" parameterType="int">
+    <select id="queryRoleIdListByUserId" resultType="int" parameterType="long">
 		SELECT ur.role_id_ FROM sys_user_role ur left join sys_role r on ur.role_id_ = r.id_ where ur.user_id_ = #{userId} and r.del_flag_ = 0
 	</select>
 
-    <select id="queryRoleCodeListByUserId" resultType="string" parameterType="int">
+    <select id="queryRoleCodeListByUserId" resultType="string" parameterType="long">
 		SELECT r.role_code_ FROM sys_user_role ur left join sys_role r on ur.role_id_ = r.id_ where ur.user_id_ = #{userId} and r.del_flag_ = 0
 	</select>
 </mapper>

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/HelpCenterCatalogController.java

@@ -37,7 +37,7 @@ public class HelpCenterCatalogController extends BaseController {
 	@GetMapping(value = "list")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "parentId", value = "父分类编号（可为空）", required = true, dataType = "Integer"),
 			@ApiImplicitParam(name = "status", value = "状态(1，显示 0，隐藏；可为空)", required = true, dataType = "Integer") })
-	public Object list(Integer parentId, Integer status) {
+	public Object list(Long parentId, Integer status) {
 		List<HelpCenterCatalog> dataList = helpCenterCatalogService.queryByParentId(parentId, status);
 		return succeed(dataList);
 	}
@@ -45,7 +45,7 @@ public class HelpCenterCatalogController extends BaseController {
 	@ApiOperation("分类详情查询")
 	@GetMapping(value = "get")
 	@ApiImplicitParam(name = "id", value = "分类编号", required = true, dataType = "Integer", paramType = "path")
-	public Object findHelpCatalogById(Integer id) {
+	public Object findHelpCatalogById(Long id) {
 		if (id == null || id <= 0)
 			return failed("请检查输入的ID");
 		return succeed(helpCenterCatalogService.get(id));
@@ -73,7 +73,7 @@ public class HelpCenterCatalogController extends BaseController {
 	@PostMapping(value = "delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@ApiImplicitParam(name = "id", value = "分类编号", required = true, dataType = "Integer", paramType = "path")
 	@AuditLogAnnotation(operateName = "帮助中心分类删除",interfaceURL = "helpCenterCatalog/delete")
-	public Object delHelpCatalog(Integer id) {
+	public Object delHelpCatalog(Long id) {
 		if (id == null || id <= 0)
 			return failed("ID解析失败");
 		List<HelpCenterCatalog> list = helpCenterCatalogService.queryByParentId(id, null);

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/HelpCenterContentControlller.java

@@ -44,7 +44,7 @@ public class HelpCenterContentControlller extends BaseController {
 	@ApiOperation("帮助中心内容明细查询")
 	@GetMapping(value = "get")
 	@ApiImplicitParam(name = "id", value = "编号", required = true, dataType = "Integer", paramType = "path")
-	public Object findHelpContentByKey(Integer id) {
+	public Object findHelpContentByKey(Long id) {
 		if (id == null || id <= 0) {
 			return failed("请检查输入的参数");
 		}
@@ -81,7 +81,7 @@ public class HelpCenterContentControlller extends BaseController {
 	@PostMapping(value = "delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@ApiImplicitParam(name = "id", value = "编号", required = true, dataType = "Integer", paramType = "path")
 	@AuditLogAnnotation(operateName = "帮助中心内容删除",interfaceURL = "helpCenterContent/delete")
-	public Object delHelpContent(Integer id) {
+	public Object delHelpContent(Long id) {
 		if (id == null || id <= 0)
 			return failed("ID解析失败");
 		return helpCenterContentService.delete(id) > 0 ? succeed() : failed("删除失败");

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -77,7 +77,7 @@ public class NewsController extends BaseController {
 
 	@ApiOperation("资讯类型列表查询")
 	@GetMapping(value = "/typeList")
-	public Object getTypeList(Integer parentId) {
+	public Object getTypeList(Long parentId) {
 		return succeed(sysNewsTypeService.queryByParentId(parentId));
 	}
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -29,7 +29,7 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	private Integer subjectId;
 	
 	@ApiModelProperty(value = "需排除编号")
-	private List<Integer> excludeIds;
+	private List<Long> excludeIds;
 	
 	private Date date;
 
@@ -89,11 +89,11 @@ public class NewsInformationQueryInfo extends QueryInfo {
 		this.subjectId = subjectId;
 	}
 
-	public List<Integer> getExcludeIds() {
+	public List<Long> getExcludeIds() {
 		return excludeIds;
 	}
 
-	public void setExcludeIds(List<Integer> excludeIds) {
+	public void setExcludeIds(List<Long> excludeIds) {
 		this.excludeIds = excludeIds;
 	}
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/HelpCenterCatalogDao.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface HelpCenterCatalogDao extends BaseDAO<Integer, HelpCenterCatalog> {
+public interface HelpCenterCatalogDao extends BaseDAO<Long, HelpCenterCatalog> {
 
-	public List<HelpCenterCatalog> queryByParentId(@Param("parentId") Integer parentId, @Param("status") Integer status);
+	public List<HelpCenterCatalog> queryByParentId(@Param("parentId") Long parentId, @Param("status") Integer status);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/HelpCenterContentDao.java

@@ -5,9 +5,9 @@ import java.util.Map;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface HelpCenterContentDao extends BaseDAO<Integer, HelpCenterContent> {
+public interface HelpCenterContentDao extends BaseDAO<Long, HelpCenterContent> {
 
 	public int updateContentByCatalog(Map<String, Object> map);
 
-	public int deleteContentByCatalog(Integer catalogId);
+	public int deleteContentByCatalog(Long catalogId);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsTypeDao.java

@@ -6,8 +6,8 @@ import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SysNewsTypeDao extends BaseDAO<Integer, SysNewsType> {
+public interface SysNewsTypeDao extends BaseDAO<Long, SysNewsType> {
 
 	// 根据父级查询子集
-	List<SysNewsTypeTree> queryByParentId(Integer parentId);
+	List<SysNewsTypeTree> queryByParentId(Long parentId);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/HelpCenterCatalog.java

@@ -7,10 +7,10 @@ import java.util.List;
 public class HelpCenterCatalog {
 
 	@ApiModelProperty(value = "编号", required = false)
-	private Integer id;
+	private Long id;
 
 	@ApiModelProperty(value = "父分类ID", required = false)
-	private Integer parentId;
+	private Long parentId;
 
 	@ApiModelProperty(value = "分类名称", required = false)
 	private String text;
@@ -35,11 +35,11 @@ public class HelpCenterCatalog {
 	@ApiModelProperty(value = "状态 1 显示 0隐藏", required = false)
 	private Integer status;
 
-	public void setId(Integer id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 
-	public Integer getId() {
+	public Long getId() {
 		return this.id;
 	}
 
@@ -59,11 +59,11 @@ public class HelpCenterCatalog {
 		this.children = children;
 	}
 
-	public void setParentId(Integer parentId) {
+	public void setParentId(Long parentId) {
 		this.parentId = parentId;
 	}
 
-	public Integer getParentId() {
+	public Long getParentId() {
 		return this.parentId;
 	}
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/HelpCenterContent.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class HelpCenterContent {
 
 	@ApiModelProperty(value = "编号", required = false)
-	private Integer id;
+	private Long id;
 
 	@ApiModelProperty(value = "标题", required = false)
 	private String title;
@@ -14,7 +14,7 @@ public class HelpCenterContent {
 	private String content = "";
 
 	@ApiModelProperty(value = "分类ID", required = false)
-	private Integer catalogId;
+	private Long catalogId;
 
 	/** 创建时间 */
 	private java.util.Date createOn;
@@ -46,11 +46,11 @@ public class HelpCenterContent {
 		this.order = order;
 	}
 
-	public void setId(Integer id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 
-	public Integer getId() {
+	public Long getId() {
 		return this.id;
 	}
 
@@ -70,11 +70,11 @@ public class HelpCenterContent {
 		return this.content;
 	}
 
-	public void setCatalogId(Integer catalogId) {
+	public void setCatalogId(Long catalogId) {
 		this.catalogId = catalogId;
 	}
 
-	public Integer getCatalogId() {
+	public Long getCatalogId() {
 		return this.catalogId;
 	}
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/entity/SysNewsType.java

@@ -8,13 +8,13 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysNewsType {
 
 	/**  */
-	private Integer id;
+	private Long id;
 	
 	/**  */
 	private String name;
 	
 	/**  */
-	private Integer parentId;
+	private Long parentId;
 	
 	/**  */
 	private boolean delFlag;
@@ -25,11 +25,11 @@ public class SysNewsType {
 	/**  */
 	private java.util.Date updateTime;
 	
-	public void setId(Integer id){
+	public void setId(Long id){
 		this.id = id;
 	}
 	
-	public Integer getId(){
+	public Long getId(){
 		return this.id;
 	}
 			
@@ -41,11 +41,11 @@ public class SysNewsType {
 		return this.name;
 	}
 			
-	public void setParentId(Integer parentId){
+	public void setParentId(Long parentId){
 		this.parentId = parentId;
 	}
 	
-	public Integer getParentId(){
+	public Long getParentId(){
 		return this.parentId;
 	}
 			

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/HelpCenterCatalogService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterCatalog;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface HelpCenterCatalogService extends BaseService<Integer, HelpCenterCatalog> {
+public interface HelpCenterCatalogService extends BaseService<Long, HelpCenterCatalog> {
 
 	/**
 	 * 根据父节点查询所有子节点对象
@@ -13,7 +13,7 @@ public interface HelpCenterCatalogService extends BaseService<Integer, HelpCente
 	 * @param status 状态（可为null）
 	 * @return
 	 */
-	public List<HelpCenterCatalog> queryByParentId(Integer parentId, Integer status);
+	public List<HelpCenterCatalog> queryByParentId(Long parentId, Integer status);
 
 	/**
 	 * 修改分类信息
@@ -27,5 +27,5 @@ public interface HelpCenterCatalogService extends BaseService<Integer, HelpCente
 	 * @param id
 	 * @return
 	 */
-	public boolean deleteCatalog(Integer id);
+	public boolean deleteCatalog(Long id);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/HelpCenterContentService.java

@@ -3,9 +3,9 @@ package com.yonge.cooleshow.cms.service;
 import com.yonge.cooleshow.cms.dal.entity.HelpCenterContent;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface HelpCenterContentService extends BaseService<Integer,HelpCenterContent>{
+public interface HelpCenterContentService extends BaseService<Long,HelpCenterContent>{
 	
-	public boolean updateContentByCatalog(Integer catalogId,Integer status);
+	public boolean updateContentByCatalog(Long catalogId,Integer status);
 	
-	public boolean deleteContentByCatalog(Integer catalogId);
+	public boolean deleteContentByCatalog(Long catalogId);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/SysNewsTypeService.java

@@ -6,10 +6,10 @@ import com.yonge.cooleshow.cms.dal.entity.SysNewsType;
 import com.yonge.cooleshow.cms.dal.entity.SysNewsTypeTree;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysNewsTypeService extends BaseService<Integer, SysNewsType> {
+public interface SysNewsTypeService extends BaseService<Long, SysNewsType> {
 	
-	List<SysNewsTypeTree> queryTree(Integer parentId);
+	List<SysNewsTypeTree> queryTree(Long parentId);
 
 	//根据父级查询子集
-	List<SysNewsTypeTree> queryByParentId(Integer parentId);
+	List<SysNewsTypeTree> queryByParentId(Long parentId);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/HelpCenterCatalogServiceImpl.java

@@ -13,7 +13,7 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Integer, HelpCenterCatalog> implements HelpCenterCatalogService {
+public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Long, HelpCenterCatalog> implements HelpCenterCatalogService {
 
 	@Autowired
 	private HelpCenterCatalogDao helpCenterCatalogDao;
@@ -22,13 +22,13 @@ public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Integer, HelpC
 	private HelpCenterContentService helpCenterContentService;
 
 	@Override
-	public BaseDAO<Integer, HelpCenterCatalog> getDAO() {
+	public BaseDAO<Long, HelpCenterCatalog> getDAO() {
 
 		return helpCenterCatalogDao;
 	}
 
 	@Override
-	public List<HelpCenterCatalog> queryByParentId(Integer parentId, Integer status) {
+	public List<HelpCenterCatalog> queryByParentId(Long parentId, Integer status) {
 
 		List<HelpCenterCatalog> dataList = helpCenterCatalogDao.queryByParentId(parentId, status);
 		if (dataList != null) {
@@ -44,7 +44,7 @@ public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Integer, HelpC
 	}
 
 	@Override
-	public boolean deleteCatalog(Integer id) {
+	public boolean deleteCatalog(Long id) {
 		return helpCenterCatalogDao.delete(id) > 0 && helpCenterContentService.deleteContentByCatalog(id);
 	}
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/HelpCenterContentServiceImpl.java

@@ -13,18 +13,18 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class HelpCenterContentServiceImpl extends BaseServiceImpl<Integer, HelpCenterContent> implements HelpCenterContentService {
+public class HelpCenterContentServiceImpl extends BaseServiceImpl<Long, HelpCenterContent> implements HelpCenterContentService {
 
 	@Autowired
 	private HelpCenterContentDao contentCenterDao;
 
 	@Override
-	public BaseDAO<Integer, HelpCenterContent> getDAO() {
+	public BaseDAO<Long, HelpCenterContent> getDAO() {
 		return contentCenterDao;
 	}
 
 	@Override
-	public boolean updateContentByCatalog(Integer catalogId, Integer status) {
+	public boolean updateContentByCatalog(Long catalogId, Integer status) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("catalogId", catalogId);
 		map.put("status", status);
@@ -33,7 +33,7 @@ public class HelpCenterContentServiceImpl extends BaseServiceImpl<Integer, HelpC
 	}
 
 	@Override
-	public boolean deleteContentByCatalog(Integer catalogId) {
+	public boolean deleteContentByCatalog(Long catalogId) {
 		contentCenterDao.deleteContentByCatalog(catalogId);
 		return true;
 	}

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsTypeServiceImpl.java

@@ -13,20 +13,20 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysNewsTypeServiceImpl extends BaseServiceImpl<Integer, SysNewsType>  implements SysNewsTypeService {
+public class SysNewsTypeServiceImpl extends BaseServiceImpl<Long, SysNewsType>  implements SysNewsTypeService {
 	
 	@Autowired
 	private SysNewsTypeDao sysNewsTypeDao;
 
 	@Override
-	public BaseDAO<Integer, SysNewsType> getDAO() {
+	public BaseDAO<Long, SysNewsType> getDAO() {
 		return sysNewsTypeDao;
 	}
 
 	@Override
-	public List<SysNewsTypeTree> queryTree(Integer parentId) {
+	public List<SysNewsTypeTree> queryTree(Long parentId) {
 		if(parentId == null){
-			parentId = 0 ;
+			parentId = 0L ;
 		}
 		List<SysNewsTypeTree> sysNewsTypeList = queryByParentId(parentId);
 		if(sysNewsTypeList != null && sysNewsTypeList.size() > 0){
@@ -39,9 +39,9 @@ public class SysNewsTypeServiceImpl extends BaseServiceImpl<Integer, SysNewsType
 	}
 
 	@Override
-	public List<SysNewsTypeTree> queryByParentId(Integer parentId) {
+	public List<SysNewsTypeTree> queryByParentId(Long parentId) {
 		if(parentId == null){
-			parentId = 0 ;
+			parentId = 0L ;
 		}
 		return sysNewsTypeDao.queryByParentId(parentId);
 	}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/security/AuthUser.java

@@ -15,19 +15,19 @@ public class AuthUser extends User {
 	/**
 	 * 用户编号
 	 */
-	private Integer userId;
+	private Long userId;
 
-	public AuthUser(Integer userId, String username, String password, boolean enabled, boolean accountNonExpired,
+	public AuthUser(Long userId, String username, String password, boolean enabled, boolean accountNonExpired,
 			boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.userId = userId;
 	}
 
-	public Integer getUserId() {
+	public Long getUserId() {
 		return userId;
 	}
 
-	public void setUserId(Integer userId) {
+	public void setUserId(Long userId) {
 		this.userId = userId;
 	}
 

cooleshow-task/src/main/java/com/yonge/cooleshow/task/controller/TaskController.java

@@ -65,7 +65,7 @@ public class TaskController extends BaseController {
 	@ApiOperation("执行当前任务")
 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
 	@PostMapping("/execute/{taskId}")
-	public HttpResponseResult<Object> execute(@PathVariable("taskId") int taskId) {
+	public HttpResponseResult<Object> execute(@PathVariable("taskId") Long taskId) {
 		boolean result = false;
 		try {
 			result = taskService.execute(taskId, scheduler);
@@ -79,7 +79,7 @@ public class TaskController extends BaseController {
 	@ApiOperation("暂停当前任务")
 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
 	@PostMapping("/pause/{taskId}")
-	public HttpResponseResult<Object> pause(@PathVariable("taskId") int taskId) {
+	public HttpResponseResult<Object> pause(@PathVariable("taskId") Long taskId) {
 		boolean result = false;
 		try {
 			result = taskService.pause(taskId, scheduler);
@@ -93,7 +93,7 @@ public class TaskController extends BaseController {
 	@ApiOperation("暂停当前任务")
 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
 	@PostMapping("/resume/{taskId}")
-	public HttpResponseResult<Object> resume(@PathVariable("taskId") int taskId) {
+	public HttpResponseResult<Object> resume(@PathVariable("taskId") Long taskId) {
 		boolean result = false;
 		try {
 			result = taskService.resume(taskId, scheduler);

cooleshow-task/src/main/java/com/yonge/cooleshow/task/dal/dao/TaskDao.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.task.dal.model.Task;
 
 public interface TaskDao {
 
-	public Task get(int taskId);
+	public Task get(Long taskId);
 
 	/**
 	 * 查询可用的任务列表（除暂停、执行中的任务外）
@@ -32,7 +32,7 @@ public interface TaskDao {
 	 * @param curStatus
 	 * @return
 	 */
-	public int updateStatusById(@Param("id") int id, @Param("oldStatus") int oldStatus, @Param("curStatus") int curStatus);
+	public int updateStatusById(@Param("id") Long id, @Param("oldStatus") int oldStatus, @Param("curStatus") int curStatus);
 
 	/**
 	 * 查询记录数
@@ -53,5 +53,5 @@ public interface TaskDao {
 	 * @param id
 	 * @return
 	 */
-	public Task getLocked(int id);
+	public Task getLocked(Long id);
 }

cooleshow-task/src/main/java/com/yonge/cooleshow/task/dal/model/Task.java

@@ -5,7 +5,7 @@ import java.util.Date;
 public class Task {
 
 	/** 任务id，主键 */
-	private Integer id;
+	private Long id;
 
 	/** 任务名称 */
 	private String name;
@@ -31,11 +31,11 @@ public class Task {
 	/** 修改时间 */
 	private Date modifyOn;
 
-	public Integer getId() {
+	public Long getId() {
 		return id;
 	}
 
-	public void setId(Integer id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 

cooleshow-task/src/main/java/com/yonge/cooleshow/task/service/TaskService.java

@@ -36,7 +36,7 @@ public interface TaskService {
 	 * @param taskId
 	 * @return
 	 */
-	public Task queryTask(int taskId);
+	public Task queryTask(Long taskId);
 
 	/**
 	 * 根据任务名称和任务组获取任务对象
@@ -53,7 +53,7 @@ public interface TaskService {
 	 * @param curStatus
 	 * @return
 	 */
-	public boolean updateTaskStatus(int taskId, TaskStatus oldStatus, TaskStatus curStatus);
+	public boolean updateTaskStatus(Long taskId, TaskStatus oldStatus, TaskStatus curStatus);
 
 	/**
 	 * 执行指定任务编号的任务
@@ -62,7 +62,7 @@ public interface TaskService {
 	 * @return
 	 * @throws SchedulerException
 	 */
-	public boolean execute(int taskId, Scheduler scheduler) throws SchedulerException;
+	public boolean execute(Long taskId, Scheduler scheduler) throws SchedulerException;
 
 	/**
 	 * 暂停任务
@@ -71,7 +71,7 @@ public interface TaskService {
 	 * @return
 	 * @throws SchedulerException
 	 */
-	public boolean pause(int taskId, Scheduler scheduler) throws SchedulerException;
+	public boolean pause(Long taskId, Scheduler scheduler) throws SchedulerException;
 
 	/**
 	 * 恢复任务
@@ -80,5 +80,5 @@ public interface TaskService {
 	 * @return
 	 * @throws SchedulerException
 	 */
-	public boolean resume(int taskId, Scheduler scheduler) throws SchedulerException;
+	public boolean resume(Long taskId, Scheduler scheduler) throws SchedulerException;
 }

cooleshow-task/src/main/java/com/yonge/cooleshow/task/service/impl/TaskServiceImpl.java

@@ -37,7 +37,7 @@ public class TaskServiceImpl implements TaskService {
 	}
 
 	@Override
-	public Task queryTask(int taskId) {
+	public Task queryTask(Long taskId) {
 		return taskDao.get(taskId);
 	}
 
@@ -47,12 +47,12 @@ public class TaskServiceImpl implements TaskService {
 	}
 
 	@Override
-	public boolean updateTaskStatus(int taskId, TaskStatus oldStatus, TaskStatus curStatus) {
+	public boolean updateTaskStatus(Long taskId, TaskStatus oldStatus, TaskStatus curStatus) {
 		return taskDao.updateStatusById(taskId, oldStatus.getCode(), curStatus.getCode()) > 0;
 	}
 
 	@Override
-	public boolean execute(int taskId, Scheduler scheduler) throws SchedulerException {
+	public boolean execute(Long taskId, Scheduler scheduler) throws SchedulerException {
 		Task task = taskDao.getLocked(taskId);
 		if (task == null) {
 			throw new TaskException("任务编号[{" + taskId + "}]不存在");
@@ -64,7 +64,7 @@ public class TaskServiceImpl implements TaskService {
 	}
 
 	@Override
-	public boolean pause(int taskId, Scheduler scheduler) throws SchedulerException {
+	public boolean pause(Long taskId, Scheduler scheduler) throws SchedulerException {
 		Task task = taskDao.getLocked(taskId);
 		if (task == null) {
 			throw new TaskException("任务编号[{" + taskId + "}]不存在");
@@ -79,7 +79,7 @@ public class TaskServiceImpl implements TaskService {
 	}
 
 	@Override
-	public boolean resume(int taskId, Scheduler scheduler) throws SchedulerException {
+	public boolean resume(Long taskId, Scheduler scheduler) throws SchedulerException {
 		Task task = taskDao.getLocked(taskId);
 		if (task == null) {
 			throw new TaskException("任务编号[{" + taskId + "}]不存在");

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/web/controller/AppVersionInfoController.java

@@ -49,7 +49,7 @@ public class AppVersionInfoController extends BaseController {
 	@ApiImplicitParam(name = "id", value = "ID编号", required = true, dataType = "Integer", paramType = "path")
 	@GetMapping(value = "/query")
 	@PreAuthorize("@pcs.hasPermissions('appVersionInfo/query')")
-	public Object query(Integer id) {
+	public Object query(Long id) {
 		return succeed(appVersionInfoService.get(id));
 	}
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/web/controller/SubjectController.java

@@ -37,7 +37,7 @@ public class SubjectController extends BaseController {
 	@ApiOperation(value = "根据科目编号查询科目")
 	@GetMapping("/get/{id}")
 	@PreAuthorize("@pcs.hasPermissions('subject/get')")
-	public Object get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Integer id) {
+	public Object get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
 		return succeed(subjectService.get(id));
 	}
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/web/controller/SysUserContractsController.java

@@ -25,7 +25,7 @@ public class SysUserContractsController extends BaseController {
     @ApiOperation(value = "查询学生最新协议")
     @GetMapping("/getLatest")
     @PreAuthorize("@pcs.hasPermissions('sysUserContracts/getLatest')")
-	public HttpResponseResult<SysUserContracts> getLatest(Integer userId) {
+	public HttpResponseResult<SysUserContracts> getLatest(Long userId) {
 		
 		SysUserContracts sysUserContracts = sysUserContractsService.getLatestUserContract(userId);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/AppVersionInfoDao.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface AppVersionInfoDao extends BaseDAO<Integer, AppVersionInfo> {
+public interface AppVersionInfoDao extends BaseDAO<Long, AppVersionInfo> {
 
 	List<AppVersionInfo> queryNewestByPlatform(String platform);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SubjectDao extends BaseDAO<Integer, Subject> {
+public interface SubjectDao extends BaseDAO<Long, Subject> {
 
     /**
      * 根据父级id查询子级列表
@@ -17,7 +17,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @param parentId
      * @return
      */
-    List<Subject> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag);
+    List<Subject> findByParentId(@Param("parentId") Long parentId, @Param("delFlag") YesOrNoEnum delFlag);
 
     /**
      * 根据声部编号列表获取声部名称map
@@ -25,10 +25,10 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @param subjectIds
      * @return
      */
-    List<Map<Integer, String>> queryNameByIds(@Param("subjectIds") String subjectIds);
+    List<Map<Long, String>> queryNameByIds(@Param("subjectIds") String subjectIds);
 
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
 
-    List<Subject> findBySubjectIds(@Param("subjectIds") List<Integer> subjectIds);
+    List<Subject> findBySubjectIds(@Param("subjectIds") List<Long> subjectIds);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysMessageConfigDao.java

@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import com.yonge.cooleshow.biz.dal.entity.SysMessageConfig;
 import com.yonge.cooleshow.common.dal.BaseDAO;
 
-public interface SysMessageConfigDao extends BaseDAO<Integer, SysMessageConfig> {
+public interface SysMessageConfigDao extends BaseDAO<Long, SysMessageConfig> {
 
 	/**
 	 * 根据消息类型查询对象

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysMessageDao.java

@@ -41,12 +41,12 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId, @Param("jpushType") String jpushType, @Param("tenantId") Integer tenantId);
+	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Long userId, @Param("jpushType") String jpushType, @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 修改用户所有消息阅读状态
 	 */
-	public int updateStatus(@Param("userId") Integer userId, @Param("status") int status, @Param("jpushType") String jpushType);
+	public int updateStatus(@Param("userId") Long userId, @Param("status") int status, @Param("jpushType") String jpushType);
 
 	/**
 	 * 修改单个消息状态

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysUserContractsDao.java

@@ -17,7 +17,7 @@ public interface SysUserContractsDao extends BaseDAO<Long, SysUserContracts> {
      * @param contractType:
      * @return java.util.List<com.ym.mec.biz.dal.entity.SysUserContracts>
      */
-    List<SysUserContracts> getUserContractWithType(@Param("userId") Integer userId,
+    List<SysUserContracts> getUserContractWithType(@Param("userId") Long userId,
                                                    @Param("contractType") SysUserContracts.ContractType contractType,
                                                    @Param("version") Integer version);
 
@@ -26,6 +26,6 @@ public interface SysUserContractsDao extends BaseDAO<Long, SysUserContracts> {
      * @param userId
      * @return
      */
-    SysUserContracts getLatestUserContract(Integer userId);
+    SysUserContracts getLatestUserContract(Long userId);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherAuthEntryRecordDao.java

@@ -4,7 +4,10 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
 
 public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRecord>{
 
@@ -12,5 +15,13 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	 * 自定义分页
 	 */
 	List<TeacherAuthEntryRecord> selectPage(IPage page, TeacherAuthEntryRecord teacherAuthEntryRecord);
-	
+
+	/***
+	 * 修改用户实名信息
+	 * @author liweifan
+	 * @param: teacherApplyDetailDto
+	 * @updateTime 2022/3/18 15:57
+	 * @return: java.lang.Integer
+	 */
+	Integer updateUserCard(@Param("param") TeacherApplyDetailDto teacherApplyDetailDto);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherDao.java

@@ -14,6 +14,6 @@ public interface TeacherDao extends BaseMapper<Teacher> {
      */
     List<Teacher> selectPage(@Param("page") IPage page, @Param("param") Teacher teacher);
 
-    Teacher detail1(@Param("userId") Integer userId);
+    Teacher detail1(@Param("userId") Long userId);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/RealnameAuthDto.java

@@ -0,0 +1,21 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 实名认证请求对象
+ * @Author: liweifan
+ * @Data: 2022/3/18 15:04
+ */
+@Data
+@ApiModel(value = "RealnameAuthDto对象", description = "实名认证请求对象")
+public class RealnameAuthDto {
+
+    @ApiModelProperty("用户真实姓名")
+    private String realname;
+    @ApiModelProperty("用户身份证号")
+    private String idcardNo;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/TeacherApplyDetailDto.java

@@ -0,0 +1,57 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/18 14:56
+ */
+@Data
+@ApiModel(value = "TeacherApplyDetailDto对象", description = "老师入驻申请信息")
+public class TeacherApplyDetailDto implements Serializable {
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "真实姓名", required = true)
+    private String realName;
+
+    @ApiModelProperty(value = "身份证号", required = true)
+    private String idCardNo;
+
+    @ApiModelProperty(value = "性别（0，女  1，男）", required = true)
+    private String gender;
+
+    @ApiModelProperty(value = "出生日期 ", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date birthdate;
+
+    @ApiModelProperty(value = "专业技能（支持多个，用逗号分隔），对应乐器表id ", required = true)
+    private String subjectId;
+
+    @ApiModelProperty(value = "个人介绍 ", required = true)
+    private String introduction;
+
+    @ApiModelProperty("毕业学校 ")
+    private String graduateSchool;
+
+    @ApiModelProperty("学校专业 ")
+    private String subject;
+
+    @ApiModelProperty("毕业证书 ")
+    private String gradCertificate;
+
+    @ApiModelProperty("学位证书 ")
+    private String degreeCertificate;
+
+    @ApiModelProperty("教师资格证 ")
+    private String teacherCertificate;
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AppVersionInfo.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class AppVersionInfo {
 
 	/**  */
-	private Integer id;
+	private Long id;
 	
 	/** 平台（andorid/ios） */
 	private String platform;
@@ -45,11 +45,11 @@ public class AppVersionInfo {
 		isForceUpdate = forceUpdate;
 	}
 
-	public void setId(Integer id){
+	public void setId(Long id){
 		this.id = id;
 	}
 	
-	public Integer getId(){
+	public Long getId(){
 		return this.id;
 	}
 			

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Order.java

@@ -35,7 +35,7 @@ public class Order implements Serializable {
     */
     @ApiModelProperty("买家id ")
 	@TableField(value = "user_id_")
-    private Integer userId;
+    private Long userId;
     /** 
     * 卖家id 
     */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/OrderRefunds.java

@@ -25,7 +25,7 @@ public class OrderRefunds implements Serializable {
     @TableId(value = "id_", type = IdType.UUID)
     private Long id;
 	@TableField(value = "user_id_")
-    private Integer userId;
+    private Long userId;
     /** 
     * 订单号 
     */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -15,7 +15,7 @@ import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 public class Subject {
 
 	/**  */
-	private Integer id;
+	private Long id;
 	
 	/**  */
 	@ApiModelProperty(value = "科目名称",required = false)
@@ -27,7 +27,7 @@ public class Subject {
 	
 	/**  */
 	@ApiModelProperty(value = "父级编号",required = false)
-	private Integer parentSubjectId;
+	private Long parentSubjectId;
 	
 	@ApiModelProperty(value = "图片地址",required = false)
 	private String img;
@@ -78,11 +78,11 @@ public class Subject {
 		this.subjects = subjects;
 	}
 
-	public void setId(Integer id){
+	public void setId(Long id){
 		this.id = id;
 	}
 	
-	public Integer getId(){
+	public Long getId(){
 		return this.id;
 	}
 			
@@ -102,11 +102,11 @@ public class Subject {
 		return this.code;
 	}
 			
-	public void setParentSubjectId(Integer parentSubjectId){
+	public void setParentSubjectId(Long parentSubjectId){
 		this.parentSubjectId = parentSubjectId;
 	}
 	
-	public Integer getParentSubjectId(){
+	public Long getParentSubjectId(){
 		return this.parentSubjectId;
 	}
 			

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMessage.java

@@ -52,7 +52,7 @@ public class SysMessage extends BaseEntity {
 	
 	/** 用户编号 */
 	@ApiModelProperty(value = "用户编号",required = false)
-	private Integer userId;
+	private Long userId;
 	
 	/** 备注 */
 	@ApiModelProperty(value = "备注",required = false)
@@ -79,7 +79,7 @@ public class SysMessage extends BaseEntity {
 	public SysMessage() {
 	}
 
-	public SysMessage(String title, String content, MessageSendMode type, String receiver, Integer userId, String memo) {
+	public SysMessage(String title, String content, MessageSendMode type, String receiver, Long userId, String memo) {
 		this.title = title;
 		this.content = content;
 		this.type = type;
@@ -152,11 +152,11 @@ public class SysMessage extends BaseEntity {
 		return this.modifyOn;
 	}
 			
-	public void setUserId(Integer userId){
+	public void setUserId(Long userId){
 		this.userId = userId;
 	}
 	
-	public Integer getUserId(){
+	public Long getUserId(){
 		return this.userId;
 	}
 			

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMessageConfig.java

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 public class SysMessageConfig {
 
 	/**  */
-	private Integer id;
+	private Long id;
 
 	/** 消息类型 */
 	private MessageTypeEnum messageType;
@@ -39,11 +39,11 @@ public class SysMessageConfig {
 		this.sendFlag = sendFlag;
 	}
 
-	public void setId(Integer id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 
-	public Integer getId() {
+	public Long getId() {
 		return this.id;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysUserContracts.java

@@ -35,7 +35,7 @@ public class SysUserContracts {
 	private Long id;
 
 	/**  */
-	private Integer userId;
+	private Long userId;
 
 	/** 合同号 */
 	private String contractNo;
@@ -70,11 +70,11 @@ public class SysUserContracts {
 		return this.id;
 	}
 
-	public void setUserId(Integer userId) {
+	public void setUserId(Long userId) {
 		this.userId = userId;
 	}
 
-	public Integer getUserId() {
+	public Long getUserId() {
 		return this.userId;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -26,7 +26,7 @@ public class Teacher implements Serializable {
     */
     @ApiModelProperty("对应user表用户编号 ")
     @TableId(value = "user_id_", type = IdType.UUID)
-    private Integer userId;
+    private Long userId;
     /** 
     * 学历 
     */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,12 +28,14 @@ public class TeacherAuthEntryRecord implements Serializable {
     */
     @ApiModelProperty("审核单id ")
     @TableId(value = "id_", type = IdType.UUID)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     /** 
     * 对应user表用户编号 
     */
     @ApiModelProperty("对应user表用户编号 ")
 	@TableField(value = "user_id_")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
     /** 
     * 专业技能（支持多个，用逗号分隔），对应乐器表id 
@@ -86,6 +90,7 @@ public class TeacherAuthEntryRecord implements Serializable {
     */
     @ApiModelProperty("审核人 ")
 	@TableField(value = "verify_user_id_")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long verifyUserId;
     /** 
     * 审核理由 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/SubjectQueryInfo.java

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.common.page.QueryInfo;
 
 public class SubjectQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "父节点编号，默认0",required = false)
-    private Integer parentId = 0;
+    private Long parentId = 0L;
 
     @ApiModelProperty(value = "节点状态，默认0未删除，1删除",required = false)
     private YesOrNoEnum delFlag = YesOrNoEnum.NO;
@@ -20,11 +20,11 @@ public class SubjectQueryInfo extends QueryInfo {
         this.delFlag = delFlag;
     }
 
-    public Integer getParentId() {
+    public Long getParentId() {
         return parentId;
     }
 
-    public void setParentId(Integer parentId) {
+    public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/AppVersionInfoService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface AppVersionInfoService extends BaseService<Integer, AppVersionInfo> {
+public interface AppVersionInfoService extends BaseService<Long, AppVersionInfo> {
 
 	List<AppVersionInfo> queryNewestByPlatform(String platform);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SubjectService.java

@@ -8,7 +8,7 @@ import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SubjectService extends BaseService<Integer, Subject> {
+public interface SubjectService extends BaseService<Long, Subject> {
 
 	/**
 	 * 分页查询科目树状列表
@@ -25,7 +25,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
 	 */
 	void upSetSubject(Subject subject);
 
-	List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
+	List<Subject> findBySubjectByIdList(List<Long> subjectIdList);
 
 	List<Subject> findBySubjectByIdList(String subjectIdList);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysMessageConfigService.java

@@ -4,7 +4,7 @@ import com.yonge.cooleshow.biz.dal.entity.SysMessageConfig;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.common.service.BaseService;
 
-public interface SysMessageConfigService extends BaseService<Integer, SysMessageConfig> {
+public interface SysMessageConfigService extends BaseService<Long, SysMessageConfig> {
 
 	/**
 	 * 根据消息类型查询对象

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysMessageService.java

@@ -31,7 +31,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param messageType
 	 * @return
 	 */
-	boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType,String memo, Object... args);
+	boolean batchSeoMessage(Set<Long> userIds, MessageTypeEnum messageType,String memo, Object... args);
 
 	/**
 	 * 发送消息
@@ -44,7 +44,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param args 参数
 	 * @return
 	 */
-	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum messageType, Map<Integer, String> receivers, Date triggerTime,
+	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum messageType, Map<Long, String> receivers, Date triggerTime,
 			Integer readStatus, String url,String jpushType, Object... args);
 
 
@@ -58,14 +58,13 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param args 参数
 	 * @return
 	 */
-	public void batchPushMessage(MessageTypeEnum messageType, Map<Integer, String> receivers, Date triggerTime,
+	public void batchPushMessage(MessageTypeEnum messageType, Map<Long, String> receivers, Date triggerTime,
 			Integer readStatus, String url,String jpushType,String sound,String channelId, Object... args);
 
 	/**
 	 * 发送消息
 	 * @param messageSender 消息发送者
 	 * @param userId 用户编号
-	 * @param mode 消息模式
 	 * @param title 消息标题
 	 * @param content 消息内容
 	 * @param receiver 消息接受者
@@ -75,19 +74,18 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param group 组
 	 * @return
 	 */
-	public void sendMessage(MessageSender messageSender, Integer userId, String title, String content, String receiver, Date triggerTime, Integer readStatus,
+	public void sendMessage(MessageSender messageSender, Long userId, String title, String content, String receiver, Date triggerTime, Integer readStatus,
 			String url, String group,String jpushType);
 
 	/**
 	 * 发送验证码
 	 * @param messageSender 消息发送者
 	 * @param userId 用户编号
-	 * @param mode 消息模式
 	 * @param messageType 消息类型
 	 * @param receiver 消息接受者
 	 * @return
 	 */
-	public boolean sendSecurityCode(MessageSender messageSender, Integer userId, MessageTypeEnum messageType, String receiver);
+	public boolean sendSecurityCode(MessageSender messageSender, Long userId, MessageTypeEnum messageType, String receiver);
 
 	/**
 	 * 获取已经发送的验证码
@@ -110,7 +108,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId,String jpushType, Integer tenantId);
+	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Long userId,String jpushType, Integer tenantId);
 
 	/**
 	 *
@@ -118,7 +116,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param status 状态/1 已读,0未读
 	 * @return
 	 */
-	public int updateStatus(Integer userId, int status,String jpushType);
+	public int updateStatus(Long userId, int status,String jpushType);
 
 	/**
 	 * 修改单条消息状态

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysUserContractsService.java

@@ -15,13 +15,13 @@ public interface SysUserContractsService extends BaseService<Long, SysUserContra
      * @param contractType:
      * @return java.util.List<com.ym.mec.biz.dal.entity.SysUserContracts>
      */
-    List<SysUserContracts> getUserContractWithType(Integer userId, SysUserContracts.ContractType contractType, Integer contractVersion);
+    List<SysUserContracts> getUserContractWithType(Long userId, SysUserContracts.ContractType contractType, Integer contractVersion);
 
     /**
      * 获取最近一次的协议
      * @param userId
      * @return
      */
-    SysUserContracts getLatestUserContract(Integer userId);
+    SysUserContracts getLatestUserContract(Long userId);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherAuthEntryRecordService.java

@@ -2,6 +2,8 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 
 /**
@@ -18,4 +20,13 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
  	 * @date 2022-03-18
      */
     IPage<TeacherAuthEntryRecord> selectPage(IPage<TeacherAuthEntryRecord> page, TeacherAuthEntryRecord teacherAuthEntryRecord);
+    /***
+     * 老师入驻申请
+     * @author liweifan
+     * @param: teacherApplyDetailDto
+     * @param: sysUser
+     * @updateTime 2022/3/18 15:38
+     * @return: java.lang.Boolean
+     */
+    Boolean doApply(TeacherApplyDetailDto teacherApplyDetailDto, SysUser sysUser);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherService.java

@@ -19,6 +19,6 @@ public interface TeacherService extends IService<Teacher>  {
      */
     IPage<Teacher> selectPage(IPage<Teacher> page, Teacher teacher);
 
-    Teacher detail1(Integer userId);
+    Teacher detail1(Long userId);
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/AppVersionInfoServiceImpl.java

@@ -16,13 +16,13 @@ import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class AppVersionInfoServiceImpl extends BaseServiceImpl<Integer, AppVersionInfo>  implements AppVersionInfoService {
+public class AppVersionInfoServiceImpl extends BaseServiceImpl<Long, AppVersionInfo>  implements AppVersionInfoService {
 	
 	@Autowired
 	private AppVersionInfoDao appVersionInfoDao;
 
 	@Override
-	public BaseDAO<Integer, AppVersionInfo> getDAO() {
+	public BaseDAO<Long, AppVersionInfo> getDAO() {
 		return appVersionInfoDao;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SmsCodeServiceImpl.java

@@ -40,7 +40,7 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 	@Override
 	public boolean sendValidCode(String mobile) {
 		SysUser sysUser = sysUserFeignService.queryUserByMobile(mobile);
-		Integer userId = null;
+		Long userId = null;
 		if (sysUser != null) {
 			userId = sysUser.getId();
 		}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -17,13 +17,13 @@ import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implements SubjectService {
+public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implements SubjectService {
 
     @Autowired
     private SubjectDao subjectDao;
 
     @Override
-    public BaseDAO<Integer, Subject> getDAO() {
+    public BaseDAO<Long, Subject> getDAO() {
         return subjectDao;
     }
 
@@ -42,7 +42,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
             subjectDao.delete(subject.getId());
             return;
         }
-        Integer parentId = upset(subject, null);
+        Long parentId = upset(subject, null);
         List<Subject> subjects = subject.getSubjects();
         if (subjects != null && subjects.size() > 0) {
             subjects.forEach(e -> {
@@ -51,7 +51,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
         }
     }
 
-    private Integer upset(Subject subject, Integer parentId) {
+    private Long upset(Subject subject, Long parentId) {
         if (parentId != null) {
             subject.setParentSubjectId(parentId);
         }
@@ -82,7 +82,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
     @Override
-    public List<Subject> findBySubjectByIdList(List<Integer> subjectIdList) {
+    public List<Subject> findBySubjectByIdList(List<Long> subjectIdList) {
         return subjectDao.findBySubjectByIdList(StringUtils.join(subjectIdList, ","));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageConfigServiceImpl.java

@@ -11,13 +11,13 @@ import com.yonge.cooleshow.common.dal.BaseDAO;
 import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
 
 @Service
-public class SysMessageConfigServiceImpl extends BaseServiceImpl<Integer, SysMessageConfig>  implements SysMessageConfigService {
+public class SysMessageConfigServiceImpl extends BaseServiceImpl<Long, SysMessageConfig>  implements SysMessageConfigService {
 	
 	@Autowired
 	private SysMessageConfigDao sysMessageConfigDao;
 
 	@Override
-	public BaseDAO<Integer, SysMessageConfig> getDAO() {
+	public BaseDAO<Long, SysMessageConfig> getDAO() {
 		return sysMessageConfigDao;
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -107,16 +107,16 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	 * @param group 消息组
 	 * @return
 	 */
-	private int addMessage(Map<Integer, String> receivers, String subject, String content, Date triggerTime, MessageSendMode mode, SendStatusEnum status,
+	private int addMessage(Map<Long, String> receivers, String subject, String content, Date triggerTime, MessageSendMode mode, SendStatusEnum status,
 			String errorMsg, Integer readStatus, String memo, String group,String jpushType) {
 		SysMessage message = null;
 		Date date = new Date();
 
 		List<SysMessage> messages = new ArrayList<>();
 
-		Integer userId = null;
+		Long userId = null;
 		String receiver;
-		for (Entry<Integer, String> entry : receivers.entrySet()) {
+		for (Entry<Long, String> entry : receivers.entrySet()) {
 			userId = entry.getKey();
 			receiver = entry.getValue();
 
@@ -156,7 +156,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType,String memo, Object... args) {
+	public boolean batchSeoMessage(Set<Long> userIds, MessageTypeEnum messageType,String memo, Object... args) {
 		if(userIds != null){
 			userIds.removeAll(Collections.singleton(null));
 		}
@@ -176,7 +176,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		SysMessage message = null;
 
 		List<SysMessage> messages = new ArrayList<>();
-		for (Integer userId : userIds) {
+		for (Long userId : userIds) {
 			message = new SysMessage();
 			message.setUserId(userId);
 			message.setContent(content);
@@ -197,14 +197,14 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
+	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
 			String url,String jpushType, Object... args) {
 		LOGGER.info("batchSendMessage msgSender {}, type {}, receivers {} ", messageSender, type, receivers);
 		if (receivers == null || receivers.size() == 0) {
 			LOGGER.error("接收地址不能为空");
 			return;
 		}
-		Integer userId = receivers.keySet().iterator().next();
+		Long userId = receivers.keySet().iterator().next();
 
 		String[] tos = receivers.values().toArray(new String[receivers.size()]);
 		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type);
@@ -245,7 +245,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public void batchPushMessage(MessageTypeEnum type, Map<Integer, String> receivers, Date triggerTime, Integer readStatus,
+	public void batchPushMessage(MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
 			String url,String jpushType,String sound,String channelId, Object... args) {
 		if (receivers == null || receivers.size() == 0) {
 			throw new BizException("接收地址不能为空");
@@ -282,7 +282,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public void sendMessage(MessageSender messageSender, Integer userId, String title, String content, String receiver, Date triggerTime, Integer readStatus, String url, String group,String jpushType) {
+	public void sendMessage(MessageSender messageSender, Long userId, String title, String content, String receiver, Date triggerTime, Integer readStatus, String url, String group,String jpushType) {
 		LOGGER.info("batchSendMessage {}, userId {}, receivers {} ", messageSender, userId, receiver);
 		if (StringUtils.isBlank(receiver)) {
 			throw new BizException("接收地址不能为空");
@@ -313,13 +313,13 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			mode = MessageSendMode.EMAIL;
 			LOGGER.info("发送邮件 {} ");
 		}
-		Map<Integer, String> receivers = new HashMap<Integer, String>();
+		Map<Long, String> receivers = new HashMap<Long, String>();
 		receivers.put(userId, receiver);
 		addMessage(receivers, title, content, triggerTime, mode, status, errorMsg, readStatus, url, null,jpushType);
 	}
 
 	@Override
-	public boolean sendSecurityCode(MessageSender messageSender, Integer userId, MessageTypeEnum messageType, String receiver) {
+	public boolean sendSecurityCode(MessageSender messageSender, Long userId, MessageTypeEnum messageType, String receiver) {
 		String key1 = getVerificationCode1CacheKey(messageType, receiver);
 		if (redisCache.get(key1) != null) {
 			throw new BizException("请勿频繁操作，获取验证码间隔时间为60秒");
@@ -330,7 +330,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (debugMode == false) {
 			code = getRandomCode(messageType, receiver);
 		}
-		Map<Integer, String> receivers = new HashMap<>(1);
+		Map<Long, String> receivers = new HashMap<>(1);
 		receivers.put(userId, receiver);
 		batchSendMessage(messageSender, messageType, receivers, null, 1, "","", code);
 		redisCache.put(key, code + "", CODE_EXPIRE);
@@ -357,7 +357,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	}
 
 	@Override
-	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId, String jpushType, Integer tenantId) {
+	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Long userId, String jpushType, Integer tenantId) {
 		List<Mapper> mappers = sysMessageDao.queryCountOfUnread(type, userId, jpushType, tenantId);
 
 		Map<String, Integer> map = new HashMap<String, Integer>();
@@ -396,7 +396,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	 * @return 修改的条数
 	 */
 	@Override
-	public int updateStatus(Integer userId, int status,String jpushType) {
+	public int updateStatus(Long userId, int status,String jpushType) {
 		return sysMessageDao.updateStatus(userId, status,jpushType);
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserContractsServiceImpl.java

@@ -23,12 +23,12 @@ public class SysUserContractsServiceImpl extends BaseServiceImpl<Long, SysUserCo
 	}
 
 	@Override
-	public List<SysUserContracts> getUserContractWithType(Integer userId, SysUserContracts.ContractType contractType, Integer contractVersion) {
+	public List<SysUserContracts> getUserContractWithType(Long userId, SysUserContracts.ContractType contractType, Integer contractVersion) {
 		return sysUserContractsDao.getUserContractWithType(userId, contractType, contractVersion);
 	}
 
 	@Override
-	public SysUserContracts getLatestUserContract(Integer userId) {
+	public SysUserContracts getLatestUserContract(Long userId) {
 		return sysUserContractsDao.getLatestUserContract(userId);
 	}
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -2,6 +2,8 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.dao.TeacherAuthEntryRecordDao;
@@ -18,5 +20,18 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
     public IPage<TeacherAuthEntryRecord> selectPage(IPage<TeacherAuthEntryRecord> page, TeacherAuthEntryRecord teacherAuthEntryRecord){
         return page.setRecords(baseMapper.selectPage(page, teacherAuthEntryRecord));
     }
-	
+
+    @Override
+    public Boolean doApply(TeacherApplyDetailDto teacherApplyDetailDto, SysUser sysUser) {
+        teacherApplyDetailDto.setUserId(sysUser.getId());
+        //修改用户表
+        Integer integer = baseMapper.updateUserCard(teacherApplyDetailDto);
+        //
+
+        return null;
+    }
+
+
+
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -27,8 +27,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     }
 
     @Override
-    public Teacher detail1(Integer userId) {
-        List<Subject> bySubjectIds = subjectDao.findBySubjectIds(Arrays.asList(1));
+    public Teacher detail1(Long userId) {
+        List<Subject> bySubjectIds = subjectDao.findBySubjectIds(Arrays.asList(1L));
         return baseMapper.detail1(userId);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherApplyDetail.java

@@ -0,0 +1,73 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/18 14:56
+ */
+@Data
+@ApiModel(value = "TeacherApplyDetail对象", description = "老师入驻申请信息")
+public class TeacherApplyDetail implements Serializable {
+    /**
+     * 审核单id
+     */
+    @ApiModelProperty("审核单id ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /**
+     * 对应user表用户编号
+     */
+    @ApiModelProperty("对应user表用户编号 ")
+    @TableField(value = "user_id_")
+    private Long userId;
+    /**
+     * 专业技能（支持多个，用逗号分隔），对应乐器表id
+     */
+    @ApiModelProperty("专业技能（支持多个，用逗号分隔），对应乐器表id ")
+    @TableField(value = "subject_id_")
+    private String subjectId;
+    /**
+     * 个人介绍
+     */
+    @ApiModelProperty("个人介绍 ")
+    @TableField(value = "introduction_")
+    private String introduction;
+    /**
+     * 毕业学校
+     */
+    @ApiModelProperty("毕业学校 ")
+    @TableField(value = "graduate_school_")
+    private String graduateSchool;
+    /**
+     * 学校专业
+     */
+    @ApiModelProperty("学校专业 ")
+    @TableField(value = "subject_")
+    private String subject;
+    /**
+     * 毕业证书
+     */
+    @ApiModelProperty("毕业证书 ")
+    @TableField(value = "grad_certificate_")
+    private String gradCertificate;
+    /**
+     * 学位证书
+     */
+    @ApiModelProperty("学位证书 ")
+    @TableField(value = "degree__certificate_")
+    private String degreeCertificate;
+    /**
+     * 教师资格证
+     */
+    @ApiModelProperty("教师资格证 ")
+    @TableField(value = "teacher__certificate_")
+    private String teacherCertificate;
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -34,9 +34,30 @@
         , t.reason_
         , t.create_time_
         , t.update_time_
-        </sql> 
-    
-    <!-- 分页查询 -->
+        </sql>
+
+	<update id="updateUserCard">
+		UPDATE sys_user
+		<set>
+			<if test="realName != null and realName != ''">
+				real_name_ = #{param.realName},
+			</if>
+			<if test="idCardNo != null and idCardNo != ''">
+				id_card_no_ = #{param.idCardNo},
+			</if>
+			<if test="gender != null and gender != ''">
+				gender_ = #{param.gender},
+			</if>
+			<if test="birthdate != null">
+				birthdate_ = #{param.birthdate},
+			</if>
+		</set>
+		WHERE id_ = #{param.userId}
+	</update>
+
+
+
+	<!-- 分页查询 -->
     <select id="selectPage" resultMap="BaseResultMap">
 		SELECT         
         	<include refid="baseColumns" />