bug修改

puhanshu

2022-04-29 1d07f3e678907a4cdc0c030732b08444926eb23e

 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;