修改bug

huanghongfa

2021-06-04 80f3715fb9c63d7e81f05a7cb329dd3f21103453

修改bug

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/listen/PartyBuildingMemberExcelListen.java

@@ -30,7 +30,7 @@
    }


    private static final int BATCH_COUNT = 100;
    private static final int BATCH_COUNT = 5000;
    private List<PartyBuildingMemberExcelVO> list = new ArrayList<>();
    @Override
    public void invoke(PartyBuildingMemberExcelVO partyBuildingMemberExcelVO, AnalysisContext analysisContext) {

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -100,28 +100,40 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R listSavePartyBuildingMemberExcelVO(List<PartyBuildingMemberExcelVO> list) {
        Boolean aBoolean = stringRedisTemplate.hasKey(REDIS_ORG_ALL);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
//        Boolean aBoolean = stringRedisTemplate.hasKey(REDIS_ORG_ALL);
//        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        List<PartyOrganizationVO> partyOrganizationVOS=new ArrayList<>();
        if (aBoolean) {
            String orgs = valueOperations.get(REDIS_ORG_ALL);
            if (!ObjectUtils.isEmpty(orgs)) {
               partyOrganizationVOS= JSONArray.parseArray(orgs,PartyOrganizationVO.class);
            }
        } else {
            List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>());
            if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
                List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>();
                comPbOrgDOS.forEach(comPbOrgDO -> {
                    PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO();
                    partyOrganizationVO.setId(comPbOrgDO.getId());
                    partyOrganizationVO.setName(comPbOrgDO.getName());
                    partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId());
                    partyOrganizationVOList.add(partyOrganizationVO);
                });
                partyOrganizationVOS= partyOrganizationVOList;
            }
            valueOperations.set(REDIS_ORG_ALL,JSONArray.toJSONString(partyOrganizationVOS),24, TimeUnit.HOURS);
//        if (aBoolean) {
//            String orgs = valueOperations.get(REDIS_ORG_ALL);
//            if (!ObjectUtils.isEmpty(orgs)) {
//               partyOrganizationVOS= JSONArray.parseArray(orgs,PartyOrganizationVO.class);
//            }
//        } else {
//            List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>());
//            if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
//                List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>();
//                comPbOrgDOS.forEach(comPbOrgDO -> {
//                    PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO();
//                    partyOrganizationVO.setId(comPbOrgDO.getId());
//                    partyOrganizationVO.setName(comPbOrgDO.getName());
//                    partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId());
//                    partyOrganizationVOList.add(partyOrganizationVO);
//                });
//                partyOrganizationVOS= partyOrganizationVOList;
//            }
//            valueOperations.set(REDIS_ORG_ALL,JSONArray.toJSONString(partyOrganizationVOS),24, TimeUnit.HOURS);
//        }
        List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>());
        if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
            List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>();
            comPbOrgDOS.forEach(comPbOrgDO -> {
                PartyOrganizationVO partyOrganizationVO=new PartyOrganizationVO();
                partyOrganizationVO.setId(comPbOrgDO.getId());
                partyOrganizationVO.setName(comPbOrgDO.getName());
                partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId());
                partyOrganizationVOList.add(partyOrganizationVO);
            });
            partyOrganizationVOS= partyOrganizationVOList;
        }
        List<ComPbMemberDO> comPbMemberDOS=new ArrayList<>();
        if (!ObjectUtils.isEmpty(list)) {