Skip to content

F
fgqyxxlr
Commit f6f8c0b0 by RuoYi
Options

reset

parent 2401c555
Showing with 42 additions and 357 deletions
sql/ry_20180723.sql
......@@ -576,14 +576,4 @@ create table sys_notice (
-- 初始化-公告信息表数据
-- ----------------------------
insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
-- ----------------------------
-- 18、角色和部门关联表 角色1-N部门（用于数据权限）
-- ----------------------------
drop table if exists sys_role_dept;
create table sys_role_dept (
role_id int(11) not null comment '角色ID',
dept_id int(11) not null comment '部门ID',
primary key(role_id, dept_id)
) engine=innodb default charset=utf8 comment = '角色和部门关联表，用于数据权限';
\ No newline at end of file
insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '管理员');
\ No newline at end of file
src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java
......@@ -2,8 +2,6 @@ package com.ruoyi.project.system.dept.controller;
import java.util.List;
import java.util.Map;
import com.ruoyi.project.system.role.domain.Role;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -149,14 +147,4 @@ public class DeptController extends BaseController
List<Map<String, Object>> tree = deptService.selectDeptTree();
return tree;
}
/**
* 加载角色部门（数据权限）列表树
*/
@GetMapping("/roleDeptTreeData")
@ResponseBody
public List<Map<String, Object>> deptTreeData(Role role){
List<Map<String, Object>> tree = deptService.roleDeptTreeData(role);
return tree;
}
}
src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
......@@ -80,12 +80,4 @@ public interface DeptMapper
* @return 结果
*/
public Dept checkDeptNameUnique(String deptName);
/**
* 根据角色ID查询菜单
*
* @param roleId 角色ID
* @return 菜单列表
*/
public List<String> selectRoleDeptTree(Long roleId);
}
src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java
......@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ruoyi.project.system.role.domain.Role;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants;
......@@ -57,42 +55,8 @@ public class DeptServiceImpl implements IDeptService
{
List<Map<String, Object>> trees = new ArrayList<Map<String, Object>>();
List<Dept> deptList = deptMapper.selectDeptAll();
trees=getTrees(deptList,false,null);
return trees;
}
/**
* 根据角色ID查询部门（数据权限）
*
* @param role 角色对象
* @return 部门列表（数据权限）
*/
@Override
public List<Map<String, Object>> roleDeptTreeData(Role role) {
Long roleId=role.getRoleId();
List<Map<String, Object>> trees = new ArrayList<Map<String, Object>>();
List<Dept> deptList=deptMapper.selectDeptAll();
if(StringUtils.isNotNull(roleId)){
List<String> roleDeptList=deptMapper.selectRoleDeptTree(roleId);
trees=getTrees(deptList,true,roleDeptList);
}else {
trees=getTrees(deptList,false,null);
}
return trees;
}
/**
* 对象转菜单树
*
* @param menuList 菜单列表
* @param isCheck 是否需要选中
* @param roleDeptList 角色已存在菜单列表
* @return
*/
public List<Map<String, Object>> getTrees(List<Dept> menuList, boolean isCheck, List<String> roleDeptList){
List<Map<String, Object>> trees = new ArrayList<Map<String, Object>>();
for (Dept dept : menuList)
for (Dept dept : deptList)
{
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
{
......@@ -101,19 +65,12 @@ public class DeptServiceImpl implements IDeptService
deptMap.put("pId", dept.getParentId());
deptMap.put("name", dept.getDeptName());
deptMap.put("title", dept.getDeptName());
if (isCheck)
{
deptMap.put("checked", roleDeptList.contains(dept.getDeptId() + dept.getDeptName()));
}
else
{
deptMap.put("checked", false);
}
trees.add(deptMap);
}
}
return trees;
}
/**
* 查询部门人数
*
......
src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
......@@ -4,7 +4,6 @@ import java.util.List;
import java.util.Map;
import com.ruoyi.project.system.dept.domain.Dept;
import com.ruoyi.project.system.role.domain.Role;
/**
* 部门管理 服务层
......@@ -36,14 +35,6 @@ public interface IDeptService
public List<Map<String, Object>> selectDeptTree();
/**
* 根据角色ID查询菜单
*
* @param role 角色对象
* @return 菜单列表
*/
public List<Map<String, Object>> roleDeptTreeData(Role role);
/**
* 查询部门人数
*
* @param parentId 父部门ID
......
src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java
......@@ -118,7 +118,8 @@ public class MenuServiceImpl implements IMenuService
/**
* 查询所有菜单
*
*
* @param role 角色对象
* @return 菜单列表
*/
@Override
......
src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
package com.ruoyi.project.system.role.controller;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.constant.BusinessType;
......@@ -8,14 +19,6 @@ import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.role.domain.Role;
import com.ruoyi.project.system.role.service.IRoleService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 角色信息
......
src/main/java/com/ruoyi/project/system/role/domain/Role.java
package com.ruoyi.project.system.role.domain;
import java.util.Arrays;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import java.util.Arrays;
/**
* 角色对象 sys_role
*
......@@ -38,8 +38,6 @@ public class Role extends BaseEntity
private boolean flag = false;
/** 菜单组 */
private Long[] menuIds;
/** 部门组（数据权限） */
private Long[] deptIds;
public Long getRoleId()
{
......@@ -111,19 +109,11 @@ public class Role extends BaseEntity
this.menuIds = menuIds;
}
public Long[] getDeptIds() {
return deptIds;
}
public void setDeptIds(Long[] deptIds) {
this.deptIds = deptIds;
}
@Override
public String toString()
{
return "Role [roleId=" + roleId + ", roleName=" + roleName + ", roleKey=" + roleKey + ", roleSort=" + roleSort
+ ", status=" + status + ", flag=" + flag + ", menuIds=" + Arrays.toString(menuIds) + ", deptIds=" + Arrays.toString(deptIds)+ "]";
+ ", status=" + status + ", flag=" + flag + ", menuIds=" + Arrays.toString(menuIds) + "]";
}
}
src/main/java/com/ruoyi/project/system/role/domain/RoleDept.java deleted 100644 → 0
package com.ruoyi.project.system.role.domain;
/**
* 角色和部门关联 sys_role_dept
*/
public class RoleDept {
/** 角色ID */
private Long roleId;
/** 部门ID */
private Long deptId;
public Long getRoleId() {
return roleId;
}
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
public Long getDeptId() {
return deptId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
@Override
public String toString()
{
return "RoleDept [roleId=" + roleId + ", deptId=" + deptId + "]";
}
}
src/main/java/com/ruoyi/project/system/role/mapper/RoleDeptMapper.java deleted 100644 → 0
package com.ruoyi.project.system.role.mapper;
import com.ruoyi.project.system.role.domain.RoleDept;
import java.util.List;
/**
* 角色与部门关联表(用于数据权限) 数据层
*/
public interface RoleDeptMapper {
/**
* 通过角色ID删除角色和部门关联
*
* @param roleId 角色ID
* @return 结果
*/
public int deleteRoleDeptByRoleId(Long roleId);
/**
* 批量删除角色部门关联信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteRoleDept(Long[] ids);
/**
* 查询部门使用数量
*
* @param detpId 部门ID
* @return 结果
*/
public int selectCountRoleDeptByDetpId(Long detpId);
/**
* 批量新增角色部门信息（数据权限）
*
* @param roleDeptList 角色菜单列表
* @return 结果
*/
public int batchRoleDept(List<RoleDept> roleDeptList);
}
src/main/java/com/ruoyi/project/system/role/service/IRoleService.java
package com.ruoyi.project.system.role.service;
import com.ruoyi.project.system.role.domain.Role;
import java.util.List;
import java.util.Set;
import com.ruoyi.project.system.role.domain.Role;
/**
* 角色业务层
......
src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java
......@@ -5,9 +5,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.ruoyi.project.system.role.domain.RoleDept;
import com.ruoyi.project.system.role.mapper.RoleDeptMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants;
......@@ -38,9 +35,6 @@ public class RoleServiceImpl implements IRoleService
@Autowired
private UserRoleMapper userRoleMapper;
@Autowired
private RoleDeptMapper roleDeptMapper;
/**
* 根据条件分页查询角色数据
*
......@@ -168,14 +162,12 @@ public class RoleServiceImpl implements IRoleService
// 新增角色信息
roleMapper.insertRole(role);
ShiroUtils.clearCachedAuthorizationInfo();
//新增角色和部门信息（数据权限）
insertRoleDept(role);
return insertRoleMenu(role);
}
/**
* 修改保存角色信息
*
*
* @param role 角色信息
* @return 结果
*/
......@@ -188,15 +180,13 @@ public class RoleServiceImpl implements IRoleService
// 删除角色与菜单关联
roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
ShiroUtils.clearCachedAuthorizationInfo();
//新增角色和部门信息（数据权限）
insertRoleDept(role);
return insertRoleMenu(role);
}
/**
* 新增角色菜单信息
*
* @param role 角色对象
* @param user 角色对象
*/
public int insertRoleMenu(Role role)
{
......@@ -218,27 +208,6 @@ public class RoleServiceImpl implements IRoleService
}
/**
* 新增角色部门信息(数据权限)
*
* @param role 角色对象
*/
public void insertRoleDept(Role role)
{
// 新增角色与部门（数据权限）管理
List<RoleDept> list = new ArrayList<RoleDept>();
for (Long deptId : role.getDeptIds())
{
RoleDept rd = new RoleDept();
rd.setRoleId(role.getRoleId());
rd.setDeptId(deptId);
list.add(rd);
}
if (list.size() > 0)
{
roleDeptMapper.batchRoleDept(list);
}
}
/**
* 校验角色名称是否唯一
*
* @param role 角色信息
......
src/main/resources/mybatis/system/DeptMapper.xml
......@@ -24,14 +24,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select t.dept_id, t.parent_id, t.dept_name, t.order_num, t.leader, t.phone, t.email, t.status, t.create_by, t.create_time from sys_dept t
</sql>
<select id="selectRoleDeptTree" parameterType="Long" resultType="String">
select concat(d.dept_id, d.dept_name) as dept_name
from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id
where rd.role_id = #{roleId}
order by d.parent_id, d.order_num
</select>
<select id="selectDeptAll" resultMap="DeptResult">
<include refid="selectDeptVo"/>
</select>
......
src/main/resources/mybatis/system/RoleDeptMapper.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.role.mapper.RoleDeptMapper">
<resultMap type="RoleDept" id="RoleDeptResult">
<result property="roleId" column="role_id" />
<result property="deptId" column="dept_id" />
</resultMap>
<delete id="deleteRoleDeptByRoleId" parameterType="Long">
delete from sys_role_dept where role_id=#{roleId}
</delete>
<select id="selectCountRoleDeptByDetpId" resultType="Integer">
select count(*) from sys_role_dept where dept_id=#{detpId}
</select>
<delete id="deleteRoleDept" parameterType="Long">
delete from sys_role_dept where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</delete>
<insert id="batchRoleDept">
insert into sys_role_dept(role_id, dept_id) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.roleId},#{item.deptId})
</foreach>
</insert>
</mapper>
\ No newline at end of file
src/main/resources/templates/system/post/post.html
......@@ -33,12 +33,12 @@
</div>
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
<i class="fa fa-plus"></i> 新增
</button>
<button class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:post:remove">
</a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:post:remove">
<i class="fa fa-trash-o"></i> 删除
</button>
</a>
</div>
<div class="col-sm-12 select-info table-striped">
......
src/main/resources/templates/system/role/add.html
......@@ -49,12 +49,6 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">数据权限</label>
<div class="col-sm-8">
<div id="deptTrees" class="ztree"></div>
</div>
</div>
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
......@@ -82,24 +76,6 @@
menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true);
}, null, null, "正在加载，请稍后...");
};loadTree();
// 权限树结构初始化加载
var deptsetting = {
check:{enable:true,nocheckInherit:true,chkboxType:{"Y":"ps","N":"ps"}},
view:{selectedMulti:false,nameIsHTML: true},
data:{simpleData:{enable:true},key:{title:"title"}},
callback:{
beforeClick: function (treeId, treeNode, clickFlag) {
var deptTrees = $.fn.zTree.getZTreeObj(treeId);
deptTrees.checkNode(treeNode, !treeNode.checked, true, true);
return false;
}
}
}, deptTrees, loadTree = function(){
$.get(ctx + "system/dept/treeData", function(data) {
deptTrees = $.fn.zTree.init($("#deptTrees"), deptsetting, data); //.expandAll(true);
}, null, null, "正在加载，请稍后...");
};loadTree();
$("#form-role-add").validate({
rules:{
......@@ -139,29 +115,17 @@
});
function selectCheckeds() {
var menuIds = "";
var treeNodes = menuTrees.getCheckedNodes(true);
for (var i = 0; i < treeNodes.length; i++) {
if (0 == i) {
menuIds = treeNodes[i].id;
} else {
menuIds += ("," + treeNodes[i].id);
}
}
return menuIds;
}
function selectDeptCheckeds() {
var deptIds = "";
var treeNodes = deptTrees.getCheckedNodes(true);
for (var i = 0; i < treeNodes.length; i++) {
if (0 == i) {
deptIds = treeNodes[i].id;
} else {
deptIds += ("," + treeNodes[i].id);
}
}
return deptIds;
}
var menuIds = "";
var treeNodes = menuTrees.getCheckedNodes(true);
for (var i = 0; i < treeNodes.length; i++) {
if (0 == i) {
menuIds = treeNodes[i].id;
} else {
menuIds += ("," + treeNodes[i].id);
}
}
return menuIds;
}
function add() {
var roleName = $("input[name='roleName']").val();
......@@ -170,7 +134,6 @@
var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
var remark = $("input[name='remark']").val();
var menuIds = selectCheckeds();
var deptIds = selectDeptCheckeds();
$.ajax({
cache : true,
type : "POST",
......@@ -181,8 +144,7 @@
"roleSort": roleSort,
"status": status,
"remark": remark,
"menuIds": menuIds,
"deptIds":deptIds
"menuIds": menuIds
},
async : false,
error : function(request) {
......
src/main/resources/templates/system/role/edit.html
......@@ -50,12 +50,6 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">数据权限</label>
<div class="col-sm-8">
<div id="deptTrees" class="ztree"></div>
</div>
</div>
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
......@@ -83,25 +77,7 @@
menuTrees = $.fn.zTree.init($("#menuTrees"), setting, data); //.expandAll(true);
}, null, null, "正在加载，请稍后...");
};loadTree();
// 部门（数据权限）树结构初始化加载
var deptsetting = {
check:{enable:true,nocheckInherit:true,chkboxType:{"Y":"ps","N":"ps"}},
view:{selectedMulti:false,nameIsHTML: true},
data:{simpleData:{enable:true},key:{title:"title"}},
callback:{
beforeClick: function (treeId, treeNode, clickFlag) {
var deptTrees = $.fn.zTree.getZTreeObj(treeId);
deptTrees.checkNode(treeNode, !treeNode.checked, true, true);
return false;
}
}
}, deptTrees, loadTree = function(){
$.get(ctx + "system/dept/roleDeptTreeData?roleId=" + $("#roleId").val(), function(data) {
deptTrees = $.fn.zTree.init($("#deptTrees"), deptsetting, data); //.expandAll(true);
}, null, null, "正在加载，请稍后...");
};loadTree();
$("#form-role-edit").validate({
rules:{
roleName:{
......@@ -154,20 +130,7 @@
}
return menuIds;
}
function selectDeptCheckeds() {
var deptIds = "";
var treeNodes = deptTrees.getCheckedNodes(true);
for (var i = 0; i < treeNodes.length; i++) {
if (0 == i) {
deptIds = treeNodes[i].id;
} else {
deptIds += ("," + treeNodes[i].id);
}
}
return deptIds;
}
function edit() {
var roleId = $("input[name='roleId']").val();
var roleName = $("input[name='roleName']").val();
......@@ -176,7 +139,6 @@
var status = $("input[name='status']").is(':checked') == true ? 0 : 1;
var remark = $("input[name='remark']").val();
var menuIds = selectCheckeds();
var deptIds = selectDeptCheckeds();
$.ajax({
cache : true,
type : "POST",
......@@ -188,8 +150,7 @@
"roleSort": roleSort,
"status": status,
"remark": remark,
"menuIds": menuIds,
"deptIds": deptIds
"menuIds": menuIds
},
async : false,
error : function(request) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment