From a22c110d080fe4387cd7b29a9bd36a727eb5944a Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 08 十二月 2021 09:49:36 +0800
Subject: [PATCH] [新增]打印业务慢日志
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 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 c228905..1a1de18 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
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
+import com.panzhihua.common.utlis.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -54,10 +55,6 @@
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.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.*;
@@ -472,25 +469,27 @@
break;
case 2:
comMngPopulationVO.setRoad(houseDO.getAlley());
- comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+// comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
break;
case 3:
comMngPopulationVO.setRoad(houseDO.getAlley());
comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
- comMngPopulationVO.setFloor(houseDO.getFloor());
+// comMngPopulationVO.setFloor(houseDO.getFloor());
break;
case 4:
comMngPopulationVO.setRoad(houseDO.getAlley());
comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
comMngPopulationVO.setFloor(houseDO.getFloor());
- comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
+// 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());
+ if(comMngPopulationVO.getLevelIsAll() == null){
+ comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
+ }
break;
default:
break;
@@ -4997,6 +4996,7 @@
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
+ populationDO.setDeath(vo.getDeath().toString());
String cardNoAES = populationDO.getCardNo();
try {
@@ -6311,23 +6311,14 @@
/**
* 批量删除实有人口
*
- * @param Ids
- * @return
+ * @param ids 实有人口id集合
+ * @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();
- }
- return R.fail();
+ public R deletePopulations(List<Long> ids, Long communityId) {
+ comMngPopulationCommunityTagsDAO.deletePopulationRelation(ids,communityId);
+ return R.ok();
}
/**
@@ -6582,17 +6573,19 @@
public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(
new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO);
-
- iPage.getRecords().forEach(page -> {
- if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
- StringBuilder sb = new StringBuilder();
- sb.append(page.getAlley());
- if(!page.getHouseNum().contains("号")){
- sb.append(page.getHouseNum() + "号");
+ if(iPage!=null){
+ iPage.getRecords().forEach(page -> {
+ if(page.getAreaName() == null || StringUtils.isEmpty(page.getAreaName())){
+ StringBuilder sb = new StringBuilder();
+ sb.append(page.getAlley());
+ if(!page.getHouseNum().contains("号")){
+ sb.append(page.getHouseNum() + "号");
+ }
+ page.setAreaName(sb.toString());
}
- page.setAreaName(sb.toString());
- }
- });
+ });
+ }
+
return R.ok(iPage);
}
@@ -7350,8 +7343,11 @@
statisticsVO.setDangerLevel("0");
statisticsVO.setMajor(false);
statisticsVO.setUrgent(false);
- if (statisticsVO.getEventDealStatus().equals(2)) {
- statisticsVO.setEventDealStatus(4);
+ if (statisticsVO.getEventDealStatus().equals(2)||statisticsVO.getEventDealStatus().equals(1)) {
+ statisticsVO.setEventDealStatus(1);
+ }
+ else {
+ statisticsVO.setEventDealStatus(2);
}
List<EventResourceVO> picList = new ArrayList<>();
String[] pics = statisticsVO.getPhotoPathList().split(",");
@@ -7471,6 +7467,10 @@
if (StringUtils.isNotEmpty(detail.getMarriage())) {
detail.setMarriage(PopulMarriageEnum.getCnDescByName(Integer.parseInt(detail.getMarriage())));
}
+ //查询该人口的标签
+ List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(populationId);
+ String label = LabelUtils.assembleLabel(communityTagsList);
+ detail.setLabel(label);
}
return R.ok(detail);
}
@@ -7694,6 +7694,11 @@
new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
}
+ @Override
+ public R specialInputUserExport(PageInputUserDTO pageInputUserDTO) {
+ return R.ok(this.comMngPopulationDAO.specialInputUserExport(pageInputUserDTO));
+ }
+
private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
--
Gitblit v1.7.1