From 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 一月 2024 09:57:01 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
index 4979aa4..43a8b3f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
@@ -1,8 +1,8 @@
package com.zy.asrs.common.utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.ManTag;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.entity.Tag;
+import com.zy.asrs.common.wms.service.TagService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component;
@@ -17,17 +17,17 @@
public class TreeUtils {
@Autowired
- private ManTagService tagService;
+ private TagService tagService;
/******************************** 褰掔被鏍� *********************************/
/**
* 鑾峰彇鏍戝浘鏁版嵁缁撴瀯
*/
- @Cacheable(cacheNames="tagTree",key="#id")
- public ArrayList<Map> getTree(String id){
+ @Cacheable(cacheNames = "tagTree", key = "#id")
+ public ArrayList<Map> getTree(Long id, Long hostId) {
ArrayList<Map> result = new ArrayList<>();
- ManTag tag = tagService.getById(id);
+ Tag tag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getId, id).eq(Tag::getHostId, hostId));
// 涓昏妭鐐�
Map<String, Object> map = new HashMap<>();
map.put("title", tag.getName());
@@ -45,12 +45,12 @@
/**
* 閫掑綊鑾峰彇瀛愯妭鐐规暟鎹�
*/
- public void dealTag(ManTag parent, List<Map> list) {
- List<ManTag> tags = tagService.list(
- new LambdaQueryWrapper<ManTag>()
- .eq(ManTag::getParentId, parent.getId())
- .eq(ManTag::getStatus, "1"));
- for (ManTag tag : tags) {
+ public void dealTag(Tag parent, List<Map> list) {
+ List<Tag> tags = tagService.list(
+ new LambdaQueryWrapper<Tag>()
+ .eq(Tag::getParentId, parent.getId())
+ .eq(Tag::getStatus, 1));
+ for (Tag tag : tags) {
Map<String, Object> map = new HashMap<>();
map.put("title", tag.getName());
map.put("id", tag.getId());
@@ -62,6 +62,22 @@
}
}
+ /**
+ * 閫掑綊鑾峰彇鑺傜偣浠ュ強瀛愯妭鐐规暟鎹�
+ */
+ public void getTagIdList(Long id, List<Long> nodes) {
+ if (!nodes.contains(id)) {
+ nodes.add(id);
+ }
+ List<Tag> tags = tagService.list(new LambdaQueryWrapper<Tag>().eq(Tag::getParentId, id).eq(Tag::getStatus, 1));
+ for (Tag tag : tags) {
+ if (!nodes.contains(tag.getId())) {
+ nodes.add(tag.getId());
+ }
+ getTagIdList(tag.getId(), nodes);
+ }
+ }
+
// -------------------------------------------------------------------------------------------------------
--
Gitblit v1.9.1