github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

#58 merge code.

Browse Source
This commit is contained in:
Kyle 2018-09-08 00:22:13 +08:00
commit e42eebe282
No known key found for this signature in database
GPG Key ID: E9D96D736A2D3F3C
8 changed files with 622 additions and 663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/Handler.java
View File

@ -17,6 +17,7 @@
package com.chatopera.cc.webim.web.handler;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
import java.text.ParseException;
@ -25,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
import com.chatopera.cc.core.UKDataContext;
import com.chatopera.cc.util.UKView;
import com.chatopera.cc.util.exception.CSKefuException;
import com.chatopera.cc.webim.service.cache.CacheHelper;
import com.chatopera.cc.webim.service.repository.TenantRepository;
import com.chatopera.cc.webim.web.handler.api.rest.QueryParams;
@ -36,6 +38,8 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.QueryStringQueryBuilder;
import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
import org.elasticsearch.index.query.RangeQueryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@ -49,6 +53,8 @@ import com.chatopera.cc.webim.web.model.SystemConfig;
@Controller
@SessionAttributes
public class Handler {
private static final Logger logger = LoggerFactory.getLogger(Handler.class);
@Autowired
private TenantRepository tenantRes;
@ -86,6 +92,32 @@ public class Handler {
return user ;
}
/**
* 构建ElasticSearch基于部门查询的Filter
* @param request
* @param boolQueryBuilder
* @return
* @throws CSKefuException
*/
public boolean esOrganFilter(final HttpServletRequest request, final BoolQueryBuilder boolQueryBuilder) throws CSKefuException {
// 组合部门条件
User u = getUser(request);
if( u == null){
throw new CSKefuException("[esOrganFilter] 未能获取到登录用户。");
} else if(u.isSuperuser()){
// 超级管理员, 查看任何数据
return true;
} else if(u.getMyorgans().size() == 0){
// 用户没有被分配到部门，返回空数据
return false;
} else {
// 用户在部门中，通过部门过滤数据
String[] values = u.getMyorgans().toArray(new String[u.getMyorgans().size()]);
boolQueryBuilder.filter(termsQuery("organ", values));
return true;
}
}
/**
*
* @param queryBuilder
@ -253,8 +285,6 @@ public class Handler {
return user ;
}
public void setUser(HttpServletRequest request , User user){
request.getSession(true).removeAttribute(UKDataContext.USER_SESSION_NAME) ;
request.getSession(true).setAttribute(UKDataContext.USER_SESSION_NAME , user) ;

98
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/LoginController.java
View File

@ -16,10 +16,26 @@
*/
package com.chatopera.cc.webim.web.handler;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.chatopera.cc.core.UKDataContext;
import com.chatopera.cc.util.Menu;
import com.chatopera.cc.util.UKTools;
import com.chatopera.cc.webim.service.cache.CacheHelper;
import com.chatopera.cc.webim.service.repository.OrganRepository;
import com.chatopera.cc.webim.service.repository.RoleAuthRepository;
import com.chatopera.cc.webim.service.repository.UserRepository;
import com.chatopera.cc.webim.service.repository.UserRoleRepository;
import com.chatopera.cc.webim.util.OnlineUserUtils;
import com.chatopera.cc.webim.web.model.*;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@ -29,49 +45,22 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.chatopera.cc.core.UKDataContext;
import com.chatopera.cc.util.Menu;
import com.chatopera.cc.webim.service.cache.CacheHelper;
import com.chatopera.cc.webim.service.repository.OrganRepository;
import com.chatopera.cc.webim.service.repository.OrganRoleRepository;
import com.chatopera.cc.webim.service.repository.RoleAuthRepository;
import com.chatopera.cc.webim.service.repository.UserRoleRepository;
import com.chatopera.cc.webim.util.OnlineUserUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import com.chatopera.cc.util.UKTools;
import com.chatopera.cc.webim.service.repository.UserRepository;
import com.chatopera.cc.webim.web.model.Organ;
import com.chatopera.cc.webim.web.model.OrganRole;
import com.chatopera.cc.webim.web.model.Role;
import com.chatopera.cc.webim.web.model.RoleAuth;
import com.chatopera.cc.webim.web.model.SystemConfig;
import com.chatopera.cc.webim.web.model.User;
import com.chatopera.cc.webim.web.model.UserRole;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
*
* @author UK
* @version 1.0.0
*
*/
@Controller
public class LoginController extends Handler {
private final static Logger logger = LoggerFactory.getLogger(LoginController.class);
@Autowired
private UserRepository userRepository;
@Autowired
private OrganRoleRepository organRoleRes ;
@Autowired
private UserRoleRepository userRoleRes;
@ -81,6 +70,21 @@ public class LoginController extends Handler{
@Autowired
private OrganRepository organRepository;
/**
* 获取一个用户所拥有的所有部门ID
*
* @param user
*/
private void organs(final User user, final String organ) {
if (organ == null)
return;
user.getMyorgans().add(organ);
List<Organ> y = organRepository.findByOrgiAndParent(user.getOrgi(), organ);
for (Organ x : y) {
organs(user, x.getId());
}
}
@RequestMapping(value = "/login", method = RequestMethod.GET)
@Menu(type = "apps", subtype = "user", access = true)
public ModelAndView login(HttpServletRequest request, HttpServletResponse response, @RequestHeader(value = "referer", required = false) String referer, @Valid String msg) throws NoSuchAlgorithmException {
@ -179,18 +183,11 @@ public class LoginController extends Handler{
loginUser.getRoleList().add(userRole.getRole());
}
}
if(!StringUtils.isBlank(loginUser.getOrgan())){
Organ organ = organRepository.findByIdAndOrgi(loginUser.getOrgan(), loginUser.getOrgi()) ;
if(organ!=null){
List<OrganRole> organRoleList = organRoleRes.findByOrgiAndOrgan(loginUser.getOrgi(), organ) ;
if(organRoleList.size() > 0){
for(OrganRole organRole : organRoleList){
loginUser.getRoleAuthMap().put(organRole.getDicvalue(),true);
}
}
}
}
//获取用户的授权资源
// 获取用户部门以及下级部门
organs(loginUser, loginUser.getOrgan()); // 添加部门到myorgans中
// 获取用户的角色权限，进行授权
List<RoleAuth> roleAuthList = roleAuthRes.findAll(new Specification<RoleAuth>() {
@Override
public Predicate toPredicate(Root<RoleAuth> root, CriteriaQuery<?> query,
@ -204,7 +201,9 @@ public class LoginController extends Handler{
Predicate[] p = new Predicate[list.size()];
cb.and(cb.equal(root.get("orgi").as(String.class), loginUser.getOrgi()));
return cb.or(list.toArray(p));
}}) ;
}
});
if (roleAuthList != null) {
for (RoleAuth roleAuth : roleAuthList) {
loginUser.getRoleAuthMap().put(roleAuth.getDicvalue(), true);
@ -215,6 +214,7 @@ public class LoginController extends Handler{
if (!StringUtils.isBlank(loginUser.getId())) {
userRepository.save(loginUser);
}
super.setUser(request, loginUser);
//当前用户 企业id为空 调到创建企业页面
if (StringUtils.isBlank(loginUser.getOrgid())) {

19
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/admin/organ/OrganController.java
View File

@ -317,25 +317,6 @@ public class OrganController extends Handler{
return request(super.createRequestPageTempletResponse("redirect:/admin/organ/index.html?msg="+msg));
}
@RequestMapping("/auth")
@Menu(type = "admin" , subtype = "organ")
public ModelAndView auth(ModelMap map ,HttpServletRequest request , @Valid String id) {
SysDic sysDic = sysDicRes.findByCode(UKDataContext.UKEFU_SYSTEM_AUTH_DIC) ;
if(sysDic!=null){
map.addAttribute("resourceList", sysDicRes.findByDicid(sysDic.getId())) ;
}
map.addAttribute("sysDic", sysDic) ;
Organ organData = organRepository.findByIdAndOrgi(id, super.getOrgiByTenantshare(request)) ;
map.addAttribute("organData", organData) ;
map.addAttribute("roleList", roleRepository.findByOrgiAndOrgid(super.getOrgiByTenantshare(request),super.getOrgid(request))) ;
map.addAttribute("organRoleList", organRoleRes.findByOrgiAndOrgan(super.getOrgiByTenantshare(request), organData)) ;
return request(super.createRequestPageTempletResponse("/admin/organ/auth"));
}
@RequestMapping("/auth/save")
@Menu(type = "admin" , subtype = "role")
public ModelAndView authsave(HttpServletRequest request ,@Valid String id ,@Valid String menus) {

1
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/AppsController.java
View File

@ -217,6 +217,7 @@ public class AppsController extends Handler {
User sessionUser = super.getUser(request) ;
tempUser.setRoleList(sessionUser.getRoleList()) ;
tempUser.setRoleAuthMap(sessionUser.getRoleAuthMap());
tempUser.setMyorgans(sessionUser.getMyorgans());
User u = tempUser;
u.setOrgi(super.getOrgi(request));
super.setUser(request, u);

62
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/apps/contacts/ContactsController.java
View File

@ -17,29 +17,28 @@
package com.chatopera.cc.webim.web.handler.apps.contacts;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.chatopera.cc.util.Menu;
import com.chatopera.cc.util.PinYinTools;
import com.chatopera.cc.util.UKTools;
import com.chatopera.cc.util.exception.CSKefuException;
import com.chatopera.cc.util.task.DSData;
import com.chatopera.cc.util.task.DSDataEvent;
import com.chatopera.cc.util.task.ExcelImportProecess;
import com.chatopera.cc.util.task.export.ExcelExporterProcess;
import com.chatopera.cc.util.task.process.ContactsProcess;
import com.chatopera.cc.webim.service.es.ContactsRepository;
import com.chatopera.cc.webim.service.repository.MetadataRepository;
import com.chatopera.cc.webim.service.repository.PropertiesEventRepository;
import com.chatopera.cc.webim.service.repository.ReporterRepository;
import com.chatopera.cc.webim.util.PropertiesEventUtils;
import com.chatopera.cc.webim.web.handler.Handler;
import com.chatopera.cc.webim.web.model.*;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageRequest;
@ -50,23 +49,21 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import com.chatopera.cc.util.UKTools;
import com.chatopera.cc.util.task.DSData;
import com.chatopera.cc.util.task.DSDataEvent;
import com.chatopera.cc.util.task.ExcelImportProecess;
import com.chatopera.cc.util.task.export.ExcelExporterProcess;
import com.chatopera.cc.util.task.process.ContactsProcess;
import com.chatopera.cc.webim.service.es.ContactsRepository;
import com.chatopera.cc.webim.service.repository.MetadataRepository;
import com.chatopera.cc.webim.service.repository.ReporterRepository;
import com.chatopera.cc.webim.web.handler.Handler;
import com.chatopera.cc.webim.web.model.Contacts;
import com.chatopera.cc.webim.web.model.MetadataTable;
import com.chatopera.cc.webim.web.model.PropertiesEvent;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
@Controller
@RequestMapping("/apps/contacts")
public class ContactsController extends Handler {
private final static Logger logger = LoggerFactory.getLogger(ContactsController.class);
@Autowired
private ContactsRepository contactsRes;
@ -85,15 +82,22 @@ public class ContactsController extends Handler{
@RequestMapping("/index")
@Menu(type = "customer", subtype = "index")
public ModelAndView index(ModelMap map , HttpServletRequest request , @Valid String q , @Valid String ckind) {
public ModelAndView index(ModelMap map, HttpServletRequest request, @Valid String q, @Valid String ckind) throws CSKefuException {
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
if(!super.esOrganFilter(request, boolQueryBuilder)){
return request(super.createAppsTempletResponse("/apps/business/contacts/index"));
}
if (!StringUtils.isBlank(q)) {
map.put("q", q);
}
if (!StringUtils.isBlank(ckind)) {
boolQueryBuilder.must(termQuery("ckind", ckind));
map.put("ckind", ckind);
}
map.addAttribute("contactsList", contactsRes.findByCreaterAndSharesAndOrgi(super.getUser(request).getId(), super.getUser(request).getId(), super.getOrgi(request), null, null, false, boolQueryBuilder, q, new PageRequest(super.getP(request), super.getPs(request))));
return request(super.createAppsTempletResponse("/apps/business/contacts/index"));

16
contact-center/app/src/main/java/com/chatopera/cc/webim/web/model/User.java
View File

@ -17,11 +17,7 @@
package com.chatopera.cc.webim.web.model;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -104,6 +100,7 @@ public class User implements java.io.Serializable{
private int fans; //粉丝
private int follows; //关注
private int integral; //积分
private HashSet<String> myorgans = new HashSet<>();
private List<Role> roleList = new ArrayList<Role>();
private Map<String ,Object> roleAuthMap = new HashMap<String ,Object>();
@ -517,4 +514,13 @@ public class User implements java.io.Serializable{
public void setOrdertype(String ordertype) {
this.ordertype = ordertype;
}
@Transient
public HashSet<String> getMyorgans() {
return myorgans;
}
public void setMyorgans(HashSet<String> myorgans) {
this.myorgans = myorgans;
}
}

60
contact-center/app/src/main/resources/templates/admin/organ/auth.html
View File

@ -1,60 +0,0 @@
<div class="uk-layui-form">
<form class="layui-form uk-form" action="/admin/organ/auth/save.html">
<input type="hidden" name="id" value="${organData.id!''}">
<input type="hidden" name="menus" id="menus" value="<#if organRoleList??><#list organRoleList as organRole><#if organRole_index gt 0>,</#if>${organRole.dicid!''}</#list></#if>">
<div class="layui-form-item">
<div class="layui-input-inline">
<ul id="organTree" class="ztree"></ul>
</div>
</div>
<div class="layui-form-button">
<div class="layui-button-block">
<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div>
</div>
</form>
</div>
<SCRIPT type="text/javascript">
var setting = {
check: {
enable: true
},
data: {
simpleData: {
enable: true
}
},
callback: {
onCheck: zTreeOnCheck
}
};
//获取所有选中节点的值
function zTreeOnCheck() {
var treeObj = $.fn.zTree.getZTreeObj("organTree");
var nodes = treeObj.getCheckedNodes(true);
var msg = "";
for (var i = 0; i < nodes.length; i++) {
if(msg!='' && nodes[i].id != ''){
msg = msg+"," ;
}
msg += nodes[i].id;
}
$("#menus").val(msg);
}
var zNodes =[
<#if sysDic??>{ id:'${sysDic.id!''}', pId:'0', name:"菜单资源", open:true , value : ""}</#if>
<#if resourceList??>
<#list resourceList as dic>
,{ id:'${dic.id}', pId:'${dic.parentid!''}' <#if organRoleList??><#list organRoleList as organRole><#if organRole.dicid?? && organRole.dicid == dic.id>,checked:true</#if></#list></#if> , name:"${dic.name!''}" , value : "${dic.code!''}", open:true , icon : "<#if dic.level?? && (dic.level == '1' || dic.level == '2')>/images/dir.png<#else>/images/menu.png</#if>"}
</#list>
</#if>
];
$(document).ready(function(){
$.fn.zTree.init($("#organTree"), setting, zNodes);
});
</SCRIPT>

3
contact-center/app/src/main/resources/templates/admin/organ/index.html
View File

@ -31,9 +31,6 @@
<button class="layui-btn layui-btn-danger layui-btn-small" href="/admin/organ/delete.html?id=${organData.id!''}" data-toggle="tip" data-title="请确认是否删除该部门？">
删除部门
</button>
<button class="layui-btn layui-btn-danger layui-btn-small" href="/admin/organ/auth.html?id=${organData.id!''}" data-toggle="ajax" title="给机构授权角色" data-width="400" data-height="450">
部门授权
</button>
</#if>
</span>
</h1>