Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-17 60e61eca037198e75296b62935877ecae5abe791

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java

@@ -120,7 +120,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.CORRECT_POPULATION_ERROR_LIST + communityId;
            String key = Constants.CORRECT_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java

@@ -110,7 +110,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.CULT_POPULATION_ERROR_LIST + communityId;
            String key = Constants.CULT_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java

@@ -111,7 +111,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String Disability = Constants.DISABILITY_POPULATION_ERROR_LIST + communityId;
            String Disability = Constants.DISABILITY_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java

@@ -123,7 +123,7 @@
                throw new ServiceException("100", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.DRUG_POPULATION_ERROR_LIST + communityId;
            String key = Constants.DRUG_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java

@@ -119,7 +119,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.KEY_POPULATION_ERROR_LIST + communityId;
            String key = Constants.KEY_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java

@@ -112,7 +112,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String LowSecurity = Constants.LOWSECURITY_POPULATION_ERROR_LIST + communityId;
            String LowSecurity = Constants.LOWSECURITY_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java

@@ -119,7 +119,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.MAJOR_POPULATION_ERROR_LIST + communityId;
            String key = Constants.MAJOR_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java

@@ -122,7 +122,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.REHABILITATION_POPULATION_ERROR_LIST + communityId;
            String key = Constants.REHABILITATION_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java

@@ -121,7 +121,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String Sentence = Constants.SENTENCE_POPULATION_ERROR_LIST + communityId;
            String Sentence = Constants.SENTENCE_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -120,7 +120,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String key = Constants.POPULATION_ERROR_LIST + communityId;
            String key = Constants.POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java

@@ -110,7 +110,7 @@
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            String Veterans = Constants.VETERANS_POPULATION_ERROR_LIST + communityId;
            String Veterans = Constants.VETERANS_POPULATION_ERROR_LIST;

            Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
//        Map<String,Integer> dictMap = new HashMap<>();

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/switchs/StreetAllAppletsVO.java

@@ -19,4 +19,7 @@
    @ApiModelProperty("街道下社区列表")
    private List<CommunitySwitchAllAppletsVO> childList;

    @ApiModelProperty("街道下社区数量")
    private Integer count = 0;

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -616,7 +616,7 @@
    @ApiOperation(value = "特殊群体/新增或修改标签")
    @PostMapping("/special/tags/save")
    R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO) {
        Long communityId = this.getCommunityId();
        Long communityId = this.getLoginUserInfo().getCommunityId();
        comMngTagVO.setCommunityId(communityId);
        return userService.saveSpecialInputUserTags(comMngTagVO);
    }

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

@@ -25,7 +25,10 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -220,8 +223,10 @@
            List<CommunitySwitchAllAppletsVO> communityList = this.comActDAO.getCommunityListByStreetId(street.getStreetId());
            if(!communityList.isEmpty()){
                street.setChildList(communityList);
                street.setCount(communityList.size());
            }
        });
        streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed()).collect(Collectors.toList());
        return R.ok(streetList);
    }


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

@@ -5105,9 +5105,9 @@
        }
        comActPopulationScreenVO.setSpecialNum(specialNum.longValue());
        //统计已使用社区通人数
//        Long count = populationDAO.countUsedCommunityPopulation(communityId);
//        comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
        comActPopulationScreenVO.setUsedCommunityNum(1183L);
        Long count = populationDAO.countUsedCommunityPopulation(communityId);
        comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
//        comActPopulationScreenVO.setUsedCommunityNum(1183L);

        //统计性别
        Map<String, Long> sexMap = populationDAO.countBySex(communityId);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/ComMngUserTagDAO.java

@@ -39,4 +39,23 @@
            " t.sys_flag DESC"
            + "</script> ")
    IPage<ComMngTagVO> pageSpecialInputUserTags(Page page, @Param(value = "comMngUserTagDTO") ComMngUserTagDTO comMngUserTagDTO);

    /**
     * 标签查询
     *
     * @param comMngTagVO
     * @return
     */
    @Select("<script> "
            + " SELECT " +
            " t.*  " +
            "FROM " +
            " com_mng_user_tag t  " +
            "WHERE " +
            " community_id = #{comMngTagVO.communityId} " +
            "<if test='comMngTagVO.tagName != null and comMngTagVO.tagName.trim() != &quot;&quot;'>" +
            " and t.tag_name = #{comMngTagVO.tagName} " +
            " </if> "
            + "</script> ")
    ComMngUserTagDO getSpecialInputUserTagsByVO(@Param(value = "comMngTagVO") ComMngTagVO comMngTagVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java

@@ -23,6 +23,7 @@
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
@@ -355,9 +356,8 @@
            comMngUserTagDO.setTagName(comMngTagVO.getTagName());
            comMngUserTagDAO.updateById(comMngUserTagDO);
        }else{
            ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId,comMngTagVO.getCommunityId()).eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
            if(comMngUserTagDO != null){
                if (comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId()))
            ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.getSpecialInputUserTagsByVO(comMngTagVO);
            if(comMngUserTagDO != null && comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId())){
                return R.fail("标签重复");
            }
            ComMngUserTagDO comMngUserTagDO1 = new ComMngUserTagDO();