shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-05-18 17:51:47 +08:00
parent f9b2f64a98
commit 4121d03b08
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/areacode/AreaCodeTree.java
View File

@@ -1,15 +1,12 @@
package com.ruoyi.xq.dto.app.areacode;
import com.ruoyi.xq.domain.AreaCode;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
public class AreaCodeTree extends AreaCode {
public class AreaCodeTree {
private Integer code;
/**
@@ -29,7 +26,7 @@ public class AreaCodeTree extends AreaCode {
*/
private String pname;
private List<AreaCode> childrenArea;
private List<AreaCodeTree> childrenArea;
public void addChild(AreaCodeTree child) {
if (childrenArea == null) {
childrenArea = new ArrayList<>();

25
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AreaCodeServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.ruoyi.xq.dto.app.areacode.AreaCodeTree;
import com.ruoyi.xq.enums.common.AreaCodeLevelEnum;
import com.ruoyi.xq.mapper.AreaCodeMapper;
import com.ruoyi.xq.service.AreaCodeService;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -67,17 +68,18 @@ public class AreaCodeServiceImpl extends ServiceImpl<AreaCodeMapper,AreaCode> im
List<AreaCode> list = this.list();
List<AreaCodeTree> nodeList = BeanConvertUtil.convertListTo(list, AreaCodeTree::new);
Map<Integer, AreaCodeTree> nodeMap = new HashMap<>();
Set<AreaCodeTree> roots = new HashSet<>();
List<AreaCodeTree> roots = new ArrayList<>(); // 新增列表用于存储根节点
// 遍历列表构建节点映射表
for (AreaCodeTree node : nodeList) {
nodeMap.put(node.getCode(), node);
if (node.getPcode() == 0 || !nodeMap.containsKey(node.getPcode())) {
roots.add(node);
}
}
// 建立父子关系
for (AreaCodeTree node : nodeList) {
if (nodeMap.containsKey(node.getPcode())) {
// 如果节点的父节点ID不在Map中，说明它是根节点
if (!nodeMap.containsKey(node.getPcode())) {
roots.add(node);
} else {
// 否则，找到其父节点并添加当前节点到父节点的子节点列表中
AreaCodeTree parentNode = nodeMap.get(node.getPcode());
parentNode.addChild(node);
}
@@ -88,20 +90,21 @@ public class AreaCodeServiceImpl extends ServiceImpl<AreaCodeMapper,AreaCode> im
@Override
public List<AreaCodeTree> treeCity() {
List<AreaCode> list = this.list(Wrappers.lambdaQuery(AreaCode.class)
.in(AreaCode::getLevel, AreaCodeLevelEnum.PROVINCE,AreaCodeLevelEnum.CITY));
.in(AreaCode::getLevel, AreaCodeLevelEnum.PROVINCE.getCode(),AreaCodeLevelEnum.CITY.getCode()));
List<AreaCodeTree> nodeList = BeanConvertUtil.convertListTo(list, AreaCodeTree::new);
Map<Integer, AreaCodeTree> nodeMap = new HashMap<>();
Set<AreaCodeTree> roots = new HashSet<>();
List<AreaCodeTree> roots = new ArrayList<>(); // 新增列表用于存储根节点
// 遍历列表构建节点映射表
for (AreaCodeTree node : nodeList) {
nodeMap.put(node.getCode(), node);
if (node.getPcode() == 0 || !nodeMap.containsKey(node.getPcode())) {
roots.add(node);
}
}
// 建立父子关系
for (AreaCodeTree node : nodeList) {
if (nodeMap.containsKey(node.getPcode())) {
// 如果节点的父节点ID不在Map中，说明它是根节点
if (!nodeMap.containsKey(node.getPcode())) {
roots.add(node);
} else {
// 否则，找到其父节点并添加当前节点到父节点的子节点列表中
AreaCodeTree parentNode = nodeMap.get(node.getPcode());
parentNode.addChild(node);
}