From e6eb127b2ef4f297b093dcd9a5b47be457f67043 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 29 一月 2026 14:29:05 +0800
Subject: [PATCH] feat(purchase): 碳立方对接
---
ruoyi-system/src/main/java/com/ruoyi/basic/service/impl/ProvinceServiceImpl.java | 77 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/basic/service/impl/ProvinceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/basic/service/impl/ProvinceServiceImpl.java
index 0fb305b..9a9aeb8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/basic/service/impl/ProvinceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/basic/service/impl/ProvinceServiceImpl.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -41,26 +43,64 @@
@Override
public List<TreeSelectOption> getAreaOptions() {
List<TreeSelectOption> res = new ArrayList<>();
- List<Province> list = provinceMapper.selectList(null);
- for (Province province : list) {
- // 鏌ヨ鐪佷笅闈㈢殑甯�
- List<City> cityList = cityMapper.selectList(new LambdaQueryWrapper<City>().eq(City::getProvinceId, province.getId()));
+
+ // 鎵归噺鏌ヨ鎵�鏈夌渷浠�
+ List<Province> provinces = provinceMapper.selectList(null);
+ if (provinces.isEmpty()) {
+ return res;
+ }
+
+ // 鑾峰彇鎵�鏈夌渷浠絀D鐢ㄤ簬鎵归噺鏌ヨ鍩庡競
+ List<Long> provinceIds = provinces.stream()
+ .map(Province::getId)
+ .collect(Collectors.toList());
+
+ // 鎵归噺鏌ヨ鎵�鏈夊煄甯�
+ List<City> allCities = cityMapper.selectList(
+ new LambdaQueryWrapper<City>().in(City::getProvinceId, provinceIds));
+
+ // 灏嗗煄甯傛寜鐪佷唤ID鍒嗙粍
+ Map<Long, List<City>> cityMap = allCities.stream()
+ .collect(Collectors.groupingBy(City::getProvinceId));
+
+ // 鑾峰彇鎵�鏈夊煄甯侷D鐢ㄤ簬鎵归噺鏌ヨ鍖哄煙
+ List<Long> cityIds = allCities.stream()
+ .map(City::getId)
+ .collect(Collectors.toList());
+
+ // 鎵归噺鏌ヨ鎵�鏈夊尯鍩�
+ List<District> allDistricts = districtMapper.selectList(
+ new LambdaQueryWrapper<District>().in(District::getCityId, cityIds));
+
+ // 灏嗗尯鍩熸寜鍩庡競ID鍒嗙粍
+ Map<Long, List<District>> districtMap = allDistricts.stream()
+ .collect(Collectors.groupingBy(District::getCityId));
+
+ // 鏋勫缓鏍戝舰缁撴瀯
+ for (Province province : provinces) {
List<TreeSelectOption> cities = new ArrayList<>();
- for (City city : cityList) {
- // 鏌ヨ甯備笅闈㈢殑鍖�
- List<District> districtList = districtMapper.selectList(new LambdaQueryWrapper<District>().eq(District::getCityId, city.getId()));
- List<TreeSelectOption> districts = new ArrayList<>();
- for (District district : districtList) {
- districts.add(new TreeSelectOption(district.getId().toString(), district.getName(), district.getId(), null));
+
+ List<City> cityList = cityMap.get(province.getId());
+ if (cityList != null && !cityList.isEmpty()) {
+ for (City city : cityList) {
+ List<TreeSelectOption> districts = new ArrayList<>();
+
+ List<District> districtList = districtMap.get(city.getId());
+ if (districtList != null && !districtList.isEmpty()) {
+ for (District district : districtList) {
+ districts.add(new TreeSelectOption(district.getId().toString(),
+ district.getName(), district.getId(), null));
+ }
+ }
+
+ TreeSelectOption cityTreeSelectOption = new TreeSelectOption();
+ cityTreeSelectOption.setValue(city.getId().toString());
+ cityTreeSelectOption.setLabel(city.getName());
+ cityTreeSelectOption.setId(city.getId());
+ cityTreeSelectOption.setChildren(districts);
+
+ cities.add(cityTreeSelectOption);
}
-
- TreeSelectOption cityTreeSelectOption = new TreeSelectOption();
- cityTreeSelectOption.setValue(city.getId().toString());
- cityTreeSelectOption.setLabel(city.getName());
- cityTreeSelectOption.setId(city.getId());
- cityTreeSelectOption.setChildren(districts);
-
- cities.add(cityTreeSelectOption);
}
TreeSelectOption treeSelectOption = new TreeSelectOption();
@@ -74,6 +114,7 @@
return res;
}
+
@Override
public String getAreaDisplay(Long provinceId, Long cityId, Long districtId) {
Province province = provinceMapper.selectById(provinceId);
--
Gitblit v1.9.3