springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationVO.java
@@ -33,4 +33,13 @@ @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)") private Integer politicalOutlook; @ApiModelProperty("年龄") private Integer age; @ApiModelProperty("手机号") private String phone; @ApiModelProperty("性别（1.男 2.女 3.保密）") private Integer sex; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java
New file @@ -0,0 +1,101 @@ package com.panzhihua.common.model.vos.grid; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * * @author cedoo email:cedoo(a)qq.com * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ @Data @ApiModel("居民详情返回参数") @EncryptDecryptClass public class PopulationDetailVO { @ApiModelProperty(value = "主键ID") @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value = "姓名") private String name; @ApiModelProperty(value = "手机号") @EncryptDecryptField private String phone; @ApiModelProperty(value = "身份证号码") @EncryptDecryptField private String cardNo; @ApiModelProperty(value = "标签") private String label; @ApiModelProperty(value = "居住地址") private String address; @ApiModelProperty(value = "民族") private String nation; @ApiModelProperty(value = "年龄") private Integer age; @ApiModelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)") private Integer politicalOutlook; @ApiModelProperty(value = "性别（1.男 2.女）") private String sex; @ApiModelProperty(value = "出生年月") private String birthday; @ApiModelProperty(value = "籍贯") private String nativePlace; @ApiModelProperty(value = "婚姻状况") private String marriage; @ApiModelProperty(value = "文化程度") private String cultureLevel; @ApiModelProperty(value = "健康状况") private String healthy; @ApiModelProperty(value = "是否租住(0.否 1.是)") private Integer isRent; @ApiModelProperty("街路巷") private String road; @ApiModelProperty("门牌号") private String doorNo; @ApiModelProperty("楼排号") private String floor; @ApiModelProperty("单元号") private String unitNo; @ApiModelProperty("户室（房间号）") private String houseNo; @ApiModelProperty("工作单位") private String workCompany; @ApiModelProperty("户口所在地") private String censusRegister; @ApiModelProperty("外地or本地（1.本地 2.外地）") private Integer outOrLocal; @ApiModelProperty("备注") private String remark; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3085,4 +3085,12 @@ */ @PostMapping("/population/list/app") R getPopulationListByApp(@RequestBody PagePopulationListDTO populationListDTO); /** * 根据人口id获取人口详情 * @param populationId * @return */ @GetMapping("/population/detail/app") R getPopulationDetailByApp(@RequestParam("populationId") Long populationId); } springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PopulationApi.java
@@ -6,16 +6,14 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridDataAreaVO; import com.panzhihua.common.model.vos.grid.PopulationDetailVO; import com.panzhihua.common.model.vos.grid.PopulationListVO; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; 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; @@ -36,6 +34,15 @@ return communityService.getPopulationListByApp(populationListDTO); } @GetMapping("/detail") @ApiOperation(value = "查询居民详情", response = PopulationDetailVO.class) public R detail(@RequestParam("populationId") Long populationId){ if(populationId == null){ return R.fail("参数错误"); } return communityService.getPopulationDetailByApp(populationId); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -2184,6 +2184,11 @@ @Override public R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO) { IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(), specialPopulationDTO.getPageSize()), specialPopulationDTO); if(!specialPopulationVOIPage.getRecords().isEmpty()){ specialPopulationVOIPage.getRecords().forEach(specialPopulation -> { specialPopulation.setAge(IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard())); }); } return R.ok(specialPopulationVOIPage); }
@@ -961,6 +961,8 @@ cmp.`name`, cmp.card_no as idCard, cmp.label, cmp.sex, cmp.phone, cmp.address, cmp.political_outlook FROM
