end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

团队重构

master
陈裕财 3 years ago
parent
692fb6b55e
commit
5e01b5d5c7
2 changed files with 381 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      xm-core/src/main/java/com/xm/core/QxTool.java
  2. 373
      xm-core/src/main/java/com/xm/core/service/XmProjectQxService.java

16
xm-core/src/main/java/com/xm/core/QxTool.java
View File

@ -23,19 +23,19 @@ public class QxTool {
* @param qxCode * @param qxCode
* @return * @return
*/ */
public static String getProjectScopeQx(String qxCode){
public static String getProjectScopeQx(String qxCode,int teamType){
String def="2"; String def="2";
if(StringUtils.isEmpty(qxCode)){ if(StringUtils.isEmpty(qxCode)){
return def; return def;
}else{ }else{
if(qxCode.length()<1){
if(qxCode.length()<(teamType*2)){
return def; return def;
}else{ }else{
String[] qxCodeArr=qxCode.split(","); String[] qxCodeArr=qxCode.split(",");
if(qxCodeArr.length<1){
if(qxCodeArr.length<(teamType*2)){
return def; return def;
}else{ }else{
return qxCodeArr[0];
return qxCodeArr[teamType*2];
} }
} }
} }
@ -46,19 +46,19 @@ public class QxTool {
* @param qxCode * @param qxCode
* @return * @return
*/ */
public static String getProjectTransmitQx(String qxCode){
public static String getProjectTransmitQx(String qxCode,int teamType){
String def="0"; String def="0";
if(StringUtils.isEmpty(qxCode)){ if(StringUtils.isEmpty(qxCode)){
return def; return def;
}else{ }else{
if(qxCode.length()<2){
if(qxCode.length()<(2*teamType+1)){
return def; return def;
}else{ }else{
String[] qxCodeArr=qxCode.split(","); String[] qxCodeArr=qxCode.split(",");
if(qxCodeArr.length<2){
if(qxCodeArr.length<(2*teamType+1)){
return def; return def;
}else{ }else{
return qxCodeArr[1];
return qxCodeArr[(2*teamType+1)];
} }
} }
} }

373
xm-core/src/main/java/com/xm/core/service/XmProjectQxService.java
View File

@ -0,0 +1,373 @@
package com.xm.core.service;
import com.mdp.core.entity.Tips;
import com.mdp.safe.client.entity.User;
import com.xm.core.QxTool;
import com.xm.core.entity.XmProject;
import com.xm.core.service.client.SysClient;
import com.xm.core.vo.XmGroupVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class XmProjectQxService {
@Autowired
XmGroupService xmGroupService;
@Autowired
SysClient sysClient;
/**
*
* @param xmProject
* @param teamType 0-任务相关 1-测试相关,2-迭代相关
* @param head
* @return
*/
public Tips checkProjectQx(XmProject xmProject, int teamType, User head){
return this.checkProjectQx(null,xmProject,teamType,head);
}
/**
*
* @param groupsMap 项目组缓存数据，当需要循环执行时，避免多次查询缓存与数据库
* @param xmProject
* @param teamType 0-任务相关 1-测试相关,2-迭代相关
* @param head
* @return
*/
public Tips checkProjectQx(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,User head){
Tips tips=this.checkProjectScopeQx(groupsMap,xmProject,teamType,head.getUserid(),head.getUsername(),head.getBranchId());
return tips;
}
/**
*
* @param groupsMap 项目组缓存数据，当需要循环执行时，避免多次查询缓存与数据库
* @param xmProject
* @param teamType 0-任务相关 1-测试相关,2-迭代相关
* @param head
* @return
*/
public Tips checkProjectQx(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,User head,String memUserid,String memUsername,String memBranchId){
Tips tips=new Tips("成功");
boolean headIsPm=xmGroupService.checkUserIsProjectAdm(xmProject,head.getUserid());
if(headIsPm){
return tips;
}
tips=this.checkProjectScopeQx(groupsMap,xmProject,teamType,head,memUserid,memUsername,memBranchId);
if(!tips.isOk()){
return tips;
}
return this.checkProjectTransmitQx(groupsMap,xmProject,teamType,head,memUserid,memUsername);
}
public Tips checkProjectScopeQx(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,User head,String memUserid,String memUsername,String memBranchId){
Tips tips=new Tips("成功");
if(!StringUtils.hasText(memUserid)|| memUserid.equals(head.getUserid())){
return this.checkProjectScopeQx(groupsMap,xmProject,teamType,head.getUserid(),head.getUsername(),head.getBranchId());
}
String headUsername=StringUtils.hasText(head.getUsername())?head.getUsername():head.getUserid();
String scopeQx= QxTool.getProjectScopeQx(xmProject.getQxCode(),teamType);
memUsername=StringUtils.hasText(memUsername)?memUsername:memUserid;
boolean headIsPm=xmGroupService.checkUserIsProjectAdm(xmProject,head.getUserid());
if("1".equals(scopeQx)){//同组织
if( !headIsPm && !head.getBranchId().equals(xmProject.getBranchId())){
tips.setFailureMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),headUsername,xmProject.getBranchId()));
return tips;
}
if(xmGroupService.checkUserIsProjectAdm(xmProject,memUserid)){
return tips;
}
if(StringUtils.hasText(memBranchId)){
User sysU=sysClient.getUserByUserid(memUserid);
if(sysU==null || StringUtils.isEmpty(sysU.getUserid())){
return tips;
}
if(sysU.getBranchId().equals(xmProject.getBranchId())){
return tips;
}
}else if (memBranchId.equals(xmProject.getBranchId())){
return tips;
}
tips.setFailureMsg("pdqx-scope-branch-1",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUsername,xmProject.getBranchId()));
return tips;
}else if("2".equals(scopeQx)){//同项目
List<XmGroupVo> groups=this.getProjectGroupsFromLocalCache(groupsMap,xmProject.getId());
if( !headIsPm && !xmGroupService.checkUserExistsGroup(groups, head.getUserid())){
tips.setFailureMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),headUsername));
return tips;
};
if(xmGroupService.checkUserIsProjectAdm(xmProject,memUserid)){
return tips;
}
if( xmGroupService.checkUserExistsGroup(groups,memUserid) ){
return tips;
};
tips.setFailureMsg("pdqx-scope-product-1",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUsername));
return tips;
}else if("3".equals(scopeQx)){//同小组
List<XmGroupVo> groups=this.getProjectGroupsFromLocalCache(groupsMap,xmProject.getId());
List<XmGroupVo> headGroups=groups;
if( !headIsPm ){
headGroups=xmGroupService.getUserGroups(groups,head.getUserid());
if( headGroups==null || headGroups.size()==0 ){
tips.setFailureMsg("pdqx-scope-team-1",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),headUsername));
return tips;
}
}
if(xmGroupService.checkUserIsProjectAdm(xmProject,memUserid)){
return tips;
}
List<XmGroupVo> memGroups=xmGroupService.getUserGroups(headGroups,memUserid);
if( memGroups!=null && memGroups.size()>0 ){
return tips;
}
tips.setFailureMsg("pdqx-scope-team-2",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUsername));
return tips;
}
return tips;
}
/**
* 检查用户是否满足项目权限控制要求
* @param xmProject
* @param teamType
* @param memUserid
* @param memUsername 只用于显示
* @param memBranchId
* @return
*/
public Tips checkProjectScopeQx(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,String memUserid,String memUsername,String memBranchId){
Tips tips=new Tips("成功");
String scopeQx= QxTool.getProjectScopeQx(xmProject.getQxCode(),teamType);
boolean isPm=xmGroupService.checkUserIsProjectAdm(xmProject,memUserid);
if(isPm){
return tips;
}
memUsername=StringUtils.hasText(memUsername)?memUsername:memUserid;
if("1".equals(scopeQx)){//同组织
if(!StringUtils.hasText(memBranchId)){
User sysUser=sysClient.getUserByUserid(memUserid);
if(sysUser==null || StringUtils.isEmpty(sysUser.getUserid())){
//如果账户不存在，可能已注销，再判断没有意义，会导致企业无法操作遗留数据问题
//tips.setFailureMsg("no-qx-branchId","项目【"+xmProject.getId()+"】只开放给同企业人员。");
return tips;
}
memBranchId=sysUser.getBranchId();
if(!sysUser.getBranchId().equals(xmProject.getBranchId())){
tips.setFailureMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUsername,xmProject.getBranchId()));
return tips;
}
}else{
if(!memBranchId.equals(xmProject.getBranchId())){
tips.setFailureMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUsername,xmProject.getBranchId()));
return tips;
}
}
}else if("2".equals(scopeQx)){//同项目
if(!xmGroupService.checkUserExistsGroup(getProjectGroupsFromLocalCache(groupsMap,xmProject.getId()), memUserid)){
tips.setFailureMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUsername));
return tips;
};
}else if("3".equals(scopeQx)){//同小组
if(!xmGroupService.checkUserExistsGroup(getProjectGroupsFromLocalCache(groupsMap,xmProject.getId()), memUserid)){
tips.setFailureMsg("pdqx-scope-team-0",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUsername));
return tips;
}
}
return tips;
}
public Tips checkProjectTransmitQx(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,User head){
return checkProjectTransmitQx(groupsMap,xmProject,teamType,head,null,null);
}
public Tips checkProjectTransmitQx(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,User head,String memUserid,String memUsername){
Tips tips=new Tips("成功");
if(!StringUtils.hasText(memUserid) || memUserid.equals(head.getUserid())){
return tips;
}
String transmitQx= QxTool.getProjectTransmitQx(xmProject.getQxCode(),teamType);
if("0".equals(transmitQx)){//不检查上下级关系
return tips;
}else if("1".equals(transmitQx)){//检查上下级关系
if(StringUtils.isEmpty(memUserid)||head.getUserid().equals(memUserid)){
return tips;
}
List<XmGroupVo> groups=getProjectGroupsFromLocalCache(groupsMap,xmProject.getId());
if(xmGroupService.checkUserIsOtherUserTeamHeadOrAss(groups, head.getUserid(), memUserid)){
return tips;
}
tips.setFailureMsg("pdqx-transmit-0",
String.format("项目【%s】开启了上下级关系检查，您当前账户【%s】不属于账户【%s】的上级，无权操作。",xmProject.getId(),head.getUsername(),memUsername));
}
return tips;
}
public Tips checkProjectQxBatch(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,User head,String ...memUserids){
Tips tips=new Tips("成功");
tips=this.checkProjectScopeQxBatch(groupsMap,xmProject,teamType,head,memUserids);
if(!tips.isOk()){
return tips;
}
return this.checkProjectTransmitQxBatch(groupsMap,xmProject,teamType,head.getUserid(),memUserids);
}
public Tips checkProjectQxBatch(XmProject xmProject,int teamType,User head,String ...memUserids){
Tips tips=new Tips("成功");
if(xmGroupService.checkUserIsProjectAdm(xmProject,head.getUserid())){
return tips;
}
Map<String,List<XmGroupVo>> groupsMap=new HashMap<>();
tips=this.checkProjectScopeQxBatch(groupsMap,xmProject,teamType,head,memUserids);
if(!tips.isOk()){
return tips;
}
return this.checkProjectTransmitQxBatch(groupsMap,xmProject,teamType,head.getUserid(),memUserids);
}
public Tips checkProjectScopeQxBatch(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,User head,String ...memUserids){
Tips tips=new Tips("成功");
if(memUserids==null || memUserids.length==0){
return this.checkProjectScopeQx(groupsMap,xmProject,teamType,head.getUserid(),head.getUsername(),head.getBranchId());
}
Set<String> memUseridSet= Arrays.stream(memUserids).filter(k->StringUtils.hasText(k)&&!k.equals(head.getUserid())).collect(Collectors.toSet());
if(memUseridSet.size()==0){
return this.checkProjectScopeQx(groupsMap,xmProject,teamType,head.getUserid(),head.getUsername(),head.getBranchId());
}
String username=head.getUsername();
String scopeQx= QxTool.getProjectScopeQx(xmProject.getQxCode(),teamType);
boolean headIsPm=xmGroupService.checkUserIsProjectAdm(xmProject,head.getUserid());
if("1".equals(scopeQx)){//同组织
if( !headIsPm && !head.getBranchId().equals(xmProject.getBranchId())){
tips.setFailureMsg("pdqx-scope-branch-0",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),username,xmProject.getBranchId()));
return tips;
}
boolean isAllNull=true;
for (String memUserid : memUseridSet) {//只要有一个满足条件即可
if(xmGroupService.checkUserIsProjectAdm(xmProject,memUserid)){
return tips;
}
User sysU=sysClient.getUserByUserid(memUserid);
if(sysU==null || StringUtils.isEmpty(sysU.getUserid())){
continue;
}
isAllNull=false;
if(sysU.getBranchId().equals(xmProject.getBranchId())){
return tips;
}
}
if(isAllNull){
return tips;
}else{
tips.setFailureMsg("pdqx-scope-branch-1",String.format("项目【%s】只开放给同企业人员,【%s】不在企业【%s】中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(",")),xmProject.getBranchId()));
return tips;
}
}else if("2".equals(scopeQx)){//同项目
List<XmGroupVo> groups=this.getProjectGroupsFromLocalCache(groupsMap,xmProject.getId());
if( !headIsPm && !xmGroupService.checkUserExistsGroup(groups, head.getUserid())){
tips.setFailureMsg("pdqx-scope-product-0",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),username));
return tips;
};
for (String memUserid : memUseridSet) {
if(xmGroupService.checkUserIsProjectAdm(xmProject,memUserid)){
return tips;
}
if( xmGroupService.checkUserExistsGroup(groups,memUserid) ){
return tips;
};
}
tips.setFailureMsg("pdqx-scope-product-1",String.format("项目【%s】只开放给同一个项目团队人员,【%s】不在项目团队中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(","))));
return tips;
}else if("3".equals(scopeQx)){//同小组
List<XmGroupVo> groups=this.getProjectGroupsFromLocalCache(groupsMap,xmProject.getId());
List<XmGroupVo> headGroups=groups;
if( !headIsPm ){
headGroups=xmGroupService.getUserGroups(groups,head.getUserid());
if( headGroups==null || headGroups.size()==0 ){
tips.setFailureMsg("pdqx-scope-team-1",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),username));
return tips;
}
}
for (String memUserid : memUseridSet) {
if(xmGroupService.checkUserIsProjectAdm(xmProject,memUserid)){
return tips;
}
List<XmGroupVo> memGroups=xmGroupService.getUserGroups(headGroups,memUserid);
if( memGroups!=null && memGroups.size()>0 ){
return tips;
}
}
tips.setFailureMsg("pdqx-scope-team-2",String.format("项目【%s】只开放给同一个项目团队下同一个小组人员,【%s】不在项目团队中。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(","))));
return tips;
}
return tips;
}
List<XmGroupVo> getProjectGroupsFromLocalCache(Map<String,List<XmGroupVo>> groupsMap,String productId){
List<XmGroupVo> groupVoList=null;
if(groupsMap!=null && groupsMap.containsKey(productId)){
groupVoList=groupsMap.get(productId);
}else{
groupVoList=xmGroupService.getProjectGroupVoList(productId);
if(groupsMap!=null){
groupsMap.put(productId,groupVoList);
}
}
return groupVoList;
}
public Tips checkProjectTransmitQxBatch(Map<String,List<XmGroupVo>> groupsMap,XmProject xmProject,int teamType,String headUserid,String ...memUserids){
Tips tips=new Tips("成功");
String transmitQx= QxTool.getProjectTransmitQx(xmProject.getQxCode(),teamType);
if("0".equals(transmitQx)){//不检查上下级关系
return tips;
}else if("1".equals(transmitQx)){//检查上下级关系
if(memUserids==null || memUserids.length==0){
return tips;
}
Set<String> memUseridSet= Arrays.stream(memUserids).filter(k->StringUtils.hasText(k) && !k.equals(headUserid)).collect(Collectors.toSet());
if(memUseridSet.size()==0){
return tips;
}
List<XmGroupVo> groups=getProjectGroupsFromLocalCache(groupsMap,xmProject.getId());
for (String memUserid : memUseridSet) {
if(xmGroupService.checkUserIsOtherUserTeamHeadOrAss(groups,headUserid,memUserid)){
return tips;
}
}
tips.setFailureMsg("pdqx-transmit-0",
String.format("项目【%s】开启了上下级关系检查，您当前账户不属于【%s】中任意账户的上级，无权操作。",xmProject.getId(),memUseridSet.stream().collect(Collectors.joining(","))));
}
return tips;
}
}
Write Preview
Loading…
Cancel
Save