pbn32vpxk
/
tamguo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
main
tamguo 7 years ago
parent 892fecf2da
commit 366bf62dc8
9 changed files with 370 additions and 1 deletions
Show Stats Download Patch File Download Diff File

8
tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysUserDataScopeMapper.java
Unescape View File

@ -0,0 +1,8 @@
package com.tamguo.modules.sys.dao;
import com.tamguo.config.dao.SuperMapper;
import com.tamguo.modules.sys.model.SysUserDataScopeEntity;
public interface SysUserDataScopeMapper extends SuperMapper<SysUserDataScopeEntity>{
}

37
tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserDataScopeEntity.java
Unescape View File

@ -0,0 +1,37 @@
package com.tamguo.modules.sys.model;
import com.baomidou.mybatisplus.annotations.TableName;
@TableName(value="sys_user_data_scope")
public class SysUserDataScopeEntity {
private String userCode;
private String ctrlType;
private String ctrlData;
private String ctrlPermi;
public String getUserCode() {
return userCode;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
}
public String getCtrlType() {
return ctrlType;
}
public void setCtrlType(String ctrlType) {
this.ctrlType = ctrlType;
}
public String getCtrlData() {
return ctrlData;
}
public void setCtrlData(String ctrlData) {
this.ctrlData = ctrlData;
}
public String getCtrlPermi() {
return ctrlPermi;
}
public void setCtrlPermi(String ctrlPermi) {
this.ctrlPermi = ctrlPermi;
}
}

10
tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysUserEntity.java
Unescape View File

@ -87,6 +87,8 @@ public class SysUserEntity implements Serializable {
private List<String> employeePosts; private List<String> employeePosts;
@TableField(exist=false) @TableField(exist=false)
private String userRoleString; private String userRoleString;
@TableField(exist=false)
private String userDataScopeListJson;
public SysUserEntity() { public SysUserEntity() {
} }
@ -467,5 +469,13 @@ public class SysUserEntity implements Serializable {
this.userType = userType; this.userType = userType;
} }
public String getUserDataScopeListJson() {
return userDataScopeListJson;
}
public void setUserDataScopeListJson(String userDataScopeListJson) {
this.userDataScopeListJson = userDataScopeListJson;
}
} }

7
tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
Unescape View File

@ -4,6 +4,7 @@ import java.util.List;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService; import com.baomidou.mybatisplus.service.IService;
import com.tamguo.modules.sys.model.SysUserDataScopeEntity;
import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.model.SysUserEntity;
import com.tamguo.modules.sys.model.SysUserRoleEntity; import com.tamguo.modules.sys.model.SysUserRoleEntity;
import com.tamguo.modules.sys.model.condition.SysUserCondition; import com.tamguo.modules.sys.model.condition.SysUserCondition;
@ -31,4 +32,10 @@ public interface ISysUserService extends IService<SysUserEntity>{
/** 获取用户角色*/ /** 获取用户角色*/
public List<SysUserRoleEntity> findUserRole(String userCode); public List<SysUserRoleEntity> findUserRole(String userCode);
/** 用户数据权限*/
public List<SysUserDataScopeEntity> selectUserDataScope(String userCode);
/** 保存用户数据权限*/
public void saveUserDataScope(SysUserEntity user);
} }

32
tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
Unescape View File

