From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 111 +++++++++++++++++--------------------------------------
1 files changed, 35 insertions(+), 76 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
index c5c13d4..03d420c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -1,64 +1,14 @@
package com.panzhihua.service_community.service.impl;
-import static java.util.Objects.isNull;
-import static java.util.Objects.nonNull;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
-import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
-import com.panzhihua.common.model.vos.community.StatisticsCommVO;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialWorkerInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenPartyBuildIngStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenResidentActStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerActStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo;
-import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO;
-import com.panzhihua.common.model.vos.community.bigscreen.FourMemberOrgRelationVO;
-import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
-import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
-import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
@@ -68,31 +18,21 @@
import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.service_community.dao.ComActActivityDAO;
-import com.panzhihua.service_community.dao.ComActCommitteeDao;
-import com.panzhihua.service_community.dao.ComActDAO;
-import com.panzhihua.service_community.dao.ComActDiscussDAO;
-import com.panzhihua.service_community.dao.ComActDynDAO;
-import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
-import com.panzhihua.service_community.dao.ComActEnterpriseDAO;
-import com.panzhihua.service_community.dao.ComActFourMemberDao;
-import com.panzhihua.service_community.dao.ComActMicroWishDAO;
-import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
-import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
-import com.panzhihua.service_community.dao.ComActSocialOrgDao;
-import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO;
-import com.panzhihua.service_community.dao.ComActSocialProjectDao;
-import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
-import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao;
-import com.panzhihua.service_community.dao.ComFmsServiceDAO;
-import com.panzhihua.service_community.dao.ComMngPopulationDAO;
-import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
-import com.panzhihua.service_community.dao.ComPropertyDao;
-import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
+import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
-
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
* @title: BigScreenStatisticsServiceImpl
@@ -232,7 +172,7 @@
statisticsVO.setWarehouseImages(warehouseImages);
//居民活动柱状统计
- List<StatisticsCommVO> residentActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, true);
+ List<StatisticsCommVO> residentActHistogram = comActActivityDAO.selectResidentActHistogramData(communityId, false);
//居民活动新增数据
List<StatisticsCommVO> actAddPolylineData = comActActivityDAO.getActAddPolylineData(communityId, true);
//居民活动发布总数
@@ -1161,6 +1101,25 @@
//志愿者组织数据
List<VolunteerOrgRelationVO> volunteerOrgRelationList = new ArrayList<>();
List<ComMngVolunteerMngVO> volunteerData = comMngVolunteerMngDAO.selectVolunteerByCommunityId(communityId);
+
+ if(volunteerData!=null && volunteerData.size()>0)
+ {
+ for (ComMngVolunteerMngVO ent:volunteerData)
+ {
+ if(!StringUtils.isEmpty(ent.getIdCard()))
+ {
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(ent.getIdCard());
+ ent.setAge(age);
+ }
+ catch (Exception e)
+ {
+ log.error("身份证号码转换年龄失败，人员id:" + ent.getId());
+ }
+ }
+ }
+ }
+
if (!volunteerData.isEmpty()) {
Map<String, List<ComMngVolunteerMngVO>> collect = volunteerData.stream().collect(Collectors.groupingBy(ComMngVolunteerMngVO::getOrgName));
for (Map.Entry<String, List<ComMngVolunteerMngVO>> entry : collect.entrySet()) {
--
Gitblit v1.7.1