项目初始化

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/dto/RoleDto.java

@@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;
 
 @ApiModel(value = "角色Model")
 @Data
@@ -27,4 +29,8 @@ public class RoleDto implements Serializable {
     @NotBlank(message = "角色编码不能为空", groups = {ValidateGroupForSave.class, ValidateGroupForUpdate.class})
     private String roleCode;
 
+    @ApiModelProperty(value = "资源")
+    @NotEmpty(message = "资源不能为空", groups = {ValidateGroupForSave.class, ValidateGroupForUpdate.class})
+    private List<String> menus;
+
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/dao/RoleMenuDao.java

@@ -2,6 +2,7 @@ package cn.datax.service.system.dao;
 
 import cn.datax.service.system.api.entity.RoleMenuEntity;
 import cn.datax.common.base.BaseDao;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -18,4 +19,7 @@ import java.util.List;
 public interface RoleMenuDao extends BaseDao<RoleMenuEntity> {
 
     void insertBatch(List<RoleMenuEntity> list);
+
+    @Delete("delete from sys_role_menu where role_id = #{id}")
+    void deleteByRoleId(String id);
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/dao/UserDeptDao.java

@@ -2,6 +2,7 @@ package cn.datax.service.system.dao;
 
 import cn.datax.service.system.api.entity.UserDeptEntity;
 import cn.datax.common.base.BaseDao;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -18,4 +19,7 @@ import java.util.List;
 public interface UserDeptDao extends BaseDao<UserDeptEntity> {
 
     void insertBatch(List<UserDeptEntity> list);
+
+    @Delete("delete from sys_user_dept where user_id = #{id}")
+    void deleteByUserId(String id);
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/dao/UserPostDao.java

@@ -2,6 +2,7 @@ package cn.datax.service.system.dao;
 
 import cn.datax.service.system.api.entity.UserPostEntity;
 import cn.datax.common.base.BaseDao;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -18,4 +19,7 @@ import java.util.List;
 public interface UserPostDao extends BaseDao<UserPostEntity> {
 
     void insertBatch(List<UserPostEntity> list);
+
+    @Delete("delete from sys_user_post where user_id = #{id}")
+    void deleteByUserId(String id);
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/dao/UserRoleDao.java

@@ -2,6 +2,7 @@ package cn.datax.service.system.dao;
 
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.system.api.entity.UserRoleEntity;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -18,4 +19,7 @@ import java.util.List;
 public interface UserRoleDao extends BaseDao<UserRoleEntity> {
 
     void insertBatch(List<UserRoleEntity> list);
+
+    @Delete("delete from sys_user_role where user_id = #{id}")
+    void deleteByUserId(String id);
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/impl/RoleServiceImpl.java

@@ -3,7 +3,9 @@ package cn.datax.service.system.service.impl;
 import cn.datax.common.exception.DataException;
 import cn.datax.service.system.api.dto.RoleDto;
 import cn.datax.service.system.api.entity.RoleEntity;
+import cn.datax.service.system.api.entity.RoleMenuEntity;
 import cn.datax.service.system.dao.RoleDao;
+import cn.datax.service.system.dao.RoleMenuDao;
 import cn.datax.service.system.mapstruct.RoleMapper;
 import cn.datax.service.system.service.RoleService;
 import cn.datax.common.base.BaseServiceImpl;
@@ -13,6 +15,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -28,6 +33,8 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
     @Autowired
     private RoleDao roleDao;
     @Autowired
+    private RoleMenuDao roleMenuDao;
+    @Autowired
     private RoleMapper roleMapper;
 
     @Override
@@ -39,6 +46,18 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
             throw new DataException("该角色名已存在");
         }
         roleDao.insert(role);
+        insertBatchMenu(roleDto.getMenus(), role.getId());
+    }
+
+    private void insertBatchMenu(List<String> menus, String roleId) {
+        List<RoleMenuEntity> roleMenuList = menus
+                .stream().map(menuId -> {
+                    RoleMenuEntity roleMenu = new RoleMenuEntity();
+                    roleMenu.setRoleId(roleId);
+                    roleMenu.setMenuId(menuId);
+                    return roleMenu;
+                }).collect(Collectors.toList());
+        roleMenuDao.insertBatch(roleMenuList);
     }
 
     @Override
@@ -46,11 +65,15 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
     public void updateRole(RoleDto roleDto) {
         RoleEntity role = roleMapper.toEntity(roleDto);
         roleDao.updateById(role);
+        roleMenuDao.delete(Wrappers.<RoleMenuEntity>lambdaQuery()
+                .eq(RoleMenuEntity::getRoleId, role.getId()));
+        insertBatchMenu(roleDto.getMenus(), role.getId());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteRoleById(String id) {
+        roleMenuDao.deleteByRoleId(id);
         roleDao.deleteById(id);
     }
 

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/service/impl/UserServiceImpl.java

@@ -103,19 +103,22 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserEntity user = userMapper.toEntity(userDto);
         userDao.updateById(user);
         userRoleDao.delete(Wrappers.<UserRoleEntity>lambdaQuery()
-                .eq(UserRoleEntity::getUserId, userDto.getId()));
+                .eq(UserRoleEntity::getUserId, user.getId()));
         insertBatchRole(userDto.getRoles(), user.getId());
         userDeptDao.delete(Wrappers.<UserDeptEntity>lambdaQuery()
-                .eq(UserDeptEntity::getUserId, userDto.getId()));
+                .eq(UserDeptEntity::getUserId, user.getId()));
         insertBatchDept(userDto.getDepts(), user.getId());
         userPostDao.delete(Wrappers.<UserPostEntity>lambdaQuery()
-                .eq(UserPostEntity::getUserId, userDto.getId()));
+                .eq(UserPostEntity::getUserId, user.getId()));
         insertBatchPost(userDto.getPosts(), user.getId());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteUserById(String id) {
+        userRoleDao.deleteByUserId(id);
+        userDeptDao.deleteByUserId(id);
+        userPostDao.deleteByUserId(id);
         userDao.deleteById(id);
     }