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

添加节点类型、标签等

master
陈裕财 4 years ago
parent
ea21d78129
commit
4844317f71
3 changed files with 25 additions and 22 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. 17
      xm-core/src/main/java/com/xm/core/service/XmMenuService.java
  2. 15
      xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
  3. 15
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java

17
xm-core/src/main/java/com/xm/core/service/XmMenuService.java
View File

@ -60,7 +60,7 @@ public class XmMenuService extends BaseService {
if(addList.size()>0) { if(addList.size()>0) {
this.batchInsert(addList); this.batchInsert(addList);
List<XmMenu> list= addList.stream().filter(i->!addList.stream().filter(k->k.getMenuId().equals(i.getPmenuId())).findAny().isPresent()).collect(Collectors.toList());
List<XmMenu> list= addList.stream().filter(i->!xmMenus.stream().filter(k->k.getMenuId().equals(i.getPmenuId())).findAny().isPresent()).collect(Collectors.toList());
list=list.stream().filter(i-> StringUtils.hasText(i.getPmenuId())).collect(Collectors.toList()); list=list.stream().filter(i-> StringUtils.hasText(i.getPmenuId())).collect(Collectors.toList());
if(list.size()>0){ if(list.size()>0){
this.updateChildrenCntByIds(list.stream().map(i->i.getPmenuId()).collect(Collectors.toSet()).stream().collect(Collectors.toList())); this.updateChildrenCntByIds(list.stream().map(i->i.getPmenuId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()));
@ -87,10 +87,11 @@ public class XmMenuService extends BaseService {
for (XmMenu node : noExistsList) { for (XmMenu node : noExistsList) {
if(hadCalcMap.containsKey(node.getPmenuId())){ if(hadCalcMap.containsKey(node.getPmenuId())){
String idPaths=hadCalcMap.get(node.getPmenuId()); String idPaths=hadCalcMap.get(node.getPmenuId());
node.setPidPaths(idPaths);
node.setPidPaths(idPaths+node.getMenuId()+",");
}else{ }else{
this.parentIdPathsCalcBeforeSave(node); this.parentIdPathsCalcBeforeSave(node);
String idPaths=node.getPidPaths(); String idPaths=node.getPidPaths();
idPaths=idPaths.substring(0,idPaths.length()-node.getMenuId().length()-1);
hadCalcMap.put(node.getPmenuId(),idPaths); hadCalcMap.put(node.getPmenuId(),idPaths);
} }
} }
@ -101,7 +102,7 @@ public class XmMenuService extends BaseService {
} }
if(hadCalcMap.containsKey(node.getPmenuId())){ if(hadCalcMap.containsKey(node.getPmenuId())){
String idPaths=hadCalcMap.get(node.getPmenuId()); String idPaths=hadCalcMap.get(node.getPmenuId());
node.setPidPaths(idPaths);
node.setPidPaths(idPaths+node.getMenuId()+",");
}else{ }else{
List<XmMenu> pnodeList=this.getParentList(node,nodes); List<XmMenu> pnodeList=this.getParentList(node,nodes);
XmMenu topParent=pnodeList.get(pnodeList.size()-1); XmMenu topParent=pnodeList.get(pnodeList.size()-1);
@ -112,13 +113,13 @@ public class XmMenuService extends BaseService {
for (int i = pnodeList.size() - 1; i >= 0; i--) { for (int i = pnodeList.size() - 1; i >= 0; i--) {
idPath=idPath+pnodeList.get(i).getMenuId()+","; idPath=idPath+pnodeList.get(i).getMenuId()+",";
} }
node.setPidPaths(idPath);
node.setPidPaths(idPath+node.getMenuId()+",");
} }
} }
for (XmMenu node : nodes) { for (XmMenu node : nodes) {
String idPaths=node.getPidPaths(); String idPaths=node.getPidPaths();
String[] idpss=idPaths.split(","); String[] idpss=idPaths.split(",");
node.setLvl(idpss.length);
node.setLvl(idpss.length-1);
} }
return nodes; return nodes;
} }
@ -126,7 +127,7 @@ public class XmMenuService extends BaseService {
public Tips parentIdPathsCalcBeforeSave(XmMenu currNode) { public Tips parentIdPathsCalcBeforeSave(XmMenu currNode) {
Tips tips = new Tips("成功"); Tips tips = new Tips("成功");
if (!StringUtils.hasText(currNode.getPmenuId()) || "0".equals(currNode.getPmenuId())) { if (!StringUtils.hasText(currNode.getPmenuId()) || "0".equals(currNode.getPmenuId())) {
currNode.setPidPaths("0,");
currNode.setPidPaths("0," + currNode.getMenuId() + ",");
return tips; return tips;
} else { } else {
List<XmMenu> parentList=this.getParentList(currNode); List<XmMenu> parentList=this.getParentList(currNode);
@ -134,11 +135,11 @@ public class XmMenuService extends BaseService {
for (int i = parentList.size() - 1; i >= 0; i--) { for (int i = parentList.size() - 1; i >= 0; i--) {
idPath=idPath+parentList.get(i).getMenuId()+","; idPath=idPath+parentList.get(i).getMenuId()+",";
} }
currNode.setPidPaths(idPath);
currNode.setPidPaths(idPath+currNode.getMenuId()+",");
String idPaths=currNode.getPidPaths(); String idPaths=currNode.getPidPaths();
String[] idpss=idPaths.split(","); String[] idpss=idPaths.split(",");
currNode.setLvl(idpss.length);
currNode.setLvl(idpss.length-1);
} }
return tips; return tips;
} }

15
xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
View File

@ -251,10 +251,11 @@ public class XmProjectPhaseService extends BaseService {
for (XmProjectPhase node : noExistsList) { for (XmProjectPhase node : noExistsList) {
if(hadCalcMap.containsKey(node.getParentPhaseId())){ if(hadCalcMap.containsKey(node.getParentPhaseId())){
String idPaths=hadCalcMap.get(node.getParentPhaseId()); String idPaths=hadCalcMap.get(node.getParentPhaseId());
node.setPidPaths(idPaths);
node.setPidPaths(idPaths+node.getId()+",");
}else{ }else{
this.parentIdPathsCalcBeforeSave(node); this.parentIdPathsCalcBeforeSave(node);
String idPaths=node.getPidPaths(); String idPaths=node.getPidPaths();
idPaths=idPaths.substring(0,idPaths.length()-node.getId().length()-1);
hadCalcMap.put(node.getParentPhaseId(),idPaths); hadCalcMap.put(node.getParentPhaseId(),idPaths);
} }
} }
@ -265,7 +266,7 @@ public class XmProjectPhaseService extends BaseService {
} }
if(hadCalcMap.containsKey(node.getParentPhaseId())){ if(hadCalcMap.containsKey(node.getParentPhaseId())){
String idPaths=hadCalcMap.get(node.getParentPhaseId()); String idPaths=hadCalcMap.get(node.getParentPhaseId());
node.setPidPaths(idPaths);
node.setPidPaths(idPaths+node.getId()+",");
}else{ }else{
List<XmProjectPhase> pnodeList=this.getParentList(node,nodes); List<XmProjectPhase> pnodeList=this.getParentList(node,nodes);
XmProjectPhase topParent=pnodeList.get(pnodeList.size()-1); XmProjectPhase topParent=pnodeList.get(pnodeList.size()-1);
@ -276,13 +277,13 @@ public class XmProjectPhaseService extends BaseService {
for (int i = pnodeList.size() - 1; i >= 0; i--) { for (int i = pnodeList.size() - 1; i >= 0; i--) {
idPath=idPath+pnodeList.get(i).getId()+","; idPath=idPath+pnodeList.get(i).getId()+",";
} }
node.setPidPaths(idPath);
node.setPidPaths(idPath+node.getId()+",");
} }
} }
for (XmProjectPhase node : nodes) { for (XmProjectPhase node : nodes) {
String idPaths=node.getPidPaths(); String idPaths=node.getPidPaths();
String[] idpss=idPaths.split(","); String[] idpss=idPaths.split(",");
node.setLvl(idpss.length);
node.setLvl(idpss.length-1);
} }
return nodes; return nodes;
} }
@ -297,7 +298,7 @@ public class XmProjectPhaseService extends BaseService {
public Tips parentIdPathsCalcBeforeSave(XmProjectPhase currNode) { public Tips parentIdPathsCalcBeforeSave(XmProjectPhase currNode) {
Tips tips = new Tips("成功"); Tips tips = new Tips("成功");
if (!StringUtils.hasText(currNode.getParentPhaseId()) || "0".equals(currNode.getParentPhaseId())) { if (!StringUtils.hasText(currNode.getParentPhaseId()) || "0".equals(currNode.getParentPhaseId())) {
currNode.setPidPaths("0,");
currNode.setPidPaths("0," + currNode.getId() + ",");
return tips; return tips;
} else { } else {
List<XmProjectPhase> parentList=this.getParentList(currNode); List<XmProjectPhase> parentList=this.getParentList(currNode);
@ -305,11 +306,11 @@ public class XmProjectPhaseService extends BaseService {
for (int i = parentList.size() - 1; i >= 0; i--) { for (int i = parentList.size() - 1; i >= 0; i--) {
idPath=idPath+parentList.get(i).getId()+","; idPath=idPath+parentList.get(i).getId()+",";
} }
currNode.setPidPaths(idPath);
currNode.setPidPaths(idPath+currNode.getId()+",");
String idPaths=currNode.getPidPaths(); String idPaths=currNode.getPidPaths();
String[] idpss=idPaths.split(","); String[] idpss=idPaths.split(",");
currNode.setLvl(idpss.length);
currNode.setLvl(idpss.length-1);
} }
return tips; return tips;
} }

15
xm-core/src/main/java/com/xm/core/service/XmTaskService.java
View File

@ -447,10 +447,11 @@ public class XmTaskService extends BaseService {
for (XmTask node : noExistsList) { for (XmTask node : noExistsList) {
if(hadCalcMap.containsKey(node.getParentTaskid())){ if(hadCalcMap.containsKey(node.getParentTaskid())){
String idPaths=hadCalcMap.get(node.getParentTaskid()); String idPaths=hadCalcMap.get(node.getParentTaskid());
node.setPidPaths(idPaths);
node.setPidPaths(idPaths+node.getId()+",");
}else{ }else{
this.parentIdPathsCalcBeforeSave(node); this.parentIdPathsCalcBeforeSave(node);
String idPaths=node.getPidPaths(); String idPaths=node.getPidPaths();
idPaths=idPaths.substring(0,idPaths.length()-node.getId().length()-1);
hadCalcMap.put(node.getParentTaskid(),idPaths); hadCalcMap.put(node.getParentTaskid(),idPaths);
} }
} }
@ -461,7 +462,7 @@ public class XmTaskService extends BaseService {
} }
if(hadCalcMap.containsKey(node.getParentTaskid())){ if(hadCalcMap.containsKey(node.getParentTaskid())){
String idPaths=hadCalcMap.get(node.getParentTaskid()); String idPaths=hadCalcMap.get(node.getParentTaskid());
node.setPidPaths(idPaths);
node.setPidPaths(idPaths+node.getId()+",");
}else{ }else{
List<XmTask> pnodeList=this.getParentList(node,nodes); List<XmTask> pnodeList=this.getParentList(node,nodes);
XmTask topParent=pnodeList.get(pnodeList.size()-1); XmTask topParent=pnodeList.get(pnodeList.size()-1);
@ -472,13 +473,13 @@ public class XmTaskService extends BaseService {
for (int i = pnodeList.size() - 1; i >= 0; i--) { for (int i = pnodeList.size() - 1; i >= 0; i--) {
idPath=idPath+pnodeList.get(i).getId()+","; idPath=idPath+pnodeList.get(i).getId()+",";
} }
node.setPidPaths(idPath);
node.setPidPaths(idPath+node.getId()+",");
} }
} }
for (XmTask node : nodes) { for (XmTask node : nodes) {
String idPaths=node.getPidPaths(); String idPaths=node.getPidPaths();
String[] idpss=idPaths.split(","); String[] idpss=idPaths.split(",");
node.setLvl(idpss.length);
node.setLvl(idpss.length-1);
} }
return nodes; return nodes;
} }
@ -493,7 +494,7 @@ public class XmTaskService extends BaseService {
public Tips parentIdPathsCalcBeforeSave(XmTask currNode) { public Tips parentIdPathsCalcBeforeSave(XmTask currNode) {
Tips tips = new Tips("成功"); Tips tips = new Tips("成功");
if (!StringUtils.hasText(currNode.getParentTaskid()) || "0".equals(currNode.getParentTaskid())) { if (!StringUtils.hasText(currNode.getParentTaskid()) || "0".equals(currNode.getParentTaskid())) {
currNode.setPidPaths("0,");
currNode.setPidPaths("0," + currNode.getId() + ",");
return tips; return tips;
} else { } else {
List<XmTask> parentList=this.getParentList(currNode); List<XmTask> parentList=this.getParentList(currNode);
@ -501,11 +502,11 @@ public class XmTaskService extends BaseService {
for (int i = parentList.size() - 1; i >= 0; i--) { for (int i = parentList.size() - 1; i >= 0; i--) {
idPath=idPath+parentList.get(i).getId()+","; idPath=idPath+parentList.get(i).getId()+",";
} }
currNode.setPidPaths(idPath);
currNode.setPidPaths(idPath+currNode.getId()+",");
String idPaths=currNode.getPidPaths(); String idPaths=currNode.getPidPaths();
String[] idpss=idPaths.split(","); String[] idpss=idPaths.split(",");
currNode.setLvl(idpss.length);
currNode.setLvl(idpss.length-1);
} }
return tips; return tips;
} }

Write Preview
Loading…
Cancel
Save