Merge branch 'huacheng_paicha' of http://gitlab.nhys.cdnhxx.com/root/zhihui...

101captain

2022-04-28 6307ae8f285d251c650b5491a74599963f807cb2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java

@@ -76,28 +76,17 @@
            String acidTest = comActAcidRecordVO.getAcidTest();
            if (StringUtils.inStringIgnoreCase(colorMark, "红码", "黄码") || travelCard.equals("是")
                    || dangerArea.equals("是") || outsideCity.equals("是") || acidTest.equals("阳性")) {
                ComActAcidDangerMember dangerMember = comActAcidDangerMemberDao.selectOne(new LambdaQueryWrapper<ComActAcidDangerMember>()
                        .eq(ComActAcidDangerMember::getIdCard, comActAcidRecordVO.getIdCard()));
                if (isNull(dangerMember)) {
                    dangerMember = new ComActAcidDangerMember();
                    dangerMember.setName(comActAcidRecordVO.getName());
                    dangerMember.setPhone(comActAcidRecordVO.getPhone());
                    dangerMember.setRecordId(comActAcidRecord.getId());
                    dangerMember.setSource(1);
                    dangerMember.setStatus(6);
                    dangerMember.setType(1);
                    dangerMember.setCreateTime(new Date());
                    comActAcidDangerMemberDao.insert(dangerMember);
                } else {
                    dangerMember.setName(comActAcidRecordVO.getName());
                    dangerMember.setPhone(comActAcidRecordVO.getPhone());
                    dangerMember.setRecordId(comActAcidRecord.getId());
                    dangerMember.setSource(1);
                    dangerMember.setStatus(6);
                    dangerMember.setType(1);
                    dangerMember.setUpdateTime(new Date());
                    comActAcidDangerMemberDao.updateById(dangerMember);
                }
                //风险人员
                saveAcidDangerMember(comActAcidRecordVO, comActAcidRecord.getId(), 1);
//                rabbitTemplate.convertAndSend("huacheng.acid.danger.exchange", "huacheng.acid.danger.key", comActAcidRecordVO, message -> {
//                    message.getMessageProperties().setHeader("x-delay", 24*60*60*1000);
//                    return message;
//                });
                return R.ok();
            }
            if (StringUtils.isEmpty(comActAcidRecordVO.getLocalCity())) {
                //未填住址人员
                saveAcidDangerMember(comActAcidRecordVO, comActAcidRecord.getId(), 2);
            }
            return R.ok();
        }
@@ -105,6 +94,33 @@
        return R.fail("操作失败，请重新尝试");
    }

    private void saveAcidDangerMember(ComActAcidRecordVO comActAcidRecordVO, Long recordId, Integer type) {
        ComActAcidDangerMember dangerMember = comActAcidDangerMemberDao.selectOne(new LambdaQueryWrapper<ComActAcidDangerMember>()
                .eq(ComActAcidDangerMember::getIdCard, comActAcidRecordVO.getIdCard()));
        if (isNull(dangerMember)) {
            dangerMember = new ComActAcidDangerMember();
            dangerMember.setName(comActAcidRecordVO.getName());
            dangerMember.setPhone(comActAcidRecordVO.getPhone());
            dangerMember.setRecordId(recordId);
            dangerMember.setIdCard(comActAcidRecordVO.getIdCard());
            dangerMember.setSource(1);
            dangerMember.setStatus(6);
            dangerMember.setType(type);
            dangerMember.setCreateTime(new Date());
            comActAcidDangerMemberDao.insert(dangerMember);
        } else {
            dangerMember.setName(comActAcidRecordVO.getName());
            dangerMember.setPhone(comActAcidRecordVO.getPhone());
            dangerMember.setRecordId(recordId);
            dangerMember.setIdCard(comActAcidRecordVO.getIdCard());
            dangerMember.setSource(1);
            dangerMember.setStatus(6);
            dangerMember.setType(type);
            dangerMember.setUpdateTime(new Date());
            comActAcidDangerMemberDao.updateById(dangerMember);
        }
    }

    @Override
    public R fiveCount(String localCity) {
        return R.ok(this.baseMapper.fiveCount(localCity));