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

添加节点类型、标签等

master
陈裕财 4 years ago
parent
4ad8cbfd58
commit
8d9fd1da7c
5 changed files with 122 additions and 110 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. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java
  2. 205
      xm-core/src/main/java/com/xm/core/service/XmMenuService.java
  3. 11
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java
  4. 4
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
  5. 8
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

4
xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java
View File

@ -199,7 +199,7 @@ public class XmIterationLinkController {
return ResponseHelper.failed("no-product-qx","您不是产品管理人员，无权将该产品移出迭代"); return ResponseHelper.failed("no-product-qx","您不是产品管理人员，无权将该产品移出迭代");
}; };
//检查是否有需求关联这个迭代，如果有，不允许删除 //检查是否有需求关联这个迭代，如果有，不允许删除
List<XmMenu> menus= xmMenuService.listTenMenuByIterationId(xmIterationLink.getIterationId());
List<XmMenu> menus= xmMenuService.listTenMenuByProductIdAndIterationId(xmIterationLink.getProId(),xmIterationLink.getIterationId());
if(menus!=null && menus.size()>0){ if(menus!=null && menus.size()>0){
return ResponseHelper.failed("menus-not-0","存在至少"+menus.size()+"个需求与迭代关联，不能移出.关联需求【"+menus.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); return ResponseHelper.failed("menus-not-0","存在至少"+menus.size()+"个需求与迭代关联，不能移出.关联需求【"+menus.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
@ -208,7 +208,7 @@ public class XmIterationLinkController {
return ResponseHelper.failed("no-project-qx","您不是项目管理人员，无权将该项目移出迭代"); return ResponseHelper.failed("no-project-qx","您不是项目管理人员，无权将该项目移出迭代");
}; };
//检查是否有任务关联这个迭代，如果有，不允许删除 //检查是否有任务关联这个迭代，如果有，不允许删除
List<XmTask> tasks= xmTaskService.listTenTaskByIterationId(xmIterationLink.getIterationId());
List<XmTask> tasks= xmTaskService.listTenTaskByProjectIdAndIterationId(xmIterationLink.getProId(),xmIterationLink.getIterationId());
if(tasks!=null && tasks.size()>0){ if(tasks!=null && tasks.size()>0){
return ResponseHelper.failed("tasks-not-0","存在至少"+tasks.size()+"个任务与迭代关联，不能移出.关联任务【"+tasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); return ResponseHelper.failed("tasks-not-0","存在至少"+tasks.size()+"个任务与迭代关联，不能移出.关联任务【"+tasks.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
} }

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

@ -28,14 +28,17 @@ public class XmMenuService extends BaseService {
/** /**
* 连同功能关联的项目需求计划数据一起带出 * 连同功能关联的项目需求计划数据一起带出
*
* @param xmMenu * @param xmMenu
* @return * @return
*/ */
public List<Map<String, Object>> selectListMapByWhereWithPlan(Map<String, Object> xmMenu) { public List<Map<String, Object>> selectListMapByWhereWithPlan(Map<String, Object> xmMenu) {
return this.selectList("selectListMapByWhereWithPlan", xmMenu); return this.selectList("selectListMapByWhereWithPlan", xmMenu);
} }
/** /**
* 连同功能关联的状态数据一起带出 * 连同功能关联的状态数据一起带出
*
* @param xmMenu * @param xmMenu
* @return * @return
*/ */
@ -46,6 +49,7 @@ public class XmMenuService extends BaseService {
/** /**
* 连同功能关联的产品计划一并带出 * 连同功能关联的产品计划一并带出
*
* @param xmMenu * @param xmMenu
* @return * @return
*/ */
@ -55,89 +59,91 @@ public class XmMenuService extends BaseService {
} }
public void updateMenuChildrenCntByMenuId(String menuId){
super.update("updateMenuChildrenCntByMenuId",menuId);
public void updateMenuChildrenCntByMenuId(String menuId) {
super.update("updateMenuChildrenCntByMenuId", menuId);
} }
public void updateChildrenCntByIds(List<String> ids) { public void updateChildrenCntByIds(List<String> ids) {
super.update("updateChildrenCntByIds",ids);
super.update("updateChildrenCntByIds", ids);
} }
@Transactional @Transactional
public void batchInsertOrUpdate(List<XmMenuVo> xmMenus) { public void batchInsertOrUpdate(List<XmMenuVo> xmMenus) {
List<XmMenuVo> addList=new ArrayList<>();
List<XmMenuVo> editList=new ArrayList<>();
List<XmMenu> xmMenusDb=this.selectListByIds(xmMenus.stream().map(i->i.getMenuId()).collect(Collectors.toList()));
editList=xmMenus.stream().filter(i->xmMenusDb.stream().filter(k->k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList());
addList=xmMenus.stream().filter(i->!xmMenusDb.stream().filter(k->k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList());
List<XmMenu> xmMenuList=new ArrayList<>();
if(addList.size()>0) {
xmMenuList.addAll(addList.stream().map(i->(XmMenu)i).collect(Collectors.toList()));
List<XmMenuVo> addList = new ArrayList<>();
List<XmMenuVo> editList = new ArrayList<>();
List<XmMenu> xmMenusDb = this.selectListByIds(xmMenus.stream().map(i -> i.getMenuId()).collect(Collectors.toList()));
editList = xmMenus.stream().filter(i -> xmMenusDb.stream().filter(k -> k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList());
addList = xmMenus.stream().filter(i -> !xmMenusDb.stream().filter(k -> k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList());
List<XmMenu> xmMenuList = new ArrayList<>();
if (addList.size() > 0) {
xmMenuList.addAll(addList.stream().map(i -> (XmMenu) i).collect(Collectors.toList()));
this.batchInsert(addList); this.batchInsert(addList);
this.xmMenuStateService.batchLoadXmMenuToState(xmMenus.get(0).getProductId());
this.xmMenuStateService.batchLoadXmMenuToState(xmMenus.get(0).getProductId());
} }
if(editList.size()>0) {
xmMenuList.addAll(editList.stream().map(i->(XmMenu)i).collect(Collectors.toList()));
if (editList.size() > 0) {
xmMenuList.addAll(editList.stream().map(i -> (XmMenu) i).collect(Collectors.toList()));
this.batchUpdate(editList); this.batchUpdate(editList);
} }
if(xmMenuList.size()>0){
if (xmMenuList.size() > 0) {
this.xmMenuStateService.batchSumParents(xmMenuList); this.xmMenuStateService.batchSumParents(xmMenuList);
} }
} }
public List< Map<String, Object>> queryTaskUsersByMenuId(String menuId) {
return this.selectList("queryTaskUsersByMenuId", menuId);
public List<Map<String, Object>> queryTaskUsersByMenuId(String menuId) {
return this.selectList("queryTaskUsersByMenuId", menuId);
} }
public List<XmMenu> selectExistIterationMenus(List<String> menuIds) {
public List<XmMenu> selectExistIterationMenus(List<String> menuIds) {
return this.selectList("selectExistIterationMenus",map("menuIds",menuIds));
}
return this.selectList("selectExistIterationMenus", map("menuIds", menuIds));
}
public List<XmMenu> parentIdPathsCalcBeforeSave(List<XmMenu> nodes) { public List<XmMenu> parentIdPathsCalcBeforeSave(List<XmMenu> nodes) {
List<XmMenu> noExistsList=nodes.stream().filter(i->!nodes.stream().filter(k->k.getMenuId().equals(i.getPmenuId())).findAny().isPresent()).collect(Collectors.toList());
noExistsList=noExistsList.stream().filter(i->StringUtils.hasText(i.getPmenuId())).collect(Collectors.toList());
Map<String,String> hadCalcMap=new HashMap<>();
List<XmMenu> noExistsList = nodes.stream().filter(i -> !nodes.stream().filter(k -> k.getMenuId().equals(i.getPmenuId())).findAny().isPresent()).collect(Collectors.toList());
noExistsList = noExistsList.stream().filter(i -> StringUtils.hasText(i.getPmenuId())).collect(Collectors.toList());
Map<String, String> hadCalcMap = new HashMap<>();
for (XmMenu node : noExistsList) { for (XmMenu node : noExistsList) {
if(hadCalcMap.containsKey(node.getPmenuId())){
String idPaths=hadCalcMap.get(node.getPmenuId());
node.setPidPaths(idPaths+node.getMenuId()+",");
}else{
if (hadCalcMap.containsKey(node.getPmenuId())) {
String idPaths = hadCalcMap.get(node.getPmenuId());
node.setPidPaths(idPaths + node.getMenuId() + ",");
} else {
this.parentIdPathsCalcBeforeSave(node); this.parentIdPathsCalcBeforeSave(node);
String idPaths=node.getPidPaths();
idPaths=idPaths.substring(0,idPaths.length()-node.getMenuId().length()-1);
hadCalcMap.put(node.getPmenuId(),idPaths);
String idPaths = node.getPidPaths();
idPaths = idPaths.substring(0, idPaths.length() - node.getMenuId().length() - 1);
hadCalcMap.put(node.getPmenuId(), idPaths);
} }
} }
for (XmMenu node : nodes) { for (XmMenu node : nodes) {
if(!StringUtils.hasText(node.getPmenuId())){
node.setPidPaths("0,"+node.getMenuId()+",");
if (!StringUtils.hasText(node.getPmenuId())) {
node.setPidPaths("0," + node.getMenuId() + ",");
continue; continue;
} }
if(hadCalcMap.containsKey(node.getPmenuId())){
String idPaths=hadCalcMap.get(node.getPmenuId());
node.setPidPaths(idPaths+node.getMenuId()+",");
}else{
List<XmMenu> pnodeList=this.getParentList(node,nodes);
if(pnodeList==null ||pnodeList.size()==0){
node.setPidPaths("0,"+node.getMenuId()+",");
if (hadCalcMap.containsKey(node.getPmenuId())) {
String idPaths = hadCalcMap.get(node.getPmenuId());
node.setPidPaths(idPaths + node.getMenuId() + ",");
} else {
List<XmMenu> pnodeList = this.getParentList(node, nodes);
if (pnodeList == null || pnodeList.size() == 0) {
node.setPidPaths("0," + node.getMenuId() + ",");
node.setPmenuId(null); node.setPmenuId(null);
continue; continue;
} }
XmMenu topParent=pnodeList.get(pnodeList.size()-1);
String idPath="0,";
if(hadCalcMap.containsKey(topParent.getPmenuId())){
idPath=hadCalcMap.get(topParent.getPmenuId());
XmMenu topParent = pnodeList.get(pnodeList.size() - 1);
String idPath = "0,";
if (hadCalcMap.containsKey(topParent.getPmenuId())) {
idPath = hadCalcMap.get(topParent.getPmenuId());
} }
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.getMenuId()+",");
node.setPidPaths(idPath + node.getMenuId() + ",");
} }
} }
for (XmMenu node : nodes) { for (XmMenu node : nodes) {
String idPaths=node.getPidPaths();
String[] idpss=idPaths.split(",");
node.setLvl(idpss.length-1);
String idPaths = node.getPidPaths();
String[] idpss = idPaths.split(",");
node.setLvl(idpss.length - 1);
} }
return nodes; return nodes;
} }
@ -149,73 +155,73 @@ public class XmMenuService extends BaseService {
currNode.setLvl(1); currNode.setLvl(1);
return tips; return tips;
} else { } else {
List<XmMenu> parentList=this.getParentList(currNode);
if(parentList==null || parentList.size()==0){
currNode.setPidPaths("0,"+currNode.getMenuId()+",");
List<XmMenu> parentList = this.getParentList(currNode);
if (parentList == null || parentList.size() == 0) {
currNode.setPidPaths("0," + currNode.getMenuId() + ",");
currNode.setPmenuId(null); currNode.setPmenuId(null);
currNode.setLvl(1); currNode.setLvl(1);
return tips; return tips;
} }
String idPath="0,";
String idPath = "0,";
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.getMenuId()+",");
currNode.setPidPaths(idPath + currNode.getMenuId() + ",");
String idPaths=currNode.getPidPaths();
String[] idpss=idPaths.split(",");
currNode.setLvl(idpss.length-1);
String idPaths = currNode.getPidPaths();
String[] idpss = idPaths.split(",");
currNode.setLvl(idpss.length - 1);
} }
return tips; return tips;
} }
private List<XmMenu> getParentList(XmMenu currNode){
List<XmMenu> parentList=new ArrayList<>();
XmMenu current=currNode;
while (true){
if(!StringUtils.hasText(current.getPmenuId()) || "0".equals(current.getPmenuId())||current.getMenuId().equals(current.getPmenuId())){
return parentList;
private List<XmMenu> getParentList(XmMenu currNode) {
List<XmMenu> parentList = new ArrayList<>();
XmMenu current = currNode;
while (true) {
if (!StringUtils.hasText(current.getPmenuId()) || "0".equals(current.getPmenuId()) || current.getMenuId().equals(current.getPmenuId())) {
return parentList;
} }
XmMenu query=new XmMenu();
XmMenu query = new XmMenu();
query.setMenuId(current.getPmenuId()); query.setMenuId(current.getPmenuId());
current=this.selectOneObject(query);
if(current==null){
current = this.selectOneObject(query);
if (current == null) {
return parentList; return parentList;
} }
parentList.add(current); parentList.add(current);
} }
} }
private List<XmMenu> getParentList(XmMenu currNode,List<XmMenu> nodes){
List<XmMenu> parentList=new ArrayList<>();
XmMenu current=currNode;
while (true){
if(!StringUtils.hasText(current.getPmenuId()) || "0".equals(current.getPmenuId())||current.getMenuId().equals(current.getPmenuId())){
private List<XmMenu> getParentList(XmMenu currNode, List<XmMenu> nodes) {
List<XmMenu> parentList = new ArrayList<>();
XmMenu current = currNode;
while (true) {
if (!StringUtils.hasText(current.getPmenuId()) || "0".equals(current.getPmenuId()) || current.getMenuId().equals(current.getPmenuId())) {
return parentList; return parentList;
} }
XmMenu query=new XmMenu();
XmMenu query = new XmMenu();
query.setMenuId(current.getPmenuId()); query.setMenuId(current.getPmenuId());
Optional<XmMenu> optional=nodes.stream().filter(i->i.getMenuId().equals(query.getMenuId())).findFirst();
if(optional.isPresent()){
current=optional.get();
Optional<XmMenu> optional = nodes.stream().filter(i -> i.getMenuId().equals(query.getMenuId())).findFirst();
if (optional.isPresent()) {
current = optional.get();
parentList.add(current); parentList.add(current);
}else{
} else {
return parentList; return parentList;
} }
} }
} }
@Transactional
public int insert(XmMenu xmMenu) {
int i= super.insert(xmMenu);
@Transactional
public int insert(XmMenu xmMenu) {
int i = super.insert(xmMenu);
xmMenuStateService.batchLoadXmMenuToState(xmMenu.getProductId()); xmMenuStateService.batchLoadXmMenuToState(xmMenu.getProductId());
xmMenuStateService.sumParents(xmMenu); xmMenuStateService.sumParents(xmMenu);
return i; return i;
} }
@Transactional @Transactional
public int updateByPk(XmMenu xmMenu) {
int i= super.updateByPk(xmMenu);
public int updateByPk(XmMenu xmMenu) {
int i = super.updateByPk(xmMenu);
return i; return i;
} }
@ -232,27 +238,29 @@ public class XmMenuService extends BaseService {
super.batchDelete(canDelList); super.batchDelete(canDelList);
this.xmMenuStateService.batchSumParents(canDelList); this.xmMenuStateService.batchSumParents(canDelList);
} }
@Transactional @Transactional
public void doBatchDeleteByProductIds(List<String> productIds) { public void doBatchDeleteByProductIds(List<String> productIds) {
super.delete("doBatchDeleteByProductIds",productIds);
super.delete("doBatchDeleteByProductIds", productIds);
} }
/** /**
* 检查是否能删除干净所有儿子孙子节点。 * 检查是否能删除干净所有儿子孙子节点。
* @param delNode 当前删除节点
*
* @param delNode 当前删除节点
* @param delNodes 本批量需要删除的全部节点 * @param delNodes 本批量需要删除的全部节点
* @return * @return
*/ */
public boolean checkCanDelAllChild(XmMenu delNode, List<XmMenu> delNodes) { public boolean checkCanDelAllChild(XmMenu delNode, List<XmMenu> delNodes) {
if(delNode==null){
if (delNode == null) {
return true; return true;
} }
if(delNode.getChildrenCnt()==null||delNode.getChildrenCnt()<=0){
if (delNode.getChildrenCnt() == null || delNode.getChildrenCnt() <= 0) {
return true; return true;
} }
List<XmMenu> childList=delNodes.stream().filter(i->delNode.getMenuId().equals(i.getPmenuId())).collect(Collectors.toList());
if(childList==null||childList.size()<delNode.getChildrenCnt()){
List<XmMenu> childList = delNodes.stream().filter(i -> delNode.getMenuId().equals(i.getPmenuId())).collect(Collectors.toList());
if (childList == null || childList.size() < delNode.getChildrenCnt()) {
return false; return false;
} }
for (XmMenu n : childList) { for (XmMenu n : childList) {
@ -264,26 +272,27 @@ public class XmMenuService extends BaseService {
} }
public void batchUnIteration(XmIterationMenuVo xmIterationMenus) {
super.update("batchUnIteration",xmIterationMenus);
}
public void batchUnIteration(XmIterationMenuVo xmIterationMenus) {
super.update("batchUnIteration", xmIterationMenus);
}
public void batchIteration(XmIterationMenuVo xmIterationMenus) { public void batchIteration(XmIterationMenuVo xmIterationMenus) {
super.update("batchIteration",xmIterationMenus);
super.update("batchIteration", xmIterationMenus);
} }
public void batchUnProductPhase(XmPhaseMenusVo xmPhaseMenusVo) { public void batchUnProductPhase(XmPhaseMenusVo xmPhaseMenusVo) {
super.update("batchUnProductPhase",xmPhaseMenusVo);
super.update("batchUnProductPhase", xmPhaseMenusVo);
} }
public void batchProductPhase(XmPhaseMenusVo xmPhaseMenusVo) { public void batchProductPhase(XmPhaseMenusVo xmPhaseMenusVo) {
super.update("batchProductPhase",xmPhaseMenusVo);
super.update("batchProductPhase", xmPhaseMenusVo);
} }
public List<XmMenu> listTenMenuByIterationId(String iterationId) {
public List<XmMenu> listTenMenuByProductIdAndIterationId(String productId, String iterationId) {
return super.selectList("listTenMenuByProductIdAndIterationId", map("productId", productId, "iterationId", iterationId));
}
return super.selectList("listTenMenuByIterationId",iterationId);
}
} }

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

@ -697,12 +697,15 @@ public class XmTaskService extends BaseService {
return tips; return tips;
} }
public List<XmTask> listTenTaskByIterationId(String iterationId) {
return super.selectList("listTenTaskByIterationId",iterationId);
public List<XmTask> listTenTaskByProjectIdAndProductId(String projectId,String productId) {
return super.selectList("listTenTaskByProductId",map("projectId", projectId, "productId", productId));
} }
public List<XmTask> listTenTaskByProductId(String productId) {
return super.selectList("listTenTaskByProductId",productId);
public List<XmTask> listTenTaskByProjectIdAndIterationId(String projectId, String iterationId) {
return super.selectList("listTenTaskByProjectIdAndIterationId", map("projectId", projectId, "iterationId", iterationId));
} }
} }

