From 7f302004e78ca5220a4f88a7fab843964a18739a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 18:35:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java
index 88d06b7..5d8f6eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/BcRegionServiceImpl.java
@@ -1,10 +1,16 @@
package com.panzhihua.sangeshenbian.service.impl;
+import com.panzhihua.sangeshenbian.dao.SystemUserMapper;
import com.panzhihua.sangeshenbian.model.entity.BcRegion;
import com.panzhihua.sangeshenbian.dao.BcRegionMapper;
+import com.panzhihua.sangeshenbian.model.vo.RegionVO;
import com.panzhihua.sangeshenbian.service.IBcRegionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -15,7 +21,9 @@
* @since 2025-02-23
*/
@Service
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class BcRegionServiceImpl extends ServiceImpl<BcRegionMapper, BcRegion> implements IBcRegionService {
+ private final SystemUserMapper systemUserMapper;
/**
* 判断区县是否存在
* @param districtName
@@ -26,6 +34,29 @@
return this.lambdaQuery()
.eq(BcRegion::getRegionName, districtName)
.eq(BcRegion::getDeleteFlag, 0)
- .eq(BcRegion::getHierarchyOrder, 2).last("LIMIT 1").one();
+ .eq(BcRegion::getHierarchyOrder, 3).last("LIMIT 1").one();
+ }
+
+ @Override
+ public BcRegion getDistrictByCode(String districtCode) {
+ return this.lambdaQuery().eq(BcRegion::getRegionCode, districtCode).last("LIMIT 1").one();
+ }
+ /**
+ * 获取区县-街道-社区树
+ * @return
+ */
+ @Override
+ public List<RegionVO> regionTree() {
+ List<RegionVO> regionTree = systemUserMapper.getRegion("510400");
+ systemUserMapper.getStreet("510400");
+ regionTree.forEach(district -> {
+ List<RegionVO> streets = systemUserMapper.getStreet(district.getId());
+ district.setChildren(streets);
+ streets.forEach(street -> {
+ List<RegionVO> communities = systemUserMapper.getCommunity(street.getId());
+ street.setChildren(communities);
+ });
+ });
+ return regionTree;
}
}
--
Gitblit v1.7.1