From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/common/cache/SysCache.java | 100 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 85 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/common/cache/SysCache.java b/src/main/java/org/springblade/common/cache/SysCache.java
index d816792..fbc0b5a 100644
--- a/src/main/java/org/springblade/common/cache/SysCache.java
+++ b/src/main/java/org/springblade/common/cache/SysCache.java
@@ -156,25 +156,33 @@
/**
* 获取子部门ID集合
*
- * @param deptId 主键
+ * @param deptIds 主键
* @return 子部门ID
*/
- public static List<Long> getDeptChildIds(Long deptId) {
- if (deptId == null) {
+ public static List<Long> getDeptChildIds(String deptIds) {
+ if (Strings.isBlank(deptIds)) {
return null;
}
- List<Long> deptIdList = CacheUtil.get(SYS_CACHE, DEPT_CHILDIDS_ID, deptId, List.class);
- if (deptIdList == null) {
- deptIdList = new ArrayList<>();
- List<Dept> deptChild = getDeptChild(deptId);
- if (deptChild != null) {
- List<Long> collect = deptChild.stream().map(Dept::getId).collect(Collectors.toList());
- deptIdList.addAll(collect);
+ List<Long> list = new ArrayList<>();
+ List<String> deptIdList = new ArrayList<>(Arrays.asList(deptIds.split(",")));
+ for (String deptId : deptIdList) {
+ List<Long> deptIdLists = CacheUtil.get(SYS_CACHE, DEPT_CHILDIDS_ID, deptId, List.class);
+ if (deptIdLists == null) {
+ deptIdLists = new ArrayList<>();
+ List<Dept> deptChild = getDeptChild(Long.parseLong(deptId));
+ if (deptChild != null) {
+ List<Long> collect = deptChild.stream().map(Dept::getId).collect(Collectors.toList());
+ deptIdLists.addAll(collect);
+ }
+ deptIdLists.add(Long.parseLong(deptId));
+ CacheUtil.put(SYS_CACHE, DEPT_CHILDIDS_ID, deptId, deptIdLists);
}
- deptIdList.add(deptId);
- CacheUtil.put(SYS_CACHE, DEPT_CHILDIDS_ID, deptId, deptIdList);
+ list.addAll(deptIdLists);
}
- return deptIdList;
+ // 去重
+ List<Long> collect = list.stream().distinct().collect(Collectors.toList());
+ // 返回
+ return collect;
}
/**
@@ -333,16 +341,46 @@
//所有行政区划code
List<String> allRegionList = new ArrayList<>();
deptIdList.forEach(id->{
-
List<String> list = new ArrayList<>();
// 查询对应的区域编号code
Dept dept = deptService.getById(id);
if (null!=dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()){
list = getRegionChildCodes(dept.getRegionCode());
-
//行政区划不为空添加进集合
if (list.size()>0){
allRegionList.addAll(list);
+ }
+ }
+ });
+
+ // 去重
+ List<String> collect = allRegionList.stream().distinct().collect(Collectors.toList());
+ return collect;
+ }
+
+ /**
+ * 获取民警（公安）下级所有区域code
+ *
+ * @return regionCode
+ */
+ public static List<String> getPoliceRegionChildCodesByDeptId(String deptId) {
+ //多个部门按逗号分割
+ List<String> deptIdList = Arrays.asList(deptId.split(","));
+
+ //所有行政区划code
+ List<String> allRegionList = new ArrayList<>();
+ deptIdList.forEach(id->{
+ List<String> list = new ArrayList<>();
+ // 查询对应的区域编号code
+ Dept dept = deptService.getById(id);
+ // 只取公安的
+ if (dept.getDeptNature()==1) {
+ if (null != dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()) {
+ list = getPoliceRegionChildCodes(dept.getRegionCode());
+ //行政区划不为空添加进集合
+ if (list.size() > 0) {
+ allRegionList.addAll(list);
+ }
}
}
});
@@ -376,6 +414,38 @@
}
/**
+ * 获取公安下级所有区域code
+ *
+ * @return regionCode
+ */
+ public static List<String> getPoliceRegionChildCodes(String regionCode) {
+ if (regionCode == null) {
+ return null;
+ }
+ List<String> regionCodeList = CacheUtil.get(SYS_CACHE, REGION_CHILDCODES_CODE, regionCode, List.class);
+ if (regionCodeList == null || regionCodeList.size()==0) {
+ regionCodeList = new ArrayList<>();
+ List<Region> deptChild = getPoliceRegionChild(regionCode);
+ if (deptChild != null) {
+ List<String> collect = deptChild.stream().map(Region::getCode).collect(Collectors.toList());
+ regionCodeList.addAll(collect);
+ }
+ regionCodeList.add(regionCode);
+ CacheUtil.put(SYS_CACHE, REGION_CHILDCODES_CODE, regionCode, regionCodeList);
+ }
+ return regionCodeList;
+ }
+
+ /**
+ * 获取民警下级区域
+ * @param regionCode
+ * @return
+ */
+ private static List<Region> getPoliceRegionChild(String regionCode) {
+ return CacheUtil.get(SYS_CACHE, REGION_CHILD_CODE, regionCode, () -> regionService.getPoliceRegionChild(regionCode));
+ }
+
+ /**
* 获取下级区域
* @param regionCode
* @return
--
Gitblit v1.9.3