4
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
View File

@ -151,8 +151,8 @@
#{item} #{item}
</foreach> </foreach>
</update> </update>
<select id="listTenMenuByIterationId" parameterType="String" resultType="com.xm.core.entity.XmMenu">
select menu_name from xm_menu res where res.iteration_id=#{iterationId}
<select id="listTenMenuByProductIdAndIterationId" parameterType="String" resultType="com.xm.core.entity.XmMenu">
select menu_name from xm_menu res where res.product_id=#{productId} and res.iteration_id=#{iterationId}
limit 10 limit 10
</select> </select>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->

8
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
View File

@ -316,14 +316,14 @@
group by p.id group by p.id
</select> </select>
<select id="listTenTaskByIterationId" parameterType="String" resultType="com.xm.core.entity.XmTask">
select name from xm_task res where exists(select 1 from xm_menu m where m.menu_id=res.menu_id and m.iteration_id=#{iterationId} and m.ntype='0')
<select id="listTenTaskByProjectIdAndIterationId" parameterType="HashMap" resultType="com.xm.core.entity.XmTask">
select name from xm_task res where res.project_id=#{projectId} and exists(select 1 from xm_menu m where m.menu_id=res.menu_id and m.iteration_id=#{iterationId} and m.ntype='0')
and res.ntype='0' and res.ntype='0'
limit 10 limit 10
</select> </select>
<select id="listTenTaskByProductId" parameterType="String" resultType="com.xm.core.entity.XmTask">
select name from xm_task res where exists(select 1 from xm_menu m where m.menu_id=res.menu_id and m.product_id=#{productId} and m.ntype='0')
<select id="listTenTaskByProjectIdAndProductId" parameterType="HashMap" resultType="com.xm.core.entity.XmTask">
select name from xm_task res where res.project_id=#{projectId} and exists(select 1 from xm_menu m where m.menu_id=res.menu_id and m.product_id=#{productId} and m.ntype='0')
and res.ntype='0' and res.ntype='0'
limit 10 limit 10
</select> </select>

Write Preview
Loading…
Cancel
Save