2.角色模块增删改查

cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleDeptDao.java

@@ -20,5 +20,9 @@ public interface SysRoleDeptDao extends BaseMapper<SysRoleDeptEntity> {
      * 根据角色ID，获取部门ID列表
      */
     List<Long> queryDeptIdList(Long[] roleIds);
-	
+
+    /**
+     * 根据角色ID数组，批量删除
+     */
+    int deleteBatch(Long[] roleIds);
 }

cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysRoleFuncDao.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mx.cneeds.server.entity.SysRoleFuncEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 功能与角色映射表
  * 
@@ -13,5 +15,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SysRoleFuncDao extends BaseMapper<SysRoleFuncEntity> {
+    /**
+     * 根据角色ID数组，批量删除
+     */
+    int deleteBatch(Long[] roleIds);
+
+    /**
+     * 根据角色ID，获取菜单ID列表
+     */
+    List<Long> queryMenuIdList(Long roleId);
 	
 }

cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserRoleDao.java

@@ -21,5 +21,8 @@ public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> {
      */
     List<Long> queryRoleIdList(Long userId);
 
-
+    /**
+     * 根据角色ID数组，批量删除
+     */
+    int deleteBatch(Long[] roleIds);
 }

cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysRoleEntity.java

 package com.mx.cneeds.server.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -8,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.beans.Transient;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 角色表
@@ -45,4 +47,7 @@ public class SysRoleEntity implements Serializable {
 
 
 
+
+
+
 }

cneeds-common-data/src/main/resources/mapper/SysRoleDeptDao.xml

@@ -18,4 +18,11 @@
         </foreach>
     </select>
 
+    <delete id="deleteBatch">
+        delete from sys_role_dept where role_id in
+        <foreach item="roleId" collection="array" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </delete>
+
 </mapper>
\ No newline at end of file

cneeds-common-data/src/main/resources/mapper/SysRoleFuncDao.xml

@@ -11,4 +11,14 @@
     </resultMap>
 
 
+    <delete id="deleteBatch">
+        delete from sys_role_func where role_id in
+        <foreach item="roleId" collection="array" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </delete>
+
+    <select id="queryMenuIdList" resultType="long">
+		select func_id from sys_role_func where role_id = #{value}
+	</select>
 </mapper>
\ No newline at end of file

cneeds-common-data/src/main/resources/mapper/SysUserRoleDao.xml

@@ -15,5 +15,11 @@
 	</select>
 
 
+    <delete id="deleteBatch">
+        delete from sys_user_role where role_id in
+        <foreach item="roleId" collection="array" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </delete>
 
 </mapper>
\ No newline at end of file

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/RoleDto.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName DeptDtp
@@ -39,4 +40,8 @@ public class RoleDto implements Serializable {
      * 部门名称
      */
     private String deptName;
+
+    private List<Long> funcIdList;
+
+    private List<Long> deptIdList;
 }

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/RoleVo.java

+package com.mx.cneeds.common.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName DeptDtp
+ * @Author zzrdark
+ * @Date 2020-03-10 16:00
+ * @Description TODO
+ **/
+@Data
+public class RoleVo implements Serializable {
+
+    /**
+     *
+     */
+    private Long roleId;
+    /**
+     * 角色名称
+     */
+    private String roleName;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 部门Id
+     */
+    private Long deptId;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    private List<Long> funcIdList;
+
+    private List<Long> deptIdList;
+}

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/UserClient.java

@@ -75,7 +75,17 @@ public interface UserClient {
                      @RequestParam("sidx") String orderField,
                      @RequestParam("order") String order);
 
+    @PostMapping("/sys/role/info")
+    RoleDto infoRole(@RequestParam Long roleId);
 
