From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 460 ++++++++++++++++++++++++++++----------------------------
1 files changed, 230 insertions(+), 230 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 b04312e..1f0d48a 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,5 @@
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;
@@ -20,7 +19,6 @@
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.screen.ComActPopulationCultureVO;
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;
@@ -29,10 +27,14 @@
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.screen.ComActPopulationCultureVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
import com.panzhihua.common.model.vos.user.*;
-import com.panzhihua.common.utlis.*;
+import com.panzhihua.common.utlis.AgeUtils;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
@@ -45,14 +47,11 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -168,13 +167,13 @@
// }
//查询当前用户电子档信息
- if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
+ if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
- if(electronicFileVO != null){
+ if (electronicFileVO != null) {
comMngPopulationVO.setUserElectronicFileVO(electronicFileVO);
//查询家庭成员信息
List<ComMngFamilyInfoVO> familyInfoVOList = populationDAO.listFamilyByUserId(electronicFileVO.getUserId());
- if(!familyInfoVOList.isEmpty()){
+ if (!familyInfoVOList.isEmpty()) {
comMngPopulationVO.setFamilyInfoVOList(familyInfoVOList);
}
}
@@ -182,8 +181,8 @@
//查询当前用户房屋信息
List<ComMngHouseVo> houseList = comMngPopulationHouseDAO.getPopulHouseListByPopulId(populationId);
- if(!houseList.isEmpty()){
- houseList.forEach(house ->{
+ if (!houseList.isEmpty()) {
+ houseList.forEach(house -> {
});
comMngPopulationVO.setHouseList(houseList);
@@ -191,7 +190,7 @@
//查询当前实有人口车辆信息
List<ComMngPopulationCarVO> carList = comMngCarDAO.getPopulationCarListByIdCard(comMngPopulationDO.getCardNo());
- if(!carList.isEmpty()){
+ if (!carList.isEmpty()) {
comMngPopulationVO.setCarList(carList);
}
return R.ok(comMngPopulationVO);
@@ -209,18 +208,18 @@
Long pageNum = comMngPopulationVO.getPageNum();
Long pageSize = comMngPopulationVO.getPageSize();
if (null == pageNum || 0 == pageNum) {
- pageNum = 1l;
+ pageNum = 1L;
}
if (null == pageSize || 0 == pageSize) {
- pageSize = 10l;
+ pageSize = 10L;
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- if(comMngPopulationVO.getHouseId() != null){
+ if (comMngPopulationVO.getHouseId() != null) {
ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(comMngPopulationVO.getHouseId());
- if(houseDO != null){
- switch (comMngPopulationVO.getLevel()){
+ if (houseDO != null) {
+ switch (comMngPopulationVO.getLevel()) {
case 1:
comMngPopulationVO.setRoad(houseDO.getAlley());
break;
@@ -252,24 +251,24 @@
}
}
- 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)){
+ 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)){
+ 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()){
+ if (!iPage.getRecords().isEmpty()) {
iPage.getRecords().forEach(populDO -> {
- if(StringUtils.isNotEmpty(populDO.getBirthday())){
+ if (StringUtils.isNotEmpty(populDO.getBirthday())) {
populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
}
});
@@ -313,17 +312,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception{
+ public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception {
List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//查询该社区
ComActDO comActDO = comActDAO.selectById(communityId);
//查询该社区的省市区地址
- AreaAddressVO areaAddressVO = populationDAO.getAreaAddress(comActDO.getProvinceCode(),comActDO.getCityCode(),comActDO.getAreaCode());
+ AreaAddressVO areaAddressVO = populationDAO.getAreaAddress(comActDO.getProvinceCode(), comActDO.getCityCode(), comActDO.getAreaCode());
//查询社区上街道信息
String streetName = "";
- if(comActDO.getStreetId() != null){
+ if (comActDO.getStreetId() != null) {
ComStreetDO streetDO = comStreetDAO.selectById(comActDO.getStreetId());
- if(streetDO != null){
+ if (streetDO != null) {
streetName = streetDO.getName();
}
}
@@ -333,17 +332,17 @@
for (ComMngPopulationServeExcelVO vo : list) {
String address = "";
//查询街路巷是否存在
- ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
if (comMngVillageDO == null) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorMsg("街路巷或小区号不存在");
- importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:"+vo.getDoorNo());
+ importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
populationImportErrorVOList.add(importErrorVO);
// index++;
continue;
}
- if(!comMngVillageDO.getHouseNum().contains("号")){
+ if (!comMngVillageDO.getHouseNum().contains("号")) {
comMngVillageDO.setHouseNum(comMngVillageDO.getHouseNum() + "号");
}
@@ -354,38 +353,38 @@
//先判断房屋是否存在
ComMngPopulationHouseDO populationHouseDO = comMngPopulationHouseDAO.selectOne(new QueryWrapper<ComMngPopulationHouseDO>().lambda()
- .eq(ComMngPopulationHouseDO::getCommunityId,communityId).eq(ComMngPopulationHouseDO::getVillageId,comMngVillageDO.getVillageId())
- .eq(ComMngPopulationHouseDO::getFloor,vo.getFloor()).eq(ComMngPopulationHouseDO::getUnitNo,vo.getUnitNo())
- .eq(ComMngPopulationHouseDO::getHouseNo,vo.getHouseNo()));
- if(populationHouseDO == null){
+ .eq(ComMngPopulationHouseDO::getCommunityId, communityId).eq(ComMngPopulationHouseDO::getVillageId, comMngVillageDO.getVillageId())
+ .eq(ComMngPopulationHouseDO::getFloor, vo.getFloor()).eq(ComMngPopulationHouseDO::getUnitNo, vo.getUnitNo())
+ .eq(ComMngPopulationHouseDO::getHouseNo, vo.getHouseNo()));
+ if (populationHouseDO == null) {
//房屋信息不存在建立房屋信息
- populationHouseDO = savePopulationHouse(vo,comMngVillageDO,communityId,address,areaPath,comActDO.getName());
+ populationHouseDO = savePopulationHouse(vo, comMngVillageDO, communityId, address, areaPath, comActDO.getName());
}
- if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
//空户处理完房屋信息，直接返回
continue;
}
String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
//判断实有人口是否已存在
ComMngPopulationDO populationDO = this.baseMapper.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
- .eq(ComMngPopulationDO::getCardNo,cardNoAES));
- if(populationDO == null){
+ .eq(ComMngPopulationDO::getCardNo, cardNoAES));
+ if (populationDO == null) {
//不存在实有人口,则新增
- populationDO = savePopulationDO(vo,comActDO,comMngVillageDO,cardNoAES);
- }else {
+ populationDO = savePopulationDO(vo, comActDO, comMngVillageDO, cardNoAES);
+ } else {
//如果存在人口信息，且是自用房，则更新人口默认的房屋信息
- if(vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())){
- populationDO = updatePopulationHouseUse(vo,populationDO,cardNoAES);
+ if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
+ populationDO = updatePopulationHouseUse(vo, populationDO, cardNoAES);
}
}
//处理实有人口房屋居住信息
- if(populationDO != null){
+ if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>()
- .lambda().eq(ComMngPopulationHouseUserDO::getHouseId,populationHouseDO.getId())
- .eq(ComMngPopulationHouseUserDO::getPopulId,populationDO.getId()));
- if(populationHouseUserDO == null){
+ .lambda().eq(ComMngPopulationHouseUserDO::getHouseId, populationHouseDO.getId())
+ .eq(ComMngPopulationHouseUserDO::getPopulId, populationDO.getId()));
+ if (populationHouseUserDO == null) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
@@ -403,13 +402,13 @@
}
this.saveBatch(populationDOList);*/
- if(!populationImportErrorVOList.isEmpty()){
+ if (!populationImportErrorVOList.isEmpty()) {
return R.fail(JSON.toJSONString(populationImportErrorVOList));
}
return R.ok();
}
- private ComMngPopulationDO updatePopulationHouseUse(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,String cardNoAES) throws Exception {
+ private ComMngPopulationDO updatePopulationHouseUse(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO, String cardNoAES) throws Exception {
populationDO.setRoad(vo.getRoad());
populationDO.setDoorNo(vo.getDoorNo());
populationDO.setFloor(vo.getFloor());
@@ -417,16 +416,16 @@
populationDO.setHouseNo(vo.getHouseNo());
populationDO.setCardNo(cardNoAES);
populationDO.setCardNoStr(vo.getCardNo());
- if(StringUtils.isNotEmpty(populationDO.getPhone())){
+ if (StringUtils.isNotEmpty(populationDO.getPhone())) {
populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
}
this.baseMapper.updateById(populationDO);
return populationDO;
}
- private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngVillageDO comMngVillageDO,String cardNoAES) {
+ private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngVillageDO comMngVillageDO, String cardNoAES) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
- BeanUtils.copyProperties(vo,populationDO);
+ BeanUtils.copyProperties(vo, populationDO);
populationDO.setId(Snowflake.getId());
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
populationDO.setVillageId(comMngVillageDO.getVillageId());
@@ -441,7 +440,7 @@
return populationDO;
}
- private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId, String address, StringBuilder areaPath,String actName) {
+ private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId, String address, StringBuilder areaPath, String actName) {
//查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
@@ -460,22 +459,22 @@
populationHouseDO.setConstructPurpose(vo.getBuildPurpose());
StringBuilder housePath = new StringBuilder();
housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(address);
- populationHouseDO.setPath(areaPath.toString()+ housePath.toString());
+ populationHouseDO.setPath(areaPath.toString() + housePath.toString());
try {
populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
- }catch (Exception e){
+ } catch (Exception e) {
}
- if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
}
- if(vo.getHouseStatus() != null){
+ if (vo.getHouseStatus() != null) {
populationHouseDO.setStatus(vo.getHouseStatus());
}
- if(vo.getHousePurpose() != null){
+ if (vo.getHousePurpose() != null) {
populationHouseDO.setPurpose(vo.getHousePurpose());
}
- if(vo.getControlStatus() != null){
+ if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
comMngPopulationHouseDAO.insert(populationHouseDO);
@@ -484,9 +483,10 @@
/**
* 确认导入实有人口（有则更新，无则新建）
- * @param list 用户信息
- * @param communityId 社区id
- * @return 导入结果
+ *
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
*/
@Override
public R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId) {
@@ -501,7 +501,7 @@
list.forEach(vo -> {
ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
//查询街路巷是否存在
- ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
// ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
BeanUtils.copyProperties(vo, comMngPopulationDO);
if (comMngVillageDO == null) {
@@ -516,7 +516,7 @@
populationDOList.add(comMngPopulationDO);
});
- if(!populationDOList.isEmpty()){
+ if (!populationDOList.isEmpty()) {
//循环遍历待导入人员信息，如果数据库存在则更新，如果不存在则新建
populationDOList.forEach(population -> {
try {
@@ -526,14 +526,14 @@
//查询这个用户是否存在
ComMngPopulationDO comMngPopulationDO = this.populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
.eq(ComMngPopulationDO::getCardNo, population.getCardNo()));
- if(comMngPopulationDO != null){
+ if (comMngPopulationDO != null) {
population.setId(comMngPopulationDO.getId());
- BeanUtils.copyProperties(population,comMngPopulationDO);
+ BeanUtils.copyProperties(population, comMngPopulationDO);
this.populationDAO.updateById(population);
- }else{
+ } else {
this.populationDAO.insert(population);
}
- }catch (Exception e){
+ } catch (Exception e) {
log.error("导入实有人口失败");
}
});
@@ -553,6 +553,7 @@
/**
* 根据id修改实有人口标签
+ *
* @param populationTagDTO 请求参数
* @return 修改结果
*/
@@ -562,10 +563,10 @@
if (comMngPopulationDO == null) {
return R.fail("未查询到人口记录");
}
- BeanUtils.copyProperties(populationTagDTO,comMngPopulationDO);
+ BeanUtils.copyProperties(populationTagDTO, comMngPopulationDO);
int nub = populationDAO.updateById(comMngPopulationDO);
- if(nub < 1){
+ if (nub < 1) {
return R.fail();
}
return R.ok();
@@ -573,13 +574,14 @@
/**
* 批量删除实有人口
+ *
* @param Ids
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R deletePopulations(List<Long> Ids) {
- if(!Ids.isEmpty()){
+ if (!Ids.isEmpty()) {
Ids.forEach(id -> {
//清除用户房屋居住信息
comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(id);
@@ -594,17 +596,18 @@
/**
* 根据社区id查询所有实有人口
- * @param communityId 社区id
- * @return 查询结果
+ *
+ * @param communityId 社区id
+ * @return 查询结果
*/
@Override
public R getPopulationListByCommunityId(Long communityId) {
- List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id",communityId));
+ List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id", communityId));
List<ComMngPopulationVO> resultList = new ArrayList<>();
- if(list.size() > 0){
+ if (list.size() > 0) {
list.forEach(populationDO -> {
- ComMngPopulationVO populationVO=new ComMngPopulationVO();
- BeanUtils.copyProperties(populationDO,populationVO);
+ ComMngPopulationVO populationVO = new ComMngPopulationVO();
+ BeanUtils.copyProperties(populationDO, populationVO);
resultList.add(populationVO);
});
}
@@ -613,17 +616,18 @@
/**
* 根据id集合查询实有人口
- * @param Ids 实有人口id集合
- * @return 查询结果
+ *
+ * @param Ids 实有人口id集合
+ * @return 查询结果
*/
@Override
public R getPopulationLists(List<Long> Ids) {
List<ComMngPopulationDO> list = populationDAO.selectBatchIds(Ids);
List<ComMngPopulationVO> resultList = new ArrayList<>();
- if(list.size() > 0){
+ if (list.size() > 0) {
list.forEach(populationDO -> {
ComMngPopulationVO populationVO = new ComMngPopulationVO();
- BeanUtils.copyProperties(populationDO,populationVO);
+ BeanUtils.copyProperties(populationDO, populationVO);
resultList.add(populationVO);
});
}
@@ -631,23 +635,23 @@
}
@Override
- public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception{
+ public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception {
ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
- if(populationDO == null){
+ if (populationDO == null) {
return R.fail();
}
- BeanUtils.copyProperties(vo,populationDO);
- if(StringUtils.isEmpty(vo.getLabel())){
+ BeanUtils.copyProperties(vo, populationDO);
+ if (StringUtils.isEmpty(vo.getLabel())) {
populationDO.setLabel(null);
}
- if(StringUtils.isEmpty(vo.getRemark())){
+ if (StringUtils.isEmpty(vo.getRemark())) {
populationDO.setRemark(null);
}
populationDO.setCardNo(null);
populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
ComActDO comActDO = comActDAO.selectById(communityId);
- if(comActDO != null){
+ if (comActDO != null) {
populationDO.setActId(comActDO.getCommunityId());
populationDO.setStreetId(comActDO.getStreetId());
}
@@ -656,13 +660,13 @@
List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId());
//清除用户房屋居住信息
comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(vo.getId());
- if(!houseIds.isEmpty()){
+ if (!houseIds.isEmpty()) {
houseIds.forEach(houseId -> {
//查询当前房屋下是否有人口信息，如果没有则将房屋设置为空户
List<Long> oldHouseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByhHosueId(houseId);
- if(oldHouseIds.isEmpty()){
+ if (oldHouseIds.isEmpty()) {
//修改房屋信息为空户
- comMngPopulationHouseDAO.updateHouseByIsEmpty(houseId,1);
+ comMngPopulationHouseDAO.updateHouseByIsEmpty(houseId, 1);
}
});
}
@@ -671,91 +675,93 @@
//更新用户的房屋信息
Long houseId = null;
List<ComMngPopulationHouseUserDO> populationHouseUserDOList = new ArrayList<>();
- if(!vo.getHouseEditDTOList().isEmpty()){
- for (ComMngPopulationHouseEditDTO houseEditDto:vo.getHouseEditDTOList()) {
+ if (!vo.getHouseEditDTOList().isEmpty()) {
+ for (ComMngPopulationHouseEditDTO houseEditDto : vo.getHouseEditDTOList()) {
ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setPopulId(populationDO.getId());
populationHouseUserDO.setHouseId(houseEditDto.getId());
- if(houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)){
+ if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
houseId = houseEditDto.getId();//居住地
}
populationHouseUserDOList.add(populationHouseUserDO);
//修改房屋信息不为空户
- comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(),2);
+ comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(), 2);
}
}
comMngPopulationHouseUserService.saveBatch(populationHouseUserDOList);
- if(houseId != null){//居住地更新
+ if (houseId != null) {//居住地更新
ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(houseId);
- if(houseDO != null){
+ if (houseDO != null) {
populationDO.setRoad(houseDO.getAlley());
populationDO.setDoorNo(houseDO.getHouseNum());
populationDO.setFloor(houseDO.getFloor());
populationDO.setUnitNo(houseDO.getUnitNo());
populationDO.setHouseNo(houseDO.getHouseNo());
ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().lambda()
- .eq(ComMngVillageDO::getAlley,houseDO.getAlley()).eq(ComMngVillageDO::getHouseNum,houseDO.getHouseNum())
- .eq(ComMngVillageDO::getCommunityId,communityId));
+ .eq(ComMngVillageDO::getAlley, houseDO.getAlley()).eq(ComMngVillageDO::getHouseNum, houseDO.getHouseNum())
+ .eq(ComMngVillageDO::getCommunityId, communityId));
if (comMngVillageDO != null) {
populationDO.setVillageId(comMngVillageDO.getVillageId());
- if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){
+ if (!StringUtils.isEmpty(comMngVillageDO.getGroupAt())) {
populationDO.setVillageName(comMngVillageDO.getGroupAt());
}
}
}
}
populationDO.setUpdateAt(new Date());
- if(populationDAO.updateById(populationDO) > 0){
+ if (populationDAO.updateById(populationDO) > 0) {
return R.ok();
- }else{
+ } else {
return R.fail("修改失败");
}
}
@Override
- public R specialInputUser(PageInputUserDTO pageInputUserDTO){
+ public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(new Page<>(pageInputUserDTO.getPageNum()
- ,pageInputUserDTO.getPageSize()), pageInputUserDTO);
+ , pageInputUserDTO.getPageSize()), pageInputUserDTO);
return R.ok(iPage);
}
/**
* 删除特殊群体人员
- * @param id 特殊群体id
- * @return 删除结果
+ *
+ * @param id 特殊群体id
+ * @return 删除结果
*/
@Override
- public R deleteSpecialInputUser(Long id){
+ public R deleteSpecialInputUser(Long id) {
//查询特殊群体人员
ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
- if(populationDO == null){
+ if (populationDO == null) {
return R.fail("未查询到该记录");
}
populationDO.setLabel(null);
- if(this.baseMapper.updateById(populationDO) > 0){
+ if (this.baseMapper.updateById(populationDO) > 0) {
return R.ok();
- }else{
+ } else {
return R.fail();
}
}
/**
* 查询实有人口电子档信息
- * @param populationId 实有人口id
- * @return 实有人口电子档信息
+ *
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
*/
@Override
- public R electronicArchivesPopulation(Long populationId){
+ public R electronicArchivesPopulation(Long populationId) {
ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
return R.fail("用户信息不存在");
}
//查询当前用户电子档信息
- if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
+ if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
- if(electronicFileVO != null){
+ if (electronicFileVO != null) {
return R.ok(electronicFileVO);
}
}
@@ -765,30 +771,69 @@
@Override
public R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO) {
UserElectronicFileVO electronicFileVO = populationDAO.getSysUserById(userElectronicFileVO.getUserId());
- if(electronicFileVO==null){
+ if (electronicFileVO == null) {
return R.fail("id有误！");
}
- populationDAO.updateSysUserElectronicFile(userElectronicFileVO);
+ populationDAO.updateSysUserElectronicFile(userElectronicFileVO);
return R.ok();
}
/**
* 实有人口统计
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId 社区id
+ * @return 统计结果
*/
@Override
- public R getPopulationTotalByAdmin(Long communityId){
+ public R getPopulationTotalByAdmin(Long communityId) {
return R.ok(this.baseMapper.getPopulationTotalByAdmin(communityId));
+ }
+
+ @Override
+ public R editTagPopulationByCardNo(ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO) {
+ ComMngPopulationDO comMngPopulationDO = getPopulationByCardNo(comMngPopulationTagCardNoDTO.getCardNo());
+ if (comMngPopulationDO == null) {
+ return R.fail("未查询到人口记录");
+ }
+ ComMngPopulationDO comMngPopulation = new ComMngPopulationDO();
+ if (comMngPopulationDO.getLabel() != null) {
+ if (!comMngPopulationDO.getLabel().contains(comMngPopulationTagCardNoDTO.getLabel())) {
+ comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel().concat(",").concat(comMngPopulationDO.getLabel()));
+ }
+ } else {
+ comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel());
+ }
+ comMngPopulation.setCardNo(null);
+ comMngPopulation.setId(comMngPopulationDO.getId());
+ int nub = populationDAO.updateById(comMngPopulation);
+ if (nub < 1) {
+ return R.fail();
+ }
+ return R.ok();
+ }
+
+ @Override
+ public ComMngPopulationDO getPopulationByCardNo(String cardNo) {
+ try {
+ String aesCardNo = AESUtil.encrypt128(cardNo, aesKey);
+ return baseMapper.selectOne(
+ new QueryWrapper<ComMngPopulationDO>()
+ .eq("card_no", aesCardNo)
+ );
+ } catch (Exception e) {
+ log.error("根据身份证查询业务-加密证件信息出错:{}", e.getCause());
+ }
+ return null;
}
/**
* 首页大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId 社区id
+ * @return 统计结果
*/
@Override
- public R getScreenIndex(Long communityId){
+ public R getScreenIndex(Long communityId) {
//创建统计返回参数
IndexStatisticsVO statisticsVO = new IndexStatisticsVO();
@@ -823,9 +868,9 @@
eventGridStatisticsVO.setGridEventStatisticsList(gridEventStatistics);
//查询网格数据
List<EventGridDataVO> gridDataList = comMngPopulationDAO.getGridDataListByCommunityId(communityId);
- if(!gridDataList.isEmpty()){
+ if (!gridDataList.isEmpty()) {
gridDataList.forEach(gridData -> {
- if(gridData != null){
+ if (gridData != null) {
IndexGridStatisticsVO gridStatisticsVO = new IndexGridStatisticsVO();
gridStatisticsVO.setEventData(gridData.getGridName());
//根据网格id查询网格事件列表
@@ -850,30 +895,30 @@
IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
otherSpecialVO.setTitle("其他");
otherSpecialVO.setSum(0);
- if(!userTagList.isEmpty()){
+ if (!userTagList.isEmpty()) {
userTagList.forEach(userTag -> {
- if(userTag != null){
- if(userTag.getSysFlag().equals(0)){
+ if (userTag != null) {
+ if (userTag.getSysFlag().equals(0)) {
Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
- }else{
- if(StringUtils.isNotEmpty(userTag.getTagName())){
- if(userTag.getTagName().equals("特扶家庭")){
+ } else {
+ if (StringUtils.isNotEmpty(userTag.getTagName())) {
+ if (userTag.getTagName().equals("特扶家庭")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(22);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("低保户")){
+ } else if (userTag.getTagName().equals("低保户")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(94);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("低收入人群")){
+ } else if (userTag.getTagName().equals("低收入人群")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(2);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("退役军人")){
+ } else if (userTag.getTagName().equals("退役军人")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(264);
@@ -900,8 +945,8 @@
return R.ok(statisticsVO);
}
- private List<IndexPopulationAgeStatisticsVO> statisticsAge(Long communityId){
- Map<String,Long> ageMap = populationDAO.indexCountByAge(communityId);
+ private List<IndexPopulationAgeStatisticsVO> statisticsAge(Long communityId) {
+ Map<String, Long> ageMap = populationDAO.indexCountByAge(communityId);
List<IndexPopulationAgeStatisticsVO> agePopulationList = new ArrayList<>();
IndexPopulationAgeStatisticsVO ageStatisticsVO1 = new IndexPopulationAgeStatisticsVO();
IndexPopulationAgeStatisticsVO ageStatisticsVO2 = new IndexPopulationAgeStatisticsVO();
@@ -916,14 +961,14 @@
ageStatisticsVO5.setType(5);
ageStatisticsVO6.setType(6);
- if(ageMap.isEmpty()){
+ if (ageMap.isEmpty()) {
ageStatisticsVO1.setSum(0);
ageStatisticsVO2.setSum(0);
ageStatisticsVO3.setSum(0);
ageStatisticsVO4.setSum(0);
ageStatisticsVO5.setSum(0);
ageStatisticsVO6.setSum(0);
- }else{
+ } else {
ageStatisticsVO1.setSum(ageMap.get("age16").intValue());
ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
@@ -943,11 +988,12 @@
/**
* 事件大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId 社区id
+ * @return 统计结果
*/
@Override
- public R getScreenEvent(Long communityId){
+ public R getScreenEvent(Long communityId) {
//创建统计返回参数
EventStatisticsVO statisticsVO = new EventStatisticsVO();
@@ -966,7 +1012,7 @@
//查询事件播报模块数据
EventNewStatisticsVO newStatisticsVO = this.baseMapper.getEventScreenRightTop(communityId);
- if(newStatisticsVO != null){
+ if (newStatisticsVO != null) {
//查询事件资源文件
List<EventResourceDO> eventResourceDOList =
eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -1034,11 +1080,12 @@
/**
* 民生大屏统计接口
- * @param communityId 社区id
- * @return 统计结果
+ *
+ * @param communityId 社区id
+ * @return 统计结果
*/
@Override
- public R getScreenCivil(Long communityId){
+ public R getScreenCivil(Long communityId) {
//创建统计返回参数
CivilStatisticsVO civilStatisticsVO = new CivilStatisticsVO();
@@ -1050,30 +1097,30 @@
IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
otherSpecialVO.setTitle("其他");
otherSpecialVO.setSum(0);
- if(!userTagList.isEmpty()){
+ if (!userTagList.isEmpty()) {
userTagList.forEach(userTag -> {
- if(userTag != null){
- if(userTag.getSysFlag().equals(0)){
+ if (userTag != null) {
+ if (userTag.getSysFlag().equals(0)) {
Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
- }else{
- if(StringUtils.isNotEmpty(userTag.getTagName())){
- if(userTag.getTagName().equals("特扶家庭")){
+ } else {
+ if (StringUtils.isNotEmpty(userTag.getTagName())) {
+ if (userTag.getTagName().equals("特扶家庭")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(22);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("低保户")){
+ } else if (userTag.getTagName().equals("低保户")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(94);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("低收入人群")){
+ } else if (userTag.getTagName().equals("低收入人群")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(2);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("退役军人")){
+ } else if (userTag.getTagName().equals("退役军人")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(264);
@@ -1098,8 +1145,8 @@
//计算特殊人群总数
specialStatisticsVOList.add(otherSpecialVO);
Integer specialNum = 0;
- if(!specialStatisticsVOList.isEmpty()){
- for (IndexSpecialStatisticsVO special:specialStatisticsVOList) {
+ if (!specialStatisticsVOList.isEmpty()) {
+ for (IndexSpecialStatisticsVO special : specialStatisticsVOList) {
specialNum += special.getSum();
}
}
@@ -1108,12 +1155,12 @@
//计算环比上月增长率
BigDecimal rate = BigDecimal.ZERO;
- CivilPopulationStatisticsVO populationStatisticsVO = this.baseMapper.getCivilScreenPopulation(communityId,DateUtils.getFirstDayOfMonth());
- if(populationStatisticsVO != null){
- if(populationStatisticsVO.getToMonthSpecialTotal().equals(0)){
+ 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));
+ } 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);
@@ -1127,43 +1174,6 @@
civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);
return R.ok(civilStatisticsVO);
- }
-
- @Override
- public R editTagPopulationByCardNo(ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO) {
- ComMngPopulationDO comMngPopulationDO = getPopulationByCardNo(comMngPopulationTagCardNoDTO.getCardNo());
- if (comMngPopulationDO == null) {
- return R.fail("未查询到人口记录");
- }
- ComMngPopulationDO comMngPopulation = new ComMngPopulationDO();
- if(comMngPopulationDO.getLabel()!=null) {
- if(!comMngPopulationDO.getLabel().contains(comMngPopulationTagCardNoDTO.getLabel())) {
- comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel().concat(",").concat(comMngPopulationDO.getLabel()));
- }
- }else{
- comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel());
- }
- comMngPopulation.setCardNo(null);
- comMngPopulation.setId(comMngPopulationDO.getId());
- int nub = populationDAO.updateById(comMngPopulation);
- if (nub < 1) {
- return R.fail();
- }
- return R.ok();
- }
-
- @Override
- public ComMngPopulationDO getPopulationByCardNo(String cardNo) {
- try {
- String aesCardNo = AESUtil.encrypt128(cardNo, aesKey);
- return baseMapper.selectOne(
- new QueryWrapper<ComMngPopulationDO>()
- .eq("card_no",aesCardNo)
- );
- } catch (Exception e) {
- log.error("根据身份证查询业务-加密证件信息出错");
- }
- return null;
}
@Override
@@ -1241,32 +1251,24 @@
comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
//统计性别
- Map<String,Long> sexMap = populationDAO.countBySex(communityId);
+ Map<String, Long> sexMap = populationDAO.countBySex(communityId);
comActPopulationScreenVO.setWoman(sexMap.get("woman") == null ? 0L : sexMap.get("woman"));
comActPopulationScreenVO.setManNum(sexMap.get("man") == null ? 0L : sexMap.get("man"));
- int manPoint = (int) (((double)comActPopulationScreenVO.getManNum()/(double)comActPopulationScreenVO.getTotalNum())*100);
+ int manPoint = (int) (((double) comActPopulationScreenVO.getManNum() / (double) comActPopulationScreenVO.getTotalNum()) * 100);
comActPopulationScreenVO.setManPoint(manPoint);
comActPopulationScreenVO.setWomanPoint(100 - manPoint);
//统计年龄结构
- setAgeGroup(comActPopulationScreenVO,communityId);
+ setAgeGroup(comActPopulationScreenVO, communityId);
//统计学历
- setCultureGroup(comActPopulationScreenVO,communityId);
-
- //查询网格数据
- List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
- comActPopulationScreenVO.setGridStatisticsList(gridStatisticsList);
-
- //查询小区列表
- List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
- comActPopulationScreenVO.setVillageStatisticsList(villageStatisticsList);
+ setCultureGroup(comActPopulationScreenVO, communityId);
return R.ok(comActPopulationScreenVO);
}
private void setCultureGroup(ComActPopulationScreenVO comActPopulationScreenVO, Long communityId) {
- Map<String,Long> cultureMap = populationDAO.countByCulture(communityId);
+ Map<String, Long> cultureMap = populationDAO.countByCulture(communityId);
List<ComActPopulationCultureVO> cultureGroup = new ArrayList<>();
ComActPopulationCultureVO xx = new ComActPopulationCultureVO();
xx.setLevel(PopulCultureLevelEnum.XX.getName());
@@ -1316,8 +1318,8 @@
comActPopulationScreenVO.setCultureGroup(cultureGroup);
}
- private void setAgeGroup(ComActPopulationScreenVO comActPopulationScreenVO,Long communityId) {
- Map<String,Long> ageMap = populationDAO.countByAge(communityId);
+ private void setAgeGroup(ComActPopulationScreenVO comActPopulationScreenVO, Long communityId) {
+ Map<String, Long> ageMap = populationDAO.countByAge(communityId);
List<ComMngPopulationAgeVO> ageList = new ArrayList<>();
ComMngPopulationAgeVO ageVO16 = new ComMngPopulationAgeVO();
ageVO16.setGroup("0-16岁");
@@ -1348,25 +1350,25 @@
}
@Override
- public R getScreenGirds(Long communityId){
+ public R getScreenGirds(Long communityId) {
return R.ok(this.baseMapper.getEventScreenGridData(communityId));
}
@Override
- public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO){
+ public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
- if(eventDetailDTO.getType().equals(7)){//随手拍详情
+ if (eventDetailDTO.getType().equals(7)) {//随手拍详情
statisticsVO = this.baseMapper.getEventScreenSSPDateil(eventDetailDTO.getEventId());
- if(statisticsVO != null && StringUtils.isNotEmpty(statisticsVO.getPhotoPathList())){
+ if (statisticsVO != null && StringUtils.isNotEmpty(statisticsVO.getPhotoPathList())) {
statisticsVO.setDangerLevel("0");
statisticsVO.setMajor(false);
statisticsVO.setUrgent(false);
- if(statisticsVO.getEventDealStatus().equals(2)){
+ if (statisticsVO.getEventDealStatus().equals(2)) {
statisticsVO.setEventDealStatus(4);
}
List<EventResourceVO> picList = new ArrayList<>();
- String [] pics = statisticsVO.getPhotoPathList().split(",");
- if(pics.length > 0){
+ String[] pics = statisticsVO.getPhotoPathList().split(",");
+ if (pics.length > 0) {
for (int i = 0; i < pics.length; i++) {
EventResourceVO resourceVO = new EventResourceVO();
resourceVO.setType(1);
@@ -1376,9 +1378,9 @@
}
statisticsVO.setPics(picList);
}
- }else{//事件详情
+ } else {//事件详情
statisticsVO = this.baseMapper.getEventScreenEventDetail(eventDetailDTO.getEventId());
- if(statisticsVO != null){
+ if (statisticsVO != null) {
//查询事件资源文件
List<EventResourceDO> eventResourceDOList =
eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -1419,7 +1421,5 @@
return R.ok(statisticsVO);
}
- 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));
- }
-}
+
+}
\ No newline at end of file
--
Gitblit v1.7.1