diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java index 49fdc3844b..0d74a3fdf2 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java @@ -3,8 +3,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; /** * @program: epmet-cloud @@ -19,9 +17,9 @@ public class List4ApplyResultDTO implements Serializable { private String name; - private String pid; +// private String pid; private Integer pointValue; - private List children = new ArrayList<>(); +// private List children = new ArrayList<>(); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 371c861773..7146f105f1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -194,35 +194,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl> list4apply(List4applyFormDTO dto) { List list = baseDao.selectList4apply(dto); - List result = build(list); - result.removeIf(category ->CollectionUtils.isEmpty(category.getChildren())); - return new Result>().ok(result); + return new Result>().ok(list); } - /** - * 构建树节点 - */ - public static List build(List treeNodes) { - List result = new ArrayList<>(); - - //list转map - Map nodeMap = new LinkedHashMap<>(treeNodes.size()); - for(List4ApplyResultDTO treeNode : treeNodes){ - nodeMap.put(treeNode.getId(), treeNode); - } - - for(List4ApplyResultDTO node : nodeMap.values()) { - List4ApplyResultDTO parent = nodeMap.get(node.getPid()); - if(parent != null && !(node.getId().equals(parent.getId()))){ - parent.getChildren().add(node); - continue; - } - - result.add(node); - } - - return result; - } @Override public Result> list4tree(List4treeFormDTO dto) { diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index 058d6db765..84a26d63e7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -45,8 +45,7 @@