Commit ac9ce01b authored by Gwofoo's avatar Gwofoo

实现:组件库一二三级的合并

parent b9495f84
...@@ -2,7 +2,6 @@ package com.yeejoin.amos.api.tool.face.service; ...@@ -2,7 +2,6 @@ package com.yeejoin.amos.api.tool.face.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.tool.face.model.ToolLibraryDetailModel; import com.yeejoin.amos.api.tool.face.model.ToolLibraryDetailModel;
import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
import com.yeejoin.amos.api.tool.face.model.ToolLibraryModel; import com.yeejoin.amos.api.tool.face.model.ToolLibraryModel;
import com.yeejoin.amos.api.tool.face.model.ToolLibraryTreeModel; import com.yeejoin.amos.api.tool.face.model.ToolLibraryTreeModel;
import com.yeejoin.amos.api.tool.face.orm.dao.ToolLibraryMapper; import com.yeejoin.amos.api.tool.face.orm.dao.ToolLibraryMapper;
...@@ -50,7 +49,15 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar ...@@ -50,7 +49,15 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
model.setParentId(Long.valueOf(map.get("parent").toString())); model.setParentId(Long.valueOf(map.get("parent").toString()));
displayLists.add(model); displayLists.add(model);
} }
return getChildren(displayLists); //新建一个用于接收数据的list
List<ToolLibraryTreeModel> resultList = new ArrayList<>();
for (ToolLibraryTreeModel result : displayLists) {
if (result.getParentId() == 0) {
//调用方法给子类添加数据
resultList.add(getMenuTree(result, displayLists));
}
}
return resultList;
} }
public Page<ToolLibraryDetailModel> queryForComponentListDetails(Page<ToolLibraryDetailModel> page, String sequenceNbr) public Page<ToolLibraryDetailModel> queryForComponentListDetails(Page<ToolLibraryDetailModel> page, String sequenceNbr)
...@@ -110,39 +117,18 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar ...@@ -110,39 +117,18 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
return page; return page;
} }
public List<ToolLibraryTreeModel> getChildren(List<ToolLibraryTreeModel> nodes) { private ToolLibraryTreeModel getMenuTree(ToolLibraryTreeModel result, List<ToolLibraryTreeModel> list) {
List<ToolLibraryTreeModel> resultList = new ArrayList<>(); for (ToolLibraryTreeModel treeModel : list) {
for (ToolLibraryTreeModel model1 : nodes) { //如果父类主键等于传过来实体类的ID
for (ToolLibraryTreeModel model2 : nodes) { if (treeModel.getParentId().equals(result.getId())) {
if (model2.getParentId().equals(model1.getId())){ if (result.getChildren() == null) {
resultList.add(model2); result.setChildren(new ArrayList<>());
} }
// 递归调用
result.getChildren().add(getMenuTree(treeModel, list));
} }
model1.setChildren(resultList);
resultList=new ArrayList<>();
} }
nodes.removeIf(model -> model.getChildren() == null || model.getChildren().size() == 0); return result;
return nodes;
} }
// /**
// * 获得模板分类子节点(递归)
// */
// public List<ToolLibraryTreeModel> getChildren(List<ToolLibraryTreeModel> nodes, String parent, Long id) {
// List<ToolLibraryTreeModel> treeModels = new ArrayList<>();
// for (ToolLibraryTreeModel node : nodes) {
// if (node.getParentId() == 0L && parent.equals("")) {
// node.setChildren(getChildren(nodes, node.getDesignerType(), node.getId()));
// treeModels.add(node);
// } else {
// if (parent.equals(node.getDesignerType()) && node.getParentId() != 0L) {
// node.setParentId(id);
// treeModels.add(node);
// }
// }
// }
// return treeModels;
// }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment