From 4afdb4f5ec7e6a10b3d9799d53af466d57e1e1a8 Mon Sep 17 00:00:00 2001 From: Null <281575458@qq.com> Date: 星期五, 19 三月 2021 11:01:05 +0800 Subject: [PATCH] 特殊群体 --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 102 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java index 894dd5e..3c86c84 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.ExportUserDTO; +import com.panzhihua.common.model.dtos.user.ComMngUserTagDTO; import com.panzhihua.common.model.dtos.user.EexcelUserDTO; import com.panzhihua.common.model.dtos.user.InputUserTagsDTO; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; @@ -16,12 +17,15 @@ import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; +import com.panzhihua.common.model.vos.user.ComMngTagVO; import com.panzhihua.common.model.vos.user.CommunityUserInfoVO; import com.panzhihua.common.model.vos.user.InputUserInfoVO; import com.panzhihua.common.utlis.IdCard; import com.panzhihua.common.utlis.SensitiveUtil; +import com.panzhihua.service_user.dao.ComMngUserTagDAO; import com.panzhihua.service_user.dao.SysUserInputDAO; import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO; +import com.panzhihua.service_user.model.dos.ComMngUserTagDO; import com.panzhihua.service_user.model.dos.SysUserDO; import com.panzhihua.service_user.model.dos.SysUserInputDO; import com.panzhihua.service_user.service.SysUserInputService; @@ -34,6 +38,7 @@ import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -49,6 +54,8 @@ private SysUserInputDAO sysUserInputDAO; @Resource private StringRedisTemplate stringRedisTemplate; + @Resource + private ComMngUserTagDAO comMngUserTagDAO; /** * 批量导入居民用户 * @param list 居民用户集合 @@ -229,7 +236,7 @@ @Override - public InputUserInfoVO inputUserDetail(Long id) { + public R inputUserDetail(Long id) { InputUserInfoVO inputUserInfoVO = new InputUserInfoVO(); SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(id); if (!org.springframework.util.ObjectUtils.isEmpty(sysUserInputDO)) { @@ -278,6 +285,99 @@ List<ComMngStructHouseVO> comMngStructHouseVOS = sysUserInputDAO.selectUserHouseList(inputUserInfoVO.getIdCard()); inputUserInfoVO.setComMngStructHouseVOS(comMngStructHouseVOS); } - return inputUserInfoVO; + return R.ok(inputUserInfoVO); + } + + @Override + public R specialInputUser(PageInputUserDTO pageInputUserDTO) { + Page page = new Page<>(); + Long pageNum = pageInputUserDTO.getPageNum(); + Long pageSize = pageInputUserDTO.getPageSize(); + if (null==pageNum||0==pageNum) { + pageNum = 1l; + } + if (null==pageSize||0==pageSize) { + pageSize = 10l; + } + page.setSize(pageSize); + page.setCurrent(pageNum); + IPage<InputUserInfoVO> iPage = sysUserInputDAO.specialInputUser(page, pageInputUserDTO); + iPage.getRecords().forEach(record->{ + record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone())); + record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard())); + }); + return R.ok(iPage); + } + + @Override + public R specialInputUserTags(ComMngUserTagDTO comMngUserTagDTO) { + Page page = new Page<>(); + Long pageNum = comMngUserTagDTO.getPageNum(); + Long pageSize = comMngUserTagDTO.getPageSize(); + if (null==pageNum||0==pageNum) { + pageNum = 1l; + } + if (null==pageSize||0==pageSize) { + pageSize = 10l; + } + page.setSize(pageSize); + page.setCurrent(pageNum); + IPage<ComMngTagVO> iPage = comMngUserTagDAO.pageSpecialInputUserTags(page, comMngUserTagDTO); + return R.ok(iPage); + } + + @Override + public R saveSpecialInputUserTags(ComMngTagVO comMngTagVO) { + if(null!=comMngTagVO.getId()&&comMngTagVO.getId()!=0){ + ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(comMngTagVO.getId()); + if(null==comMngUserTagDO){ + return R.fail("标签不存在"); + } + if(comMngUserTagDO.getSysFlag()==1){ + return R.fail("系统预置标签不可修改"); + } + ComMngUserTagDO exist = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName())); + if(null!=exist && exist.getId()!=comMngUserTagDO.getId()){ + return R.fail("标签重复"); + } + comMngUserTagDO.setTagName(comMngTagVO.getTagName()); + comMngUserTagDAO.updateById(comMngUserTagDO); + }else{ + int count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName())); + if(count>0){ + return R.fail("标签重复"); + } + ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO(); + comMngUserTagDO.setTagName(comMngTagVO.getTagName()); + comMngUserTagDO.setCommunityId(comMngTagVO.getCommunityId()); + comMngUserTagDO.setSysFlag(0); + comMngUserTagDO.setCreateAt(new Date()); + comMngUserTagDAO.insert(comMngUserTagDO); + } + return R.ok(); + } + + @Override + public R deleteSpecialInputUser(Long id) { + SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(id); + if(null==sysUserInputDO){ + return R.fail("用户不存在"); + } + List<SysUserInputDO> sysUserInputDOS = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getIdCard,sysUserInputDO.getIdCard())); + sysUserInputDOS.forEach(sysUserInput ->{ + sysUserInput.setTags(null); + sysUserInput.setKeyPersonnel(0); + sysUserInput.setSpecialServiceFamily(0); + sysUserInput.setSoldier(0); + sysUserInput.setLowincomeHouseholds(0); + sysUserInput.setLowincomePeople(0); + sysUserInput.setOldPeople(0); + sysUserInput.setDisability(0); + }); + boolean update = this.updateBatchById(sysUserInputDOS); + if(update){ + return R.ok(); + } + return R.fail(); } } -- Gitblit v1.7.1