From dd60de8d90f05c64e3cf166bc617b95a82102c52 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 11 Apr 2024 16:38:58 +0800
Subject: [PATCH] 新增自定义异常类
---
src/main/java/org/springblade/common/cache/SysCache.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/common/cache/SysCache.java b/src/main/java/org/springblade/common/cache/SysCache.java
index d58137b..537abf2 100644
--- a/src/main/java/org/springblade/common/cache/SysCache.java
+++ b/src/main/java/org/springblade/common/cache/SysCache.java
@@ -318,7 +318,7 @@
*
* @return regionCode
*/
- public static List<String> getRegionChildCodesByDeptId(String deptId) {
+ public static List<String> getRegionChildCodesByDeptId(String deptId,String communityCode) {
//多个部门按逗号分割
List<String> deptIdList = Arrays.asList(deptId.split(","));
@@ -329,7 +329,7 @@
// 查询对应的区域编号code
Dept dept = deptService.getById(id);
if (null!=dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()){
- list = getRegionChildCodes(dept.getRegionCode());
+ list = getRegionChildCodes(dept.getRegionCode(),communityCode);
//行政区划不为空添加进集合
if (list.size()>0){
allRegionList.addAll(list);
@@ -347,8 +347,7 @@
*
* @return regionCode
*/
- public static List<String> getPoliceRegionChildCodesByDeptId(String deptId) {
- // 去重
+ public static List<String> getPoliceRegionChildCodesByDeptId(String deptId,String communityCode) {
List<String> regionCodeList = new ArrayList<>();
if (!Strings.isBlank(deptId)) {
//多个部门按逗号分割
@@ -363,7 +362,7 @@
// 只取公安的
if (dept.getDeptNature() == 1) {
if (null != dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()) {
- list = getPoliceRegionChildCodes(dept.getRegionCode());
+ list = getPoliceRegionChildCodes(dept.getRegionCode(),communityCode);
//行政区划不为空添加进集合
if (list.size() > 0) {
allRegionList.addAll(list);
@@ -377,19 +376,75 @@
return regionCodeList;
}
+
+ /**
+ * 查询综治网格相关的网格，社区编号集合
+ * @param deptId
+ * @param communityCode
+ * @param roleName
+ * @return
+ */
+ public static List<String> getGridRegionChildCodesByDeptId(String deptId, String communityCode,String roleName) {
+ List<String> regionCodeList = new ArrayList<>();
+ if (!Strings.isBlank(deptId)) {
+ //多个部门按逗号分割
+ List<String> deptIdList = Arrays.asList(deptId.split(","));
+ List<String> finalRegionCodeList = regionCodeList;
+ String key = AuthUtil.getUserId().toString();
+ if (!Strings.isBlank(roleName)){
+ key = key + ":" + roleName;
+ }
+ String finalKey = key;
+ deptIdList.forEach(id -> {
+ List<String> list = new ArrayList<>();
+ // 查询对应的区域编号code
+ Dept dept = deptService.getById(id);
+ // 只取综治的
+ if (dept.getDeptNature() == 2) {
+ if (null != dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()) {
+// list = getGridRegionChildCodes(dept.getRegionCode(),communityCode,roleName);
+ if (dept.getRegionCode() == null) {
+ return;
+ }
+ list = CacheUtil.get(SYS_CACHE, REGION_CHILDCODES_CODE, finalKey, List.class);
+ if (list == null || list.size()==0) {
+ list = new ArrayList<>();
+ List<Region> deptChild = getGridRegionChild(dept.getRegionCode(),communityCode,roleName);
+ if (deptChild != null) {
+ List<String> collect = deptChild.stream().map(Region::getCode).collect(Collectors.toList());
+ list.addAll(collect);
+ }
+// finalRegionCodeList.add(dept.getRegionCode());
+ }
+
+ //行政区划不为空添加进集合
+ if (list.size() > 0) {
+ finalRegionCodeList.addAll(list);
+ }
+ }
+ }
+ });
+ // 去重
+ regionCodeList = finalRegionCodeList.stream().distinct().collect(Collectors.toList());
+ CacheUtil.put(SYS_CACHE, REGION_CHILDCODES_CODE, key, regionCodeList);
+ }
+ return regionCodeList;
+ }
+
+
/**
* 获取下级所有区域code
*
* @return regionCode
*/
- public static List<String> getRegionChildCodes(String regionCode) {
+ public static List<String> getRegionChildCodes(String regionCode,String communityCode) {
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 = getRegionChild(regionCode);
+ List<Region> deptChild = getRegionChild(regionCode,communityCode);
if (deptChild != null) {
List<String> collect = deptChild.stream().map(Region::getCode).collect(Collectors.toList());
regionCodeList.addAll(collect);
@@ -405,14 +460,14 @@
*
* @return regionCode
*/
- public static List<String> getPoliceRegionChildCodes(String regionCode) {
+ public static List<String> getPoliceRegionChildCodes(String regionCode,String communityCode) {
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);
+ List<Region> deptChild = getPoliceRegionChild(regionCode,communityCode);
if (deptChild != null) {
List<String> collect = deptChild.stream().map(Region::getCode).collect(Collectors.toList());
regionCodeList.addAll(collect);
@@ -424,12 +479,21 @@
}
/**
+ * 获取综治下级区域
+ * @param regionCode
+ * @return
+ */
+ private static List<Region> getGridRegionChild(String regionCode, String communityCode,String roleName) {
+ return CacheUtil.get(SYS_CACHE, REGION_CHILD_CODE, regionCode, () -> regionService.getGridRegionChild(regionCode,communityCode,roleName));
+ }
+
+ /**
* 获取民警下级区域
* @param regionCode
* @return
*/
- private static List<Region> getPoliceRegionChild(String regionCode) {
- return CacheUtil.get(SYS_CACHE, REGION_CHILD_CODE, regionCode, () -> regionService.getPoliceRegionChild(regionCode));
+ private static List<Region> getPoliceRegionChild(String regionCode,String communityCode) {
+ return CacheUtil.get(SYS_CACHE, REGION_CHILD_CODE, regionCode, () -> regionService.getPoliceRegionChild(regionCode,communityCode));
}
/**
@@ -437,7 +501,8 @@
* @param regionCode
* @return
*/
- private static List<Region> getRegionChild(String regionCode) {
- return CacheUtil.get(SYS_CACHE, REGION_CHILD_CODE, regionCode, () -> regionService.getRegionChild(regionCode));
+ private static List<Region> getRegionChild(String regionCode,String communityCode) {
+ return CacheUtil.get(SYS_CACHE, REGION_CHILD_CODE, regionCode, () -> regionService.getRegionChild(regionCode,communityCode));
}
+
}
--
Gitblit v1.9.3