+    @PostMapping("/sys/role/save")
+    void addRole(@RequestBody RoleDto dto);
+
+    @PostMapping("/sys/role/update")
+    void updateRole(@RequestBody RoleDto dto);
+
+    @PostMapping("/sys/role/delete")
+    void deleteRole(@RequestBody List<Long> ids);
     /**
      *
      * @param page

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java

@@ -2,15 +2,13 @@ package com.mx.cneeds.server.datashow.web.system;
 
 import com.mx.cneeds.common.UserUtils;
 import com.mx.cneeds.common.converter.RequestParamterConverter;
-import com.mx.cneeds.common.dto.DepartmentDto;
-import com.mx.cneeds.common.dto.FuncDto;
-import com.mx.cneeds.common.dto.PageDto;
-import com.mx.cneeds.common.dto.UserDto;
+import com.mx.cneeds.common.dto.*;
 import com.mx.cneeds.common.generate.CascaderToolUtils;
 import com.mx.cneeds.common.generate.TreeToolUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.vo.CascaderVo;
 import com.mx.cneeds.common.vo.DepartmentVo;
+import com.mx.cneeds.common.vo.RoleVo;
 import com.mx.cneeds.common.vo.TreeVo;
 import com.mx.cneeds.server.datashow.client.UserClient;
 import lombok.extern.slf4j.Slf4j;
@@ -67,72 +65,29 @@ public class SystemController {
         return new R().put("data",pageDto);
     }
 
-    @PostMapping("/dept/list")
-    public R deptList(@RequestParam(required = false) Integer page,
-                      @RequestParam(required = false) Integer pageSize,
-                      @RequestParam(required = false) String sort){
-
-        String orderField = null;
-        String order = null;
-
-        if (page==null || page==0){
-            page = new Integer(1);
-        }
-        if (pageSize==null || pageSize==0){
-            pageSize = new Integer(10);
-        }
-
-        if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
-            if (sort.contains("+")){
-                order = new String("asc");
-            }
-            if (sort.contains("-")){
-                order = new String("desc");
-            }
-            orderField = sort.substring(1);
-            orderField = RequestParamterConverter.toLine(orderField);
-        }
-
-
-        PageDto pageDto = userClient.deptList(page,pageSize,orderField,order);
-
-        return new R().put("data",pageDto);
-    }
-
-    @PostMapping("/role/list")
-    public R roleList(@RequestParam(required = false) Integer page,
-                      @RequestParam(required = false) Integer pageSize,
-                      @RequestParam(required = false) String sort){
-
-
-        String orderField = null;
-        String order = null;
-
-        if (page==null || page==0){
-            page = new Integer(1);
-        }
-        if (pageSize==null || pageSize==0){
-            pageSize = new Integer(10);
-        }
-
-        if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
-            if (sort.contains("+")){
-                order = new String("asc");
-            }
-            if (sort.contains("-")){
-                order = new String("desc");
+    @PostMapping("/func/listAll")
+    public R selectTreeFunc(){
+        List<FuncDto> dtos = userClient.funcListAll();
+        List<TreeVo> rootList = new ArrayList<>();
+        List<TreeVo> bodyList = new ArrayList<>();
+        dtos.forEach(dto -> {
+            TreeVo vo = new TreeVo(
+                    dto.getFuncId(),
+                    dto.getName(),
+                    dto.getParentId());
+            if (dto.getParentId() == 0L){
+                rootList.add(vo);
+            } else {
+                bodyList.add(vo);
             }
-            orderField = sort.substring(1);
-            orderField = RequestParamterConverter.toLine(orderField);
-        }
-
-        PageDto pageDto = userClient.roleList(page,pageSize,orderField,order);
-
-        return new R().put("data",pageDto);
+        });
+        TreeToolUtils utils =  new TreeToolUtils(rootList,bodyList);
+        List<TreeVo> result =  utils.getTree();
+        return new R().put("data",result);
     }
 
-    @PostMapping("/user/list")
-    public R userList(@RequestParam(required = false) Integer page,
+    @PostMapping("/dept/list")
+    public R deptList(@RequestParam(required = false) Integer page,
                       @RequestParam(required = false) Integer pageSize,
                       @RequestParam(required = false) String sort){
 
@@ -158,7 +113,7 @@ public class SystemController {
         }
 
 
-        PageDto pageDto = userClient.userList(page,pageSize,orderField,order);
+        PageDto pageDto = userClient.deptList(page,pageSize,orderField,order);
 
         return new R().put("data",pageDto);
     }
@@ -197,16 +152,18 @@ public class SystemController {
         List<DepartmentDto> dtos = userClient.deptListAll();
         List<CascaderVo> rootList = new ArrayList<>();
         List<CascaderVo> bodyList = new ArrayList<>();
-        if (userDto.getDeptId()==0){
+        /*if (userDto.getDeptId()==0){
             CascaderVo voRoot = new CascaderVo(0L,"根",0L);
             rootList.add(voRoot);
-        }
+        }*/
         dtos.forEach(dto -> {
             CascaderVo vo = new CascaderVo(
                     dto.getDeptId(),
                     dto.getName(),
                     dto.getParentId());
-            if (dto.getParentId().equals(userDto.getDeptId())){
+            if (dto.getParentId()==null){
+                rootList.add(vo);
+            }else if (rootList.size() == 0 && dto.getParentId().equals(userDto.getDeptId())){
                 rootList.add(vo);
             } else {
                 bodyList.add(vo);
@@ -228,35 +185,113 @@ public class SystemController {
                     dto.getDeptId(),
                     dto.getName(),
                     dto.getParentId());
-            if (dto.getParentId().equals(userDto.getDeptId())){
+            if (dto.getParentId()==null){
+                rootList.add(vo);
+            }else if (rootList.size() == 0 && dto.getParentId().equals(userDto.getDeptId())){
                 rootList.add(vo);
             } else {
                 bodyList.add(vo);
             }
+
         });
         TreeToolUtils utils =  new TreeToolUtils(rootList,bodyList);
         List<TreeVo> result =  utils.getTree();
         return new R().put("data",result);
     }
 
-    @PostMapping("/func/listAll")
-    public R selectTreeFunc(){
-        List<FuncDto> dtos = userClient.funcListAll();
-        List<TreeVo> rootList = new ArrayList<>();
-        List<TreeVo> bodyList = new ArrayList<>();
-        dtos.forEach(dto -> {
-            TreeVo vo = new TreeVo(
-                    dto.getFuncId(),
-                    dto.getName(),
-                    dto.getParentId());
-            if (dto.getParentId() == 0L){
-                rootList.add(vo);
-            } else {
-                bodyList.add(vo);
+    @PostMapping("/role/list")
+    public R roleList(@RequestParam(required = false) Integer page,
+                      @RequestParam(required = false) Integer pageSize,
+                      @RequestParam(required = false) String sort){
+
+
+        String orderField = null;
+        String order = null;
+
+        if (page==null || page==0){
+            page = new Integer(1);
+        }
+        if (pageSize==null || pageSize==0){
+            pageSize = new Integer(10);
+        }
+
+        if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
+            if (sort.contains("+")){
+                order = new String("asc");
             }
-        });
-        TreeToolUtils utils =  new TreeToolUtils(rootList,bodyList);
-        List<TreeVo> result =  utils.getTree();
-        return new R().put("data",result);
+            if (sort.contains("-")){
+                order = new String("desc");
+            }
+            orderField = sort.substring(1);
+            orderField = RequestParamterConverter.toLine(orderField);
+        }
+
+        PageDto pageDto = userClient.roleList(page,pageSize,orderField,order);
+
+        return new R().put("data",pageDto);
     }
+
+    @RequestMapping("/role/info")
+    public R infoRole(Long roleId){
+        RoleDto dto = userClient.infoRole(roleId);
+
+        return R.ok().put("data",dto);
+    }
+
+    @RequestMapping("/role/add")
+    public R roleAdd(RoleVo vo){
+        RoleDto dto = new RoleDto();
+        BeanUtils.copyProperties(vo,dto);
+        userClient.addRole(dto);
+        return R.ok();
+    }
+
+    @PostMapping("/role/edit")
+    public R editRole(RoleVo vo){
+
+        RoleDto dto = new RoleDto();
+        BeanUtils.copyProperties(vo,dto);
+        userClient.updateRole(dto);
+        return R.ok();
+
+    }
+
+    @PostMapping("/role/delete")
+    public R deleteRole(@RequestParam(value = "ids",required = false) List<Long> ids){
+        userClient.deleteRole(ids);
+        return R.ok();
+    }
+
+    @PostMapping("/user/list")
+    public R userList(@RequestParam(required = false) Integer page,
+                      @RequestParam(required = false) Integer pageSize,
+                      @RequestParam(required = false) String sort){
+
+        String orderField = null;
+        String order = null;
+
+        if (page==null || page==0){
+            page = new Integer(1);
+        }
+        if (pageSize==null || pageSize==0){
+            pageSize = new Integer(10);
+        }
+
+        if (StringUtils.isNotEmpty(sort) && StringUtils.isNotBlank(sort.trim())){
+            if (sort.contains("+")){
+                order = new String("asc");
+            }
+            if (sort.contains("-")){
+                order = new String("desc");
+            }
+            orderField = sort.substring(1);
+            orderField = RequestParamterConverter.toLine(orderField);
+        }
+
+
+        PageDto pageDto = userClient.userList(page,pageSize,orderField,order);
+
+        return new R().put("data",pageDto);
+    }
+
 }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java

@@ -7,6 +7,7 @@ import com.mx.cneeds.server.entity.SysDeptEntity;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 部门表
@@ -31,7 +32,7 @@ public interface SysDeptService extends IService<SysDeptEntity> {
 
     List<Long> queryDetpIdList(Long parentId);
 
-    List<SysDeptEntity> queryDeptIdsBydeptName(List<Long> Ids);
+    List<SysDeptEntity> queryDeptIdsBydeptName(Set<Long> Ids);
 
     Long queryDeptCount(Map<String, Object> params);
 

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java

@@ -3,6 +3,7 @@ package com.mx.cneeds.server.user.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.server.entity.SysRoleDeptEntity;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -22,5 +23,9 @@ public interface SysRoleDeptService extends IService<SysRoleDeptEntity> {
      * 根据角色ID，获取部门ID列表
      */
     List<Long> queryDeptIdList(Long[] roleIds) ;
+
+    void saveOrUpdate(Long roleId, List<Long> deptIdList);
+
+    int deleteBatch(Long[] roleIds);
 }
 

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java

@@ -3,7 +3,9 @@ package com.mx.cneeds.server.user.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.server.entity.SysRoleFuncEntity;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,6 +17,12 @@ import java.util.Map;
  */
 public interface SysRoleFuncService extends IService<SysRoleFuncEntity> {
 
+    void saveOrUpdate(Long roleId, List<Long> menuIdList);
+
     PageUtils queryPage(Map<String, Object> params);
+
+    int deleteBatch(Long[] roleIds);
+
+    List<Long> queryMenuIdList(Long roleId);
 }
 

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java

@@ -3,7 +3,9 @@ package com.mx.cneeds.server.user.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.server.entity.SysRoleEntity;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,5 +18,9 @@ import java.util.Map;
 public interface SysRoleService extends IService<SysRoleEntity> {
 
     PageUtils queryPage(Map<String, Object> params);
+
+    void saveRole(SysRoleEntity role, List<Long> funcIdList, List<Long> deptIdList);
+
+    void deleteBatch(Long[] roleIds);
 }
 

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java

@@ -24,5 +24,6 @@ public interface SysUserRoleService extends IService<SysUserRoleEntity> {
      */
     List<Long> queryRoleIdList(Long userId);
 
+    int deleteBatch(Long[] roleIds);
 }
 

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -86,7 +88,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDeptEntity> i
 
     @Override
 //    @Transactional
-    public List<SysDeptEntity> queryDeptIdsBydeptName(List<Long> Ids) {
+    public List<SysDeptEntity> queryDeptIdsBydeptName(Set<Long> Ids) {
         return baseMapper.selectList(new QueryWrapper<SysDeptEntity>()
                 .select("dept_id","name").in("dept_id",Ids));
     }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java

@@ -12,6 +12,7 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 
 @Service("sysRoleDeptService")
@@ -32,4 +33,29 @@ public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptDao, SysRoleD
         return baseMapper.queryDeptIdList(roleIds);
     }
 
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrUpdate(Long roleId, List<Long> deptIdList) {
+        //先删除角色与部门关系
+        deleteBatch(new Long[]{roleId});
+
+        if(deptIdList.size() == 0){
+            return ;
+        }
+
+        //保存角色与菜单关系
+        for(Long deptId : deptIdList){
+            SysRoleDeptEntity sysRoleDeptEntity = new SysRoleDeptEntity();
+            sysRoleDeptEntity.setDeptId(deptId);
+            sysRoleDeptEntity.setRoleId(roleId);
+
+            this.save(sysRoleDeptEntity);
+        }
+    }
+
+    @Override
+    public int deleteBatch(Long[] roleIds){
+        return baseMapper.deleteBatch(roleIds);
+    }
 }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java

@@ -6,16 +6,39 @@ import com.mx.cneeds.server.dao.SysRoleFuncDao;
 import com.mx.cneeds.server.entity.SysRoleFuncEntity;
 import com.mx.cneeds.server.user.service.SysRoleFuncService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 
 @Service("sysRoleFuncService")
 public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleFuncEntity> implements SysRoleFuncService {
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrUpdate(Long roleId, List<Long> menuIdList) {
+        //先删除角色与菜单关系
+        deleteBatch(new Long[]{roleId});
+
+        if(menuIdList.size() == 0){
+            return ;
+        }
+
+        //保存角色与菜单关系
+        for(Long funcId : menuIdList){
+            SysRoleFuncEntity sysRoleFuncEntity = new SysRoleFuncEntity();
+            sysRoleFuncEntity.setFuncId(funcId);
+            sysRoleFuncEntity.setRoleId(roleId);
+
+            this.save(sysRoleFuncEntity);
+        }
+    }
+
+    @Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<SysRoleFuncEntity> page = this.page(
                 new Query<SysRoleFuncEntity>().getPage(params),
@@ -25,4 +48,14 @@ public class SysRoleFuncServiceImpl extends ServiceImpl<SysRoleFuncDao, SysRoleF
         return new PageUtils(page);
     }
 
+    @Override
+    public int deleteBatch(Long[] roleIds){
+        return baseMapper.deleteBatch(roleIds);
+    }
+
+    @Override
+    public List<Long> queryMenuIdList(Long roleId) {
+        return baseMapper.queryMenuIdList(roleId);
+    }
+
 }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java

@@ -5,22 +5,27 @@ import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysRoleDao;
 import com.mx.cneeds.server.entity.SysDeptEntity;
 import com.mx.cneeds.server.entity.SysRoleEntity;
-import com.mx.cneeds.server.user.service.SysDeptService;
-import com.mx.cneeds.server.user.service.SysRoleService;
+import com.mx.cneeds.server.user.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 
 @Service("sysRoleService")
 public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> implements SysRoleService {
 
+    @Autowired
+    private SysRoleFuncService sysRoleFuncService;
+    @Autowired
+    private SysRoleDeptService sysRoleDeptService;
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
 
 
     @Override
@@ -33,4 +38,34 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i
         return new PageUtils(page);
     }
 
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRole(SysRoleEntity role, List<Long> funcIdList, List<Long> deptIdList) {
+        role.setCreateTime(new Date());
+        this.save(role);
+
+        //保存角色与菜单关系
+        sysRoleFuncService.saveOrUpdate(role.getRoleId(), funcIdList);
+
+        //保存角色与部门关系
+        sysRoleDeptService.saveOrUpdate(role.getRoleId(), deptIdList);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteBatch(Long[] roleIds) {
+        //删除角色
+        this.removeByIds(Arrays.asList(roleIds));
+
+        //删除角色与菜单关联
+        sysRoleFuncService.deleteBatch(roleIds);
+
+        //删除角色与部门关联
+        sysRoleDeptService.deleteBatch(roleIds);
+
+        //删除角色与用户关联
+        sysUserRoleService.deleteBatch(roleIds);
+    }
+
 }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java

@@ -32,5 +32,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR
         return baseMapper.queryRoleIdList(userId);
     }
 
-
+    @Override
+    public int deleteBatch(Long[] roleIds){
+        return baseMapper.deleteBatch(roleIds);
+    }
 }

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java

