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

添加节点类型、标签等

master
陈裕财 4 years ago
parent
13413ec6ce
commit
0c8e121ff8
3 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
  2. 6
      xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java
  3. 3
      xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java

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

@ -121,7 +121,7 @@ public class XmProjectGroupController {
xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId());
xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】");
}else {
xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId());
xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId());
xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】");
}
@ -228,11 +228,13 @@ public class XmProjectGroupController {
if(!projectAdmMap.containsKey(u.getUserid())) {
return ResponseHelper.failed("not-project-adm","您不是项目管理人员，不能创建小组。项目级助理以上人员可以创建小组。");
}
xmProjectGroup.setProductId(null);
}else{
if(!StringUtils.hasText(xmProjectGroup.getProductId())){
return ResponseHelper.failed("productId-0","产品编号不能为空");
}
XmProduct product = xmProductService.selectOneObject(new XmProduct(xmProjectGroup.getProductId()));
if(product==null){
return ResponseHelper.failed("product-0","产品已不存在");
@ -245,6 +247,7 @@ public class XmProjectGroupController {
if(!productAdmMap.containsKey(u.getUserid())) {
return ResponseHelper.failed("not-product-adm","您不是产品管理人员，不能创建小组。产品级助理及以上人员可以创建小组。");
}
xmProjectGroup.setProjectId(null);
}
if (StringUtils.isEmpty(xmProjectGroup.getId())) {
xmProjectGroup.setId(xmProjectGroupService.createKey("id"));
@ -263,7 +266,7 @@ public class XmProjectGroupController {
xmRecordService.addXmProductGroupRecord(xmProjectGroup.getProductId(),xmProjectGroup.getId(),"团队-小组-新增小组","新增小组【"+xmProjectGroup.getGroupName()+"】");
}else {
xmProjectGroupCacheService.clearProjectGroup(xmProjectGroup.getProjectId(),xmProjectGroup.getId());
xmProjectGroupCacheService.clearProjectGroup(xmProjectGroup.getProjectId());
xmRecordService.addXmProductGroupRecord(xmProjectGroup.getProductId(),xmProjectGroup.getId(),"团队-小组-新增小组","新增小组【"+xmProjectGroup.getGroupName()+"】");
}
m.put("data",xmProjectGroup);
@ -297,7 +300,7 @@ public class XmProjectGroupController {
}
if(!"1".equals(groupDb.getPgClass())) {
if(StringUtils.hasText(groupDb.getProjectId())){
XmProject project = xmProjectService.getProjectFromCache(xmProjectGroup.getProjectId());
XmProject project = xmProjectService.getProjectFromCache(groupDb.getProjectId());
if(project==null){
return ResponseHelper.failed("project-0","项目已不存在");
}
@ -310,7 +313,7 @@ public class XmProjectGroupController {
}else{
if(!StringUtils.hasText(xmProjectGroup.getProductId())){
XmProduct product = xmProductService.selectOneObject(new XmProduct(xmProjectGroup.getProductId()));
XmProduct product = xmProductService.selectOneObject(new XmProduct(groupDb.getProductId()));
if(product==null){
return ResponseHelper.failed("product-0","产品已不存在");
}
@ -329,7 +332,7 @@ public class XmProjectGroupController {
xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId());
xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】");
}else {
xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId());
xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId());
xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】");
}

6
xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java
View File

@ -136,8 +136,8 @@ public class XmProjectGroupService extends BaseService {
}
List<XmProjectGroupUser> groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProjectId(projectId);
if(groupUserList==null || groupUserList.size()==0) {
groupCacheService.putProjectGroups(projectId, groupVoList);
return groupVoList;
//groupCacheService.putProjectGroups(projectId, groupVoList);
//return groupVoList;
}
groupList.forEach(g -> {
XmProjectGroupVo gvo = new XmProjectGroupVo();
@ -216,8 +216,6 @@ public class XmProjectGroupService extends BaseService {
}
List<XmProjectGroupUser> groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProductId(productId);
if(groupUserList==null || groupUserList.size()==0) {
groupCacheService.putProductGroups(productId, groupVoList);
return groupVoList;
}
groupList.forEach(g -> {
XmProjectGroupVo gvo = new XmProjectGroupVo();

3
xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java
View File

@ -63,9 +63,8 @@ public class XmProjectGroupCacheService {
/**
*
* @param projectId
* @param groupId
*/
public void clearProjectGroup(String projectId,String groupId){
public void clearProjectGroup(String projectId){
String key=this.getProjectKey(projectId);
this.clearProjectGroups(projectId);
}

Write Preview
Loading…
Cancel
Save