From d65fa095369a1c0484ae0fc3ece1c1fbaae357b7 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Thu, 20 Apr 2023 16:03:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9[=E8=8E=B7=E5=8F=96=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=A0=87=E7=AD=BE=E7=9A=84=E7=88=B6=E7=BA=A7=E8=B7=AF?= =?UTF-8?q?=E5=BE=84]=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/controller/TreeLabelManagerController.java | 4 ++-- .../adc/da/report/service/impl/ITreeLabelServiceImpl.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) 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 bf05e23..4177a6b 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 @@ -51,9 +51,9 @@ public class TreeLabelManagerController { * @param id * @return */ - @ApiOperation("获取当前标签的路径List") + @ApiOperation("获取当前标签的父级路径") @GetMapping("/labelList/{id}") - public ResponseMessage add(@PathVariable String id) { + public ResponseMessage parentLabelList(@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/impl/ITreeLabelServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java index 7f06798..7de3c6a 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 @@ -152,12 +152,13 @@ public class ITreeLabelServiceImpl extends ServiceImpl getLabelList(String id) { List labelList = new ArrayList<>(); TreeLabelEntity treeLabelEntity = getById(id); + //获取上层标签 + treeLabelEntity = getById(treeLabelEntity.getParentId()); + labelList.add(treeLabelEntity.getId()); while (!TreeLabelConstants.ROOT_TAG_PARENT_ID.equals(treeLabelEntity.getParentId())) { - labelList.add(treeLabelEntity.getId()); treeLabelEntity = getById(treeLabelEntity.getParentId()); + labelList.add(treeLabelEntity.getId()); } - TreeLabelEntity root = getById(TreeLabelConstants.ROOT_LABEL_ID); - labelList.add(root.getId()); Collections.reverse(labelList); return labelList; }