bug

eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java

@@ -693,7 +693,24 @@ public class RedisUtils {
      * @param prefix 前缀
      * @param ids    id
      */
-    public void delByKeys(String prefix, Set<String> ids) {
+    public void delByKeys(String prefix, Set<Long> ids) {
+        Set<Object> keys = new HashSet<>();
+        for (Long id : ids) {
+            keys.addAll(redisTemplate.keys(new StringBuffer(prefix).append(id).toString()));
+        }
+        long count = redisTemplate.delete(keys);
+        // 此处提示可自行删除
+        log.debug("--------------------------------------------");
+        log.debug("成功删除缓存：" + keys.toString());
+        log.debug("缓存删除数量：" + count + "个");
+        log.debug("--------------------------------------------");
+    }
+
+    /**
+     * @param prefix 前缀
+     * @param ids    id
+     */
+    public void delByKeysString(String prefix, Set<String> ids) {
         Set<Object> keys = new HashSet<>();
         for (String id : ids) {
             keys.addAll(redisTemplate.keys(new StringBuffer(prefix).append(id).toString()));

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -221,14 +221,14 @@ public class ZkDataSyncTask {
 
                 Set<Job> jobs = new HashSet<Job>();
                 Job job = new Job();
-                job.setId("10");
+                job.setId(Long.valueOf(10));
                 jobs.add(job);
                 user.setJobs(jobs);
 
                 Set<Role> roles = new HashSet<Role>();
 
                 Role role = new Role();
-                role.setId("2");//普通用户
+                role.setId(Long.valueOf(2));//普通用户
                 roles.add(role);
                 user.setRoles(roles);
                 dmUser = new DmUser();

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java

@@ -39,7 +39,8 @@ public class Job extends BaseEntity implements Serializable {
     @Column(name = "job_id")
     @NotNull(groups = Update.class)
     @ApiModelProperty(value = "ID", hidden = true)
-    private String id;
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
 
     @NotBlank
     @ApiModelProperty(value = "岗位名称")

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java

@@ -45,7 +45,7 @@ public class Role extends BaseEntity implements Serializable {
     @NotNull(groups = {Update.class})
     @ApiModelProperty(value = "ID", hidden = true)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private String id;
+    private Long id;
 
     @JSONField(serialize = false)
     @ManyToMany(mappedBy = "roles")

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java

@@ -25,7 +25,7 @@ import java.util.Set;
 * @author Zheng Jie
 * @date 2019-03-29
 */
-public interface JobRepository extends JpaRepository<Job, String>, JpaSpecificationExecutor<Job> {
+public interface JobRepository extends JpaRepository<Job, Long>, JpaSpecificationExecutor<Job> {
 
     /**
      * 根据名称查询
@@ -38,5 +38,5 @@ public interface JobRepository extends JpaRepository<Job, String>, JpaSpecificat
      * 根据Id删除
      * @param ids /
      */
-    void deleteAllByIdIn(Set<String> ids);
+    void deleteAllByIdIn(Set<Long> ids);
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java

@@ -29,7 +29,7 @@ import java.util.Set;
  * @author Zheng Jie
  * @date 2018-12-03
  */
-public interface RoleRepository extends JpaRepository<Role, String>, JpaSpecificationExecutor<Role> {
+public interface RoleRepository extends JpaRepository<Role, Long>, JpaSpecificationExecutor<Role> {
 
     /**
      * 根据名称查询
@@ -42,7 +42,7 @@ public interface RoleRepository extends JpaRepository<Role, String>, JpaSpecific
      * 删除多个角色
      * @param ids /
      */
-    void deleteAllByIdIn(Set<String> ids);
+    void deleteAllByIdIn(Set<Long> ids);
 
     /**
      * 根据用户ID查询
@@ -86,5 +86,5 @@ public interface RoleRepository extends JpaRepository<Role, String>, JpaSpecific
      */
     @Query(value = "SELECT r.* FROM sys_role r WHERE " +
             "r.role_key = :roleKey AND if(:id != '',r.role_id != :id,1=1)",nativeQuery = true)
-    List<Role> findByRoleKey(@Param("roleKey") String roleKey,@Param("id") String id);
+    List<Role> findByRoleKey(@Param("roleKey") String roleKey,@Param("id") Long id);
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java

@@ -101,7 +101,7 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
      */
     @Query(value = "SELECT u.* FROM sys_user u, sys_users_roles r WHERE" +
             " u.user_id = r.user_id AND r.role_id = ?1", nativeQuery = true)
-    List<User> findByRoleId(String roleId);
+    List<User> findByRoleId(Long roleId);
 
     /**
      * 根据角色查询用户
@@ -110,7 +110,7 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
      */
     @Query(value = "SELECT u.user_id as userId,u.username FROM sys_user u, sys_users_roles r WHERE" +
             " u.user_id = r.user_id AND r.role_id = ?1", nativeQuery = true)
-    List<Map<String,Object>> findByRoleId2(String roleId);
+    List<Map<String,Object>> findByRoleId2(Long roleId);
 
     /**
      * 根据角色中的部门查询
@@ -162,7 +162,7 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
      * @return /
      */
     @Query(value = "SELECT count(1) FROM sys_user u, sys_users_jobs j WHERE u.user_id = j.user_id AND j.job_id IN ?1", nativeQuery = true)
-    int countByJobs(Set<String> ids);
+    int countByJobs(Set<Long> ids);
 
     /**
      * 根据部门查询
@@ -179,7 +179,7 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
      */
     @Query(value = "SELECT count(1) FROM sys_user u, sys_users_roles r WHERE " +
             "u.user_id = r.user_id AND r.role_id in ?1", nativeQuery = true)
-    int countByRoles(Set<String> ids);
+    int countByRoles(Set<Long> ids);
 
     @Query(value = "SELECT u.* FROM sys_user u WHERE " +
             "u.dm_user_id = :dmUserId AND if(:userId != '',u.user_id != :userId,1=1)",nativeQuery = true)

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java

@@ -85,7 +85,7 @@ public class JobController {
     @ApiOperation("删除岗位")
     @DeleteMapping
     @PreAuthorize("@el.check('job:del')")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
+    public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
         // 验证是否被用户关联
         jobService.verification(ids);
         jobService.delete(ids);

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java

@@ -57,7 +57,7 @@ public class RoleController {
     @ApiOperation("获取单个role")
     @GetMapping(value = "/{id}")
     @PreAuthorize("@el.check('roles:list')")
-    public ResponseEntity<Object> query(@PathVariable String id){
+    public ResponseEntity<Object> query(@PathVariable Long id){
         return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK);
     }
 
@@ -126,8 +126,8 @@ public class RoleController {
     @ApiOperation("删除角色")
     @DeleteMapping
     @PreAuthorize("@el.check('roles:del')")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
-        for (String id : ids) {
+    public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
+        for (Long id : ids) {
             RoleDto role = roleService.findById(id);
             getLevels(role.getLevel());
         }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java

@@ -36,7 +36,7 @@ public interface JobService {
      * @param id /
      * @return /
      */
-    JobDto findById(String id);
+    JobDto findById(Long id);
 
     /**
      * 创建
@@ -55,7 +55,7 @@ public interface JobService {
      * 删除
      * @param ids /
      */
-    void delete(Set<String> ids);
+    void delete(Set<Long> ids);
 
     /**
      * 分页查询
@@ -84,5 +84,5 @@ public interface JobService {
      * 验证是否被用户关联
      * @param ids /
      */
-    void verification(Set<String> ids);
+    void verification(Set<Long> ids);
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java

@@ -41,11 +41,11 @@ public interface RoleService {
     List<RoleDto> queryAll();
 
     /**
-     * 根据ID查询
+     * 根据ID查询delete
      * @param id /
      * @return /
      */
-    RoleDto findById(String id);
+    RoleDto findById(Long id);
 
     /**
      * 创建
@@ -63,7 +63,7 @@ public interface RoleService {
      * 删除
      * @param ids /
      */
-    void delete(Set<String> ids);
+    void delete(Set<Long> ids);
 
     /**
      * 根据用户ID查询
@@ -126,7 +126,7 @@ public interface RoleService {
      * 验证是否被用户关联
      * @param ids /
      */
-    void verification(Set<String> ids);
+    void verification(Set<Long> ids);
 
     /**
      * 根据菜单Id查询

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java

@@ -31,7 +31,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class JobDto extends BaseDTO implements Serializable {
 
-    private String id;
+    private Long id;
 
     private Integer jobSort;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java

@@ -352,7 +352,7 @@ public class DeptServiceImpl implements DeptService {
     public void delCaches(String id){
         List<User> users = userRepository.findByRoleDeptId(id);
         // 删除数据权限
-        redisUtils.delByKeys(CacheKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
+        redisUtils.delByKeysString(CacheKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
         redisUtils.del(CacheKey.DEPT_ID + id);
     }
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java

@@ -65,7 +65,7 @@ public class JobServiceImpl implements JobService {
 
     @Override
     @Cacheable(key = "'id:' + #p0")
-    public JobDto findById(String id) {
+    public JobDto findById(Long id) {
         Job job = jobRepository.findById(id).orElseGet(Job::new);
         ValidationUtil.isNull(job.getId(),"Job","id",id);
         return jobMapper.toDto(job);
@@ -97,7 +97,7 @@ public class JobServiceImpl implements JobService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(Set<String> ids) {
+    public void delete(Set<Long> ids) {
         jobRepository.deleteAllByIdIn(ids);
         // 删除缓存
         redisUtils.delByKeys(CacheKey.JOB_ID, ids);
@@ -117,7 +117,7 @@ public class JobServiceImpl implements JobService {
     }
 
     @Override
-    public void verification(Set<String> ids) {
+    public void verification(Set<Long> ids) {
         if(userRepository.countByJobs(ids) > 0){
             throw new BadRequestException("所选的岗位中存在用户关联，请解除关联再试！");
         }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java

@@ -346,7 +346,7 @@ public class MenuServiceImpl implements MenuService {
     public void delCaches(String id){
         List<User> users = userRepository.findByMenuId(id);
         redisUtils.del(CacheKey.MENU_ID + id);
-        redisUtils.delByKeys(CacheKey.MENU_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
+        redisUtils.delByKeysString(CacheKey.MENU_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
         // 清除 Role 缓存
         List<Role> roles = roleService.findInMenuId(new ArrayList<String>(){{
             add(id);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -84,7 +84,7 @@ public class RoleServiceImpl implements RoleService {
     @Override
     @Cacheable(key = "'id:' + #p0")
     @Transactional(rollbackFor = Exception.class)
-    public RoleDto findById(String id) {
+    public RoleDto findById(Long id) {
         Role role = roleRepository.findById(id).orElseGet(Role::new);
         ValidationUtil.isNull(role.getId(), "Role", "id", id);
         return roleMapper.toDto(role);
@@ -151,8 +151,8 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(Set<String> ids) {
-        for (String id : ids) {
+    public void delete(Set<Long> ids) {
+        for (Long id : ids) {
             // 更新相关缓存
             delCaches(id, null);
         }
@@ -209,7 +209,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public void verification(Set<String> ids) {
+    public void verification(Set<Long> ids) {
         if (userRepository.countByRoles(ids) > 0) {
             throw new BadRequestException("所选角色存在用户关联，请解除关联再试！");
         }
@@ -224,14 +224,14 @@ public class RoleServiceImpl implements RoleService {
      * 清理缓存
      * @param id /
      */
-    public void delCaches(String id, List<User> users) {
+    public void delCaches(Long id, List<User> users) {
         users = CollectionUtil.isEmpty(users) ? userRepository.findByRoleId(id) : users;
         if (CollectionUtil.isNotEmpty(users)) {
             users.forEach(item -> userCacheClean.cleanUserCache(item.getUsername()));
             Set<String> userIds = users.stream().map(User::getId).collect(Collectors.toSet());
-            redisUtils.delByKeys(CacheKey.DATA_USER, userIds);
-            redisUtils.delByKeys(CacheKey.MENU_USER, userIds);
-            redisUtils.delByKeys(CacheKey.ROLE_AUTH, userIds);
+            redisUtils.delByKeysString(CacheKey.DATA_USER, userIds);
+            redisUtils.delByKeysString(CacheKey.MENU_USER, userIds);
+            redisUtils.delByKeysString(CacheKey.ROLE_AUTH, userIds);
         }
         redisUtils.del(CacheKey.ROLE_ID + id);
     }