@@ -7,15 +7,14 @@ import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysDeptEntity;
 import com.mx.cneeds.server.entity.SysRoleEntity;
 import com.mx.cneeds.server.user.service.SysDeptService;
+import com.mx.cneeds.server.user.service.SysRoleDeptService;
+import com.mx.cneeds.server.user.service.SysRoleFuncService;
 import com.mx.cneeds.server.user.service.SysRoleService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 //import org.apache.shiro.authz.annotation.RequiresPermissions;
 
@@ -35,6 +34,12 @@ public class SysRoleController {
 
     @Autowired
     private SysDeptService sysDeptService;
+
+    @Autowired
+    private SysRoleFuncService sysRoleFuncService;
+
+    @Autowired
+    private SysRoleDeptService sysRoleDeptService;
     /**
      * 列表
      */
@@ -43,14 +48,14 @@ public class SysRoleController {
     public PageUtils list(@RequestParam Map<String, Object> params){
         PageUtils page = sysRoleService.queryPage(params);
 
-        List<Long> list = new ArrayList<>();
+        Set<Long> set = new HashSet<>();
 
         page.getList().forEach(e -> {
             SysRoleEntity entity = (SysRoleEntity) e;
-            list.add(entity.getDeptId());
+            set.add(entity.getDeptId());
         });
 
-        List<SysDeptEntity> sysDeptEntityList = sysDeptService.queryDeptIdsBydeptName(list);
+        List<SysDeptEntity> sysDeptEntityList = sysDeptService.queryDeptIdsBydeptName(set);
 
         List<RoleDto> roleDtos = new ArrayList<>();
         page.getList().forEach(e -> {
@@ -72,21 +77,34 @@ public class SysRoleController {
     /**
      * 信息
      */
-    @RequestMapping("/info/{roleId}")
-//    @RequiresPermissions("sys:sysrole:info")
-    public R info(@PathVariable("roleId") Long roleId){
-        SysRoleEntity sysRole = sysRoleService.getById(roleId);
+    @RequestMapping("/info")
+    public RoleDto info(Long roleId){
+        SysRoleEntity role = sysRoleService.getById(roleId);
+
+        RoleDto roleDto = new RoleDto();
+
+        BeanUtils.copyProperties(role,roleDto);
+
+
+        //查询角色对应的菜单
+        List<Long> funcIdList = sysRoleFuncService.queryMenuIdList(roleId);
+        roleDto.setFuncIdList(funcIdList);
+
+        //查询角色对应的部门
+        List<Long> deptIdList = sysRoleDeptService.queryDeptIdList(new Long[]{roleId});
+        roleDto.setDeptIdList(deptIdList);
 
-        return R.ok().put("sysRole", sysRole);
+        return roleDto;
     }
 
     /**
      * 保存
      */
     @RequestMapping("/save")
-//    @RequiresPermissions("sys:sysrole:save")
-    public R save(@RequestBody SysRoleEntity sysRole){
-        sysRoleService.save(sysRole);
+    public R save(@RequestBody RoleDto dto){
+        SysRoleEntity sysRole = new SysRoleEntity();
+        BeanUtils.copyProperties(dto,sysRole);
+        sysRoleService.saveRole(sysRole,dto.getFuncIdList(),dto.getDeptIdList());
 
         return R.ok();
     }
@@ -95,7 +113,6 @@ public class SysRoleController {
      * 修改
      */
     @RequestMapping("/update")
-//    @RequiresPermissions("sys:sysrole:update")
     public R update(@RequestBody SysRoleEntity sysRole){
         ValidatorUtils.validateEntity(sysRole);
         sysRoleService.updateById(sysRole);
@@ -107,9 +124,8 @@ public class SysRoleController {
      * 删除
      */
     @RequestMapping("/delete")
-//    @RequiresPermissions("sys:sysrole:delete")
     public R delete(@RequestBody Long[] roleIds){
-        sysRoleService.removeByIds(Arrays.asList(roleIds));
+        sysRoleService.deleteBatch(roleIds);
 
         return R.ok();
     }

cneeds-server-user/src/main/resources/application-dev.yml

@@ -50,7 +50,7 @@ eureka:
       defaultZone: http://192.168.2.244:8761/eureka/
   instance:
     prefer-ip-address: true
-    ip-address: 192.168.2.244
+#    ip-address: 192.168.2.244
 
 
 mybatis-plus: