springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
@@ -198,5 +198,8 @@ @ApiModelProperty(value = "特殊人群列表") private List<EventSpecialPopulationDetailsVO> populationList; @ApiModelProperty(value = "网格绑定社区id") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationVO.java
@@ -37,6 +37,7 @@ private Integer age; @ApiModelProperty("手机号") @EncryptDecryptField private String phone; @ApiModelProperty("性别（1.男 2.女 3.保密）") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3093,4 +3093,11 @@ */ @GetMapping("/population/detail/app") R getPopulationDetailByApp(@RequestParam("populationId") Long populationId); /** * 修复人口加密问题 * @return 修复结果 */ @GetMapping("/population/repair") R getPopulationRepairByApp(); } springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java
@@ -43,6 +43,12 @@ return communityService.getPopulationDetailByApp(populationId); } @GetMapping("/repair/noToken") @ApiOperation(value = "修复居民身份证号码加密接口-不要乱调用") public R repair(){ return communityService.getPopulationRepairByApp(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
@@ -5,10 +5,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComMngPopulationService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -20,11 +17,21 @@ @Resource private ComMngPopulationService comMngPopulationService; @PostMapping("list/app") @PostMapping("/list/app") public R pagePopulationList(@RequestBody PagePopulationListDTO populationListDTO) { return comMngPopulationService.pagePopulationListApp(populationListDTO); } @GetMapping("/detail/app") public R getPopulationDetail(@RequestParam("populationId") Long populationId) { return comMngPopulationService.getPopulationDetailApp(populationId); } @GetMapping("/repair") public R repair() { return comMngPopulationService.getPopulationRepairByApp(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -15,6 +15,7 @@ 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.PopulationDetailVO; import com.panzhihua.common.model.vos.grid.PopulationListVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.model.vos.community.PageComActMessageVO; @@ -878,4 +879,35 @@ " </script>") IPage<PopulationListVO> pagePopulationListApp(Page page, @Param("populationListDTO") PagePopulationListDTO populationListDTO); @Select("SELECT " + " cmp.id, " + " cmp.`name`, " + " cmp.phone, " + " cmp.card_no, " + " cmp.label, " + " cmp.address, " + " cmp.nation, " + " cmp.political_outlook, " + " cmp.sex, " + " cmp.birthday, " + " cmp.native_place, " + " cmp.healthy, " + " cmp.is_rent, " + " cmv.alley AS road, " + " cmv.house_num AS doorNo, " + " cmp.floor, " + " cmp.unit_no, " + " cmp.house_no, " + " cmp.work_company, " + " cmp.census_register, " + " cmp.out_or_local, " + " cmp.remark, " + " cmp.marriage " + "FROM " + " com_mng_population AS cmp " + " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " + "WHERE " + " id = #{populationId}") PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -210,4 +210,8 @@ R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO); R pagePopulationListApp(PagePopulationListDTO populationListDTO); R getPopulationDetailApp(Long populationId); R getPopulationRepairByApp(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -12,6 +12,7 @@ import com.panzhihua.common.enums.PopulCultureLevelEnum; import com.panzhihua.common.enums.PopulHouseUseEnum; import com.panzhihua.common.enums.PopulIsOksEnum; import com.panzhihua.common.enums.PopulMarriageEnum; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO; @@ -29,6 +30,7 @@ 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.grid.PopulationDetailVO; import com.panzhihua.common.model.vos.grid.PopulationListVO; import com.panzhihua.common.model.vos.screen.ComActPopulationCultureVO; import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO; @@ -374,11 +376,11 @@ .eq(ComMngPopulationDO::getCardNo, cardNoAES)); if (populationDO == null) { //不存在实有人口,则新增 populationDO = savePopulationDO(vo, comActDO, comMngVillageDO, cardNoAES); populationDO = savePopulationDO(vo, comActDO, comMngVillageDO); } else { //如果存在人口信息，且是自用房，则更新人口默认的房屋信息 if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) { populationDO = updatePopulationHouseUse(vo, populationDO, cardNoAES); populationDO = updatePopulationHouseUse(vo, populationDO); } } @@ -411,22 +413,23 @@ return R.ok(); } private ComMngPopulationDO updatePopulationHouseUse(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO, String cardNoAES) throws Exception { private ComMngPopulationDO updatePopulationHouseUse(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO) throws Exception { populationDO.setRoad(vo.getRoad()); populationDO.setDoorNo(vo.getDoorNo()); populationDO.setFloor(vo.getFloor()); populationDO.setUnitNo(vo.getUnitNo()); populationDO.setHouseNo(vo.getHouseNo()); populationDO.setCardNo(cardNoAES); populationDO.setCardNo(vo.getCardNo()); populationDO.setCardNoStr(vo.getCardNo()); if (StringUtils.isNotEmpty(populationDO.getPhone())) { populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey)); // populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey)); populationDO.setPhone(populationDO.getPhone()); } 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) { ComMngPopulationDO populationDO = new ComMngPopulationDO(); BeanUtils.copyProperties(vo, populationDO); populationDO.setId(Snowflake.getId()); @@ -436,7 +439,7 @@ populationDO.setStreetId(comActDO.getStreetId()); populationDO.setLabel(Joiner.on(",").join(userTag)); populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNo(cardNoAES); populationDO.setCardNo(vo.getCardNo()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); this.baseMapper.insert(populationDO); @@ -1450,5 +1453,32 @@ return R.ok(pagePopulationList); } @Override public R getPopulationDetailApp(Long populationId){ PopulationDetailVO detail = this.baseMapper.getPopulationDetailApp(populationId); if(detail != null){ detail.setAge(IdcardUtil.getAgeByIdCard(detail.getCardNo())); if(StringUtils.isNotEmpty(detail.getCultureLevel())){ detail.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(Integer.parseInt(detail.getCultureLevel()))); } if(StringUtils.isNotEmpty(detail.getMarriage())){ detail.setMarriage(PopulMarriageEnum.getCnDescByName(Integer.parseInt(detail.getMarriage()))); } } return R.ok(detail); } @Override @Transactional(rollbackFor = Exception.class) public R getPopulationRepairByApp(){ List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>()); if(!populationDOList.isEmpty()){ populationDOList.forEach(population -> { this.baseMapper.updateById(population); }); } return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -162,6 +162,7 @@ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId()); if (eventGridDataDO != null) { eventDetailsVO.setGridName(eventGridDataDO.getGridName()); eventDetailsVO.setCommunityId(eventGridDataDO.getGridCommunityId()); } //查询事件关联附件