@ -9,13 +9,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.toolkit.CollectionUtils; import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.tamguo.modules.sys.dao.SysUserDataScopeMapper;
import com.tamguo.modules.sys.dao.SysUserMapper; import com.tamguo.modules.sys.dao.SysUserMapper;
import com.tamguo.modules.sys.dao.SysUserPostMapper; import com.tamguo.modules.sys.dao.SysUserPostMapper;
import com.tamguo.modules.sys.dao.SysUserRoleMapper; import com.tamguo.modules.sys.dao.SysUserRoleMapper;
import com.tamguo.modules.sys.model.SysUserDataScopeEntity;
import com.tamguo.modules.sys.model.SysUserEntity; import com.tamguo.modules.sys.model.SysUserEntity;
import com.tamguo.modules.sys.model.SysUserPostEntity; import com.tamguo.modules.sys.model.SysUserPostEntity;
import com.tamguo.modules.sys.model.SysUserRoleEntity; import com.tamguo.modules.sys.model.SysUserRoleEntity;
@ -39,6 +42,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
public SysUserRoleMapper sysUserRoleMapper; public SysUserRoleMapper sysUserRoleMapper;
@Autowired @Autowired
public ISysRoleService iSysRoleService; public ISysRoleService iSysRoleService;
@Autowired
public SysUserDataScopeMapper sysUserDataScopeMapper;
@Transactional(readOnly=false) @Transactional(readOnly=false)
@Override @Override
@ -173,4 +178,31 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
return sysUserRoleMapper.selectList(Condition.create().eq("user_code", userCode)); return sysUserRoleMapper.selectList(Condition.create().eq("user_code", userCode));
} }
@SuppressWarnings("unchecked")
@Transactional(readOnly=true)
@Override
public List<SysUserDataScopeEntity> selectUserDataScope(String userCode) {
return sysUserDataScopeMapper.selectList(Condition.create().eq("user_code", userCode));
}
@SuppressWarnings("unchecked")
@Transactional(readOnly=false)
@Override
public void saveUserDataScope(SysUserEntity user) {
// 删除之前的数据权限
sysUserDataScopeMapper.delete(Condition.create().eq("user_code", user.getUserCode()));
if(!StringUtils.isEmpty(user.getUserDataScopeListJson())) {
JSONArray dataScopeList = JSONArray.parseArray(user.getUserDataScopeListJson());
for(int i=0 ; i<dataScopeList.size() ; i++) {
SysUserDataScopeEntity entity = new SysUserDataScopeEntity();
entity.setCtrlData(dataScopeList.getJSONObject(i).getString("ctrlData"));
entity.setCtrlType(dataScopeList.getJSONObject(i).getString("ctrlType"));
entity.setUserCode(user.getUserCode());
entity.setCtrlPermi("2");
sysUserDataScopeMapper.insert(entity);
}
}
}
} }

22
tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
Unescape View File

@ -29,6 +29,8 @@ public class SysUserController {
private final String USER_ADD_PAGE = "modules/sys/user/add"; private final String USER_ADD_PAGE = "modules/sys/user/add";
/** 分配角色*/ /** 分配角色*/
private final String USER_ROLE_PAGE = "modules/sys/user/role"; private final String USER_ROLE_PAGE = "modules/sys/user/role";
/** 数据权限*/
private final String USER_DATA_SCOPE_PAGE = "modules/sys/user/dataScope";
@Autowired @Autowired
private ISysUserService iSysUserService; private ISysUserService iSysUserService;
@ -59,6 +61,14 @@ public class SysUserController {
return model; return model;
} }
@RequestMapping(path="dataScope")
public ModelAndView dataScope(String userCode , ModelAndView model) {
model.setViewName(USER_DATA_SCOPE_PAGE);
model.addObject("user", iSysUserService.selectById(userCode));
model.addObject("userDataScopeList", iSysUserService.selectUserDataScope(userCode));
return model;
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RequestMapping(path="update") @RequestMapping(path="update")
public ModelAndView update(String userCode , ModelAndView model) { public ModelAndView update(String userCode , ModelAndView model) {
@ -124,4 +134,16 @@ public class SysUserController {
return ExceptionSupport.resolverResult("分配角色", this.getClass(), e); return ExceptionSupport.resolverResult("分配角色", this.getClass(), e);
} }
} }
/** 保存用户数据权限*/
@RequestMapping(path="saveUserDataScope",method=RequestMethod.POST)
@ResponseBody
public Result saveUserDataScope(SysUserEntity user) {
try {
iSysUserService.saveUserDataScope(user);
return Result.result(0, null, "【"+user.getUserName()+"】保存数据权限成功！");
} catch (Exception e) {
return ExceptionSupport.resolverResult("保存数据权限", this.getClass(), e);
}
}
} }

