From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RegionServiceImpl.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RegionServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RegionServiceImpl.java
index 350303c..bfe3bd6 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RegionServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RegionServiceImpl.java
@@ -10,7 +10,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -31,11 +30,9 @@
private RedisTemplate<Object, Object> redisTemplate;
@Override
- public List<Region> addressTree() {
- // redis缓存
- Map<Object, Object> regionList = redisTemplate.opsForHash().entries(RedisConstants.ADDRESS_TREE);
+ public List<Region> addressTree(List<String> cityCodeList) {
// 获取所有地区信息 省市区三级
- List<Region> regions = getReginList(regionList);
+ List<Region> regions = getReginList(cityCodeList);
// 所有地区
Map<String, Region> courseTypeMap = regions.stream().
collect(Collectors.toMap(region -> region.getId().toString()
@@ -67,15 +64,13 @@
/**
* 获取redis数据进行封装
*/
- private List<Region> getReginList(Map<Object, Object> regionMap) {
- List<Region> regions = new ArrayList<>();
- if (!regionMap.isEmpty()) {
- Collection<Object> values = regionMap.values();
- for (Object value : values) {
- regions.add((Region) value);
- }
- } else {
+ private List<Region> getReginList(List<String> cityCodeList) {
+ List<Region> regions;
+ if (cityCodeList==null) {
regions = this.list();
+ } else {
+ regions = this.lambdaQuery()
+ .in(Region::getCode, cityCodeList).list();
}
return regions;
}
--
Gitblit v1.7.1