From 0eece5f7ec409a93c0fc2f11b46c1ece3ff271f4 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 18 Apr 2023 17:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A0=87=E7=AD=BE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TreeLabelManagerController.java | 20 ++--------- .../adc/da/report/dao/mysql/TreeLabelDao.java | 2 +- .../com/adc/da/report/eo/TreeLabelEntity.java | 14 ++++---- .../da/report/service/ITreeLabelService.java | 3 ++ .../service/impl/ITreeLabelServiceImpl.java | 33 ++++++++----------- .../com/adc/da/report/vo/TreeLabelVo.java | 14 +++----- 6 files changed, 30 insertions(+), 56 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 1b72c03..dd4c4cc 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 @@ -37,28 +37,12 @@ public class TreeLabelManagerController { * @param treeLabelVo * @return */ - @ApiOperation("新增标签") + @ApiOperation("新增或编辑标签") @PostMapping("/add") public ResponseMessage add(@Valid @RequestBody TreeLabelVo treeLabelVo) { TreeLabelEntity treeLabelEntity = Convert.convert(TreeLabelEntity.class, treeLabelVo); iTreeLabelService.saveOrUpdateTag(treeLabelEntity); return Result.success(); - - - } - - /** - * 新增或编辑标签 - * - * @param treeLabelVo - * @return - */ - @ApiOperation("编辑标签") - @PostMapping("/update") - public ResponseMessage update(@Valid @RequestBody TreeLabelVo treeLabelVo) { - TreeLabelEntity treeLabelEntity = Convert.convert(TreeLabelEntity.class, treeLabelVo); - iTreeLabelService.saveOrUpdateTag(treeLabelEntity); - return Result.success(); } /** @@ -71,7 +55,7 @@ public class TreeLabelManagerController { @ApiOperation("标签列表") @GetMapping("/list") public ResponseMessage list(@RequestParam(value = "like", required = false) String like - ) throws ExecutionException, InterruptedException { + ) throws ExecutionException, InterruptedException { List rootLabel = iTreeLabelService.getTreeLabellist(like); return Result.success(rootLabel); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java index d4cdcfc..647b8de 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java @@ -16,7 +16,7 @@ public interface TreeLabelDao extends BaseMapper { * @param parentId * @return */ - double getMaxNum(String parentId); + int getMaxNum(String parentId); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java index a43c2d1..3159e44 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java @@ -31,18 +31,13 @@ public class TreeLabelEntity implements Serializable { /** * */ - private String label; + private String name; /** * */ private String parentId; - /** - * 备注 - */ - private String remark; - /** * */ @@ -51,7 +46,12 @@ public class TreeLabelEntity implements Serializable { /** * */ - private Double orderNum; + private Integer orderNum; + + /** + * 0代表未删除，1代表已删除 + */ + private Integer delFlag; @TableField(exist = false) private static final long serialVersionUID = 1L; 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..ed0f61c 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 @@ -17,6 +17,8 @@ public interface ITreeLabelService extends IService { * 获取标签树形结构 * * @param like 模糊查询字段 + * 返回树形结构 + * * @return */ List getTreeLabellist(String like); @@ -33,6 +35,7 @@ public interface ITreeLabelService extends IService { * * @param id 标签id * @return + * 自动维护顺序的删除标签方法 */ boolean deleteByIdAutoOrder(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 088a674..46a2869 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 @@ -36,8 +36,10 @@ public class ITreeLabelServiceImpl extends ServiceImpl getTreeLabellist(String like) { - //查询所有标签 - List treeLabelEntities = list(); + //查询所有未删除的标签 + LambdaQueryWrapper treeLabelEntityWrapper = new LambdaQueryWrapper<>(); + treeLabelEntityWrapper.eq(TreeLabelEntity::getDelFlag, TreeLabelConstants.UNDELETE); + List treeLabelEntities = treeLabelDao.selectList(treeLabelEntityWrapper); //找出根节点 TreeLabelEntity rootTag = treeLabelEntities.stream(). filter(treeLabelEntity -> @@ -91,19 +93,10 @@ public class ITreeLabelServiceImpl extends ServiceImpl().eq("id", id)); //如果删除的不是最后一个标签，需要移动前面的标签 @@ -140,7 +133,7 @@ public class ITreeLabelServiceImpl extends ServiceImpl tree = new ArrayList<>(); for (TreeLabelVo label : treeLabelVos) { if (label.getParentId().equals(rootParentId)) { - label.setChildren(createTree(label.getId(), treeLabelVos)); + label.setChildLabel(createTree(label.getId(), treeLabelVos)); tree.add(label); } } @@ -150,20 +143,20 @@ public class ITreeLabelServiceImpl extends ServiceImpl childLabel = new ArrayList<>(); - if (root.getChildren() != null) { - for (TreeLabelVo child : root.getChildren()) { + if (root.getChildLabel() != null) { + for (TreeLabelVo child : root.getChildLabel()) { TreeLabelVo newChild = filterByName(child, name); if (newChild != null) { childLabel.add(newChild); } } } - newRoot.setChildren(childLabel.isEmpty() ? null : childLabel); - return root.getLabel().contains(name) || !childLabel.isEmpty() ? newRoot : null; + newRoot.setChildLabel(childLabel.isEmpty() ? null : childLabel); + return root.getName().contains(name) || !childLabel.isEmpty() ? newRoot : null; } } diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java index 8951d5a..438a991 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java @@ -27,31 +27,25 @@ public class TreeLabelVo { * 标签名称 */ @NotBlank(message = "名称不能为空") - private String label; - - /** - * 备注 - */ - private String remark; + private String name; /** * 父id */ - @NotBlank(message = "上级标签不能为空") private String parentId; /** * */ - private Double orderNum; + private Integer orderNum; /** * 子标签 */ - private List children; + private List childLabel; public TreeLabelVo(String parentId) { this.parentId = parentId; - this.children = new ArrayList<>(); + this.childLabel = new ArrayList<>(); } }