From 3596cbaabc93f39dcb46ed1ba9523f54a4081e1e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 16 六月 2021 18:25:49 +0800
Subject: [PATCH] 修改随手拍处理状态问题
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 383 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 369 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 03a3485..70af590 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -1,6 +1,8 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,34 +14,32 @@
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.helper.AESUtil;
-import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.*;
+import com.panzhihua.common.model.vos.community.screen.index.*;
+import com.panzhihua.common.model.vos.grid.EventGridDataVO;
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.common.model.vos.user.*;
-import com.panzhihua.common.utlis.AgeUtils;
-import com.panzhihua.common.utlis.IdCard;
-import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import com.panzhihua.service_community.service.ComMngPopulationService;
+import com.panzhihua.service_community.service.EventResourceService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import com.panzhihua.common.utlis.StringUtils;
import javax.annotation.Resource;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -63,7 +63,13 @@
@Resource
private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
@Resource
+ private ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+ @Resource
+ private EventResourceService eventResourceService;
+ @Resource
+ private BigScreenDAO bigScreenDAO;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -198,6 +204,56 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+
+ if(comMngPopulationVO.getHouseId() != null){
+ ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(comMngPopulationVO.getHouseId());
+ if(houseDO != null){
+ switch (comMngPopulationVO.getLevel()){
+ case 1:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ break;
+ case 2:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ break;
+ case 3:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ comMngPopulationVO.setFloor(houseDO.getFloor());
+ break;
+ case 4:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ comMngPopulationVO.setFloor(houseDO.getFloor());
+ comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
+ break;
+ case 5:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ comMngPopulationVO.setFloor(houseDO.getFloor());
+ comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
+ comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ if(StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())){
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeStart()) + 1)),"yyyy-MM-dd");
+ if(StringUtils.isNotEmpty(ageStartTime)){
+ comMngPopulationVO.setAgeStartTime(ageStartTime);
+ }
+ }
+
+ if(StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())){
+ String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeEnd()) + 1)),"yyyy-MM-dd");
+ if(StringUtils.isNotEmpty(ageEndTime)){
+ comMngPopulationVO.setAgeEndTime(ageEndTime);
+ }
+ }
+
IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
if(!iPage.getRecords().isEmpty()){
iPage.getRecords().forEach(populDO -> {
@@ -276,8 +332,12 @@
continue;
}
+ if(!comMngVillageDO.getHouseNum().contains("号")){
+ comMngVillageDO.setHouseNum(comMngVillageDO.getHouseNum() + "号");
+ }
+
address = areaAddressVO.getProvince() + areaAddressVO.getCity()
- + areaAddressVO.getDistrict() + street + comMngVillageDO.getAlley() + comMngVillageDO.getHouseNum() + "号"
+ + areaAddressVO.getDistrict() + street + comMngVillageDO.getAlley() + comMngVillageDO.getHouseNum()
+ vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
vo.setAddress(address);
@@ -308,6 +368,7 @@
populationHouseDO.setUnitNo(vo.getUnitNo());
populationHouseDO.setHouseNo(vo.getHouseNo());
populationHouseDO.setAddress(address);
+ populationHouseDO.setUpdateAt(new Date());
if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
}
@@ -369,6 +430,7 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setHouseAddress(address);
populationDO.setHouseId(populationHouseDO.getId());
+ populationDO.setUpdateAt(new Date());
this.baseMapper.insert(populationDO);
savePopulList.add(populationDO);
index++;
@@ -385,6 +447,7 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setHouseAddress(address);
populationDO.setHouseId(populationHouseDO.getId());
+ populationDO.setUpdateAt(new Date());
this.baseMapper.insert(populationDO);
savePopulList.add(populationDO);
index++;
@@ -527,7 +590,14 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R deletePopulations(List<Long> Ids) {
+ if(!Ids.isEmpty()){
+ Ids.forEach(id -> {
+ //清除用户房屋居住信息
+ comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(id);
+ });
+ }
int delete = populationDAO.deleteBatchIds(Ids);
if (delete > 0) {
return R.ok();
@@ -580,6 +650,12 @@
return R.fail();
}
BeanUtils.copyProperties(vo,populationDO);
+ if(StringUtils.isEmpty(vo.getLabel())){
+ populationDO.setLabel(null);
+ }
+ if(StringUtils.isEmpty(vo.getRemark())){
+ populationDO.setRemark(null);
+ }
populationDO.setCardNo(null);
populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
@@ -719,6 +795,285 @@
return R.ok(this.baseMapper.getPopulationTotalByAdmin(communityId));
}
+ /**
+ * 首页大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
+ public R getScreenIndex(Long communityId){
+ //创建统计返回参数
+ IndexStatisticsVO statisticsVO = new IndexStatisticsVO();
+
+ //查询基础数据模块
+ IndexBasicsStatisticsVO basicsStatisticsVO = comMngPopulationDAO.getScreenIndexByBasics(communityId);
+ statisticsVO.setBasicsStatistics(basicsStatisticsVO);
+
+ //查询实有人口统计模块
+ IndexPopulationStatisticsVO populationStatisticsVO = new IndexPopulationStatisticsVO();
+ //查询实有人口性别统计
+ List<IndexPopulationSexStatisticsVO> sexPopulationList = comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
+ populationStatisticsVO.setSexPopulationList(sexPopulationList);
+ //查询实有人口年龄统计
+ List<ComMngPopulationDO> populationDOList = comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda()
+ .eq(ComMngPopulationDO::getActId,communityId));
+ List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(populationDOList);
+ populationStatisticsVO.setAgePopulationList(agePopulationList);
+ statisticsVO.setPopulationStatisticsVO(populationStatisticsVO);
+
+ //查询实有人口实时治理信息
+ List<IndexEventListStatisticsVO> eventListStatisticsList = comMngPopulationDAO.getScreenIndexByEventList(communityId);
+ statisticsVO.setEventListStatisticsList(eventListStatisticsList);
+
+ //查询社区治理动态信息
+ IndexDynamicStatisticsVO dynamicStatisticsVO = comMngPopulationDAO.getScreenIndexByDynamic(communityId);
+ dynamicStatisticsVO.setCultureActivityTotal(dynamicStatisticsVO.getPbTotal() + dynamicStatisticsVO.getActTotal());
+ statisticsVO.setDynamicStatisticsVO(dynamicStatisticsVO);
+
+ //查询网格化治理
+ IndexEventGridStatisticsVO eventGridStatisticsVO = new IndexEventGridStatisticsVO();
+ List<IndexGridStatisticsVO> gridStatisticsList = new ArrayList<>();
+ //查询网格化事件数据
+ IndexGridEventStatisticsVO gridEventStatistics = comMngPopulationDAO.getGridEventStatisticsList(communityId);
+ eventGridStatisticsVO.setGridEventStatisticsList(gridEventStatistics);
+ //查询网格数据
+ List<EventGridDataVO> gridDataList = comMngPopulationDAO.getGridDataListByCommunityId(communityId);
+ if(!gridDataList.isEmpty()){
+ gridDataList.forEach(gridData -> {
+ if(gridData != null){
+ IndexGridStatisticsVO gridStatisticsVO = new IndexGridStatisticsVO();
+ gridStatisticsVO.setEventData(gridData.getGridName());
+ //根据网格id查询网格事件列表
+ IndexGridEventStatisticsVO gridEventList = comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
+ gridStatisticsVO.setGridEventStatisticsList(gridEventList);
+ gridStatisticsList.add(gridStatisticsVO);
+ }
+ });
+ }
+ eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList);
+ statisticsVO.setEventGridStatisticsVO(eventGridStatisticsVO);
+
+ //查询党建数据
+ BigScreenStatisticPartyBuild statisticPartyBuild = bigScreenDAO.partybuild(communityId);
+ statisticsVO.setStatisticPartyBuild(statisticPartyBuild);
+
+ //查询特殊人群统计
+ List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
+
+ //查询特殊人群标签列表
+ List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
+ IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
+ otherSpecialVO.setTitle("其他");
+ otherSpecialVO.setSum(0);
+ if(!userTagList.isEmpty()){
+ userTagList.forEach(userTag -> {
+ if(userTag != null){
+ if(userTag.getSysFlag().equals(0)){
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
+ }else{
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ specialStatisticsVO.setSum(count);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }
+ }
+ });
+ }
+ specialStatisticsVOList.add(otherSpecialVO);
+ statisticsVO.setSpecialStatisticsVOList(specialStatisticsVOList);
+ return R.ok(statisticsVO);
+ }
+
+ private List<IndexPopulationAgeStatisticsVO> statisticsAge(List<ComMngPopulationDO> populationDOList){
+ List<IndexPopulationAgeStatisticsVO> agePopulationList = new ArrayList<>();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO1 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO2 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO3 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO4 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO5 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO6 = new IndexPopulationAgeStatisticsVO();
+ ageStatisticsVO1.setType(1);
+ ageStatisticsVO2.setType(2);
+ ageStatisticsVO3.setType(3);
+ ageStatisticsVO4.setType(4);
+ ageStatisticsVO5.setType(5);
+ ageStatisticsVO6.setType(6);
+
+ if(populationDOList.isEmpty()){
+ ageStatisticsVO1.setSum(0);
+ ageStatisticsVO2.setSum(0);
+ ageStatisticsVO3.setSum(0);
+ ageStatisticsVO4.setSum(0);
+ ageStatisticsVO5.setSum(0);
+ ageStatisticsVO6.setSum(0);
+ }else{
+ populationDOList.forEach(population -> {
+ Integer age = IdcardUtil.getAgeByIdCard(population.getCardNoStr());
+ if(age >= 0 && age < 16){
+ ageStatisticsVO1.setSum(ageStatisticsVO1.getSum() + 1);
+ }else if(age >= 16 && age < 27){
+ ageStatisticsVO2.setSum(ageStatisticsVO2.getSum() + 1);
+ }else if(age >= 27 && age < 35){
+ ageStatisticsVO3.setSum(ageStatisticsVO3.getSum() + 1);
+ }else if(age >= 35 && age < 45){
+ ageStatisticsVO4.setSum(ageStatisticsVO4.getSum() + 1);
+ }else if(age >= 45 && age < 55){
+ ageStatisticsVO5.setSum(ageStatisticsVO5.getSum() + 1);
+ }else if(age >= 55){
+ ageStatisticsVO6.setSum(ageStatisticsVO6.getSum() + 1);
+ }
+ });
+ }
+ agePopulationList.add(ageStatisticsVO1);
+ agePopulationList.add(ageStatisticsVO2);
+ agePopulationList.add(ageStatisticsVO3);
+ agePopulationList.add(ageStatisticsVO4);
+ agePopulationList.add(ageStatisticsVO5);
+ agePopulationList.add(ageStatisticsVO6);
+ return agePopulationList;
+ }
+
+ /**
+ * 事件大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
+ public R getScreenEvent(Long communityId){
+ //创建统计返回参数
+ EventStatisticsVO statisticsVO = new EventStatisticsVO();
+
+ //查询页面左边数据
+ EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
+ //查询左上数据
+ EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(communityId);
+ //查询时间频发月份
+ List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
+ leftTopStatisticsVO.setOftenMonth(monthList);
+ leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
+ //查询左下数据
+ EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(communityId);
+ leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
+ statisticsVO.setLeftStatisticsVO(leftStatisticsVO);
+
+ //查询事件播报模块数据
+ EventNewStatisticsVO newStatisticsVO = this.baseMapper.getEventScreenRightTop(communityId);
+ if(newStatisticsVO != null){
+ //查询事件资源文件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1)
+ .eq(EventResourceDO::getRefId, newStatisticsVO.getId())
+ );
+ List<EventResourceVO> picList = new ArrayList<>();
+ List<EventResourceVO> audioList = new ArrayList<>();
+ List<EventResourceVO> videoList = new ArrayList<>();
+ eventResourceDOList.forEach(eventResourceDO -> {
+ switch (eventResourceDO.getType()) {
+ case 1:
+ EventResourceVO picEventResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
+ picList.add(picEventResourceVO);
+ break;
+ case 2:
+ EventResourceVO audioResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
+ audioList.add(audioResourceVO);
+ break;
+ case 3:
+ EventResourceVO videoResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
+ videoList.add(videoResourceVO);
+ break;
+ }
+ });
+ newStatisticsVO.setAudios(audioList);
+ newStatisticsVO.setPics(picList);
+ newStatisticsVO.setVideos(videoList);
+ }
+ statisticsVO.setNewStatisticsVO(newStatisticsVO);
+
+ //查询网格数据
+ List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+ statisticsVO.setGridStatisticsList(gridStatisticsList);
+
+ //查询社区事件列表
+ List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
+ statisticsVO.setGridIncidentList(gridIncidentList);
+
+ return R.ok(statisticsVO);
+ }
+
+ /**
+ * 民生大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
+ public R getScreenCivil(Long communityId){
+ //创建统计返回参数
+ CivilStatisticsVO civilStatisticsVO = new CivilStatisticsVO();
+
+ //查询特殊人群统计
+ List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
+
+ //查询特殊人群标签列表
+ List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
+ IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
+ otherSpecialVO.setTitle("其他");
+ otherSpecialVO.setSum(0);
+ if(!userTagList.isEmpty()){
+ userTagList.forEach(userTag -> {
+ if(userTag != null){
+ if(userTag.getSysFlag().equals(0)){
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
+ }else{
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ specialStatisticsVO.setSum(count);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }
+ }
+ });
+ }
+ //计算特殊人群总数
+ specialStatisticsVOList.add(otherSpecialVO);
+ Integer specialNum = 0;
+ if(!specialStatisticsVOList.isEmpty()){
+ for (IndexSpecialStatisticsVO special:specialStatisticsVOList) {
+ specialNum += special.getSum();
+ }
+ }
+ civilStatisticsVO.setSpecialNum(specialNum);
+ civilStatisticsVO.setSpecialStatisticsList(specialStatisticsVOList);
+
+ //计算环比上月增长率
+ BigDecimal rate = BigDecimal.ZERO;
+ CivilPopulationStatisticsVO populationStatisticsVO = this.baseMapper.getCivilScreenPopulation(communityId,DateUtils.getFirstDayOfMonth());
+ if(populationStatisticsVO != null){
+ if(populationStatisticsVO.getToMonthSpecialTotal().equals(0)){
+ rate = BigDecimal.valueOf(100);
+ }else{
+ rate = BigDecimal.valueOf(populationStatisticsVO.getSpecialTotal() - populationStatisticsVO.getToMonthSpecialTotal()).divide(BigDecimal.valueOf(populationStatisticsVO.getToMonthSpecialTotal()),3,BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100));
+ }
+ }
+ civilStatisticsVO.setRate(rate);
+
+ //查询网格数据
+ List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+ civilStatisticsVO.setGridStatisticsList(gridStatisticsList);
+
+ //查询小区列表
+ List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
+ civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);
+
+ return R.ok(civilStatisticsVO);
+ }
+
public static void main(String[] args) {
// List<ComMngPopulationHouseUserDO> distinctClass = populationHouseUserDOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getPopulId() + ";" + o.getHouseId() + ";" + o.getId() + ";" + o.getRelation()))), ArrayList::new));
--
Gitblit v1.7.1