From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/AnalyticStatisticsController.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/AnalyticStatisticsController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/AnalyticStatisticsController.java
index 52f3f87..e024aa4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/AnalyticStatisticsController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/AnalyticStatisticsController.java
@@ -61,10 +61,10 @@
Integer id = loginUserInfoSanGeShenBian.getId();
List<SystemUserLevel> listBySystemUsers = systemUserLevelService.getListBySystemUserId(id);
if(listBySystemUsers.size()==0){
+ // 没有权限
return R.ok(new AnalyticStatisticsDataVo());
}
-
- LambdaQueryWrapper<Complaint> wrapper = new LambdaQueryWrapper<Complaint>();
+ LambdaQueryWrapper<Complaint> wrapper = new LambdaQueryWrapper<>();
SystemUserLevel systemUserLevel = listBySystemUsers.stream().filter(e -> e.getLevel() == 1).findFirst().orElse(null);
if(query.getCityCode()!=null){
// 判断是否有市级权限
@@ -111,6 +111,7 @@
// 查看是否有本级权限
List<SystemUserLevel> systemUserLevels4 = listBySystemUsers.stream().filter(e -> e.getLevel() == 4 && e.getCommunityId().equals(query.getCommunityId())).collect(Collectors.toList());
+
// 判断是否有上面的4个权限
if(systemUserLevels4.size()==0 && systemUserLevels3.size()==0 && systemUserLevels2.size()==0 && systemUserLevel==null){
throw new ServiceException("没有该社区权限");
@@ -126,22 +127,28 @@
List<Long> communityIds=new ArrayList<>();
// 不是市级 查看是否是区县账号
List<SystemUserLevel> systemUserLevels2 = listBySystemUsers.stream().filter(e -> e.getLevel() == 2).collect(Collectors.toList());
- if(systemUserLevels2.size()>0){
+ if(!systemUserLevels2.isEmpty()){
+ // 区县账号 找出code
districtsCodes = systemUserLevels2.stream().map(SystemUserLevel::getDistrictsCode).collect(Collectors.toList());
}else {
districtsCodes.add("0");
}
List<SystemUserLevel> systemUserLevels3 = listBySystemUsers.stream().filter(e -> e.getLevel() == 3).collect(Collectors.toList());
- if(systemUserLevels3.size()>0){
- streetIds = systemUserLevels3.stream().filter(e -> !systemUserLevels2.contains(e.getDistrictsCode())).map(SystemUserLevel::getStreetId).collect(Collectors.toList());
+ if(!systemUserLevels3.isEmpty()){
+ // 街道账号 找出id 且不在上面的区县下的街道
+ List<String> finalDistrictsCodes1 = districtsCodes;
+ streetIds = systemUserLevels3.stream().filter(e -> !finalDistrictsCodes1.contains(e.getDistrictsCode())).map(SystemUserLevel::getStreetId).collect(Collectors.toList());
}else {
streetIds.add("0");
}
List<SystemUserLevel> systemUserLevels4 = listBySystemUsers.stream().filter(e -> e.getLevel() == 4).collect(Collectors.toList());
- if(systemUserLevels4.size()>0){
- communityIds = systemUserLevels4.stream().filter(e -> !systemUserLevels3.contains(e.getStreetId()) && !systemUserLevels2.contains(e.getDistrictsCode())).map(SystemUserLevel::getCommunityId).collect(Collectors.toList());
+ if(!systemUserLevels4.isEmpty()){
+ // community账号 找出id 且不在上面的街道下的社区
+ List<String> finalStreetIds1 = streetIds;
+ List<String> finalDistrictsCodes2 = districtsCodes;
+ communityIds = systemUserLevels4.stream().filter(e -> !finalStreetIds1.contains(e.getStreetId()) && !finalDistrictsCodes2.contains(e.getDistrictsCode())).map(SystemUserLevel::getCommunityId).collect(Collectors.toList());
}else {
communityIds.add(0L);
}
@@ -161,14 +168,13 @@
AnalyticStatisticsOneVo analyticStatisticsOneVo = complaintService.analyticStatisticsOne(query,complaints,simpleDateFormat);
// 第二部分数据
- List<AnalyticStatisticsTwoVo> analyticStatisticsTwoVos =complaintService.analyticStatisticsTwo(query,complaints,simpleDateFormat);
+ List<AnalyticStatisticsTwoVo> analyticStatisticsTwoVos =complaintService.analyticStatisticsTwo(query.getTime(),complaints,simpleDateFormat);
// 第三部分数据
- List<AnalyticStatisticsThreeVo> analyticStatisticsThreeVos =complaintService.analyticStatisticsThree(query,complaints);
+ List<AnalyticStatisticsThreeVo> analyticStatisticsThreeVos =complaintService.analyticStatisticsThree(query.getRank(), complaints);
// 第四部分数据
AnalyticStatisticsFourVo analyticStatisticsFourVos =complaintService.analyticStatisticsFour(complaints);
-
AnalyticStatisticsDataVo analyticStatisticsDataVo = new AnalyticStatisticsDataVo();
analyticStatisticsDataVo.setAnalyticStatisticsOneVo(analyticStatisticsOneVo);
@@ -202,6 +208,7 @@
analyticStatisticsRegionVo.setBcRegions(list);
analyticStatisticsRegionVo.setComStreets(list1);
analyticStatisticsRegionVo.setComActs(list2);
+
return R.ok(analyticStatisticsRegionVo);
}
@@ -214,13 +221,11 @@
}
// 找出这个区县的
List<BcRegion> list = bcRegionService.list(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getParentId, 510400).in(BcRegion::getRegionCode, collect));
-
// 区县街道
List<ComStreet> list1 = comStreetService.list(new LambdaQueryWrapper<ComStreet>().in(ComStreet::getAreaCode, collect));
// 区县社区
List<ComAct> list2 = comActService.list(new LambdaQueryWrapper<ComAct>().in(ComAct::getAreaCode, collect).eq(ComAct::getState,0));
-
// 有街道权限 排除上个查询出来的
List<SystemUserLevel> systemUserLevels1 = listBySystemUsers.stream().filter(e -> e.getLevel() == 3 && !collect.contains(e.getDistrictsCode())).collect(Collectors.toList());
@@ -228,6 +233,7 @@
if(collect1.size()==0){
collect1.add("0");
}
+
// 区县街道
List<ComStreet> list3 = comStreetService.list(new LambdaQueryWrapper<ComStreet>().in(ComStreet::getStreetId, collect1));
--
Gitblit v1.7.1