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

分布式本地缓存

master
陈裕财 3 years ago
parent
5611041a5e
commit
26d191c076
3 changed files with 12 additions and 14 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. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
  2. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  3. 13
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

5
xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
View File

@ -16,7 +16,6 @@ import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.*; import com.xm.core.entity.*;
import com.xm.core.service.*; import com.xm.core.service.*;
import com.xm.core.service.push.XmPushMsgService; import com.xm.core.service.push.XmPushMsgService;
import com.xm.core.vo.XmGroupVo;
import com.xm.core.vo.XmQuestionVo; import com.xm.core.vo.XmQuestionVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -382,10 +381,10 @@ public class XmQuestionController {
String handlerUserid= (String) xmQuestionMap.get("handlerUserid"); String handlerUserid= (String) xmQuestionMap.get("handlerUserid");
String handlerUsername= (String) xmQuestionMap.get("handlerUsername"); String handlerUsername= (String) xmQuestionMap.get("handlerUsername");
XmQuestion xmQuedb=canOper.get(0); XmQuestion xmQuedb=canOper.get(0);
Tips tips1=productQxService.checkProductScopeQx(null,productService.getProductFromCache(xmQuedb.getProductId()),1,user,handlerUserid,handlerUsername,null);
Tips tips1=productQxService.checkProductScopeQx(productService.getProductFromCache(xmQuedb.getProductId()),1,user,handlerUserid,handlerUsername,null);
if(!tips1.isOk()){ if(!tips1.isOk()){
if(StringUtils.hasText(xmQuedb.getProjectId())){ if(StringUtils.hasText(xmQuedb.getProjectId())){
tips1=projectQxService.checkProjectScopeQx(null,projectService.getProjectFromCache(xmQuedb.getProjectId()),1,user,handlerUserid,handlerUsername,null);
tips1=projectQxService.checkProjectScopeQx(projectService.getProjectFromCache(xmQuedb.getProjectId()),1,user,handlerUserid,handlerUsername,null);
} }
if(!tips1.isOk()){ if(!tips1.isOk()){
return failed(tips1); return failed(tips1);

8
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
View File

@ -583,7 +583,7 @@ public class XmTaskController {
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
if(StringUtils.hasText(xmTaskVo.getCreateUserid()) && !xmTaskVo.getCreateUserid().equals(user.getUserid())){ if(StringUtils.hasText(xmTaskVo.getCreateUserid()) && !xmTaskVo.getCreateUserid().equals(user.getUserid())){
tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),null);
tips1=projectQxService.checkProjectQx(xmProject,2,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),null);
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -726,7 +726,7 @@ public class XmTaskController {
XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId());
if(xmProject!=null && groupService.checkUserIsProjectAdm(xmProject,user.getUserid())){ if(xmProject!=null && groupService.checkUserIsProjectAdm(xmProject,user.getUserid())){
Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
Tips tips1=projectQxService.checkProjectQx(xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -838,7 +838,7 @@ public class XmTaskController {
} }
XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId());
Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
Tips tips1=projectQxService.checkProjectQx(xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -982,7 +982,7 @@ public class XmTaskController {
String projectId=batchImportVo.getProjectId(); String projectId=batchImportVo.getProjectId();
String productId=batchImportVo.getProductId(); String productId=batchImportVo.getProductId();
XmProject xmProject=xmProjectService.getProjectFromCache(projectId); XmProject xmProject=xmProjectService.getProjectFromCache(projectId);
Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user);
Tips tips1=projectQxService.checkProjectQx(xmProject,2,user);
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }

13
xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
View File

@ -208,7 +208,7 @@ public class XmTaskExecuserController {
xmTaskExecuser.setStatus("0"); //如果是众包，智能添加为候选人 xmTaskExecuser.setStatus("0"); //如果是众包，智能添加为候选人
}else { }else {
//如果不是众包，需要判断是否已加入项目组组织架构中，如未加入，需要提示其先加入 //如果不是众包，需要判断是否已加入项目组组织架构中，如未加入，需要提示其先加入
tips=projectQxService.checkProjectQx(null,xmProjectDb,0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
tips=projectQxService.checkProjectQx(xmProjectDb,0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
}; };
@ -282,7 +282,7 @@ public class XmTaskExecuserController {
break; break;
} }
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务 if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
}; };
@ -358,8 +358,7 @@ public class XmTaskExecuserController {
if(xmProject==null ){ if(xmProject==null ){
return ResponseHelper.failed("project-0","项目已不存在"); return ResponseHelper.failed("project-0","项目已不存在");
} }
groupsMap.put(xmProject.getId(),pgroups);
tips=projectQxService.checkProjectQx(xmProject,2,user); tips=projectQxService.checkProjectQx(xmProject,2,user);
if(tips.isOk()) { if(tips.isOk()) {
@ -542,7 +541,7 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId(); String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
} }
if(tips.isOk()) { if(tips.isOk()) {
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid())); XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid()));
@ -592,7 +591,7 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId(); String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
} }
if(tips.isOk()) { if(tips.isOk()) {
xmTaskExecuserService.becomeCandidate(xmTaskExecuser); xmTaskExecuserService.becomeCandidate(xmTaskExecuser);
@ -637,7 +636,7 @@ public class XmTaskExecuserController {
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskDb.getId(),xmTaskExecuser.getUserid())); XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskDb.getId(),xmTaskExecuser.getUserid()));
if(xmTaskExecuserDb !=null ) { if(xmTaskExecuserDb !=null ) {
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId());
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId());
} }
if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) { if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) {
xmTaskExecuserService.delete(xmTaskExecuser); xmTaskExecuserService.delete(xmTaskExecuser);

Write Preview
Loading…
Cancel
Save