5
tamguo-oms/src/main/resources/mappers/sys/SysUserDataScopeMapper.xml
Unescape View File

@ -0,0 +1,5 @@
<?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.tamguo.modules.sys.dao.SysUserDataScopeMapper">
</mapper>

248
tamguo-oms/src/main/resources/templates/modules/sys/user/dataScope.html
Unescape View File

@ -0,0 +1,248 @@
<!DOCTYPE html><html><head><meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
<title>用户管理 - JeeSite Demo</title>
<script th:src="${setting.domain + 'global.min.js'}"></script>
<script th:src="${setting.domain + 'jquery/jquery-1.12.4.min.js'}"></script>
<script th:src="${setting.domain + 'jquery/jquery-migrate-1.4.1.min.js'}"></script>
<!--[if lt IE 9]><script src="/js/static/common/h5fix.min.js"></script><![endif]-->
<link rel="stylesheet" th:href="${setting.domain + 'fonts/font-icons.min.css'}">
<link rel="stylesheet" th:href="${setting.domain + 'bootstrap/css/bootstrap.min.css'}">
<link rel="stylesheet" th:href="${setting.domain + 'select2/4.0/select2.css'}">
<link rel="stylesheet" th:href="${setting.domain + 'icheck/1.0/minimal/grey.css'}">
<link rel="stylesheet" th:href="${setting.domain + 'jquery-ztree/3.5/css/metro/zTreeStyle.css'}">
<link rel="stylesheet" th:href="${setting.domain + 'adminlte/css/AdminLTE.min.css'}">
<link rel="stylesheet" th:href="${setting.domain + 'common/jeesite.css'}">
<link rel="stylesheet" th:href="${setting.domain + 'common/common.css'}">
</head><body class="hold-transition ">
<div class="wrapper"><div class="main-content">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-people"></i> 用户分配数据权限
</div>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
</div>
</div>
<form id="inputForm" th:action="${setting.domain + 'sys/user/saveUserDataScope'}" method="post" class="form-horizontal">
<input type="hidden" id="userCode" name="userCode" th:value="${user.userCode}"/>
<div class="box-body"><br/>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 登录账号：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="loginCode" name="loginCode" th:value="${user.loginCode}" maxlength="32" readonly="true" class="form-control required "/>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 用户昵称：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<input type="text" id="userName" name="userName" th:value="${user.userName}" maxlength="32" readonly="true" class="form-control required "/>
</div>
</div>
</div>
</div>
<div class="form-unit">数据权限</div>
<div id="dataScopeTrees"></div>
<script id="dataScopeTpl" type="text/template">
<div class="pull-left" style="padding:0 15px;min-width:300px;">
<div class="box box-solid" style="background:#FAFAFA">
<div class="box-header">
<div class="box-title icheck">
<label><input type="checkbox" id="checkall_{{d.key}}"
class="checkall"/> {{d.label}}</label>
</div>
<div class="box-tools pull-right" style="top:8px;">
<a class="btn btn-box-tool" id="expand_{{d.key}}"
value="dataScopeTree_{{d.key}}" >展开</a>/<a
class="btn btn-box-tool" id="collapse_{{d.key}}"
value="dataScopeTree_{{d.key}}" >折叠</a>
</div>
</div>
<div class="box-body">
<div id="dataScopeTree_{{d.key}}" class="ztree"></div>
</div>
</div>
</div>
</script>
<input type="hidden" id="userDataScopeListJson" name="userDataScopeListJson" value=""/>
</div>
<div class="box-footer">
<div class="row">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 保 存</button>&nbsp;
<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 关 闭</button>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
<a id="scroll-up" href="#" class="btn btn-sm"><i class="fa fa-angle-double-up"></i></a>
<script th:src="${setting.domain + 'bootstrap/js/bootstrap.min.js'}"></script>
<script th:src="${setting.domain + 'select2/4.0/select2.js'}"></script>
<script th:src="${setting.domain + 'select2/4.0/i18n/zh_CN.js'}"></script>
<script th:src="${setting.domain + 'layer/3.1/layer.js'}"></script>
<script th:src="${setting.domain + 'my97/WdatePicker.js'}"></script>
<script th:src="${setting.domain + 'jquery-ztree/3.5/js/jquery.ztree.all-3.5.js'}"></script>
<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.js'}"></script>
<script th:src="${setting.domain + 'jquery-validation/1.16/localization/messages_zh_CN.js'}"></script>
<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.extend.js'}"></script>
<script th:src="${setting.domain + 'common/jeesite.js'}"></script>
<script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
<script th:src="${setting.domain + 'common/common.js'}"></script>
<script>
$("#inputForm").validate({
submitHandler: function(form){
// 获取数据权限数据
var dataScopeData = [];
$.each(dataScopeTrees, function(key, dataScopeTree){
var treeNodes = dataScopeTree.getCheckedNodes(true);
for(var i=0; i<treeNodes.length; i++) {
dataScopeData.push({
ctrlType: key, ctrlData: treeNodes[i].id
});
}
});
$("#userDataScopeListJson").val(JSON.stringify(dataScopeData));
// 提交表单数据
js.ajaxSubmitForm($(form), function(data){
js.showMessage(data.message);
if(data.result == Global.TRUE){
js.closeCurrentTabPage(function(contentWindow){
contentWindow.page();
});
}
}, "json");
}
});
//加载数据权限树结构
var setting = {
check:{enable:true,nocheckInherit:true},
view:{selectedMulti:false,nameIsHTML: true},
data:{simpleData:{enable:true},key:{title:"title"}},
callback:{
beforeClick: function (treeId, treeNode, clickFlag) {
var tree = $.fn.zTree.getZTreeObj(treeId);
tree.checkNode(treeNode, !treeNode.checked, true, true);
return false;
},
onCheck: function (event, treeId, treeNode){
var tid = treeNode.tId;
if(!treeNode.checked){
$(".checkall[value="+treeId+"]").each(function(){
if(this.checked){
$(this).removeAttr("checked").iCheck('update');
}
return false;
});
}
}
}
},
moduleCodes = '["core","devtools"]';
dataScopes = [{
moduleCode: "core",
ctrlPermi: "0",
ctrlName: "机构权限",
ctrlName_en: "Office",
ctrlType: "Office",
ctrlDataUrl: "/sys/office/treeData",
chkboxType: {"Y":"ps","N":"ps"},
expandLevel: -1,
remarks: ""
},{
moduleCode: "core",
ctrlName: "公司权限",
ctrlName_en: "Company",
ctrlType: "Company",
ctrlPermi: "0",
ctrlDataUrl: "/sys/company/treeData",
chkboxType: {"Y":"ps","N":"ps"},
expandLevel: -1,
remarks: ""
},{
moduleCode: "core",
ctrlName: "角色权限",
ctrlName_en: "Role",
ctrlType: "Role",
ctrlPermi: "2",
ctrlDataUrl: "/sys/role/treeData",
chkboxType: {"Y":"ps","N":"ps"},
expandLevel: -1,
remarks: ""
}]
,
dataScopeTrees = {}; // 用sysCode分类存储所有菜单树
for (var i=0; i<dataScopes.length; i++){
var dataScope = dataScopes[i];
// 验证模块是否开启，如果未开启，则跳过
if (moduleCodes.indexOf("\""+dataScope.moduleCode+"\"") == -1){
continue;
}
// 控制权限 ctrlPermi: 0全部 1拥有权限 2管理权限
if (!(dataScope.ctrlPermi == '0'
|| dataScope.ctrlPermi == '1')){
continue;
}
$('#dataScopeTrees').append(js.template('dataScopeTpl', {
key: dataScope.ctrlType, label: dataScope.ctrlName_zh_CN || dataScope.ctrlName}));
var ctrlDataUrl = dataScope.ctrlDataUrl || '';
$.ajax({
type: 'POST',
url: ctrlDataUrl + (ctrlDataUrl.indexOf("?")!=-1?'&':'?') + "___t=" + new Date().getTime(),
data: {ctrlPermi: '2'},
dataType: 'json',
async: false,
error: function(data){
js.showErrorMessage(data.responseText);
},
success: function(data, status, xhr){
// 初始化树结构
var tree = $.fn.zTree.init($("#dataScopeTree_"+dataScope.ctrlType), setting, data);
tree.setting.check.chkboxType = dataScope.chkboxType;
// 默认展开节点（如果级别设置为-1，则：如果有1个根节点，则展开一级节点，否则不展开）
$.fn.zTree.expandNodeByLevel(tree, dataScope.expandLevel);
// 树结构：全选、取消全选
$('#checkall_'+dataScope.ctrlType).iCheck({
checkboxClass:'icheckbox_minimal-grey'
}).on('ifChecked ifUnchecked', function(){
var ctrlType = $(this).attr('ctrlType');
if(this.checked){
dataScopeTrees[ctrlType].checkAllNodes(true);
}else{
dataScopeTrees[ctrlType].checkAllNodes(false);
}
}).attr("ctrlType", dataScope.ctrlType);
// 展开和折叠按钮绑定
$('#expand_'+dataScope.ctrlType).click(function(){
var ctrlType = $(this).attr('ctrlType');
dataScopeTrees[ctrlType].expandAll(true);
}).attr("ctrlType", dataScope.ctrlType);
$('#collapse_'+dataScope.ctrlType).click(function(){
var ctrlType = $(this).attr('ctrlType');
dataScopeTrees[ctrlType].expandAll(false);
}).attr("ctrlType", dataScope.ctrlType);
// 将树对象存储到全局数组里
dataScopeTrees[dataScope.ctrlType] = tree;
}
});
}
// 默认选择节点
var userDataScopeList = [[${userDataScopeList}]];
for(var i=0 ; i<userDataScopeList.length ; i++){
try{
dataScopeTrees[userDataScopeList[i].ctrlType].checkNode(dataScopeTrees[userDataScopeList[i].ctrlType].getNodeByParam("id",userDataScopeList[i].ctrlData), true, false);
}catch(e){}
}
</script>

