花城E+防疫修改

101captain

2022-05-05 13515d9f2852e068951d20e6655bf9a19badb38d

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

@@ -56,7 +56,7 @@

    @Override
    public R export(ComActAcidRecordDTO comActAcidRecordDTO) {
        List<ComActAcidRecordExcelVO> comActAcidRecordExcelVOS=this.baseMapper.export(comActAcidRecordDTO);
        List<ComActAcidRecordExcelReturn> comActAcidRecordExcelVOS=this.baseMapper.export(comActAcidRecordDTO);
        comActAcidRecordExcelVOS.forEach(comActAcidRecordExcelVO -> {
            if(StringUtils.isNotEmpty(comActAcidRecordExcelVO.getTouristCity())&&comActAcidRecordExcelVO.getTouristCity().contains("[")){
                JSONArray jsonArray = JSON.parseArray(comActAcidRecordExcelVO.getTouristCity());
@@ -88,7 +88,7 @@
        }
        if(StringUtils.isEmpty(comActAcidRecordVO.getLocalCity())){
            rabbitTemplate.convertAndSend("huacheng.acid.exchange", "huacheng.acid.key", comActAcidRecordVO, message -> {
                message.getMessageProperties().setHeader("x-delay", 24*60*60*1000);
                message.getMessageProperties().setHeader("x-delay", 2*60*60*1000);
                return message;
            });
        }
@@ -122,13 +122,7 @@
        String localCity = comActAcidRecordVO.getLocalCity();
        String relationName = "panzhihua";
        if (isNotEmpty(localCity)) {
            if (StringUtils.inStringIgnoreCase(localCity, "东区,炳草岗街道,红星社区", "盐边县,红果彝族乡,红星社区",
                    "仁和区,大河中路街道,阳光社区", "盐边县,红格镇,阳光社区", "米易县,攀莲镇,城南社区", "盐边县,桐子林镇,城南社区",
                    "米易县,攀莲镇,城北社区", "盐边县,桐子林镇,城北社区")) {
                relationName = localCity;
            } else {
                relationName = localCity.substring(localCity.lastIndexOf(",") + 1);
            }
            relationName = localCity;
        } else {
            String realAddress = comActAcidRecordVO.getRealAddress();
            if (realAddress.contains("攀枝花")) {
@@ -168,7 +162,7 @@
        ComActAcidDangerMemberVO dangerMemberVO = new ComActAcidDangerMemberVO();
        BeanUtils.copyProperties(dangerMember, dangerMemberVO);
        rabbitTemplate.convertAndSend("huacheng.acid.danger.exchange", "huacheng.acid.danger.key", dangerMemberVO, message -> {
            message.getMessageProperties().setHeader("x-delay", 5*60*1000);
            message.getMessageProperties().setHeader("x-delay", 1*60*1000);
            return message;
        });
    }
@@ -203,4 +197,23 @@
        }
        return R.ok(comAcidStaticVOS);
    }

    @Override
    public R updateLocalCity(ComActAcidRecordVO comActAcidRecordVO) {
        ComActAcidRecord comActAcidRecord=new ComActAcidRecord();
        BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
        if(StringUtils.isNotEmpty(comActAcidRecord.getLocalCity())){
            ComActAcidDangerMember comActAcidDangerMember= comActAcidDangerMemberDao.selectOne(new QueryWrapper<ComActAcidDangerMember>().lambda().eq(ComActAcidDangerMember::getRecordId,comActAcidRecordVO.getId()));
            if(comActAcidDangerMember!=null){
                if(comActAcidDangerMember.getType()==2){
                    this.comActAcidDangerMemberDao.deleteById(comActAcidDangerMember.getId());
                }
                else {
                    comActAcidDangerMember.setRelationName(comActAcidRecord.getLocalCity());
                    this.comActAcidDangerMemberDao.updateById(comActAcidDangerMember);
                }
            }
        }
        return R.ok(this.baseMapper.updateById(comActAcidRecord));
    }
}