diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index c294d4f4dc..69a153c84d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -268,4 +268,8 @@ public interface SysUserFeign { @PostMapping(value = "/selectPrivilegeLevel") ResultBean selectPrivilegeLevel(@RequestBody PrivilegeQuery query); + @ApiOperation(value = "清除所有离职人员的移动端登录缓存") + @PostMapping(value = "/removeRedis") + ResultBean removeRedis(); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java index 141f731e2b..bd49d0e880 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -250,4 +250,9 @@ public class SysUserFeignFallback implements SysUserFeign { public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { return null; } + + @Override + public ResultBean removeRedis() { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java index eece22714e..7541ab547d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java @@ -198,4 +198,6 @@ public interface SysUserMapper extends BaseMapper { String fetchByUserNameAndUserPhone(@Param("userName") String userName, @Param("userPhone") String userPhone); List selectUserByStaffSid(@Param("list") List staffList); + + List selectTokenList(); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 8c2397a086..17e9acbc75 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -5,59 +5,59 @@ SELECT su.* FROM sys_user su - left join sys_staffinfo si on si.sid = su.staffSid + left join sys_staffinfo si on si.sid = su.staffSid where su.userName = #{param1} and su.isDelete = 0 and su.userType = 1 @@ -122,18 +122,20 @@ SELECT * FROM sys_user su - LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid + LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid WHERE su.staffSid = #{staffSid} AND su.isDelete = 0 @@ -199,32 +201,35 @@ @@ -243,7 +248,7 @@ SELECT su.sid, ss.name, sso.orgNamePath departmentName FROM `sys_user` su - LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid - LEFT JOIN `sys_staff_org` sso ON sso.staffSid = ss.sid - LEFT JOIN `sys_user_role` sur ON sur.userSid = su.sid - LEFT JOIN `sys_role` sr ON sr.sid = sur.roleSid + LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid + LEFT JOIN `sys_staff_org` sso ON sso.staffSid = ss.sid + LEFT JOIN `sys_user_role` sur ON sur.userSid = su.sid + LEFT JOIN `sys_role` sr ON sr.sid = sur.roleSid WHERE sr.sid = #{roleSid} select su.*, ss.name from sys_user su - left join sys_staffinfo ss on su.staffSid = ss.sid + left join sys_staffinfo ss on su.staffSid = ss.sid where su.sid in #{item} @@ -321,8 +326,8 @@ @@ -347,14 +352,16 @@ select distinct su.sid from sys_user_role sr - left join sys_user su on sr.userSid = su.sid - left join sys_staffinfo si on si.sid = su.staffSid - left join sys_staff_org so on so.staffSid = si.sid + left join sys_user su on sr.userSid = su.sid + left join sys_staffinfo si on si.sid = su.staffSid + left join sys_staff_org so on so.staffSid = si.sid where sr.roleSid = #{roleSid} - and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ',')) - and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in + and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ',')) + and si.personTypeKey != '01' + AND so.`manageType` = 3 + and su.sid in #{item} @@ -385,17 +394,26 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java index 5d01f1baf1..525ebca0a0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java @@ -670,4 +670,9 @@ public class SysUserRest implements SysUserFeign { public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { return sysUserService.selectPrivilegeLevel(query); } + + @Override + public ResultBean removeRedis() { + return sysUserService.removeRedis(); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 02ab08e6ad..c8f60096de 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -74,7 +74,7 @@ public class SysUserService extends MybatisBaseService { * 设置redis的过期时间为4小时 */ public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600; -// public static final long USERS_REDIS_SESSION_TL_PC = 60; + // public static final long USERS_REDIS_SESSION_TL_PC = 60; public static final long USERS_REDIS_SESSION_TL_App = 24 * 15 * 3600; /** * 验证码长度 @@ -1521,4 +1521,16 @@ public class SysUserService extends MybatisBaseService { } return rb.success().setData(sysUserVoList); } + + public ResultBean removeRedis() { + ResultBean rb = ResultBean.fireFail(); + //查询所有离职人员的移动端的token + List tokenList = baseMapper.selectTokenList(); + tokenList.removeAll(Collections.singleton(null)); + if (!tokenList.isEmpty()) { + String[] tokenss = tokenList.toArray(new String[tokenList.size()]); + redisUtil.remove(tokenss); + } + return rb.success(); + } } \ No newline at end of file