2
tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
Unescape View File

@ -331,7 +331,7 @@ $('#dataGrid').dataGrid({
actions.push('<a href="javascript:" class="btnMore" title="更多操作"><i class="fa fa-chevron-circle-right"></i></a>&nbsp;'); actions.push('<a href="javascript:" class="btnMore" title="更多操作"><i class="fa fa-chevron-circle-right"></i></a>&nbsp;');
actions.push('<div class="moreItems">'); actions.push('<div class="moreItems">');
actions.push('<a href="sys/user/role?userCode='+row.userCode+'&op=auth" class="btn btn-default btn-xs btnList" title="用户分配角色"><i class="fa fa-check-square-o"></i> 分配角色</a>&nbsp;'); actions.push('<a href="sys/user/role?userCode='+row.userCode+'&op=auth" class="btn btn-default btn-xs btnList" title="用户分配角色"><i class="fa fa-check-square-o"></i> 分配角色</a>&nbsp;');
actions.push('<a href="/js/a/sys/empUser/formAuthDataScope?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="用户分配数据权限"><i class="fa fa-check-circle-o"></i> 数据权限</a>&nbsp;'); actions.push('<a href="/sys/user/dataScope?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="用户分配数据权限"><i class="fa fa-check-circle-o"></i> 数据权限</a>&nbsp;');
actions.push('<a href="/js/a/sys/empUser/resetpwd?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="用户密码重置" data-confirm="确认要将该用户密码重置到初始状态吗？"><i class="fa fa-reply-all"></i> 重置密码</a>&nbsp;'); actions.push('<a href="/js/a/sys/empUser/resetpwd?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="用户密码重置" data-confirm="确认要将该用户密码重置到初始状态吗？"><i class="fa fa-reply-all"></i> 重置密码</a>&nbsp;');
actions.push('</div>'); actions.push('</div>');
return actions.join(''); return actions.join('');

Write Preview
Loading…
Cancel
Save