diff --git a/adc-da-report/src/main/java/com/adc/da/report/constant/TreeLabelConstants.java b/adc-da-report/src/main/java/com/adc/da/report/constant/TreeLabelConstants.java index 0ccc7b6..facc2a1 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/constant/TreeLabelConstants.java +++ b/adc-da-report/src/main/java/com/adc/da/report/constant/TreeLabelConstants.java @@ -10,4 +10,6 @@ public class TreeLabelConstants { public static final Integer UNDELETE = 0; public static final String ROOT_TAG_PARENT_ID = "0"; + + public static final String ROOT_LABEL_ID = "RTYUHYT"; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java index 1b72c03..bf05e23 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java @@ -43,8 +43,19 @@ public class TreeLabelManagerController { TreeLabelEntity treeLabelEntity = Convert.convert(TreeLabelEntity.class, treeLabelVo); iTreeLabelService.saveOrUpdateTag(treeLabelEntity); return Result.success(); + } - + /** + * 新增或编辑标签 + * + * @param id + * @return + */ + @ApiOperation("获取当前标签的路径List") + @GetMapping("/labelList/{id}") + public ResponseMessage add(@PathVariable String id) { + List labelList = iTreeLabelService.getLabelList(id); + return Result.success(labelList); } /** diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java b/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java index 6333b0e..2098117 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java @@ -43,4 +43,11 @@ public interface ITreeLabelService extends IService { */ boolean deleteById(String id); + /** + * 获取当前标签的路径 + * + * @param id + * @return + */ + List getLabelList(String id); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java index 10fec66..14a1134 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java @@ -130,8 +130,8 @@ public class ITreeLabelServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.gt(TreeLabelEntity::getOrderNum, currentNum) - .le(TreeLabelEntity::getOrderNum, maxNum) - .eq(TreeLabelEntity::getParentId, parentId); + .le(TreeLabelEntity::getOrderNum, maxNum) + .eq(TreeLabelEntity::getParentId, parentId); List labelList = treeLabelDao.selectList(wrapper); for (TreeLabelEntity entity : labelList) { entity.setOrderNum(entity.getOrderNum() - 1); @@ -148,6 +148,20 @@ public class ITreeLabelServiceImpl extends ServiceImpl getLabelList(String id) { + List labelList = new ArrayList<>(); + TreeLabelEntity treeLabelEntity = getById(id); + while (!TreeLabelConstants.ROOT_TAG_PARENT_ID.equals(treeLabelEntity.getParentId())) { + labelList.add(treeLabelEntity.getLabel()); + treeLabelEntity = getById(treeLabelEntity.getParentId()); + } + TreeLabelEntity root = getById(TreeLabelConstants.ROOT_LABEL_ID); + labelList.add(root.getLabel()); + Collections.reverse(labelList); + return labelList; + } + private List createTree(String rootParentId, List treeLabelVos) { List tree = new ArrayList<>(); for (TreeLabelVo label : treeLabelVos) {