springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidDangerMemberApi.java
@@ -46,6 +46,8 @@ @ApiOperation(value = "分页查询风险人员", response = ComActAcidDangerMemberVO.class) @PostMapping("/page") public R pageDangerMember(@RequestBody @Valid PageDangerMemberDTO pageDangerMemberDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); pageDangerMemberDTO.setRelationName(loginUserInfo.getRelationName()); return communityService.pageDangerMember(pageDangerMemberDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidDangerMemberDTO.java
@@ -52,4 +52,7 @@ @ApiModelProperty(value = "当前处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控") private Integer status; @ApiModelProperty(value = "绑定单位", hidden = true) private String relationName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/PageDangerMemberDTO.java
@@ -33,4 +33,7 @@ @ApiModelProperty(value = "人员类型 1风险人员 2未填地址人员") private Integer type = 1; @ApiModelProperty(value = "绑定单位", hidden = true) private String relationName; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidDangerMemberApi.java
@@ -5,6 +5,7 @@ import javax.validation.Valid; import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -41,6 +42,8 @@ @ApiOperation(value = "后台分页查询风险人员", response = ComActAcidDangerMemberVO.class) @PostMapping("/queryAll") public R pageDangerMember(@RequestBody @Valid ComActAcidDangerMemberDTO pageDangerMemberDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); pageDangerMemberDTO.setRelationName(loginUserInfo.getName()); return communityService.pageDangerMemberAdmin(pageDangerMemberDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidDangerMember.java
@@ -89,4 +89,10 @@ @ApiModelProperty(value = "身份证") private String idCard; /** * 绑定单位 */ @ApiModelProperty(value = "绑定单位") private String relationName; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -29,6 +29,7 @@ import java.util.Date; import java.util.List; import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotEmpty; import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNull; /** @@ -118,8 +119,28 @@ } private void saveAcidDangerMember(ComActAcidRecordVO comActAcidRecordVO, Long recordId, Integer type) { String localCity = comActAcidRecordVO.getLocalCity(); String relationName = "panzhihua"; if (isNotEmpty(localCity)) { if (StringUtils.inStringIgnoreCase(localCity, "东区,炳草岗街道,红星社区", "盐边县,红果彝族乡,红星社区", "仁和区,大河中路街道,阳光社区", "盐边县,红格镇,阳光社区", "米易县,攀莲镇,城南社区", "盐边县,桐子林镇,城南社区", "米易县,攀莲镇,城北社区", "盐边县,桐子林镇,城北社区")) { relationName = localCity; } else { relationName = localCity.substring(localCity.lastIndexOf(",") + 1); } } else { String realAddress = comActAcidRecordVO.getRealAddress(); if (realAddress.contains("攀枝花")) { if (realAddress.contains("区")) { relationName = realAddress.substring(realAddress.indexOf("市") + 1, realAddress.indexOf("区") + 1); } else { relationName = realAddress.substring(realAddress.indexOf("市") + 1, realAddress.indexOf("县") + 1); } } } ComActAcidDangerMember dangerMember = comActAcidDangerMemberDao.selectOne(new LambdaQueryWrapper<ComActAcidDangerMember>() .eq(ComActAcidDangerMember::getIdCard, comActAcidRecordVO.getIdCard())); .eq(ComActAcidDangerMember::getIdCard, comActAcidRecordVO.getIdCard()).eq(ComActAcidDangerMember::getRelationName, relationName)); if (isNull(dangerMember)) { dangerMember = new ComActAcidDangerMember(); dangerMember.setName(comActAcidRecordVO.getName()); @@ -129,6 +150,7 @@ dangerMember.setSource(1); dangerMember.setStatus(6); dangerMember.setType(type); dangerMember.setRelationName(relationName); dangerMember.setCreateTime(new Date()); comActAcidDangerMemberDao.insert(dangerMember); } else { @@ -139,17 +161,12 @@ dangerMember.setSource(1); dangerMember.setStatus(6); dangerMember.setType(type); dangerMember.setRelationName(relationName); dangerMember.setUpdateTime(new Date()); comActAcidDangerMemberDao.updateById(dangerMember); } ComActAcidDangerMemberVO dangerMemberVO = new ComActAcidDangerMemberVO(); BeanUtils.copyProperties(dangerMember, dangerMemberVO); String realAddress = comActAcidRecordVO.getRealAddress(); if (realAddress.contains("区")) { dangerMemberVO.setRelationName(realAddress.substring(realAddress.indexOf("市") + 1, realAddress.indexOf("区") + 1)); } else { dangerMemberVO.setRelationName(realAddress.substring(realAddress.indexOf("市") + 1, realAddress.indexOf("县") + 1)); } rabbitTemplate.convertAndSend("huacheng.acid.danger.exchange", "huacheng.acid.danger.key", dangerMemberVO, message -> { message.getMessageProperties().setHeader("x-delay", 5*60*1000); return message; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidDangerMemberMapper.xml
@@ -12,6 +12,7 @@ <result property="idCard" column="id_card"/> <result property="type" column="type"/> <result property="updateTime" column="update_time"/> <result property="relationName" column="relation_name"/> </resultMap> <select id="pageList" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidDangerMemberVO"> @@ -32,6 +33,9 @@ </if> <if test="commonPage.type != null"> AND t1.`type` = #{commonPage.type} </if> <if test="commonPage.relationName !=null and commonPage.relationName !='' and commonPage.relationName !='panzhihua'"> and t1.relation_name = #{commonPage.relationName} </if> </where> GROUP BY t1.id @@ -65,6 +69,9 @@ <if test="pageDangerMemberDTO.type != null"> AND t1.`type` = #{pageDangerMemberDTO.type} </if> <if test="pageDangerMemberDTO.relationName !=null and pageDangerMemberDTO.relationName !='' and pageDangerMemberDTO.relationName !='panzhihua'"> and t1.relation_name = #{pageDangerMemberDTO.relationName} </if> </where> GROUP BY t1.id ORDER BY checkTime ASC </select>
