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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

 springcloud_k8s_panzhihuazhihuishequ/applets/pom.xml

@@ -50,7 +50,15 @@
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>

        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>

    <build>

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java

@@ -59,7 +59,7 @@
        WxMaService maService = wxMaConfiguration.getMaService();
        WxMaJscode2SessionResult sessionInfo=null;
        try {
             sessionInfo = maService.getUserService().getSessionInfo(code);
            sessionInfo = maService.getUserService().getSessionInfo(code);
        } catch (Exception e) {
            log.error("微信登录失败【{}】", e.getMessage());
            if (code.equals("22")) {
@@ -125,6 +125,50 @@
        return userService.updateUserWeiXinPhone(userId,purePhoneNumber);
    }

    @ApiOperation(value = "维护微信用户手机号")
    @PostMapping("updateUserWeiXinPhone2")
    public R updateUserWeiXinPhone2(@RequestBody LoginRequest loginRequest){
        String code = loginRequest.getCode();
        if (ObjectUtils.isEmpty(code)) {
            return R.fail("缺少登录参数");
        }
        log.info(code);
        WxMaService maService = wxMaConfiguration.getMaService();
        WxMaJscode2SessionResult sessionInfo=null;
        try {
            sessionInfo = maService.getUserService().getSessionInfo(code);
        } catch (Exception e) {
            log.error("微信登录失败【{}】", e.getMessage());
            if (code.equals("22")) {
                sessionInfo=new WxMaJscode2SessionResult();
                sessionInfo.setOpenid("88888888");
                sessionInfo.setSessionKey("9999999");
            }else{
                return R.fail("微信登录失败");
            }
        }
        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));

        String encryptedData = loginRequest.getEncryptedData();
        String iv = loginRequest.getIv();
        boolean empty = ObjectUtils.isEmpty(iv);
        boolean empty1 = ObjectUtils.isEmpty(encryptedData);
        if (empty||empty1) {
            return R.fail("微信用户参数不全");
        }
//        WxMaService maService = wxMaConfiguration.getMaService();
        Long userId = this.getUserId();
//        R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
//        LoginUserInfoVO loginUserInfoVO = r.getData();
        WxMaPhoneNumberInfo wxMaPhoneNumberInfo = maService.getUserService().getPhoneNoInfo(sessionInfo.getSessionKey(),
                encryptedData, iv);
        if (ObjectUtils.isEmpty(wxMaPhoneNumberInfo) || ObjectUtils.isEmpty(wxMaPhoneNumberInfo.getPhoneNumber())) {
            return R.fail("微信解析手机号失败");
        }
        String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber();
        return userService.updateUserWeiXinPhone(userId,purePhoneNumber);
    }

    @ApiOperation(value = "用户登出")
    @PostMapping("logout")
    public R updateUserWeiXinPhone(){

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java

@@ -154,7 +154,7 @@
                try {
                    String url = "https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token;
                    String result = getActicle(url);
                    log.info("通过token获取文章列表成功,返回结果：" + result);
//                    log.info("通过token获取文章列表成功,返回结果：" + result);

                    JSONObject resultJson = JSON.parseObject(result);
                    if(resultJson != null){

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml

@@ -29,4 +29,17 @@
    secret: c7ea9aaa7e391a487e8a5b9ba61045d1
    msgDataFormat: JSON

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: applets


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/pom.xml

@@ -48,7 +48,15 @@
            <artifactId>hystrix-javanica</artifactId>
        </dependency>


        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>

    </dependencies>


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml

@@ -20,7 +20,19 @@
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: appletsbackstage




 springcloud_k8s_panzhihuazhihuishequ/auth/pom.xml

@@ -92,7 +92,15 @@
            <scope>compile</scope>
        </dependency>


        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>

    <build>

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml

@@ -17,3 +17,16 @@
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka


management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: auth

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -171,6 +171,8 @@

    public static final String DISABILITY_POPULATION_ERROR_LIST = "DISABILITY_POPULATION_ERROR_LIST_";

    public static final String LOWSECURITY_POPULATION_ERROR_LIST = "LOWSECURITY_POPULATION_ERROR_LIST_";

    /**
     * 高德地图获取天气url
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java

@@ -16,6 +16,7 @@
     * 30分钟
     */
    public static  final int EXPIRETIME=300;
    public static  final Long EXPIRETIME_LONG = 300L;
    public static  final String SECRET="UTivpbn%n9O!KnnL";
    /**
     * 24小时

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * 是否状态
 * 
 * @author huanghongfa
 */
@Getter
public enum PopulIsRentEnum
{
    YES(1, "租住"), NO(0, "自住");

    private final Integer code;
    private final String name;

    PopulIsRentEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }

    public static int getCodeByName(String name) {
        for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return 0;
    }

    public static String getCnDescByName(Integer code) {
        for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "否";
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java

@@ -10,8 +10,8 @@
@Getter
public enum PopulRelationEnum
{
    relation01(01, "本人"),
    relation02(02, "户主"),
    relation01(1, "本人"),
    relation02(2, "户主"),
    relation10(10, "配偶"),
    relation11(11, "夫"),
    relation12(12, "妻"),

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.context.AnalysisContext;
@@ -115,11 +116,11 @@
            R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
            log.info("开始导入社区矫正人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
            if (list.size()  == 0) {
                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<>();
@@ -127,9 +128,9 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
                ArrayList<ComMngPopulationCorrectExcelVO> voList = Lists.newArrayList();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ArrayList<ComMngPopulationCorrectMistakeExcelVO> mistakes = Lists.newArrayList();
@@ -139,7 +140,6 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                            index++;
@@ -186,7 +186,6 @@
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    }
                    if(StringUtils.isNotEmpty(oneData.get(2))){
                        vo.setNation(oneData.get(2));
                    }
@@ -211,33 +210,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(6).trim());
                    if(StringUtils.isEmpty(oneData.get(7))){
                        index++;
                        ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(7))){
//                        index++;
//                        ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(7))) {
                        vo.setFloor(oneData.get(7).trim());
                    }
                    vo.setFloor(oneData.get(7).trim());
                    if(StringUtils.isEmpty(oneData.get(8))){
                        index++;
                        ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(8))){
//                        index++;
//                        ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(8))) {
                        vo.setUnitNo(oneData.get(8).trim());
                    }
                    vo.setUnitNo(oneData.get(8).trim());
                    if(StringUtils.isEmpty(oneData.get(9))){
                        index++;
                        ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(9))){
//                        index++;
//                        ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(9))) {
                        vo.setHouseNo(oneData.get(9).trim());
                    }
                    vo.setHouseNo(oneData.get(9).trim());
                    if(StringUtils.isNotEmpty(oneData.get(10))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10));
                        if(isOk.equals(-1)){
@@ -306,30 +311,167 @@
                        vo.setCensusRegister(oneData.get(15).trim());
                    }
                    if(StringUtils.isEmpty(oneData.get(16))){
                        ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                        index++;
                        setMistake(oneData, mistake);
                        mistake.setMistake("矫正开始时间不可为空，请填写矫正开始时间");
                        mistakes.add(mistake);
                        continue;
                    }
                    if(StringUtils.isNotEmpty(oneData.get(16))){
                        vo.setCorrectBegin(new SimpleDateFormat("yyyy-MM-dd").parse(oneData.get(16)));
                        Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(16));
                        if(isOk.equals(-1)){
                            index++;
                            ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的学历有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setCultureLevel(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(17))){
                        vo.setCorrectEnd(new SimpleDateFormat("yyyy-MM-dd").parse(oneData.get(17)));
                        vo.setCorrectPersonCode(oneData.get(17).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(18))){
                        vo.setCorrectType(oneData.get(18).trim());
                        vo.setOriginalCustodyplace(oneData.get(18).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(19))){
                        vo.setCharges(oneData.get(19).trim());
                        vo.setCorrectType(oneData.get(19).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(20))){
                        vo.setRemark(oneData.get(20).trim());
                        vo.setCaseType(oneData.get(20).trim());
                    }
                    vo.getUserTagStr().add("社区矫正人员");
                    for (int i = 21; i < headSize; i++) {
                    if(StringUtils.isNotEmpty(oneData.get(21))){
                        vo.setSpecificCharge(oneData.get(21).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(22))){
                        vo.setOriginalTerm(oneData.get(22).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(23))){
                        vo.setOriginalTermBegin(DateUtil.parse(oneData.get(23).trim(), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(24))){
                        vo.setOriginalTermEnd(DateUtil.parse(oneData.get(24).trim(), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(25))){
                        vo.setCorrectBegin(DateUtil.parse(oneData.get(25).trim(), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(26))){
                        vo.setCorrectEnd(DateUtil.parse(oneData.get(26).trim(), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(27))){
                        vo.setReceiveMethod(oneData.get(27).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(27))){
                        vo.setReceiveMethod(oneData.get(27).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(28))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(28));
                        if(isOk.equals(-1)){
                            ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否累惯犯有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsRecidivist(isOk);
                    }else {
                        vo.setIsRecidivist(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(29))){
                        vo.setFourHistory(oneData.get(29).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(30))){
                        vo.setThreeInvovle(oneData.get(30).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(31))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(31));
                        if(isOk.equals(-1)){
                            ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否建立矫正小组有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsCorrectGroup(isOk);
                    }else {
                        vo.setIsCorrectGroup(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(32))){
                        vo.setCorrectGroupConstitute(oneData.get(32).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(33))){
                        vo.setCorrectRelieveType(oneData.get(33).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(34))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(34));
                        if(isOk.equals(-1)){
                            ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否有脱管有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsOutControl(isOk);
                    }else {
                        vo.setIsOutControl(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(35))){
                        vo.setOutControlReason(oneData.get(35).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(36))){
                        vo.setOutControlCorrect(oneData.get(36).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(37))){
                        vo.setInspectOutControl(oneData.get(37).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(38))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(38));
                        if(isOk.equals(-1)){
                            ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否有漏管有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsMissControl(isOk);
                    }else {
                        vo.setIsMissControl(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(39))){
                        vo.setMissControlReason(oneData.get(39).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(40))){
                        vo.setMissControlCorrect(oneData.get(40).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(41))){
                        vo.setInspectMissControl(oneData.get(41).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(42))){
                        vo.setRewardAndPunishiment(oneData.get(42).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(43))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(43));
                        if(isOk.equals(-1)){
                            ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否重新犯罪有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsAgainCrime(isOk);
                    }else {
                        vo.setIsAgainCrime(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(44))){
                        vo.setAgainCrimeName(oneData.get(44).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(45))){
                        vo.setPubishmentChange(oneData.get(45).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(46))){
                        vo.setRemark(oneData.get(46).trim());
                    }
                    vo.getUserTagStr().add("社区矫正");
                    for (int i = 47; i < headSize; i++) {
                        if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                            vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                        }
@@ -394,16 +536,6 @@
//                populationImportErrorVOList.add(importErrorVO);
                log.error("数据格式有误，第" + index + "行");
                throw new ServiceException("500", "导入失败111");
            } catch (ParseException e1) {
                log.info("处理数据时失败2");
                e1.printStackTrace();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                importErrorVO.setErrorPosition("第" + index + "行");
//                importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
//                populationImportErrorVOList.add(importErrorVO);
                log.error("数据格式有误，第" + index + "行");
                throw new ServiceException("500", "导入失败222");
            }
        }

@@ -424,11 +556,37 @@
        vo.setControlStatus(map.get(13));
        vo.setOutOrLocal(map.get(14));
        vo.setCensusRegister(map.get(15));
        vo.setCorrectBegin(map.get(16));
        vo.setCorrectEnd(map.get(17));
        vo.setCorrectType(map.get(18));
        vo.setCharges(map.get(19));
        vo.setRemark(map.get(20));
        vo.setCultureLevel(map.get(16));
        vo.setCorrectPersonCode(map.get(17));
        vo.setOriginalCustodyplace(map.get(18));
        vo.setCorrectType(map.get(19));
        vo.setCaseType(map.get(20));
        vo.setSpecificCharge(map.get(21));
        vo.setOriginalTerm(map.get(22));
        vo.setOriginalTermBegin(map.get(23));
        vo.setOriginalTermEnd(map.get(24));
        vo.setCorrectBegin(map.get(25));
        vo.setCorrectEnd(map.get(26));
        vo.setReceiveMethod(map.get(27));
        vo.setIsRecidivist(map.get(28));
        vo.setFourHistory(map.get(29));
        vo.setThreeInvovle(map.get(30));
        vo.setIsCorrectGroup(map.get(31));
        vo.setCorrectGroupConstitute(map.get(32));
        vo.setCorrectRelieveType(map.get(33));
        vo.setIsOutControl(map.get(34));
        vo.setOutControlReason(map.get(35));
        vo.setOutControlCorrect(map.get(35));
        vo.setInspectOutControl(map.get(37));
        vo.setIsMissControl(map.get(38));
        vo.setMissControlReason(map.get(39));
        vo.setMissControlCorrect(map.get(40));
        vo.setInspectMissControl(map.get(41));
        vo.setRewardAndPunishiment(map.get(42));
        vo.setIsAgainCrime(map.get(43));
        vo.setAgainCrimeName(map.get(44));
        vo.setPubishmentChange(map.get(45));
        vo.setRemark(map.get(46));
    }

        private R mistakeExportPopulation(List<ComMngPopulationMistakeExcelVO> vo) {

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
@@ -106,10 +107,10 @@
            log.info("开始导入邪教人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -120,6 +121,7 @@

            int index = 2;
            try {
                String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
                ArrayList<ComMngPopulationCultExcelVO> voList = Lists.newArrayList();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ArrayList<ComMngPopulationCultMistakeExcelVO> mistakes = Lists.newArrayList();
@@ -129,7 +131,6 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
                            index++;
@@ -176,7 +177,7 @@
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    }

                    if(StringUtils.isNotEmpty(oneData.get(3))){
                        vo.setNation(oneData.get(3));
                    }
@@ -237,33 +238,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(9).trim());
                    if(StringUtils.isEmpty(oneData.get(10))){
                        index++;
                        ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(10))){
//                        index++;
//                        ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(10))) {
                        vo.setFloor(oneData.get(10).trim());
                    }
                    vo.setFloor(oneData.get(10).trim());
                    if(StringUtils.isEmpty(oneData.get(11))){
                        index++;
                        ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(11))){
//                        index++;
//                        ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(11))) {
                        vo.setUnitNo(oneData.get(11).trim());
                    }
                    vo.setUnitNo(oneData.get(11).trim());
                    if(StringUtils.isEmpty(oneData.get(12))){
                        index++;
                        ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(12))){
//                        index++;
//                        ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(12))) {
                        vo.setHouseNo(oneData.get(12).trim());
                    }
                    vo.setHouseNo(oneData.get(12).trim());
                    if(StringUtils.isNotEmpty(oneData.get(13))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(13));
                        if(isOk.equals(-1)){
@@ -338,10 +345,27 @@
                        vo.setBasicSituation(oneData.get(20).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(21))){
                        vo.setRemark(oneData.get(21).trim());
                        vo.setJoinCultDate(DateUtil.parse(oneData.get(21).trim(), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(22))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(22));
                        if(isOk.equals(-1)){
                            ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否对外宣传有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsExternalPublicity(isOk);
                    }else {
                        vo.setIsExternalPublicity(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(23))){
                        vo.setRemark(oneData.get(23).trim());
                    }
                    vo.getUserTagStr().add("邪教人员");
                    for (int i = 22; i < headSize; i++) {
                    for (int i = 24; i < headSize; i++) {
                        if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                            vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                        }
@@ -431,7 +455,9 @@
        vo.setCensusRegister(map.get(18));
        vo.setCultName(map.get(19));
        vo.setBasicSituation(map.get(20));
        vo.setRemark(map.get(21));
        vo.setJoinCultDate(map.get(21));
        vo.setIsExternalPublicity(map.get(22));
        vo.setRemark(map.get(23));
    }

        private String convertMarriage(String ma) {

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

@@ -108,10 +108,10 @@
            log.info("开始导入残疾人数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -131,7 +131,6 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
                            index++;
@@ -178,7 +177,7 @@
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    }

                    if(StringUtils.isNotEmpty(oneData.get(3))){
                        vo.setCertificateSituation(oneData.get(3));
                    }
@@ -224,33 +223,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(10).trim());
                    if(StringUtils.isEmpty(oneData.get(11))){
                        index++;
                        ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
                        setDisabilityMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(11))){
//                        index++;
//                        ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
//                        setDisabilityMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(11))) {
                        vo.setFloor(oneData.get(11).trim());
                    }
                    vo.setFloor(oneData.get(11).trim());
                    if(StringUtils.isEmpty(oneData.get(12))){
                        index++;
                        ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
                        setDisabilityMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(12))){
//                        index++;
//                        ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
//                        setDisabilityMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(12))) {
                        vo.setUnitNo(oneData.get(12).trim());
                    }
                    vo.setUnitNo(oneData.get(12).trim());
                    if(StringUtils.isEmpty(oneData.get(13))){
                        index++;
                        ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
                        setDisabilityMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(13))){
//                        index++;
//                        ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
//                        setDisabilityMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(13))) {
                        vo.setHouseNo(oneData.get(13).trim());
                    }
                    vo.setHouseNo(oneData.get(13).trim());
                    if(StringUtils.isNotEmpty(oneData.get(14))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(14));
                        if(isOk.equals(-1)){

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.context.AnalysisContext;
@@ -119,10 +120,10 @@
            log.info("开始导入吸毒人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -133,6 +134,7 @@

            int index = 2;
            try {
                String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
                ArrayList<ComMngPopulationDrugExcelVO> voList = Lists.newArrayList();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ArrayList<ComMngPopulationDrugMistakeExcelVO> mistakes = Lists.newArrayList();
@@ -142,54 +144,53 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                            index++;
                            setDrugMistake(oneData, mistake);
                            mistake.setMistake("名字不可为空，请填写姓名");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setName(oneData.get(1));
                        if(StringUtils.isEmpty(oneData.get(3))){
                            ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                            index++;
                            setDrugMistake(oneData, mistake);
                            mistake.setMistake("身份证号不可为空，请填写身份证");
                            mistakes.add(mistake);
                            continue;
                        }
                    if(StringUtils.isEmpty(oneData.get(1))){
                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                        index++;
                        setDrugMistake(oneData, mistake);
                        mistake.setMistake("名字不可为空，请填写姓名");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setName(oneData.get(1));
                    if(StringUtils.isEmpty(oneData.get(3))){
                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                        index++;
                        setDrugMistake(oneData, mistake);
                        mistake.setMistake("身份证号不可为空，请填写身份证");
                        mistakes.add(mistake);
                        continue;
                    }

                        //判断身份证号码位数
                        if(oneData.get(3).length() != 18){
                            ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                            index++;
                            setDrugMistake(oneData, mistake);
                            mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setCardNo(oneData.get(3).toUpperCase());
                        //根据身份证号码解析年龄以及性别
                        //获取用户生日
                        String birthday = vo.getCardNo().substring(6, 14);
                        if(StringUtils.isNotEmpty(birthday)){
                            String year = birthday.substring(0,4);
                            String month = birthday.substring(4,6);
                            String day = birthday.substring(6,8);
                            vo.setBirthday(year + "-" + month + "-" + day);
                        }
                    //判断身份证号码位数
                    if(oneData.get(3).length() != 18){
                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                        index++;
                        setDrugMistake(oneData, mistake);
                        mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setCardNo(oneData.get(3).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    if(StringUtils.isNotEmpty(birthday)){
                        String year = birthday.substring(0,4);
                        String month = birthday.substring(4,6);
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                        //获取用户性别
                        int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                        if(sex%2 == 1){
                            vo.setSex(PopulSexEnum.nan.getCode());
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }

                    if(StringUtils.isNotEmpty(oneData.get(2))){
                        vo.setNation(oneData.get(2));
                    }
@@ -214,33 +215,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(6).trim());
                    if(StringUtils.isEmpty(oneData.get(7))){
                        index++;
                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                        setDrugMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(7))){
//                        index++;
//                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
//                        setDrugMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(7))) {
                        vo.setFloor(oneData.get(7).trim());
                    }
                    vo.setFloor(oneData.get(7).trim());
                    if(StringUtils.isEmpty(oneData.get(8))){
                        index++;
                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                        setDrugMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(8))){
//                        index++;
//                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
//                        setDrugMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(8))) {
                        vo.setUnitNo(oneData.get(8).trim());
                    }
                    vo.setUnitNo(oneData.get(8).trim());
                    if(StringUtils.isEmpty(oneData.get(9))){
                        index++;
                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
                        setDrugMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(9))){
//                        index++;
//                        ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
//                        setDrugMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(9))) {
                        vo.setHouseNo(oneData.get(9).trim());
                    }
                    vo.setHouseNo(oneData.get(9).trim());
                    if(StringUtils.isNotEmpty(oneData.get(10))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10));
                        if(isOk.equals(-1)){
@@ -309,10 +316,43 @@
                        vo.setCensusRegister(oneData.get(15).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(16))){
                        vo.setRemark(oneData.get(16).trim());
                        vo.setFirstDate(DateUtil.parse(oneData.get(16).trim(), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(17))){
                        vo.setControlSituation(oneData.get(17).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(18))){
                        vo.setControlPerson(oneData.get(18).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(19))){
                        vo.setControlPersonPhone(oneData.get(19).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(20))){
                        vo.setHelpSituation(oneData.get(20).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(21))){
                        vo.setHelpPerson(oneData.get(21).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(22))){
                        vo.setHelpPersonPhone(oneData.get(22).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(23))){
                        vo.setDrugReason(oneData.get(23).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(24))){
                        vo.setDrugResult(oneData.get(24).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(25))){
                        vo.setHaveCrime(oneData.get(25).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(26))){
                        vo.setCrimeSutiation(oneData.get(26).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(27))){
                        vo.setRemark(oneData.get(27).trim());
                    }
                    vo.getUserTagStr().add("吸毒人员");
                    for (int i = 17; i < headSize; i++) {
                    for (int i = 28; i < headSize; i++) {
                        if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                            vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                        }
@@ -380,51 +420,6 @@
            }
        }

        private void setMistake(Map<Integer, String> map, ComMngPopulationMistakeExcelVO vo){
            vo.setName(map.get(0));
            vo.setCardNo(map.get(1));
            vo.setNation(map.get(2));
            vo.setPoliticalOutlook(map.get(3));
            vo.setIsRent(map.get(4));
            vo.setRelation(map.get(5));
            vo.setRoad(map.get(6));
            vo.setDoorNo(map.get(7));
            vo.setFloor(map.get(8));
            vo.setUnitNo(map.get(9));
            vo.setHouseNo(map.get(10));
            vo.setBuildPurpose(map.get(11));
            vo.setBuildArea(map.get(12));
            vo.setHouseStatus(map.get(13));
            vo.setHousePurpose(map.get(14));
            vo.setControlStatus(map.get(15));
            vo.setPhone(map.get(16));
            vo.setNativePlace(map.get(17));
            vo.setCultureLevel(map.get(18));
            vo.setMarriage(map.get(19));
            vo.setHealthy(map.get(20));
            vo.setBloodType(map.get(21));
            vo.setReligion(map.get(22));
            vo.setProfession(map.get(23));
            vo.setWorkCompany(map.get(24));
            vo.setOutOrLocal(map.get(25));
            vo.setCensusRegister(map.get(26));
            vo.setResidence(map.get(27));
//        vo.setAddress(map.get(28));
            vo.setPersonType(map.get(28));
            vo.setCountry(map.get(29));
            vo.setStringOfDeparture(map.get(30));
            vo.setPersonStatus(map.get(31));
            vo.setMonthlyIncome(map.get(32));
            vo.setFamilyStatus(map.get(33));
            vo.setGoalInChina(map.get(34));
            vo.setStringOfArrival(map.get(35));
            vo.setRemark(map.get(36));
            vo.setIdCardPositive(map.get(37));
            vo.setIdCardBack(map.get(38));
            vo.setHouseHold(map.get(39));
            vo.setDeath(map.get(40));
        }

    private void setDrugMistake(Map<Integer, String> map, ComMngPopulationDrugMistakeExcelVO vo){
        vo.setSerialNumber(map.get(0));
        vo.setName(map.get(1));
@@ -442,7 +437,18 @@
        vo.setControlStatus(map.get(13));
        vo.setOutOrLocal(map.get(14));
        vo.setCensusRegister(map.get(15));
        vo.setRemark(map.get(16));
        vo.setFirstDate(map.get(16));
        vo.setControlSituation(map.get(17));
        vo.setControlPerson(map.get(18));
        vo.setControlPersonPhone(map.get(19));
        vo.setHelpSituation(map.get(20));
        vo.setHelpPerson(map.get(21));
        vo.setHelpPersonPhone(map.get(22));
        vo.setDrugReason(map.get(23));
        vo.setDrugResult(map.get(24));
        vo.setHaveCrime(map.get(25));
        vo.setCrimeSutiation(map.get(26));
        vo.setRemark(map.get(27));
    }

        private R mistakeExportPopulation(List<ComMngPopulationMistakeExcelVO> vo) {

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

@@ -116,10 +116,10 @@
            log.info("开始导入重点上访人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -139,54 +139,53 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                            index++;
                            setKeyMistake(oneData, mistake);
                            mistake.setMistake("名字不可为空，请填写姓名");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setName(oneData.get(1));
                        if(StringUtils.isEmpty(oneData.get(3))){
                            ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                            index++;
                            setKeyMistake(oneData, mistake);
                            mistake.setMistake("身份证号不可为空，请填写身份证");
                            mistakes.add(mistake);
                            continue;
                        }
                    if(StringUtils.isEmpty(oneData.get(1))){
                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                        index++;
                        setKeyMistake(oneData, mistake);
                        mistake.setMistake("名字不可为空，请填写姓名");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setName(oneData.get(1));
                    if(StringUtils.isEmpty(oneData.get(3))){
                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                        index++;
                        setKeyMistake(oneData, mistake);
                        mistake.setMistake("身份证号不可为空，请填写身份证");
                        mistakes.add(mistake);
                        continue;
                    }

                        //判断身份证号码位数
                        if(oneData.get(3).length() != 18){
                            ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                            index++;
                            setKeyMistake(oneData, mistake);
                            mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setCardNo(oneData.get(3).toUpperCase());
                        //根据身份证号码解析年龄以及性别
                        //获取用户生日
                        String birthday = vo.getCardNo().substring(6, 14);
                        if(StringUtils.isNotEmpty(birthday)){
                            String year = birthday.substring(0,4);
                            String month = birthday.substring(4,6);
                            String day = birthday.substring(6,8);
                            vo.setBirthday(year + "-" + month + "-" + day);
                        }
                    //判断身份证号码位数
                    if(oneData.get(3).length() != 18){
                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                        index++;
                        setKeyMistake(oneData, mistake);
                        mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setCardNo(oneData.get(3).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    if(StringUtils.isNotEmpty(birthday)){
                        String year = birthday.substring(0,4);
                        String month = birthday.substring(4,6);
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                        //获取用户性别
                        int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                        if(sex%2 == 1){
                            vo.setSex(PopulSexEnum.nan.getCode());
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }

                    if(StringUtils.isNotEmpty(oneData.get(2))){
                        vo.setNation(oneData.get(2));
                    }
@@ -214,33 +213,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(7).trim());
                    if(StringUtils.isEmpty(oneData.get(8))){
                        index++;
                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                        setKeyMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(8))){
//                        index++;
//                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
//                        setKeyMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(8))) {
                        vo.setFloor(oneData.get(8).trim());
                    }
                    vo.setFloor(oneData.get(8).trim());
                    if(StringUtils.isEmpty(oneData.get(9))){
                        index++;
                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                        setKeyMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(9))){
//                        index++;
//                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
//                        setKeyMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(9))) {
                        vo.setUnitNo(oneData.get(9).trim());
                    }
                    vo.setUnitNo(oneData.get(9).trim());
                    if(StringUtils.isEmpty(oneData.get(10))){
                        index++;
                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
                        setKeyMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(10))){
//                        index++;
//                        ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
//                        setKeyMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(10))) {
                        vo.setHouseNo(oneData.get(10).trim());
                    }
                    vo.setHouseNo(oneData.get(10).trim());
                    if(StringUtils.isNotEmpty(oneData.get(11))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11));
                        if(isOk.equals(-1)){
@@ -311,7 +316,7 @@
                    if(StringUtils.isNotEmpty(oneData.get(17))){
                        vo.setRemark(oneData.get(17).trim());
                    }
                    vo.getUserTagStr().add("重点上访人员");
                    vo.getUserTagStr().add("重点人员");
                    for (int i = 18; i < headSize; i++) {
                        if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                            vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));

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

New file
@@ -0,0 +1,614 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.panzhihua.common.constants.BcDictionaryConstants;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityMistakeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.PayUtil;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
 * @description: 低保户导入监听
 * @author: txb
 */
@Slf4j
public class ComMngPopulationLowSecurityExcelListen extends AnalysisEventListener<Map<Integer, String>> {
    private CommunityService communityService;

    private Long communityId;

    private static int headSize = 0;

    private Map<Integer, String> headData;

    private String userName;
    // FTP 登录密码
    private String password;
    // FTP 服务器地址IP地址
    private String host;
    // FTP 端口
    private int port;
    private String excelUrl;

    private StringRedisTemplate stringRedisTemplate;

    public static String loadUrl;

    public ComMngPopulationLowSecurityExcelListen(CommunityService communityService, Long communityId, String userName, String password, String host, int port, String excelUrl, StringRedisTemplate stringRedisTemplate) {
            this.communityService = communityService;
            this.communityId = communityId;
            this.userName = userName;
            this.password = password;
            this.host = host;
            this.port = port;
            this.excelUrl = excelUrl;
            this.stringRedisTemplate = stringRedisTemplate;
        }

        /**
         * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
         */
        private static final int BATCH_COUNT = 5000;
        List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();

        @Override
        public void invoke(Map<Integer, String> data, AnalysisContext context) {
            list.add(data);
            if (list.size() >= BATCH_COUNT) {
                saveData();
                list.clear();
            }
        }

        /**
         * 这里会一行行的返回头
         *
         * @param headMap
         * @param context
         */
        @Override
        public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
            headSize = headMap.size();
            headData = headMap;
        }

        @Override
        public void doAfterAllAnalysed(AnalysisContext context) {
            saveData();
            log.info("所有数据解析完成！");
        }

        /**
         * 不是固定的列只能手动处理
         */
        private void saveData() {
            R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
            log.info("开始导入低保户数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("000", "导入数据为空！");
            }
            ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
            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<>();
//        for(BcDictionaryVO vo : dictionaryR.getData()){
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d", "yyyy/MM", "yyyy/M", "yyyy-M", "yyyy-MM"};
                ArrayList<ComMngPopulationLowSecurityExcelVO> voList = Lists.newArrayList();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ArrayList<ComMngPopulationLowSecurityMistakeExcelVO> mistakes = Lists.newArrayList();
                for (Map<Integer, String> oneData : list) {
                    ComMngPopulationLowSecurityExcelVO vo = new ComMngPopulationLowSecurityExcelVO();
                    if (StringUtils.isNotEmpty(oneData.get(0))){
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isEmpty(oneData.get(1))){
                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                        index++;
                        setLowSecurityMistake(oneData, mistake);
                        mistake.setMistake("名字不可为空，请填写姓名");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setName(oneData.get(1));
                    if(StringUtils.isEmpty(oneData.get(2))){
                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                        index++;
                        setLowSecurityMistake(oneData, mistake);
                        mistake.setMistake("身份证号不可为空，请填写身份证");
                        mistakes.add(mistake);
                        continue;
                    }

                    //判断身份证号码位数
                    if(oneData.get(2).length() != 18){
                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                        index++;
                        setLowSecurityMistake(oneData, mistake);
                        mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setCardNo(oneData.get(2).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    if(StringUtils.isNotEmpty(birthday)){
                        String year = birthday.substring(0,4);
                        String month = birthday.substring(4,6);
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }

                    if(StringUtils.isNotEmpty(oneData.get(3))){
                        vo.setPhone(oneData.get(3));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(4))){
                        vo.setRegion(oneData.get(4));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(5))){
                        vo.setFamilyCode(oneData.get(5));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(6))){
                        vo.setGroupName(oneData.get(6));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(7))){
                        vo.setClassifiedRescueCategory(oneData.get(7));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(8))){
                        vo.setApplyDate(DateUtil.parse(oneData.get(8), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(9))){
                        vo.setHouseHolderName(oneData.get(9));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(10))){
                        vo.setHouseHolderCardNo(oneData.get(10));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(11))){
                        vo.setHouseHolderCode(oneData.get(11));
                    }
                    if(StringUtils.isEmpty(oneData.get(12))){
                        index++;
                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                        setLowSecurityMistake(oneData, mistake);
                        mistake.setMistake("街路巷不可为空");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setRoad(oneData.get(12));
                    if(StringUtils.isEmpty(oneData.get(13))){
                        index++;
                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                        setLowSecurityMistake(oneData, mistake);
                        mistake.setMistake("小区号不可为空");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setDoorNo(oneData.get(13).trim());
//                    if(StringUtils.isEmpty(oneData.get(14))){
//                        index++;
//                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
//                        setLowSecurityMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(14))) {
                        vo.setFloor(oneData.get(14).trim());
                    }
//                    if(StringUtils.isEmpty(oneData.get(15))){
//                        index++;
//                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
//                        setLowSecurityMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(15))) {
                        vo.setUnitNo(oneData.get(15).trim());
                    }
//                    if(StringUtils.isEmpty(oneData.get(16))){
//                        index++;
//                        ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
//                        setLowSecurityMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(16))) {
                        vo.setHouseNo(oneData.get(16).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(17))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(17));
                        if(isOk.equals(-1)){
                            ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                            index++;
                            setLowSecurityMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否租住有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsRent(isOk);
                    }else {
                        vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(18))){
                        Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(18).trim());
                        if(isOk.equals(-1)){
                            index++;
                            ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                            setLowSecurityMistake(oneData, mistake);
                            mistake.setMistake("您填写的房屋状态有误");
                            mistakes.add(mistake);
                            continue;
                        }
                    vo.setHouseStatus(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(19))){
                        Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(19).trim());
                        if(isOk.equals(-1)){
                            index++;
                            ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                            setLowSecurityMistake(oneData, mistake);
                            mistake.setMistake("您填写的房屋用途有误");
                            mistakes.add(mistake);
                            continue;
                        }
                    vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(19).trim()));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(20))){
                        Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(20));
                        if(isOk.equals(-1)){
                            index++;
                            ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                            setLowSecurityMistake(oneData, mistake);
                            mistake.setMistake("您填写的管控状态有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setControlStatus(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(21))){
                        Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(21));
                        if(isOk.equals(-1)){
                            index++;
                            ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                            setLowSecurityMistake(oneData, mistake);
                            mistake.setMistake("您填写的本地/外地有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setOutOrLocal(isOk);
                    }else {
                        vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(22))){
                        vo.setCensusRegister(oneData.get(22).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(23))){
                        vo.setResidencePostalCode(oneData.get(23).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(24))){
                        vo.setSalvageCertificateNo(oneData.get(24).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(25))){
                        vo.setGuaranteedPopulationNumber(Integer.valueOf(oneData.get(25).trim()));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(26))){
                        vo.setFamilyPopulationNumber(Integer.valueOf(oneData.get(26).trim()));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(27))){
                        vo.setAccountPerson(oneData.get(27).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(28))){
                        vo.setAccountBank(oneData.get(28).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(29))){
                        vo.setAccountCardNo(oneData.get(29).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(30))){
                        vo.setBankAccount(oneData.get(30).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(31))){
                        vo.setSupportInstitutions(oneData.get(31).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(32))){
                        vo.setDistributionMethod(oneData.get(32).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(33))){
                        vo.setGuaranteedAmount(new BigDecimal(oneData.get(33).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(34))){
                        vo.setReallocationAmount(new BigDecimal(oneData.get(34).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(35))){
                        vo.setDifferenceReliefAmount(new BigDecimal(oneData.get(35).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(36))){
                        vo.setClassifiedInsuredAmount(new BigDecimal(oneData.get(36).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(37))){
                        vo.setTotalMonthlyFamilyIncome(new BigDecimal(oneData.get(37).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(38))){
                        vo.setAverageMonthlyFamilyIncome(new BigDecimal(oneData.get(38).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(39))){
                        vo.setTotalMonthlyFamilyExpenditure(new BigDecimal(oneData.get(39).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(40))){
                        vo.setLng(oneData.get(40).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(41))){
                        vo.setLat(oneData.get(41).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(42))){
                        vo.setOriginateDate(oneData.get(42).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(43))){
                        vo.setNursingFee(new BigDecimal(oneData.get(43).trim()).setScale(2, RoundingMode.HALF_UP));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(44))){
                        vo.setApplyReason(oneData.get(44).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(45))){
                        vo.setReviewComment(oneData.get(45).trim());
                    }
                    vo.getUserTagStr().add("低保户");
                    for (int i = 46; i < headSize; i++) {
                        if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                            vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                        }
                    }
                    //将重复的数据进行MD5加密实现去重
                    String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
                    try {
                        String distinctPass = PayUtil.MD5(distinct);
                        if(StringUtils.isNotEmpty(distinctPass)){
                            vo.setDistinctPass(distinctPass);
                        }
                    }catch (Exception e){
                        log.error("组装MD5加密字段失败，数据表格行数：" + index);
                        continue;
                    }
                    voList.add(vo);
                    index++;
                }
                //客户需要暂时注释，等客户处理完成需要恢复
//            if(populationImportErrorVOList.isEmpty()){
//                R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
//                if (!R.isOk(r)) {
//                    throw new ServiceException(r.getMsg());
//                }
//            }else{
//                throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
//            }
                //根据list中的IdCard城市来去重
                List<ComMngPopulationLowSecurityExcelVO> newVoList = voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationLowSecurityExcelVO::getDistinctPass)).collect(Collectors.toList());
                log.info("开始进入业务层处理逻辑");
                R r = communityService.listSavePopulationLowSecurityExcelVO(newVoList, communityId);
                log.info("业务层处理逻辑完成");
                if (!R.isOk(r)) {
                    log.info("业务层处理成功");
                    List<ComMngPopulationLowSecurityMistakeExcelVO> list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationLowSecurityMistakeExcelVO.class);
//                    String errMsg = r.getMsg();
//                    List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
//                    if(!errorList.isEmpty()){
//                        populationImportErrorVOList.addAll(errorList);
//                    }
                    mistakes.addAll(list);
                    log.info("将错误数据存入redis中");
                    valueOperations.set(LowSecurity,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
                    log.info("将错误数据存入redis中成功");
                    throw new ServiceException("500", LowSecurity);
                }else{
                    log.info("业务层处理逻辑失败");
                    if(!mistakes.isEmpty()){
                        log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
                        valueOperations.set(LowSecurity,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
                        log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
                        throw new ServiceException("500", LowSecurity);
                    }
                }
            } catch (NumberFormatException e) {
                log.info("处理数据时失败");
                e.printStackTrace();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                importErrorVO.setErrorPosition("第" + index + "行");
//                importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
//                populationImportErrorVOList.add(importErrorVO);
                log.error("数据格式有误，第" + index + "行");
                throw new ServiceException("500", "导入失败111");
            }
        }

    private void setLowSecurityMistake(Map<Integer, String> map, ComMngPopulationLowSecurityMistakeExcelVO vo){
        vo.setSerialNumber(map.get(0));
        vo.setName(map.get(1));
        vo.setCardNo(map.get(2));
        vo.setPhone(map.get(3));
        vo.setRegion(map.get(4));
        vo.setFamilyCode(map.get(5));
        vo.setGroupName(map.get(6));
        vo.setClassifiedRescueCategory(map.get(7));
        vo.setApplyDate(map.get(8));
        vo.setHouseHolderName(map.get(9));
        vo.setHouseHolderCardNo(map.get(10));
        vo.setHouseHolderCode(map.get(11));
        vo.setRoad(map.get(12));
        vo.setDoorNo(map.get(13));
        vo.setFloor(map.get(14));
        vo.setUnitNo(map.get(15));
        vo.setHouseNo(map.get(16));
        vo.setIsRent(map.get(17));
        vo.setHouseStatus(map.get(18));
        vo.setHousePurpose(map.get(19));
        vo.setControlStatus(map.get(20));
        vo.setOutOrLocal(map.get(21));
        vo.setCensusRegister(map.get(22));
        vo.setResidencePostalCode(map.get(23));
        vo.setSalvageCertificateNo(map.get(24));
        vo.setGuaranteedPopulationNumber(map.get(25));
        vo.setFamilyPopulationNumber(map.get(26));
        vo.setAccountPerson(map.get(27));
        vo.setAccountBank(map.get(28));
        vo.setAccountCardNo(map.get(29));
        vo.setBankAccount(map.get(30));
        vo.setSupportInstitutions(map.get(31));
        vo.setDistributionMethod(map.get(32));
        vo.setGuaranteedAmount(map.get(33));
        vo.setReallocationAmount(map.get(34));
        vo.setDifferenceReliefAmount(map.get(35));
        vo.setClassifiedInsuredAmount(map.get(36));
        vo.setTotalMonthlyFamilyIncome(map.get(37));
        vo.setAverageMonthlyFamilyIncome(map.get(38));
        vo.setTotalMonthlyFamilyExpenditure(map.get(39));
        vo.setLng(map.get(40));
        vo.setLat(map.get(41));
        vo.setOriginateDate(map.get(42));
        vo.setNursingFee(map.get(43));
        vo.setApplyReason(map.get(44));
        vo.setReviewComment(map.get(45));
    }

        private String convertMarriage(String ma) {

            if(Objects.equals("已",ma) || Objects.equals("一",ma)){
                ma = "已婚";
            }else if(Objects.equals("未",ma) || Objects.equals("未婚婚",ma)){
                ma = "未婚";
            }else if(Objects.equals("初",ma)){
                ma = "初婚";
            }else if(Objects.equals("再",ma)){
                ma = "再婚";
            }else if(Objects.equals("复",ma)){
                ma = "复婚";
            }else if(Objects.equals("丧",ma) || Objects.equals("丧偶偶",ma)){
                ma = "丧偶";
            }else if(Objects.equals("离",ma) || Objects.equals("离异",ma) || Objects.equals("离异婚",ma)){
                ma = "离婚";
            }else if(Objects.equals("分",ma)){
                ma = "分居";
            }

            return ma;
        }

        private String convertRelation(String ra) {
            if(ra.contains("户主")){
                ra = "户主";
            }else if(Objects.equals(ra,"女儿")){
                ra = "女";
            }else if(Objects.equals(ra,"儿子") || Objects.equals(ra,"儿")){
                ra = "子";
            }else if(Objects.equals(ra,"大女")){
                ra = "长女";
            }else if(Objects.equals(ra,"二女") || Objects.equals(ra,"此女")){
                ra = "次女";
            }else if(Objects.equals(ra,"二子")){
                ra = "次子";
            }else if(Objects.equals(ra,"长男") || ra.contains("长子")){
                ra = "长子";
            }else if(Objects.equals(ra,"非亲属") || ra.contains("女友")  || ra.contains("女朋友")
                    || ra.contains("男友") || ra.contains("男朋友")){
                ra = "其他";
            }else if(Objects.equals(ra,"姐")){
                ra = "姐姐";
            }else if(Objects.equals(ra,"户主")){
                ra = "本人";
            }else if(Objects.equals(ra,"妻子") || Objects.equals(ra,"媳妇")){
                ra = "妻";
            }else if(Objects.equals(ra,"哥") || Objects.equals(ra,"哥哥")){
                ra = "兄";
            }else if(Objects.equals(ra,"丈夫")){
                ra = "夫";
            }else if(Objects.equals(ra,"丈母娘")){
                ra = "岳母";
            }else if(Objects.equals(ra,"继子") || Objects.equals(ra,"养子")){
                ra = "养子或继子";
            }else if(Objects.equals(ra,"继女") || Objects.equals(ra,"养女")){
                ra = "养女或继女";
            }else if(ra.contains("儿媳")||ra.contains("长媳")){
                ra = "儿媳";
            }else if(Objects.equals(ra,"三姨") || Objects.equals(ra,"姨姨")){
                ra = "姨母";
            }else if(Objects.equals(ra,"二外孙女")){
                ra = "外孙女";
            }else if(Objects.equals(ra,"外孙")){
                ra = "外孙子";
            }else if(Objects.equals(ra,"侄儿")){
                ra = "侄子";
            }else if(ra.contains("表")){
                ra = "表兄弟、表姐妹";
            }else if(Objects.equals(ra,"继父") || Objects.equals(ra,"养父")){
                ra = "继父或养父";
            }else if(Objects.equals(ra,"父")){
                ra = "父亲";
            }else if(Objects.equals(ra,"弟弟")){
                ra = "弟";
            }else if(Objects.equals(ra,"孙")){
                ra = "孙子";
            }else if(Objects.equals(ra,"孙媳妇") || Objects.equals(ra,"外孙媳妇")){
                ra = "孙媳妇或外孙媳妇";
            }else if(Objects.equals(ra,"妹")){
                ra = "妹妹";
            }else if(Objects.equals(ra,"祖父母")){
                ra = "祖父母或外祖父母";
            }else if(Objects.equals(ra,"姐妹") || Objects.equals(ra,"兄弟")){
                ra = "兄弟姐妹";
            }else if(Objects.equals(ra,"其他姐妹") || Objects.equals(ra,"其他兄弟")){
                ra = "其他兄弟姐妹";
            }else if(Objects.equals(ra,"奶奶")){
                ra = "祖母";
            }else if(Objects.equals(ra,"爷爷")){
                ra = "祖父";
            }else if(Objects.equals(ra,"爷爷")){
                ra = "祖父";
            }else if(ra.contains("堂")){
                ra = "堂兄弟、堂姐妹";
            }

            return ra;
        }
}

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

@@ -15,10 +15,7 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationMistakeExcelVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.PayUtil;
@@ -119,10 +116,10 @@
            log.info("开始导入重精人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -142,54 +139,53 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("名字不可为空，请填写姓名");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setName(oneData.get(1));
                        if(StringUtils.isEmpty(oneData.get(2))){
                            ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("身份证号不可为空，请填写身份证");
                            mistakes.add(mistake);
                            continue;
                        }
                    if(StringUtils.isEmpty(oneData.get(1))){
                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                        index++;
                        setMistake(oneData, mistake);
                        mistake.setMistake("名字不可为空，请填写姓名");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setName(oneData.get(1));
                    if(StringUtils.isEmpty(oneData.get(2))){
                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                        index++;
                        setMistake(oneData, mistake);
                        mistake.setMistake("身份证号不可为空，请填写身份证");
                        mistakes.add(mistake);
                        continue;
                    }

                        //判断身份证号码位数
                        if(oneData.get(2).length() != 18){
                            ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setCardNo(oneData.get(2).toUpperCase());
                        //根据身份证号码解析年龄以及性别
                        //获取用户生日
                        String birthday = vo.getCardNo().substring(6, 14);
                        if(StringUtils.isNotEmpty(birthday)){
                            String year = birthday.substring(0,4);
                            String month = birthday.substring(4,6);
                            String day = birthday.substring(6,8);
                            vo.setBirthday(year + "-" + month + "-" + day);
                        }
                    //判断身份证号码位数
                    if(oneData.get(2).length() != 18){
                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                        index++;
                        setMistake(oneData, mistake);
                        mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setCardNo(oneData.get(2).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    if(StringUtils.isNotEmpty(birthday)){
                        String year = birthday.substring(0,4);
                        String month = birthday.substring(4,6);
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                        //获取用户性别
                        int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                        if(sex%2 == 1){
                            vo.setSex(PopulSexEnum.nan.getCode());
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }

                    if(StringUtils.isEmpty(oneData.get(3))){
                        index++;
                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
@@ -208,33 +204,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(4).trim());
                    if(StringUtils.isEmpty(oneData.get(5))){
                        index++;
                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(5))){
//                        index++;
//                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(5))) {
                        vo.setFloor(oneData.get(5).trim());
                    }
                    vo.setFloor(oneData.get(5).trim());
                    if(StringUtils.isEmpty(oneData.get(6))){
                        index++;
                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(6))){
//                        index++;
//                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(6))) {
                        vo.setUnitNo(oneData.get(6).trim());
                    }
                    vo.setUnitNo(oneData.get(6).trim());
                    if(StringUtils.isEmpty(oneData.get(7))){
                        index++;
                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(7))){
//                        index++;
//                        ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(7))) {
                        vo.setHouseNo(oneData.get(7).trim());
                    }
                    vo.setHouseNo(oneData.get(7).trim());
                    if(StringUtils.isNotEmpty(oneData.get(8))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(8));
                        if(isOk.equals(-1)){
@@ -318,31 +320,66 @@
                        vo.setEconomicCondition(oneData.get(15).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(16))){
                        vo.setGuarDian(oneData.get(16).trim());
                        vo.setPersonType(oneData.get(16).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(17))){
                        vo.setGuarDianPhone(oneData.get(17).trim());
                        vo.setFamilySituation(oneData.get(17).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(18))){
                        Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
                        vo.setCustodyPerson(oneData.get(18).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(19))){
                        Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19));
                        if(isOk.equals(-1)){
                            index++;
                            ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的与患者关系有误");
                            mistake.setMistake("您填写的与监护人关系有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setPatientRelation(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(19))){
                        vo.setDiagnose(oneData.get(19).trim());
                        vo.setCustodyRelation(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(20))){
                        vo.setOther(oneData.get(20).trim());
                        vo.setCustodyCardNo(oneData.get(20).trim());
                    }
                    vo.getUserTagStr().add("重精人员");
                    for (int i = 21; i < headSize; i++) {
                    if(StringUtils.isNotEmpty(oneData.get(21))){
                        vo.setCustodyPersonPhone(oneData.get(21).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(22))){
                        vo.setCustodyAddress(oneData.get(22).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(23))){
                        vo.setHelpPerson(oneData.get(23).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(24))){
                        vo.setHelpPersonPhone(oneData.get(24).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(25))){
                        vo.setHelpMethod(oneData.get(25).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(26))){
                        vo.setHelpSituation(oneData.get(26).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(27))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(27));
                        if(isOk.equals(-1)){
                            ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否违法犯罪有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsCrime(isOk);
                    }else {
                        vo.setIsCrime(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(28))){
                        vo.setCrimeSutiation(oneData.get(28).trim());
                    }
                    vo.getUserTagStr().add("精神障碍患者");
                    for (int i = 29; i < headSize; i++) {
                        if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                            vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                        }
@@ -427,11 +464,19 @@
        vo.setCensusRegister(map.get(13));
        vo.setCultureLevel(map.get(14));
        vo.setEconomicCondition(map.get(15));
        vo.setGuarDian(map.get(16));
        vo.setGuarDianPhone(map.get(17));
        vo.setPatientRelation(map.get(18));
        vo.setDiagnose(map.get(19));
        vo.setOther(map.get(20));
        vo.setPersonType(map.get(16));
        vo.setFamilySituation(map.get(17));
        vo.setCustodyPerson(map.get(18));
        vo.setCustodyRelation(map.get(19));
        vo.setCustodyCardNo(map.get(20));
        vo.setCustodyPersonPhone(map.get(21));
        vo.setCustodyAddress(map.get(22));
        vo.setHelpPerson(map.get(23));
        vo.setHelpPersonPhone(map.get(24));
        vo.setHelpMethod(map.get(25));
        vo.setHelpSituation(map.get(26));
        vo.setIsCrime(map.get(27));
        vo.setCrimeSutiation(map.get(28));
    }

        private String convertMarriage(String ma) {

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

@@ -1,5 +1,7 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateException;
import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.context.AnalysisContext;
@@ -30,6 +32,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -116,10 +119,10 @@
            log.info("开始导入刑释人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -130,6 +133,7 @@

            int index = 2;
            try {
                String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
                ArrayList<ComMngPopulationRehabilitationExcelVO> voList = Lists.newArrayList();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ArrayList<ComMngPopulationRehabilitationMistakeExcelVO> mistakes = Lists.newArrayList();
@@ -139,54 +143,53 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("名字不可为空，请填写姓名");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setName(oneData.get(1));
                        if(StringUtils.isEmpty(oneData.get(3))){
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("身份证号不可为空，请填写身份证");
                            mistakes.add(mistake);
                            continue;
                        }
                    if(StringUtils.isEmpty(oneData.get(1))){
                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                        index++;
                        setRehabilitationMistake(oneData, mistake);
                        mistake.setMistake("名字不可为空，请填写姓名");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setName(oneData.get(1));
                    if(StringUtils.isEmpty(oneData.get(3))){
                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                        index++;
                        setRehabilitationMistake(oneData, mistake);
                        mistake.setMistake("身份证号不可为空，请填写身份证");
                        mistakes.add(mistake);
                        continue;
                    }

                        //判断身份证号码位数
                        if(oneData.get(3).length() != 18){
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setCardNo(oneData.get(3).toUpperCase());
                        //根据身份证号码解析年龄以及性别
                        //获取用户生日
                        String birthday = vo.getCardNo().substring(6, 14);
                        if(StringUtils.isNotEmpty(birthday)){
                            String year = birthday.substring(0,4);
                            String month = birthday.substring(4,6);
                            String day = birthday.substring(6,8);
                            vo.setBirthday(year + "-" + month + "-" + day);
                        }
                    //判断身份证号码位数
                    if(oneData.get(3).length() != 18){
                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                        index++;
                        setRehabilitationMistake(oneData, mistake);
                        mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setCardNo(oneData.get(3).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    if(StringUtils.isNotEmpty(birthday)){
                        String year = birthday.substring(0,4);
                        String month = birthday.substring(4,6);
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                        //获取用户性别
                        int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                        if(sex%2 == 1){
                            vo.setSex(PopulSexEnum.nan.getCode());
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }

                    if(StringUtils.isNotEmpty(oneData.get(2))){
                        vo.setNation(oneData.get(2));
                    }
@@ -214,33 +217,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(7).trim());
                    if(StringUtils.isEmpty(oneData.get(8))){
                        index++;
                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                        setRehabilitationMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(8))){
//                        index++;
//                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
//                        setRehabilitationMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(8))) {
                        vo.setFloor(oneData.get(8).trim());
                    }
                    vo.setFloor(oneData.get(8).trim());
                    if(StringUtils.isEmpty(oneData.get(9))){
                        index++;
                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                        setRehabilitationMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(9))){
//                        index++;
//                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
//                        setRehabilitationMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(9))) {
                        vo.setUnitNo(oneData.get(9).trim());
                    }
                    vo.setUnitNo(oneData.get(9).trim());
                    if(StringUtils.isEmpty(oneData.get(10))){
                        index++;
                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                        setRehabilitationMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(10))){
//                        index++;
//                        ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
//                        setRehabilitationMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(10))) {
                        vo.setHouseNo(oneData.get(10).trim());
                    }
                    vo.setHouseNo(oneData.get(10).trim());
                    if(StringUtils.isNotEmpty(oneData.get(11))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11));
                        if(isOk.equals(-1)){
@@ -341,10 +350,105 @@
                        vo.setIsRehab(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(21))){
                        vo.setRemark(oneData.get(21).trim());
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(21));
                        if(isOk.equals(-1)){
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否累惯犯有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsRecidivist(isOk);
                    }else {
                        vo.setIsRecidivist(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(22))){
                        vo.setOriginalTerm(oneData.get(22).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(23))){
                        vo.setSentenceBegin(DateUtil.parse(oneData.get(23).trim()));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(24))){
                        vo.setOriginalCharge(oneData.get(24).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(25))){
                        vo.setSentenceEnd(DateUtil.parse(oneData.get(25).trim()));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(26))){
                        vo.setSentencePlace(oneData.get(26).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(27))){
                        vo.setRiskAssessment(oneData.get(27).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(28))){
                        vo.setJoinDate(DateUtil.parse(oneData.get(28).trim()));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(29))){
                        vo.setJoinSituation(oneData.get(29).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(30))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(30));
                        if(isOk.equals(-1)){
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("您填写的是否重新犯罪有误");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setIsAgainCrime(isOk);
                    }else {
                        vo.setIsAgainCrime(PopulHouseUseEnum.getCodeByName("否"));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(31))){
                        vo.setAgainCrimeName(oneData.get(31).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(32))){
                        vo.setPlaceSituation(oneData.get(32).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(33))){
                        vo.setPlaceDate(DateUtil.parse(oneData.get(33).trim()));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(34))){
                        vo.setNotPlaceReason(oneData.get(34).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(35))){
                        try {
                            vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim()));
                        } catch (DateException e) {
                            log.info("处理数据时失败");
                            e.printStackTrace();
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("您填写的帮教开始日期有误");
                            mistakes.add(mistake);
                            continue;
                        }
                    }
                    if(StringUtils.isNotEmpty(oneData.get(36))){
                        try {
                            vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim()));
                        } catch (DateException e) {
                            log.info("处理数据时失败");
                            e.printStackTrace();
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("您填写的帮教结束日期有误");
                            mistakes.add(mistake);
                            continue;
                        }
                    }
                    if(StringUtils.isNotEmpty(oneData.get(37))){
                        vo.setHelpSituation(oneData.get(37).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(38))){
                        vo.setRemark(oneData.get(38).trim());
                    }
                    vo.getUserTagStr().add("刑满释放");
                    for (int i = 22; i < headSize; i++) {
                    for (int i = 39; i < headSize; i++) {
                        if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                            vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
                        }
@@ -434,7 +538,24 @@
        vo.setPatientRelation(map.get(18));
        vo.setRehabReasonAndType(map.get(19));
        vo.setIsRehab(map.get(20));
        vo.setRemark(map.get(21));
        vo.setIsRecidivist(map.get(21));
        vo.setOriginalTerm(map.get(22));
        vo.setSentenceBegin(map.get(23));
        vo.setOriginalCharge(map.get(24));
        vo.setSentenceEnd(map.get(25));
        vo.setSentencePlace(map.get(26));
        vo.setRiskAssessment(map.get(27));
        vo.setJoinDate(map.get(28));
        vo.setJoinSituation(map.get(29));
        vo.setIsAgainCrime(map.get(30));
        vo.setAgainCrimeName(map.get(31));
        vo.setPlaceSituation(map.get(32));
        vo.setPlaceDate(map.get(33));
        vo.setNotPlaceReason(map.get(34));
        vo.setHelpBegin(map.get(35));
        vo.setHelpEnd(map.get(36));
        vo.setHelpSituation(map.get(37));
        vo.setRemark(map.get(38));
    }

        private R mistakeExportPopulation(List<ComMngPopulationMistakeExcelVO> vo) {

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

@@ -118,10 +118,10 @@
            log.info("开始导入服刑人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -141,54 +141,53 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                            index++;
                            setSentenceMistake(oneData, mistake);
                            mistake.setMistake("名字不可为空，请填写姓名");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setName(oneData.get(1));
                        if(StringUtils.isEmpty(oneData.get(3))){
                            ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                            index++;
                            setSentenceMistake(oneData, mistake);
                            mistake.setMistake("身份证号不可为空，请填写身份证");
                            mistakes.add(mistake);
                            continue;
                        }
                    if(StringUtils.isEmpty(oneData.get(1))){
                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                        index++;
                        setSentenceMistake(oneData, mistake);
                        mistake.setMistake("名字不可为空，请填写姓名");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setName(oneData.get(1));
                    if(StringUtils.isEmpty(oneData.get(3))){
                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                        index++;
                        setSentenceMistake(oneData, mistake);
                        mistake.setMistake("身份证号不可为空，请填写身份证");
                        mistakes.add(mistake);
                        continue;
                    }

                        //判断身份证号码位数
                        if(oneData.get(3).length() != 18){
                            ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                            index++;
                            setSentenceMistake(oneData, mistake);
                            mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setCardNo(oneData.get(3).toUpperCase());
                        //根据身份证号码解析年龄以及性别
                        //获取用户生日
                        String birthday = vo.getCardNo().substring(6, 14);
                        if(StringUtils.isNotEmpty(birthday)){
                            String year = birthday.substring(0,4);
                            String month = birthday.substring(4,6);
                            String day = birthday.substring(6,8);
                            vo.setBirthday(year + "-" + month + "-" + day);
                        }
                    //判断身份证号码位数
                    if(oneData.get(3).length() != 18){
                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                        index++;
                        setSentenceMistake(oneData, mistake);
                        mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setCardNo(oneData.get(3).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    if(StringUtils.isNotEmpty(birthday)){
                        String year = birthday.substring(0,4);
                        String month = birthday.substring(4,6);
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                        //获取用户性别
                        int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                        if(sex%2 == 1){
                            vo.setSex(PopulSexEnum.nan.getCode());
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }

                    if(StringUtils.isNotEmpty(oneData.get(2))){
                        vo.setNation(oneData.get(2));
                    }
@@ -219,33 +218,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(8).trim());
                    if(StringUtils.isEmpty(oneData.get(9))){
                        index++;
                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                        setSentenceMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(9))){
//                        index++;
//                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
//                        setSentenceMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(9))) {
                        vo.setFloor(oneData.get(9).trim());
                    }
                    vo.setFloor(oneData.get(9).trim());
                    if(StringUtils.isEmpty(oneData.get(10))){
                        index++;
                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                        setSentenceMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(10))){
//                        index++;
//                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
//                        setSentenceMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(10))) {
                        vo.setUnitNo(oneData.get(10).trim());
                    }
                    vo.setUnitNo(oneData.get(10).trim());
                    if(StringUtils.isEmpty(oneData.get(11))){
                        index++;
                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
                        setSentenceMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(11))){
//                        index++;
//                        ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
//                        setSentenceMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(11))) {
                        vo.setHouseNo(oneData.get(11).trim());
                    }
                    vo.setHouseNo(oneData.get(11).trim());
                    if(StringUtils.isNotEmpty(oneData.get(12))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(12));
                        if(isOk.equals(-1)){

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

@@ -116,15 +116,17 @@
            R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
            log.info("开始导入人口数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                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<>();
//        for(BcDictionaryVO vo : dictionaryR.getData()){
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
@@ -302,45 +304,51 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(7).trim());
                    if(StringUtils.isEmpty(oneData.get(8))){
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第9列");
//                        importErrorVO.setErrorMsg("楼排号不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(8))){
////                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
////                        importErrorVO.setErrorPosition("第" + index + "行，第9列");
////                        importErrorVO.setErrorMsg("楼排号不可为空");
////                        populationImportErrorVOList.add(importErrorVO);
//                        index++;
//                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(8))) {
                        vo.setFloor(oneData.get(8).trim());
                    }
                    vo.setFloor(oneData.get(8).trim());
                    if(StringUtils.isEmpty(oneData.get(9))){
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第10列");
//                        importErrorVO.setErrorMsg("单元号不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(9))){
////                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
////                        importErrorVO.setErrorPosition("第" + index + "行，第10列");
////                        importErrorVO.setErrorMsg("单元号不可为空");
////                        populationImportErrorVOList.add(importErrorVO);
//                        index++;
//                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(9))) {
                        vo.setUnitNo(oneData.get(9).trim());
                    }
                    vo.setUnitNo(oneData.get(9).trim());
                    if(StringUtils.isEmpty(oneData.get(10))){
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第11列");
//                        importErrorVO.setErrorMsg("户室不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(10))){
////                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
////                        importErrorVO.setErrorPosition("第" + index + "行，第11列");
////                        importErrorVO.setErrorMsg("户室不可为空");
////                        populationImportErrorVOList.add(importErrorVO);
//                        index++;
//                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
//                        setMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(10))) {
                        vo.setHouseNo(oneData.get(10).trim());
                    }
                    vo.setHouseNo(oneData.get(10).trim());
                    if(StringUtils.isNotEmpty(oneData.get(11))){
                        vo.setBuildPurpose(oneData.get(11).trim());
                    }

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

@@ -13,8 +13,6 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransMistakeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.PayUtil;
@@ -23,8 +21,6 @@
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -111,10 +107,10 @@
            log.info("开始导入退役军人数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
                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<>();
@@ -135,54 +131,53 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(3)) || StringUtils.isNotEmpty(oneData.get(4))){
                        if(StringUtils.isEmpty(oneData.get(3))){
                            ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                            index++;
                            setVeteransMistake(oneData, mistake);
                            mistake.setMistake("名字不可为空，请填写姓名");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setName(oneData.get(3));
                        if(StringUtils.isEmpty(oneData.get(4))){
                            ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                            index++;
                            setVeteransMistake(oneData, mistake);
                            mistake.setMistake("身份证号不可为空，请填写身份证");
                            mistakes.add(mistake);
                            continue;
                        }
                    if(StringUtils.isEmpty(oneData.get(3))){
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        index++;
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("名字不可为空，请填写姓名");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setName(oneData.get(3));
                    if(StringUtils.isEmpty(oneData.get(4))){
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        index++;
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("身份证号不可为空，请填写身份证");
                        mistakes.add(mistake);
                        continue;
                    }

                        //判断身份证号码位数
                        if(oneData.get(4).length() != 18){
                            ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                            index++;
                            setVeteransMistake(oneData, mistake);
                            mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setCardNo(oneData.get(4).toUpperCase());
                        //根据身份证号码解析年龄以及性别
                        //获取用户生日
                        String birthday = vo.getCardNo().substring(6, 14);
                        if(StringUtils.isNotEmpty(birthday)){
                            String year = birthday.substring(0,4);
                            String month = birthday.substring(4,6);
                            String day = birthday.substring(6,8);
                            vo.setBirthday(year + "-" + month + "-" + day);
                        }
                    //判断身份证号码位数
                    if(oneData.get(4).length() != 18){
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        index++;
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setCardNo(oneData.get(4).toUpperCase());
                    //根据身份证号码解析年龄以及性别
                    //获取用户生日
                    String birthday = vo.getCardNo().substring(6, 14);
                    if(StringUtils.isNotEmpty(birthday)){
                        String year = birthday.substring(0,4);
                        String month = birthday.substring(4,6);
                        String day = birthday.substring(6,8);
                        vo.setBirthday(year + "-" + month + "-" + day);
                    }
//                    //设置用户年龄
//                    vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
                        //获取用户性别
                        int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                        if(sex%2 == 1){
                            vo.setSex(PopulSexEnum.nan.getCode());
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    //获取用户性别
                    int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
                    if(sex%2 == 1){
                        vo.setSex(PopulSexEnum.nan.getCode());
                    }else{
                        vo.setSex(PopulSexEnum.nv.getCode());
                    }

                    if(StringUtils.isNotEmpty(oneData.get(1))){
                        vo.setPersonStatus(oneData.get(1));
                    }
@@ -242,33 +237,39 @@
                        continue;
                    }
                    vo.setDoorNo(oneData.get(11).trim());
                    if(StringUtils.isEmpty(oneData.get(12))){
                        index++;
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("楼排号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(12))){
//                        index++;
//                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
//                        setVeteransMistake(oneData, mistake);
//                        mistake.setMistake("楼排号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(12))) {
                        vo.setFloor(oneData.get(12).trim());
                    }
                    vo.setFloor(oneData.get(12).trim());
                    if(StringUtils.isEmpty(oneData.get(13))){
                        index++;
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("单元号不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(13))){
//                        index++;
//                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
//                        setVeteransMistake(oneData, mistake);
//                        mistake.setMistake("单元号不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(13))) {
                        vo.setUnitNo(oneData.get(13).trim());
                    }
                    vo.setUnitNo(oneData.get(13).trim());
                    if(StringUtils.isEmpty(oneData.get(14))){
                        index++;
                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                        setVeteransMistake(oneData, mistake);
                        mistake.setMistake("户室不可为空");
                        mistakes.add(mistake);
                        continue;
//                    if(StringUtils.isEmpty(oneData.get(14))){
//                        index++;
//                        ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
//                        setVeteransMistake(oneData, mistake);
//                        mistake.setMistake("户室不可为空");
//                        mistakes.add(mistake);
//                        continue;
//                    }
                    if(StringUtils.isNotEmpty(oneData.get(14))) {
                        vo.setHouseNo(oneData.get(14).trim());
                    }
                    vo.setHouseNo(oneData.get(14).trim());
                    if(StringUtils.isNotEmpty(oneData.get(15))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(15));
                        if(isOk.equals(-1)){
@@ -305,7 +306,7 @@
                            mistakes.add(mistake);
                            continue;
                        }
                        vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim()));
                        vo.setHousePurpose(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(18))){
                        Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(18));
@@ -320,10 +321,10 @@
                        vo.setControlStatus(isOk);
                    }
                    if(StringUtils.isNotEmpty(oneData.get(19))){
                        vo.setEnlistDate(DateUtil.parse(oneData.get(19)));
                        vo.setEnlistDate(DateUtil.parse(oneData.get(19), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(20))){
                        vo.setRetireDate(DateUtil.parse(oneData.get(20)));
                        vo.setRetireDate(DateUtil.parse(oneData.get(20), parsePatterns));
                    }
                    if(StringUtils.isNotEmpty(oneData.get(21))){
                        vo.setPersonCategory(oneData.get(21).trim());
@@ -352,7 +353,7 @@
                            index++;
                            ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                            setVeteransMistake(oneData, mistake);
                            mistake.setMistake("您填写的政治面貌有误");
                            mistake.setMistake("您填写的婚姻关系·有误");
                            mistakes.add(mistake);
                            continue;
                        }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("收益结算列表请求参数")
public class PageComActWalletTradeAdminDTO {
@@ -34,4 +36,22 @@

    @ApiModelProperty("排序（1.升序 2.降序）")
    private Integer sort;

    @ApiModelProperty("变动类型（1.增加  2.减少）")
    private Integer changeType;

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("关键词")
    private String keyWord;

    @ApiModelProperty("关键词")
    private String expenditureKeyWord;

    @ApiModelProperty("奖励内容")
    private String remark;

    @ApiModelProperty("导出id集合")
    private List<Long> tradeIds;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletUserInfoVO.java

New file
@@ -0,0 +1,141 @@
package com.panzhihua.common.model.vos;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Set;

/**
 * 小程序用户信息
 */
@Data
@ApiModel(value = "小程序用户信息")
public class AppletUserInfoVO {

    @ApiModelProperty("user_id")
    private Long userId;

    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("昵称")
    private String nickName;

    @ApiModelProperty("真实名字")
    private String name;

    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("社区名字")
    private String communityName;

    @ApiModelProperty("性别 1 男 2 女")
    private Integer sex;
    
    @ApiModelProperty("生日")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthday;

    @ApiModelProperty("头像")
    private String imageUrl;

    @ApiModelProperty("是否志愿者 0否 1 是")
    private Integer isVolunteer;

    @ApiModelProperty("是否党员 0 否 1 是")
    private Integer isPartymember;

    @ApiModelProperty("1 启用 2 禁用")
    private Integer status;

    @ApiModelProperty("创建时间")
    private Date createAt;

    @ApiModelProperty("最后登录时间")
    private Date lastLoginTime;

    @ApiModelProperty("角色集合")
    private Set<String> roles;

    @ApiModelProperty("权限集合")
    private Set<String> permissions;

    @ApiModelProperty("身份证号")
    private String idCard;

    @ApiModelProperty("标签 多个用,隔开")
    private String tags;

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "分页当前记录数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty("人脸采集审核状态 0 待审核 1 审核通过 2驳回")
    private Integer faceState;

    @ApiModelProperty("操作类型 1通过 2驳回 3删除")
    private Integer operationType;

    @ApiModelProperty("用户小区id")
    private Long areaId;

    @ApiModelProperty("用户所在社区信息")
    private ComActVO comActVO;

    @ApiModelProperty("0 未申请 1 申请中 2 通过 3 驳回")
    private Integer volunteerStatus;

    @ApiModelProperty("是否注册 0 否 1 是")
    private Integer isRegister;

    @ApiModelProperty("年龄")
    private Integer age;

    @ApiModelProperty("政治面貌：1 - 党员；2 - 团员；3 - 群众")
    private Integer politicalOutlook;

    @ApiModelProperty("是否已实名(1.是 2.否)")
    private Integer isRealNamed;

    @ApiModelProperty("关键词")
    private String keyWord;

    @ApiModelProperty("钱包id")
    private Long walletId;

    @ApiModelProperty("钱包收益总金额")
    private BigDecimal incomeAmount;

    @ApiModelProperty("钱包可用金额")
    private BigDecimal availableAmount;

    @ApiModelProperty("钱包结算金额")
    private BigDecimal settlementAmount;

    @ApiModelProperty("积分总余额")
    private Integer integralSum;

    @ApiModelProperty("积分可用余额")
    private Integer integralAvailableSum;

    @ApiModelProperty("积分冻结金额")
    private Integer integralFrozenSum;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LiveVO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.common.model.vos;

import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 天气信息对象
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-8-17 12:55
 **/
@Data
@ApiModel(value = "天气信息返回体")
public class LiveVO {
    private String adcode;
    private String city;
    private String humidity;
    private String province;
    private String reporttime;
    private String temperature;
    private String weather;
    private String winddirection;
    private String windpower;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/WeatherVO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 天气信息对象
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-8-17 12:55
 **/
@Data
@ApiModel(value = "天气信息返回体")
public class WeatherVO {
    private String count;
    private String info;
    private String infocode;
    private String status;
    private List<LiveVO> lives;
}

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

New file
@@ -0,0 +1,43 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;

/**
 * 随手拍反馈信息
 */
@Data
@ApiModel("随手拍反馈信息")
public class ComActEasyPhotoFeedbackVO {

    @ApiModelProperty("自增id")
    private Long id;

    @ApiModelProperty("随手拍id")
    private Long easyId;

    @ApiModelProperty("反馈内容")
    private String feedbackContent;

    @ApiModelProperty("反馈图片列表")
    private String feedbackImg;

    @ApiModelProperty("反馈时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("反馈人名字")
    private String createByName;

    @ApiModelProperty("反馈人头像")
    private String createByImage;

}

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

@@ -106,7 +106,7 @@
    @ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0")
    private Integer isNeedFeedBack;

    @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈")
    @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈 4.完成随手拍")
    private Integer type;

    @ApiModelProperty(value = "登录用户id",hidden = true)
@@ -160,4 +160,14 @@

    @ApiModelProperty(value = "随手拍活动")
    private ComActEasyPhotoActivityVO easyPhotoActivityVO;

    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "反馈信息列表")
    private List<ComActEasyPhotoFeedbackVO> photoFeedbackList;

    @ApiModelProperty(value = "完成人名称")
    private String completeName;

}

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

New file
@@ -0,0 +1,51 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * @description: 批量导出钱包交易记录
 * @author: Null
 * @date: 2021/3/11 17:11
 */
@Data
public class ComActUserWalletTradeExcelVO implements Serializable {
    /**
     * 金额
     */
    @ExcelProperty(value = "金额" ,index = 0)
    private BigDecimal amount;
    /**
     * 姓名
     */
    @ExcelProperty(value = "姓名" ,index = 1)
    private String userName;

    /**
     * 用户手机号
     */
    @ExcelProperty(value = "账号" ,index = 2)
    private String phone;

    /**
     * 时间
     */
    @ExcelProperty(value = "时间" ,index = 3)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    /**
     * 操作人
     */
    @ExcelProperty(value = "操作人" ,index = 4)
    private String createBy;

}


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

New file
@@ -0,0 +1,55 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * @description: 批量导出奖励台账记录
 * @author: Null
 * @date: 2021/3/11 17:11
 */
@Data
public class ComActUserWalletTradeRewardExcelVO implements Serializable {
    /**
     * 金额
     */
    @ExcelProperty(value = "金额" ,index = 0)
    private BigDecimal amount;
    /**
     * 姓名
     */
    @ExcelProperty(value = "姓名" ,index = 1)
    private String userName;

    /**
     * 用户手机号
     */
    @ExcelProperty(value = "用户手机号" ,index = 2)
    private String phone;

    @ExcelProperty(value = "奖励类别" ,index = 3)
    private String type;

    @ExcelProperty(value = "奖励内容" ,index = 4)
    private String remark;

    /**
     * 时间
     */
    @ExcelProperty(value = "时间" ,index = 5)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    /**
     * 操作人
     */
    @ExcelProperty(value = "操作人" ,index = 6)
    private String createBy;

}


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

New file
@@ -0,0 +1,287 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:57:35
 * @describe 社区矫正人员表实体类
 */

@Data
@ApiModel("社区矫正表")
@EncryptDecryptClass
public class ComCorrectPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("社区矫正人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
    * 矫正类别
    */
    @ApiModelProperty("矫正类别")
    private String correctType;

    /**
    * 矫正开始时间
    */
    @ApiModelProperty("矫正开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date correctBegin;

    /**
    * 矫正结束时间
    */
    @ApiModelProperty("矫正结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date correctEnd;

    /**
    * 接收方式
    */
    @ApiModelProperty("接收方式")
    private String receiveMethod;

    /**
    * 是否累惯犯（1.是 0.否）
    */
    @ApiModelProperty("是否累惯犯（1.是 0.否）")
    private Integer isRecidivist;

    /**
    * 四史情况
    */
    @ApiModelProperty("四史情况")
    private String fourHistory;

    /**
    * 三涉情况
    */
    @ApiModelProperty("三涉情况")
    private String threeInvovle;

    /**
    * 是否建立矫正小组（1.是 0.否）
    */
    @ApiModelProperty("是否建立矫正小组（1.是 0.否）")
    private Integer isCorrectGroup;

    /**
    * 矫正小组人员组成情况
    */
    @ApiModelProperty("矫正小组人员组成情况")
    private String correctGroupConstitute;

    /**
    * 矫正解除（终止）类型
    */
    @ApiModelProperty("矫正解除（终止）类型")
    private String correctRelieveType;

    /**
    * 是否有脱管（1.是 0.否）
    */
    @ApiModelProperty("是否有脱管（1.是 0.否）")
    private Integer isOutControl;

    /**
    * 脱管原因
    */
    @ApiModelProperty("脱管原因")
    private String outControlReason;

    /**
    * 脱管纠正情况
    */
    @ApiModelProperty("脱管纠正情况")
    private String outControlCorrect;

    /**
    * 检察监督脱管情况
    */
    @ApiModelProperty("检察监督脱管情况")
    private String inspectOutControl;

    /**
    * 是否有漏管（1.是 0.否）
    */
    @ApiModelProperty("是否有漏管（1.是 0.否）")
    private Integer isMissControl;

    /**
    * 漏管原因
    */
    @ApiModelProperty("漏管原因")
    private String missControlReason;

    /**
    * 漏管纠正情况
    */
    @ApiModelProperty("漏管纠正情况")
    private String missControlCorrect;

    /**
    * 检察监督漏管
    */
    @ApiModelProperty("检察监督漏管")
    private String inspectMissControl;

    /**
    * 奖惩情况
    */
    @ApiModelProperty("奖惩情况")
    private String rewardAndPunishiment;

    /**
    * 是否重新犯罪（1.是 0.否）
    */
    @ApiModelProperty("是否重新犯罪（1.是 0.否）")
    private Integer isAgainCrime;

    /**
    * 重新犯罪名称
    */
    @ApiModelProperty("重新犯罪名称")
    private String againCrimeName;

    /**
    * 刑罚变更执行情况
    */
    @ApiModelProperty("刑罚变更执行情况")
    private String pubishmentChange;

    /**
    * 案件类别
    */
    @ApiModelProperty("案件类别")
    private String caseType;

    /**
    * 具体罪名
    */
    @ApiModelProperty("具体罪名")
    private String specificCharge;

    /**
    * 原判刑期
    */
    @ApiModelProperty("原判刑期")
    private String originalTerm;

    /**
    * 原判刑开始日期
    */
    @ApiModelProperty("原判刑开始日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date originalTermBegin;

    /**
    * 原判刑结束日期
    */
    @ApiModelProperty("原判刑结束日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date originalTermEnd;

    /**
    * 学历
    */
    @ApiModelProperty("学历")
    private Integer cultureLevel;

    /**
    * 社区矫正人员编号
    */
    @ApiModelProperty("社区矫正人员编号")
    private String correctPersonCode;

    /**
    * 原羁押场所
    */
    @ApiModelProperty("原羁押场所")
    private String originalCustodyplace;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
    private Long updateBy;
}

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

New file
@@ -0,0 +1,122 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:58:07
 * @describe 邪教人员表实体类
 */

@Data
@ApiModel("邪教人员表")
@EncryptDecryptClass
public class ComCultPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("邪教矫正人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 邪教名称
    */
    @ApiModelProperty("邪教名称")
    private String cultName;

    /**
    * 基本情况（参加邪教的活动情况）
    */
    @ApiModelProperty("基本情况（参加邪教的活动情况）")
    private String basicSituation;

    /**
    * 参加邪教时间
    */
    @ApiModelProperty("参加邪教时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinCultDate;

    /**
    * 是否对外宣传（1.是 0.否）
    */
    @ApiModelProperty("是否对外宣传（1.是 0.否）")
    private Integer isExternalPublicity;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
    private Long updateBy;
}

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

New file
@@ -0,0 +1,120 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 19:48:22
 * @describe 实有人口导入》残疾人表实体类
 */

@Data
@ApiModel("残疾人表")
@EncryptDecryptClass
public class ComDisabilityPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("残疾人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
    * 办证状况
    */
    @ApiModelProperty("办证状况")
    private String certificateSituation;

    /**
    * 残疾类别
    */
    @ApiModelProperty("残疾类别")
    private String disType;

    /**
    * 残疾等级
    */
    @ApiModelProperty("残疾等级")
    private String disLevel;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
    private Long updateBy;
}

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

New file
@@ -0,0 +1,170 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:57:18
 * @describe 吸毒人员表实体类
 */

@Data
@ApiModel("吸毒人员表")
@EncryptDecryptClass
public class ComDrugPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("吸毒人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    @ApiModelProperty("身份证号码")
    private String cardNo;

    /**
    * 联系电话
    */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
    * 初次发现日期
    */
    @ApiModelProperty("初次发现日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date firstDate;

    /**
    * 管控情况
    */
    @ApiModelProperty("管控情况")
    private String controlSituation;

    /**
    * 管控人姓名
    */
    @ApiModelProperty("管控人姓名")
    private String controlPerson;

    /**
    * 管控人联系方式
    */
    @ApiModelProperty("管控人联系方式")
    private String controlPersonPhone;

    /**
    * 帮扶情况
    */
    @ApiModelProperty("帮扶情况")
    private String helpSituation;

    /**
    * 帮扶人姓名
    */
    @ApiModelProperty("帮扶人姓名")
    private String helpPerson;

    /**
    * 帮扶人联系方式
    */
    @ApiModelProperty("帮扶人联系方式")
    private String helpPersonPhone;

    /**
    * 吸毒原因
    */
    @ApiModelProperty("吸毒原因")
    private String drugReason;

    /**
    * 吸毒后果
    */
    @ApiModelProperty("吸毒后果")
    private String drugResult;

    /**
    * 有无犯罪史
    */
    @ApiModelProperty("有无犯罪史")
    private String haveCrime;

    /**
    * 违法犯罪情况
    */
    @ApiModelProperty("违法犯罪情况")
    private String crimeSutiation;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
    private Long updateBy;
}

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

New file
@@ -0,0 +1,102 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 17:41:05
 * @describe 实体类
 */

@Data
@ApiModel("重点上访人员表")
@EncryptDecryptClass
public class ComKeyPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("重点上访人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
    private Long updateBy;
}

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

New file
@@ -0,0 +1,286 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 19:48:38
 * @describe 实有人口导入》低保户人员表实体类
 */

@Data
@ApiModel("低保户人员表")
@EncryptDecryptClass
public class ComLowSecurityPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("低保户人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
    * 地区
    */
    @ApiModelProperty("地区")
    private String region;

    /**
    * 家庭编码
    */
    @ApiModelProperty("家庭编码")
    private String familyCode;

    /**
    * 组名称
    */
    @ApiModelProperty("组名称")
    private String groupName;

    /**
    * 分类救助类别
    */
    @ApiModelProperty("分类救助类别")
    private String classifiedRescueCategory;

    /**
    * 申请日期
    */
    @ApiModelProperty("申请日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date applyDate;

    /**
    * 户主姓名
    */
    @ApiModelProperty("户主姓名")
    private String houseHolderName;

    /**
    * 户主身份证
    */
    @ApiModelProperty("户主身份证")
    private String houseHolderCardNo;

    /**
    * 户主编码
    */
    @ApiModelProperty("户主编码")
    private String houseHolderCode;

    /**
    * 居住地邮编
    */
    @ApiModelProperty("居住地邮编")
    private String residencePostalCode;

    /**
    * 救助证号
    */
    @ApiModelProperty("救助证号")
    private String salvageCertificateNo;

    /**
    * 保障人口数
    */
    @ApiModelProperty("保障人口数")
    private Integer guaranteedPopulationNumber;

    /**
    * 家庭人口数
    */
    @ApiModelProperty("家庭人口数")
    private Integer familyPopulationNumber;

    /**
    * 开户人
    */
    @ApiModelProperty("开户人")
    private String accountPerson;

    /**
    * 开户银行
    */
    @ApiModelProperty("开户银行")
    private String accountBank;

    /**
    * 开户人身份证号
    */
    @ApiModelProperty("开户人身份证号")
    private String accountCardNo;

    /**
    * 银行账号
    */
    @ApiModelProperty("银行账号")
    private String bankAccount;

    /**
    * 供养机构
    */
    @ApiModelProperty("供养机构")
    private String supportInstitutions;

    /**
    * 资金发放方式
    */
    @ApiModelProperty("资金发放方式")
    private String distributionMethod;

    /**
    * 保障金额
    */
    @ApiModelProperty("保障金额")
    private BigDecimal guaranteedAmount;

    /**
    * 调剂金额
    */
    @ApiModelProperty("调剂金额")
    private BigDecimal reallocationAmount;

    /**
    * 差额救助金额
    */
    @ApiModelProperty("差额救助金额")
    private BigDecimal differenceReliefAmount;

    /**
    * 分类施保金额
    */
    @ApiModelProperty("分类施保金额")
    private BigDecimal classifiedInsuredAmount;

    /**
    * 家庭月总收入
    */
    @ApiModelProperty("家庭月总收入")
    private BigDecimal totalMonthlyFamilyIncome;

    /**
    * 家庭月均收入
    */
    @ApiModelProperty("家庭月均收入")
    private BigDecimal averageMonthlyFamilyIncome;

    /**
    * 家庭月支出
    */
    @ApiModelProperty("家庭月支出")
    private BigDecimal totalMonthlyFamilyExpenditure;

    /**
    * 经度
    */
    @ApiModelProperty("经度")
    private String lng;

    /**
    * 纬度
    */
    @ApiModelProperty("纬度")
    private String lat;

    /**
    * 始发年月
    */
    @ApiModelProperty("始发年月")
    private Date originateDate;

    /**
    * 护理费
    */
    @ApiModelProperty("护理费")
    private BigDecimal nursingFee;

    /**
    * 申请理由
    */
    @ApiModelProperty("申请理由")
    private String applyReason;

    /**
    * 审核意见
    */
    @ApiModelProperty("审核意见")
    private String reviewComment;

    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
     * 创建用户
     */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
     * 修改用户
     */
    @ApiModelProperty("修改用户")
    private Long updateBy;

}

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

New file
@@ -0,0 +1,174 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:57:54
 * @describe 重精人员表实体类
 */

@Data
@ApiModel("重精人员表")
@EncryptDecryptClass
public class ComMajorPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("重精人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 经济状况
    */
    @ApiModelProperty("经济状况")
    private String economicCondition;

    /**
    * 人员类型
    */
    @ApiModelProperty("人员类型")
    private String personType;

    /**
    * 家庭情况
    */
    @ApiModelProperty("家庭情况")
    private String familySituation;

    /**
    * 监护人姓名
    */
    @ApiModelProperty("监护人姓名")
    private String custodyPerson;

    /**
    * 与监护人关系
    */
    @ApiModelProperty("与监护人关系")
    private Integer custodyRelation;

    /**
    * 监护人公民身份号码
    */
    @ApiModelProperty("监护人公民身份号码")
    private String custodyCardNo;

    /**
    * 监护人联系方式
    */
    @ApiModelProperty("监护人联系方式")
    private String custodyPersonPhone;

    /**
    * 监护人居住详址
    */
    @ApiModelProperty("监护人居住详址")
    private String custodyAddress;

    /**
    * 帮扶人姓名
    */
    @ApiModelProperty("帮扶人姓名")
    private String helpPerson;

    /**
    * 帮扶人联系方式
    */
    @ApiModelProperty("帮扶人联系方式")
    private String helpPersonPhone;

    /**
    * 帮扶手段
    */
    @ApiModelProperty("帮扶手段")
    private String helpMethod;

    /**
    * 帮扶情况
    */
    @ApiModelProperty("帮扶情况")
    private String helpSituation;

    /**
    * 是否违法犯罪（1.是 0.否）
    */
    @ApiModelProperty("是否违法犯罪（1.是 0.否）")
    private Integer isCrime;

    /**
    * 违法犯罪情况
    */
    @ApiModelProperty("违法犯罪情况")
    private String crimeSutiation;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
    private Long updateBy;
}

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

@@ -67,19 +67,97 @@
    @ExcelProperty(value = "户口所在地", index = 15)
    private String censusRegister;

    @ExcelProperty(value = "矫正开始时间", index = 16)
    private Date correctBegin;
    @ExcelProperty(value = "学历", index = 16)
    private Integer cultureLevel;

    @ExcelProperty(value = "矫正结束时间", index = 17)
    private Date correctEnd;
    @ExcelProperty(value = "社区矫正人员编号", index = 17)
    private String correctPersonCode;

    @ExcelProperty(value = "矫正类型", index = 18)
    @ExcelProperty(value = "原羁押场所", index = 18)
    private String originalCustodyplace;

    @ExcelProperty(value = "矫正类别", index = 19)
    private String correctType;

    @ExcelProperty(value = "罪名", index = 19)
    private String charges;
    @ExcelProperty(value = "案件类别", index = 20)
    private String caseType;

    @ExcelProperty(value = "罪名", index = 20)
    @ExcelProperty(value = "具体罪名", index = 21)
    private String specificCharge;

    @ExcelProperty(value = "原判刑期", index = 22)
    private String originalTerm;

    @ExcelProperty(value = "原判刑开始日期", index = 23)
    private Date originalTermBegin;

    @ExcelProperty(value = "原判刑结束日期", index = 24)
    private Date originalTermEnd;

    @ExcelProperty(value = "矫正开始时间", index = 25)
    private Date correctBegin;

    @ExcelProperty(value = "矫正结束时间", index = 26)
    private Date correctEnd;

    @ExcelProperty(value = "接收方式", index = 27)
    private String receiveMethod;

    @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 28)
    private Integer isRecidivist;

    @ExcelProperty(value = "四史情况", index = 29)
    private String fourHistory;

    @ExcelProperty(value = "三涉情况", index = 30)
    private String threeInvovle;

    @ExcelProperty(value = "是否建立矫正小组（1.是 0.否）", index = 31)
    private Integer isCorrectGroup;

    @ExcelProperty(value = "矫正小组人员组成情况", index = 32)
    private String correctGroupConstitute;

    @ExcelProperty(value = "矫正解除（终止）类型", index = 33)
    private String correctRelieveType;

    @ExcelProperty(value = "是否有脱管（1.是 0.否）", index = 34)
    private Integer isOutControl;

    @ExcelProperty(value = "脱管原因", index = 35)
    private String outControlReason;

    @ExcelProperty(value = "脱管纠正情况", index = 36)
    private String outControlCorrect;

    @ExcelProperty(value = "检察监督脱管情况", index = 37)
    private String inspectOutControl;

    @ExcelProperty(value = "是否有漏管（1.是 0.否）", index = 38)
    private Integer isMissControl;

    @ExcelProperty(value = "漏管原因", index = 39)
    private String missControlReason;

    @ExcelProperty(value = "漏管纠正情况", index = 40)
    private String missControlCorrect;

    @ExcelProperty(value = "检察监督漏管", index = 41)
    private String inspectMissControl;

    @ExcelProperty(value = "奖惩情况", index = 42)
    private String rewardAndPunishiment;

    @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 43)
    private Integer isAgainCrime;

    @ExcelProperty(value = "重新犯罪名称", index = 44)
    private String againCrimeName;

    @ExcelProperty(value = "刑罚变更执行情况", index = 45)
    private String pubishmentChange;

    @ExcelProperty(value = "备注", index = 46)
    private String remark;



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

@@ -6,6 +6,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @description: 批量导入社区矫正人员
@@ -64,21 +65,99 @@
    @ExcelProperty(value = "户口所在地", index = 15)
    private String censusRegister;

    @ExcelProperty(value = "矫正开始时间", index = 16)
    private String correctBegin;
    @ExcelProperty(value = "学历", index = 16)
    private String cultureLevel;

    @ExcelProperty(value = "矫正结束时间", index = 17)
    private String correctEnd;
    @ExcelProperty(value = "社区矫正人员编号", index = 17)
    private String correctPersonCode;

    @ExcelProperty(value = "矫正类型", index = 18)
    @ExcelProperty(value = "原羁押场所", index = 18)
    private String originalCustodyplace;

    @ExcelProperty(value = "矫正类别", index = 19)
    private String correctType;

    @ExcelProperty(value = "罪名", index = 19)
    private String charges;
    @ExcelProperty(value = "案件类别", index = 20)
    private String caseType;

    @ExcelProperty(value = "备注", index = 20)
    @ExcelProperty(value = "具体罪名", index = 21)
    private String specificCharge;

    @ExcelProperty(value = "原判刑期", index = 22)
    private String originalTerm;

    @ExcelProperty(value = "原判刑开始日期", index = 23)
    private String originalTermBegin;

    @ExcelProperty(value = "原判刑结束日期", index = 24)
    private String originalTermEnd;

    @ExcelProperty(value = "矫正开始时间", index = 25)
    private String correctBegin;

    @ExcelProperty(value = "矫正结束时间", index = 26)
    private String correctEnd;

    @ExcelProperty(value = "接收方式", index = 27)
    private String receiveMethod;

    @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 28)
    private String isRecidivist;

    @ExcelProperty(value = "四史情况", index = 29)
    private String fourHistory;

    @ExcelProperty(value = "三涉情况", index = 30)
    private String threeInvovle;

    @ExcelProperty(value = "是否建立矫正小组（1.是 0.否）", index = 31)
    private String isCorrectGroup;

    @ExcelProperty(value = "矫正小组人员组成情况", index = 32)
    private String correctGroupConstitute;

    @ExcelProperty(value = "矫正解除（终止）类型", index = 33)
    private String correctRelieveType;

    @ExcelProperty(value = "是否有脱管（1.是 0.否）", index = 34)
    private String isOutControl;

    @ExcelProperty(value = "脱管原因", index = 35)
    private String outControlReason;

    @ExcelProperty(value = "脱管纠正情况", index = 36)
    private String outControlCorrect;

    @ExcelProperty(value = "检察监督脱管情况", index = 37)
    private String inspectOutControl;

    @ExcelProperty(value = "是否有漏管（1.是 0.否）", index = 38)
    private String isMissControl;

    @ExcelProperty(value = "漏管原因", index = 39)
    private String missControlReason;

    @ExcelProperty(value = "漏管纠正情况", index = 40)
    private String missControlCorrect;

    @ExcelProperty(value = "检察监督漏管", index = 41)
    private String inspectMissControl;

    @ExcelProperty(value = "奖惩情况", index = 42)
    private String rewardAndPunishiment;

    @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 43)
    private String isAgainCrime;

    @ExcelProperty(value = "重新犯罪名称", index = 44)
    private String againCrimeName;

    @ExcelProperty(value = "刑罚变更执行情况", index = 45)
    private String pubishmentChange;

    @ExcelProperty(value = "备注", index = 46)
    private String remark;

    @ExcelProperty(value = "错误信息", index = 21)
    @ExcelProperty(value = "错误信息", index = 47)
    private String mistake;
}

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

@@ -7,6 +7,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
@@ -75,13 +76,19 @@
    @ExcelProperty(value = "户口所在地", index = 18)
    private String censusRegister;

    @ExcelProperty(value = "邪教名称", index = 19)
    @ExcelProperty(value = "邪教名称（涉邪组织）", index = 19)
    private String cultName;

    @ExcelProperty(value = "基本情况", index = 20)
    @ExcelProperty(value = "基本情况（参加邪教的活动情况）", index = 20)
    private String basicSituation;

    @ExcelProperty(value = "备注", index = 21)
    @ExcelProperty(value = "参加邪教时间", index = 21)
    private Date joinCultDate;

    @ExcelProperty(value = "是否对外宣传（1.是 0.否）", index = 22)
    private Integer isExternalPublicity;

    @ExcelProperty(value = "备注", index = 23)
    private String remark;



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

@@ -7,6 +7,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
@@ -75,15 +76,21 @@
    @ExcelProperty(value = "户口所在地", index = 18)
    private String censusRegister;

    @ExcelProperty(value = "邪教名称", index = 19)
    @ExcelProperty(value = "邪教名称（涉邪组织）", index = 19)
    private String cultName;

    @ExcelProperty(value = "基本情况", index = 20)
    @ExcelProperty(value = "基本情况（参加邪教的活动情况）", index = 20)
    private String basicSituation;

    @ExcelProperty(value = "备注", index = 21)
    @ExcelProperty(value = "参加邪教时间）", index = 21)
    private String joinCultDate;

    @ExcelProperty(value = "是否对外宣传（1.是 0.否）", index = 22)
    private String isExternalPublicity;

    @ExcelProperty(value = "备注", index = 23)
    private String remark;

    @ExcelProperty(value = "错误信息", index = 22)
    @ExcelProperty(value = "错误信息", index = 24)
    private String mistake;
}

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

@@ -67,7 +67,40 @@
    @ExcelProperty(value = "户口所在地", index = 15)
    private String censusRegister;

    @ExcelProperty(value = "备注", index = 16)
    @ExcelProperty(value = "初次发现日期", index = 16)
    private Date firstDate;

    @ExcelProperty(value = "管控情况", index = 17)
    private String controlSituation;

    @ExcelProperty(value = "管控人姓名", index = 18)
    private String controlPerson;

    @ExcelProperty(value = "管控人联系方式", index = 19)
    private String controlPersonPhone;

    @ExcelProperty(value = "帮扶情况", index = 20)
    private String helpSituation;

    @ExcelProperty(value = "帮扶人姓名", index = 21)
    private String helpPerson;

    @ExcelProperty(value = "帮扶人联系方式", index = 22)
    private String helpPersonPhone;

    @ExcelProperty(value = "吸毒原因", index = 23)
    private String drugReason;

    @ExcelProperty(value = "吸毒后果", index = 24)
    private String drugResult;

    @ExcelProperty(value = "有无犯罪史", index = 25)
    private String haveCrime;

    @ExcelProperty(value = "违法犯罪情况", index = 26)
    private String crimeSutiation;

    @ExcelProperty(value = "备注", index = 27)
    private String remark;



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

@@ -7,6 +7,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
@@ -66,9 +67,42 @@
    @ExcelProperty(value = "户口所在地", index = 15)
    private String censusRegister;

    @ExcelProperty(value = "备注", index = 16)
    @ExcelProperty(value = "初次发现日期", index = 16)
    private String firstDate;

    @ExcelProperty(value = "管控情况", index = 17)
    private String controlSituation;

    @ExcelProperty(value = "管控人姓名", index = 18)
    private String controlPerson;

    @ExcelProperty(value = "管控人联系方式", index = 19)
    private String controlPersonPhone;

    @ExcelProperty(value = "帮扶情况", index = 20)
    private String helpSituation;

    @ExcelProperty(value = "帮扶人姓名", index = 21)
    private String helpPerson;

    @ExcelProperty(value = "帮扶人联系方式", index = 22)
    private String helpPersonPhone;

    @ExcelProperty(value = "吸毒原因", index = 23)
    private String drugReason;

    @ExcelProperty(value = "吸毒后果", index = 24)
    private String drugResult;

    @ExcelProperty(value = "有无犯罪史", index = 25)
    private String haveCrime;

    @ExcelProperty(value = "违法犯罪情况", index = 26)
    private String crimeSutiation;

    @ExcelProperty(value = "备注", index = 27)
    private String remark;

    @ExcelProperty(value = "错误信息", index = 17)
    @ExcelProperty(value = "错误信息", index = 28)
    private String mistake;
}

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

New file
@@ -0,0 +1,192 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import com.google.common.collect.Lists;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @description: 批量导入低保户
 * @author: txb
 */
@Data
@EncryptDecryptClass
public class ComMngPopulationLowSecurityExcelVO implements Serializable {

    @ExcelProperty(value = "序号", index = 0)
    private String serialNumber;

    @ExcelProperty(value = "姓名", index = 1)
    private String name;

    @ExcelProperty(value = "身份证号码", index = 2)
    @EncryptDecryptField
    private String cardNo;

    @ExcelProperty(value = "联系电话", index = 3)
    private String phone;

    @ExcelProperty(value = "地区", index = 4)
    private String region;

    @ExcelProperty(value = "家庭编码", index = 5)
    private String familyCode;

    @ExcelProperty(value = "组名称" ,index = 6)
    private String groupName;

    @ExcelProperty(value = "分类救助类别", index = 7)
    private String classifiedRescueCategory;

    @ExcelProperty(value = "申请日期", index = 8)
    private Date applyDate;

    @ExcelProperty(value = "户主姓名", index = 9)
    private String houseHolderName;

    @ExcelProperty(value = "户主身份证", index = 10)
    private String houseHolderCardNo;

    @ExcelProperty(value = "户主编码", index = 11)
    private String houseHolderCode;

    @ExcelProperty(value = "街/路/巷", index = 12)
    private String road;

    @ExcelProperty(value = "小区号", index = 13)
    private String doorNo;

    @ExcelProperty(value = "楼排号", index = 14)
    private String floor;

    @ExcelProperty(value = "单元号", index = 15)
    private String unitNo;

    @ExcelProperty(value = "户室（房间号）", index = 16)
    private String houseNo;

    @ExcelProperty(value = "是否租住", index = 17)
    private Integer isRent;

    @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 18)
    private Integer houseStatus;

    @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 19)
    private Integer housePurpose;

    @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 20)
    private Integer controlStatus;

    @ExcelProperty(value = "外地/本地（1.本地  2.外地）", index = 21)
    private Integer outOrLocal;

    @ExcelProperty(value = "户口所在地", index = 22)
    private String censusRegister;

    @ExcelProperty(value = "居住地邮编", index = 23)
    private String residencePostalCode;

    @ExcelProperty(value = "救助证号", index = 24)
    private String salvageCertificateNo;

    @ExcelProperty(value = "保障人口数", index = 25)
    private Integer guaranteedPopulationNumber;

    @ExcelProperty(value = "家庭人口数", index = 26)
    private Integer familyPopulationNumber;

    @ExcelProperty(value = "开户人", index = 27)
    private String accountPerson;

    @ExcelProperty(value = "开户银行", index = 28)
    private String accountBank;

    @ExcelProperty(value = "开户人身份证号", index = 29)
    private String accountCardNo;

    @ExcelProperty(value = "银行账号", index = 30)
    private String bankAccount;

    @ExcelProperty(value = "供养机构", index = 31)
    private String supportInstitutions;

    @ExcelProperty(value = "资金发放方式", index = 32)
    private String distributionMethod;

    @ExcelProperty(value = "保障金额", index = 33)
    private BigDecimal guaranteedAmount;

    @ExcelProperty(value = "调剂金额", index = 34)
    private BigDecimal reallocationAmount;

    @ExcelProperty(value = "差额救助金额", index = 35)
    private BigDecimal differenceReliefAmount;

    @ExcelProperty(value = "分类施保金额", index = 36)
    private BigDecimal classifiedInsuredAmount;

    @ExcelProperty(value = "家庭月总收入", index = 37)
    private BigDecimal totalMonthlyFamilyIncome;

    @ExcelProperty(value = "家庭月均收入", index = 38)
    private BigDecimal averageMonthlyFamilyIncome;

    @ExcelProperty(value = "家庭月支出", index = 39)
    private BigDecimal totalMonthlyFamilyExpenditure;

    @ExcelProperty(value = "经度", index = 40)
    private String lng;

    @ExcelProperty(value = "纬度", index = 41)
    private String lat;

    @ExcelProperty(value = "始发年月", index = 42)
    private String originateDate;

    @ExcelProperty(value = "护理费", index = 43)
    private BigDecimal nursingFee;

    @ExcelProperty(value = "申请理由", index = 44)
    private String applyReason;

    @ExcelProperty(value = "审核意见", index = 45)
    private String reviewComment;

    /**
     * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
     */
    private String distinctPass;

    /**
     * 年龄
     */
    private Integer age;

    /**
     * 性别（1.男  2.女）
     */
    private Integer sex;

    /**
     * 出生年月日
     */
    private String birthday;

    /**
     * 扩展字段用逗号隔开
     */
    private List<String> userTagStr = Lists.newArrayList();

    private Long houseId;

    /**
     * 地址
     */
    private String address;
}

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

New file
@@ -0,0 +1,159 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;

/**
 * @description: 批量导入低保户
 * @author: txb
 */
@Data
@EncryptDecryptClass
public class ComMngPopulationLowSecurityMistakeExcelVO implements Serializable {

    @ExcelProperty(value = "序号", index = 0)
    private String serialNumber;

    @ExcelProperty(value = "姓名", index = 1)
    private String name;

    @ExcelProperty(value = "身份证号码", index = 2)
    @EncryptDecryptField
    private String cardNo;

    @ExcelProperty(value = "联系电话", index = 3)
    private String phone;

    @ExcelProperty(value = "地区", index = 4)
    private String region;

    @ExcelProperty(value = "家庭编码", index = 5)
    private String familyCode;

    @ExcelProperty(value = "组名称" ,index = 6)
    private String groupName;

    @ExcelProperty(value = "分类救助类别", index = 7)
    private String classifiedRescueCategory;

    @ExcelProperty(value = "申请日期", index = 8)
    private String applyDate;

    @ExcelProperty(value = "户主姓名", index = 9)
    private String houseHolderName;

    @ExcelProperty(value = "户主身份证", index = 10)
    private String houseHolderCardNo;

    @ExcelProperty(value = "户主编码", index = 11)
    private String houseHolderCode;

    @ExcelProperty(value = "街/路/巷", index = 12)
    private String road;

    @ExcelProperty(value = "小区号", index = 13)
    private String doorNo;

    @ExcelProperty(value = "楼排号", index = 14)
    private String floor;

    @ExcelProperty(value = "单元号", index = 15)
    private String unitNo;

    @ExcelProperty(value = "户室（房间号）", index = 16)
    private String houseNo;

    @ExcelProperty(value = "是否租住", index = 17)
    private String isRent;

    @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 18)
    private String houseStatus;

    @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 19)
    private String housePurpose;

    @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 20)
    private String controlStatus;

    @ExcelProperty(value = "外地/本地（1.本地  2.外地）", index = 21)
    private String outOrLocal;

    @ExcelProperty(value = "户口所在地", index = 22)
    private String censusRegister;

    @ExcelProperty(value = "居住地邮编", index = 23)
    private String residencePostalCode;

    @ExcelProperty(value = "救助证号", index = 24)
    private String salvageCertificateNo;

    @ExcelProperty(value = "保障人口数", index = 25)
    private String guaranteedPopulationNumber;

    @ExcelProperty(value = "家庭人口数", index = 26)
    private String familyPopulationNumber;

    @ExcelProperty(value = "开户人", index = 27)
    private String accountPerson;

    @ExcelProperty(value = "开户银行", index = 28)
    private String accountBank;

    @ExcelProperty(value = "开户人身份证号", index = 29)
    private String accountCardNo;

    @ExcelProperty(value = "银行账号", index = 30)
    private String bankAccount;

    @ExcelProperty(value = "供养机构", index = 31)
    private String supportInstitutions;

    @ExcelProperty(value = "资金发放方式", index = 32)
    private String distributionMethod;

    @ExcelProperty(value = "保障金额", index = 33)
    private String guaranteedAmount;

    @ExcelProperty(value = "调剂金额", index = 34)
    private String reallocationAmount;

    @ExcelProperty(value = "差额救助金额", index = 35)
    private String differenceReliefAmount;

    @ExcelProperty(value = "分类施保金额", index = 36)
    private String classifiedInsuredAmount;

    @ExcelProperty(value = "家庭月总收入", index = 37)
    private String totalMonthlyFamilyIncome;

    @ExcelProperty(value = "家庭月均收入", index = 38)
    private String averageMonthlyFamilyIncome;

    @ExcelProperty(value = "家庭月支出", index = 39)
    private String totalMonthlyFamilyExpenditure;

    @ExcelProperty(value = "经度", index = 40)
    private String lng;

    @ExcelProperty(value = "纬度", index = 41)
    private String lat;

    @ExcelProperty(value = "始发年月", index = 42)
    private String originateDate;

    @ExcelProperty(value = "护理费", index = 43)
    private String nursingFee;

    @ExcelProperty(value = "申请理由", index = 44)
    private String applyReason;

    @ExcelProperty(value = "审核意见", index = 45)
    private String reviewComment;

    @ExcelProperty(value = "错误信息", index = 46)
    private String mistake;
}

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

@@ -67,20 +67,44 @@
    @ExcelProperty(value = "经济状况", index = 15)
    private String economicCondition;

    @ExcelProperty(value = "监护人", index = 16)
    private String guarDian;
    @ExcelProperty(value = "人员类型", index = 16)
    private String personType;

    @ExcelProperty(value = "监护人联系电话", index = 17)
    private String guarDianPhone;
    @ExcelProperty(value = "家庭情况", index = 17)
    private String familySituation;

    @ExcelProperty(value = "与患者关系", index = 18)
    private Integer patientRelation;
    @ExcelProperty(value = "监护人姓名", index = 18)
    private String custodyPerson;

    @ExcelProperty(value = "目前诊断", index = 19)
    private String diagnose;
    @ExcelProperty(value = "与监护人关系", index = 19)
    private Integer custodyRelation;

    @ExcelProperty(value = "其他", index = 20)
    private String other;
    @ExcelProperty(value = "监护人公民身份号码", index = 20)
    private String custodyCardNo;

    @ExcelProperty(value = "监护人联系方式", index = 21)
    private String custodyPersonPhone;

    @ExcelProperty(value = "监护人居住详址", index = 22)
    private String custodyAddress;

    @ExcelProperty(value = "帮扶人姓名", index = 23)
    private String helpPerson;

    @ExcelProperty(value = "帮扶人联系方式", index = 24)
    private String helpPersonPhone;

    @ExcelProperty(value = "帮扶手段", index = 25)
    private String helpMethod;

    @ExcelProperty(value = "帮扶情况", index = 26)
    private String helpSituation;

    @ExcelProperty(value = "是否违法犯罪（1.是 0.否）", index = 27)
    private Integer isCrime;

    @ExcelProperty(value = "违法犯罪情况", index = 28)
    private String crimeSutiation;


    /**

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

@@ -66,21 +66,45 @@
    @ExcelProperty(value = "经济状况", index = 15)
    private String economicCondition;

    @ExcelProperty(value = "监护人", index = 16)
    private String guarDian;
    @ExcelProperty(value = "人员类型", index = 16)
    private String personType;

    @ExcelProperty(value = "监护人联系电话", index = 17)
    private String guarDianPhone;
    @ExcelProperty(value = "家庭情况", index = 17)
    private String familySituation;

    @ExcelProperty(value = "与患者关系", index = 18)
    private String patientRelation;
    @ExcelProperty(value = "监护人姓名", index = 18)
    private String custodyPerson;

    @ExcelProperty(value = "目前诊断", index = 19)
    private String diagnose;
    @ExcelProperty(value = "与监护人关系", index = 19)
    private String custodyRelation;

    @ExcelProperty(value = "其他", index = 20)
    private String other;
    @ExcelProperty(value = "监护人公民身份号码", index = 20)
    private String custodyCardNo;

    @ExcelProperty(value = "错误信息", index = 21)
    @ExcelProperty(value = "监护人联系方式", index = 21)
    private String custodyPersonPhone;

    @ExcelProperty(value = "监护人居住详址", index = 22)
    private String custodyAddress;

    @ExcelProperty(value = "帮扶人姓名", index = 23)
    private String helpPerson;

    @ExcelProperty(value = "帮扶人联系方式", index = 24)
    private String helpPersonPhone;

    @ExcelProperty(value = "帮扶手段", index = 25)
    private String helpMethod;

    @ExcelProperty(value = "帮扶情况", index = 26)
    private String helpSituation;

    @ExcelProperty(value = "是否违法犯罪（1.是 0.否）", index = 27)
    private String isCrime;

    @ExcelProperty(value = "违法犯罪情况", index = 28)
    private String crimeSutiation;

    @ExcelProperty(value = "错误信息", index = 29)
    private String mistake;
}

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

@@ -7,6 +7,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
@@ -81,8 +82,60 @@
    @ExcelProperty(value = "是否列管", index = 20)
    private Integer isRehab;

    @ExcelProperty(value = "备注", index = 21)
    @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 21)
    private Integer isRecidivist;

    @ExcelProperty(value = "原判刑期", index = 22)
    private String originalTerm;

    @ExcelProperty(value = "服刑日期", index = 23)
    private Date sentenceBegin;

    @ExcelProperty(value = "原罪名", index = 24)
    private String originalCharge;

    @ExcelProperty(value = "释放日期", index = 25)
    private Date sentenceEnd;

    @ExcelProperty(value = "服刑场所", index = 26)
    private String sentencePlace;

    @ExcelProperty(value = "危险性评估", index = 27)
    private String riskAssessment;

    @ExcelProperty(value = "衔接日期", index = 28)
    private Date joinDate;

    @ExcelProperty(value = "衔接情况", index = 29)
    private String joinSituation;

    @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 30)
    private Integer isAgainCrime;

    @ExcelProperty(value = "重新犯罪名称", index = 31)
    private String againCrimeName;

    @ExcelProperty(value = "安置情况", index = 32)
    private String placeSituation;

    @ExcelProperty(value = "安置日期", index = 33)
    private Date placeDate;

    @ExcelProperty(value = "未安置原因", index = 34)
    private String notPlaceReason;

    @ExcelProperty(value = "帮教开始", index = 35)
    private Date helpBegin;

    @ExcelProperty(value = "帮教结束", index = 36)
    private Date helpEnd;

    @ExcelProperty(value = "帮教情况", index = 37)
    private String helpSituation;

    @ExcelProperty(value = "备注", index = 38)
    private String remark;

    /**
     * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
     */

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

@@ -7,6 +7,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
@@ -81,9 +82,60 @@
    @ExcelProperty(value = "是否列管", index = 20)
    private String isRehab;

    @ExcelProperty(value = "备注", index = 21)
    @ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 21)
    private String isRecidivist;

    @ExcelProperty(value = "原判刑期", index = 22)
    private String originalTerm;

    @ExcelProperty(value = "服刑日期", index = 23)
    private String sentenceBegin;

    @ExcelProperty(value = "原罪名", index = 24)
    private String originalCharge;

    @ExcelProperty(value = "释放日期", index = 25)
    private String sentenceEnd;

    @ExcelProperty(value = "服刑场所", index = 26)
    private String sentencePlace;

    @ExcelProperty(value = "危险性评估", index = 27)
    private String riskAssessment;

    @ExcelProperty(value = "衔接日期", index = 28)
    private String joinDate;

    @ExcelProperty(value = "衔接情况", index = 29)
    private String joinSituation;

    @ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 30)
    private String isAgainCrime;

    @ExcelProperty(value = "重新犯罪名称", index = 31)
    private String againCrimeName;

    @ExcelProperty(value = "安置情况", index = 32)
    private String placeSituation;

    @ExcelProperty(value = "安置日期", index = 33)
    private String placeDate;

    @ExcelProperty(value = "未安置原因", index = 34)
    private String notPlaceReason;

    @ExcelProperty(value = "帮教开始", index = 35)
    private String helpBegin;

    @ExcelProperty(value = "帮教结束", index = 36)
    private String helpEnd;

    @ExcelProperty(value = "帮教情况", index = 37)
    private String helpSituation;

    @ExcelProperty(value = "备注", index = 38)
    private String remark;

    @ExcelProperty(value = "错误信息", index = 22)
    @ExcelProperty(value = "错误信息", index = 39)
    private String mistake;
}

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

@@ -38,4 +38,57 @@
    @ApiModelProperty("小区总数")
    private Integer villageTotal;

    /**
     * 吸毒人员
     */
    @ApiModelProperty("吸毒人员")
    private Integer drugTotal;

    /**
     * 社区矫正人员
     */
    @ApiModelProperty("社区矫正人员")
    private Integer correctTotal;

    /**
     * 重精人员
     */
    @ApiModelProperty("重精人员")
    private Integer majorTotal;

    /**
     * 邪教人员
     */
    @ApiModelProperty("邪教人员")
    private Integer cultTotal;

    /**
     * 刑释人员
     */
    @ApiModelProperty("刑释人员")
    private Integer rehabilitationTotal;

    /**
     * 重点上访人员
     */
    @ApiModelProperty("重点上访人员")
    private Integer keyTotal;

    /**
     * 退役军人
     */
    @ApiModelProperty("退役军人")
    private Integer veteransTotal;
    /**
     * 残疾人
     */
    @ApiModelProperty("残疾人")
    private Integer disabilityTotal;

    /**
     * 低保户
     */
    @ApiModelProperty("低保户")
    private Integer LowSecurityTotal;

}

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

@@ -157,6 +157,9 @@
    @ApiModelProperty("文化程度名称")
    private String cultureLevelName;

    @ApiModelProperty("职业")
    private String profession;

    @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
    private Integer marriage;

@@ -190,6 +193,33 @@
    @ApiModelProperty("车辆列表")
    private List<ComMngPopulationCarVO> carList;

    @ApiModelProperty("吸毒信息")
    private List<ComDrugPopulationVO> comDrugPopulationVOs;

    @ApiModelProperty("社区矫正信息")
    private List<ComCorrectPopulationVO> comCorrectPopulationVOs;

    @ApiModelProperty("精神障碍信息")
    private List<ComMajorPopulationVO> comMajorPopulationVOs;

    @ApiModelProperty("邪教信息")
    private List<ComCultPopulationVO> comCultPopulationVOs;

    @ApiModelProperty("刑释信息")
    private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs;

    @ApiModelProperty("上访信息")
    private List<ComKeyPopulationVO> comKeyPopulationVOs;

    @ApiModelProperty("退役军人信息")
    private List<ComVeteransPopulationVO> comVeteransPopulationVOs;

    @ApiModelProperty("残疾人信息")
    private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs;

    @ApiModelProperty("低保户信息")
    private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;

    public interface sex{
        int nan = 1;
        int nv = 2;

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

New file
@@ -0,0 +1,230 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:58:23
 * @describe 实体类
 */

@Data
@ApiModel("刑满释放人员表")
@EncryptDecryptClass
public class ComRehabilitationPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("刑满释放人员id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
    private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    @ApiModelProperty("联系电话")
    private String phone;

    /**
    * 与人员关系
    */
    @ApiModelProperty("与人员关系")
    private Integer patientRelation;

    /**
    * 列管原因及类型
    */
    @ApiModelProperty("列管原因及类型")
    private String rehabReasonAndType;

    /**
    * 是否列管（1.是 0.否）
    */
    @ApiModelProperty("是否列管（1.是 0.否）")
    private Integer isRehab;

    /**
    * 是否累惯犯（1.是 0.否）
    */
    @ApiModelProperty("是否累惯犯（1.是 0.否）")
    private Integer isRecidivist;

    /**
    * 原判刑期
    */
    @ApiModelProperty("原判刑期")
    private String originalTerm;

    /**
    * 服刑日期
    */
    @ApiModelProperty("服刑日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date sentenceBegin;

    /**
    * 原罪名
    */
    @ApiModelProperty("原罪名")
    private String originalCharge;

    /**
    * 释放日期
    */
    @ApiModelProperty("释放日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date sentenceEnd;

    /**
    * 服刑场所
    */
    @ApiModelProperty("服刑场所")
    private String sentencePlace;

    /**
    * 危险性评估
    */
    @ApiModelProperty("危险性评估")
    private String riskAssessment;

    /**
    * 衔接日期
    */
    @ApiModelProperty("衔接日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinDate;

    /**
    * 衔接情况
    */
    @ApiModelProperty("衔接情况")
    private String joinSituation;

    /**
    * 是否重新犯罪（1.是 0.否）
    */
    @ApiModelProperty("是否重新犯罪（1.是 0.否）")
    private Integer isAgainCrime;

    /**
    * 重新犯罪名称
    */
    @ApiModelProperty("重新犯罪名称")
    private String againCrimeName;

    /**
    * 安置情况
    */
    @ApiModelProperty("安置情况")
    private String placeSituation;

    /**
    * 安置日期
    */
    @ApiModelProperty("安置日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date placeDate;

    /**
    * 未安置原因
    */
    @ApiModelProperty("未安置原因")
    private String notPlaceReason;

    /**
    * 帮教开始
    */
    @ApiModelProperty("帮教开始")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date helpBegin;

    /**
    * 帮教结束
    */
    @ApiModelProperty("帮教结束")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date helpEnd;

    /**
    * 帮教情况
    */
    @ApiModelProperty("帮教情况")
    private String helpSituation;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
    private String remark;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
    private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
    private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
    private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
    private Long updateBy;

}

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

@@ -26,7 +26,7 @@
    /**
     * 安全工作记录id
     */
    @ApiModelProperty("巡查记录id")
    @ApiModelProperty("安全工作记录id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;


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

New file
@@ -0,0 +1,357 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 19:48:54
 * @describe 实有人口导入》退役军人表实体类
 */

@Data
@ApiModel("退役军人表")
@EncryptDecryptClass
public class ComVeteransPopulationVO {

    /**
    * 主键id
    */
    @ApiModelProperty("退役军人id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
    * 人口id
    */
    @ApiModelProperty("人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populationId;

    /**
    * 街道id
    */
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    /**
    * 社区id
    */
    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
        private Long communityId;

    /**
    * 名字
    */
    @ApiModelProperty("名字")
        private String name;

    /**
    * 身份证号码
    */
    @ApiModelProperty("身份证号码")
    @EncryptDecryptField
        private String cardNo;

    /**
    * 联系电话
    */
    @ApiModelProperty("联系电话")
        private String phone;

    /**
    * 人员状态：正常、失联、出国(取字典表）
    */
    @ApiModelProperty("人员状态：正常、失联、出国(取字典表）")
        private String personStatus;

    /**
    * 机构
    */
    @ApiModelProperty("机构")
        private String organization;

    /**
    * 照片
    */
    @ApiModelProperty("照片")
        private String photo;

    /**
    * 户籍性质（1.城镇户口 2.农村户口）
    */
    @ApiModelProperty("户籍性质（1.城镇户口 2.农村户口）")
        private Integer regiterNature;

    /**
    * 入伍时间
    */
    @ApiModelProperty("入伍时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
        private Date enlistDate;

    /**
    * 退伍时间
    */
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty("退伍时间")
        private Date retireDate;

    /**
    * 人员类别
    */
    @ApiModelProperty("人员类别")
        private String personCategory;

    /**
    * 住房状况
    */
    @ApiModelProperty("住房状况")
        private String houseSituation;

    /**
    * 住房状况其他
    */
    @ApiModelProperty("住房状况其他")
        private String houseSituationOther;

    /**
    * 建筑面积
    */
    @ApiModelProperty("建筑面积")
        private String buildArea;

    /**
    * 现就业情况
    */
    @ApiModelProperty("现就业情况")
        private String employmentSituation;

    /**
    * 在职情况类型
    */
    @ApiModelProperty("在职情况类型")
        private String incumbencyType;

    /**
    * 现就业情况其他
    */
    @ApiModelProperty("现就业情况其他")
        private String employmentSituationOther;

    /**
    * 养老保险
    */
    @ApiModelProperty("养老保险")
        private String endowmentInsurance;

    /**
    * 医疗保险
    */
    @ApiModelProperty("医疗保险")
        private String medicalInsurance;

    /**
    * 现个人年收入（单位：元）
    */
    @ApiModelProperty("现个人年收入（单位：元）")
        private String annualIncome;

    /**
    * 父亲健康状况
    */
    @ApiModelProperty("父亲健康状况")
        private String fatherHealthy;

    /**
    * 母亲健康状况
    */
    @ApiModelProperty("母亲健康状况")
        private String motherHealthy;

    /**
    * 配偶健康状况
    */
    @ApiModelProperty("配偶健康状况")
        private String spouseHealthy;

    /**
    * 儿子健康状况
    */
    @ApiModelProperty("儿子健康状况")
        private String sonHealthy;

    /**
    * 女儿健康状况
    */
    @ApiModelProperty("女儿健康状况")
        private String daughterDealthy;

    /**
    * 主要困难
    */
    @ApiModelProperty("主要困难")
        private String mainDifficulty;

    /**
    * 其他困难
    */
    @ApiModelProperty("其他困难")
        private String otherDifficulty;

    /**
    * 主要诉求
    */
    @ApiModelProperty("主要诉求")
        private String mainDemand;

    /**
    * 主要诉求其他事项问题（手填）
    */
    @ApiModelProperty("主要诉求其他事项问题（手填）")
        private String mainDemandOther;

    /**
    * 需参加的学历培训
    */
    @ApiModelProperty("需参加的学历培训")
        private String academicTraining;

    /**
    * 是否已参加退役军人培训（政府性质）1.是 2.否
    */
    @ApiModelProperty("是否已参加退役军人培训（政府性质）1.是 2.否")
        private Integer isVeteransTraining;

    /**
    * 入伍前学历
    */
    @ApiModelProperty("入伍前学历")
        private String educationBeforeEnlistment;

    /**
    * 再教育学历
    */
    @ApiModelProperty("再教育学历")
        private String reEducation;

    /**
    * 所学专业
    */
    @ApiModelProperty("所学专业")
        private String major;

    /**
    * 所学专业其他
    */
    @ApiModelProperty("所学专业其他")
        private String majorOther;

    /**
    * 曾从事行业（含现从事行业）
    */
    @ApiModelProperty("曾从事行业（含现从事行业）")
        private String onceEngagedIndustry;

    /**
    * 曾从事行业（含现从事行业）其他（手填）
    */
    @ApiModelProperty("曾从事行业（含现从事行业）其他（手填）")
        private String onceEngagedIndustryOther;

    /**
    * 意向就业地点
    */
    @ApiModelProperty("意向就业地点")
        private String intendedPlaceOfEmployment;

    /**
    * 意向就业地点其他地区（手填）
    */
    @ApiModelProperty("意向就业地点其他地区（手填）")
        private String intendedPlaceOfEmploymentOther;

    /**
    * 待业期间的求职意向
    */
    @ApiModelProperty("待业期间的求职意向")
        private String unemploymedEngagedIndustry;

    /**
    * 待业期间的求职意向其他（手填）
    */
    @ApiModelProperty("待业期间的求职意向其他（手填）")
        private String unemploymedEngagedIndustryOther;

    /**
    * 是否有创业意愿（1.是 2.否）
    */
    @ApiModelProperty("是否有创业意愿（1.是 2.否）")
        private Integer isBusiness;

    /**
    * 创业意愿
    */
    @ApiModelProperty("创业意愿")
        private String businessDesire;

    /**
    * 备注
    */
    @ApiModelProperty("备注")
        private String remark;

    /**
    * 填表单位
    */
    @ApiModelProperty("填表单位")
        private String fillUnit;

    /**
    * 填表人
    */
    @ApiModelProperty("填表人")
        private String fillPerson;

    /**
    * 填表人联系电话
    */
    @ApiModelProperty("填表人联系电话")
        private String fillPersonPhone;

    /**
    * 创建时间
    */
    @ApiModelProperty("创建时间")
        private Date createAt;

    /**
    * 创建用户
    */
    @ApiModelProperty("创建用户")
        private Long createBy;

    /**
    * 修改时间
    */
    @ApiModelProperty("修改时间")
        private Date updateAt;

    /**
    * 修改用户
    */
    @ApiModelProperty("修改用户")
        private Long updateBy;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoStatisticsVO.java

@@ -4,19 +4,51 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("随手拍列表统计返回参数")
public class ComActEasyPhotoStatisticsVO {

    @ApiModelProperty("待审核数量")
    private Integer examineNum;
    private Integer examineNum = 0;

    @ApiModelProperty("待验证数量")
    private Integer verificationNum;
    private Integer verificationNum = 0;

    @ApiModelProperty("已驳回数量")
    private Integer rejectNum;
    private Integer rejectNum = 0;

    @ApiModelProperty("已完成数量")
    private Integer completeNum;
    private Integer completeNum = 0;

    @ApiModelProperty("优质数量")
    private Integer yzAllTotal = 0;

    @ApiModelProperty("今日优质数量")
    private Integer yzDayTotal = 0;

    @ApiModelProperty("精良数量")
    private Integer jlAllTotal = 0;

    @ApiModelProperty("今日精良数量")
    private Integer jlDayTotal = 0;

    @ApiModelProperty("普通数量")
    private Integer ptAllTotal = 0;

    @ApiModelProperty("今日普通数量")
    private Integer ptDayTotal = 0;

    @ApiModelProperty("一般数量")
    private Integer ybAllTotal = 0;

    @ApiModelProperty("今日一般数量")
    private Integer ybDayTotal = 0;

    @ApiModelProperty("奖励总数量")
    private BigDecimal allRewardAmount = BigDecimal.ZERO;

    @ApiModelProperty("今日奖励数量")
    private BigDecimal dayRewardAmount = BigDecimal.ZERO;
}

 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/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeAdminVO.java

@@ -43,4 +43,10 @@
    @ApiModelProperty("操作人")
    private String operationUserName;

    @ApiModelProperty("交易备注")
    private String remark;

    @ApiModelProperty("交易业务id")
    private Long serviceId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeStatisticsAdminVO.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.common.model.vos.community.wallet;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("交易记录统计返回参数")
public class ComActWalletTradeStatisticsAdminVO {

    @ApiModelProperty("今日交易金额")
    private BigDecimal dayTotal = BigDecimal.ZERO;

    @ApiModelProperty("本月交易金额")
    private BigDecimal monthTotal = BigDecimal.ZERO;

    @ApiModelProperty("累计交易金额")
    private BigDecimal total = BigDecimal.ZERO;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

@@ -103,4 +103,7 @@

    @ApiModelProperty("话题名称")
    private String topicName;

    @ApiModelProperty("话题id")
    private String topicId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamWishVO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.vos.partybuilding;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微心愿服务团队人员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-21 18:11
 **/
@Data
@ApiModel("微心愿服务团队人员")
public class ComPbServiceTeamWishVO {

    @ApiModelProperty("managerId")
    private Long managerId;

    @ApiModelProperty("姓名")
    private String name;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java

@@ -33,4 +33,7 @@
    @ApiModelProperty("房屋状态")
    private Integer status;

    @ApiModelProperty("是否居住地 1.是 0.否")
    private Integer residence;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1795,6 +1795,16 @@
    R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入低保户
     *
     * @param list        低保户数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importLowSecurity")
    R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list        用户信息
@@ -3765,6 +3775,38 @@
    R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询用户交易记录总额
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录总额
     */
    @PostMapping("/user/wallet/trade/total")
    R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询用户导出数据
     * @param pageTradeAdminDTO 请求参数
     * @return  用户导出数据
     */
    @PostMapping("/user/wallet/trade/export")
    R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 导出奖励台账数据
     * @param pageTradeAdminDTO 请求参数
     * @return  奖励台账数据
     */
    @PostMapping("/user/wallet/trade/reward/export")
    R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询社区统计数据
     * @param pageTradeAdminDTO 查询社区统计数据
     * @return  社区统计数据
     */
    @PostMapping("/user/wallet/trade/statistics")
    R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -111,6 +111,15 @@
    R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);

    /**
     * 微心愿搜索社区团队人员列表
     * @param param 请求参数
     * @param communityId   社区id
     * @return  社区团队人员列表
     */
    @PostMapping("listactivitymanager2")
    R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);

    /**
     *分页查询人脸识别
     * @param loginUserInfoVO 查询参数
     * @return 分页集合
@@ -128,11 +137,11 @@

    /**
     *分页查询人口管理
     * @param loginUserInfoVO 查询参数
     * @param userInfoVO 查询参数
     * @return 分页数据
     */
    @PostMapping("pageuser")
    R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO);
    R pageUser(@RequestBody AppletUserInfoVO userInfoVO);

    /**
     * 查询所有人员标签

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/JWTTokenUtil.java

@@ -27,7 +27,7 @@
     * @return 令牌
     */
    private static String generateToken(Map<String, Object> claims) {
        Date expirationDate = new Date(System.currentTimeMillis() + TokenConstant.EXPIRETIME*60*1000);
        Date expirationDate = new Date(System.currentTimeMillis() + TokenConstant.EXPIRETIME_LONG*60*1000*72);
        return Jwts.builder().setClaims(claims).setExpiration(expirationDate).signWith(SignatureAlgorithm.HS512, TokenConstant.SECRET).compact();
    }


 springcloud_k8s_panzhihuazhihuishequ/community_backstage/pom.xml

@@ -48,6 +48,20 @@
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>
        <dependency>
            <groupId>com.github.kmood</groupId>
            <artifactId>officeexport-java</artifactId>
            <version>1.0.1.6-RELEASE</version>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>

    <build>

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

@@ -1,25 +1,35 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoActivityVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoActivityUserVO;
import com.panzhihua.common.model.vos.community.ComActUserWalletTradeExcelVO;
import com.panzhihua.common.model.vos.community.ComActUserWalletTradeRewardExcelVO;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletAdminVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeAdminVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeStatisticsAdminVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.List;

@Slf4j
@Api(tags = {"财务管理模块"})
@@ -29,6 +39,20 @@

    @Resource
    private CommunityService communityService;
    @Value("${excel.userurl}")
    private String excelUrl;
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;

    @ApiOperation(value = "分页查询收益结算列表",response = ComActWalletAdminVO.class)
    @PostMapping("/page")
@@ -53,4 +77,96 @@
        return communityService.pageUserWalletTradeAdmin(pageTradeAdminDTO);
    }

    @ApiOperation(value = "查询用户交易总额")
    @PostMapping("/trade/user/total")
    public R tradeUserTotal(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
        Long communityId = this.getCommunityId();
        pageTradeAdminDTO.setCommunityId(communityId);
        return communityService.getTradeUserTotalWalletTradeAdmin(pageTradeAdminDTO);
    }

    @ApiOperation(value = "导出交易记录")
    @PostMapping("/trade/export")
    public R tradeExport(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
        Long communityId = this.getCommunityId();
        pageTradeAdminDTO.setCommunityId(communityId);

        String fileNames = "";
        if(pageTradeAdminDTO.getChangeType().equals(1)){
            fileNames = "奖励台账";
        }else{
            fileNames = "结算记录";
        }
        String name = fileNames + "导出数据.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
//        用户搜索了就下载搜索的用户否则下载所有用户
        R r = communityService.getTradeUserTotalWalletTradeExportAdmin(pageTradeAdminDTO);
        if (R.isOk(r)) {
            List<ComActUserWalletTradeExcelVO> jsTradeList = null;
            List<ComActUserWalletTradeRewardExcelVO> jlTradeList = null;
            if(pageTradeAdminDTO.getChangeType().equals(1)){
                r = communityService.getTradeUserTotalJLWalletTradeExportAdmin(pageTradeAdminDTO);
                jlTradeList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActUserWalletTradeRewardExcelVO.class);
            }else{
                jsTradeList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActUserWalletTradeExcelVO.class);
            }

            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        if(pageTradeAdminDTO.getChangeType().equals(1)){
                            excelWriter = EasyExcel.write(fileName, ComActUserWalletTradeRewardExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                            WriteSheet writeSheet = EasyExcel.writerSheet(fileNames + "导出").build();
                            excelWriter.write(jlTradeList, writeSheet);
                        }else{
                            excelWriter = EasyExcel.write(fileName, ComActUserWalletTradeExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                            WriteSheet writeSheet = EasyExcel.writerSheet(fileNames + "导出").build();
                            excelWriter.write(jsTradeList, writeSheet);
                        }

                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(excelUrl + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return r;
    }

    @ApiOperation(value = "交易记录统计",response = ComActWalletTradeStatisticsAdminVO.class)
    @PostMapping("/trade/user/statistics")
    public R tradeUserStatistics(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
        Long communityId = this.getCommunityId();
        pageTradeAdminDTO.setCommunityId(communityId);
        return communityService.getTradeUserStatisticsAdmin(pageTradeAdminDTO);
    }

}

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

@@ -4,20 +4,34 @@
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
//import com.kmood.datahandle.DocumentProducer;
//import com.kmood.utils.FileUtils;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComMngPopulationServeExcelListen;
import com.panzhihua.common.listen.ComSwRotaExcelListen;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.LiveVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.WeatherVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.model.vos.shop.ComShopSysConfVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.utlis.HttpUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
//import freemarker.template.Configuration;
//import freemarker.template.Template;
//import freemarker.template.Version;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.Version;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -25,14 +39,24 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import sun.applet.Main;
import sun.misc.BASE64Encoder;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.net.URL;
import java.net.URLConnection;
import java.text.SimpleDateFormat;
import java.util.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;

/**
@@ -429,6 +453,863 @@
        }
    }

    @ApiOperation(value = "下载安全工作记录报告")
    @PostMapping("/export/safetyWorkRecord")
    public R exportSafetyWorkRecord(@RequestBody List<Long> ids){
        Long communityId = this.getLoginUserInfo().getCommunityId();
        List<String> downLoadUrl = new ArrayList<>();
            try {
                for (Long id : ids){
                    SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                    sftp.login();
                    Map<String,Object> dataMap = new HashMap<String, Object>();
                    ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = JSONObject.parseObject(JSONObject.toJSONString(communityService.detailSafetyWorkRecord(id, communityId).getData()),ComSwSafetyWorkRecordVO.class);
                    //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
                    String ftpUrl = "/mnt/data/web/excel/";
                    String name = "安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc";
                    boolean existDir = sftp.isExistDir(ftpUrl + name);
                    if (!existDir) {
                        String property = System.getProperty("user.dir");
                        String fileName = property + File.separator + name;
                        // 这里 需要指定写用哪个class去写
                        ExcelWriter excelWriter = null;
                        InputStream inputStream = null;
                        try {
                            //日期
                            dataMap.put("date", new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
                            //巡查类型
                            dataMap.put("patrolType", comSwSafetyWorkRecordVO.getPatrolType());
                            //社区名称
                            dataMap.put("communityName", comSwSafetyWorkRecordVO.getCommunityName());
                            //地址
                            dataMap.put("address", comSwSafetyWorkRecordVO.getAddress());
                            //记录内容
                            dataMap.put("recordContent", comSwSafetyWorkRecordVO.getRecordContent());
                            //发现记录
                            dataMap.put("findRecord", comSwSafetyWorkRecordVO.getFindRecord());
                            //记录照片
                            List<String> photo = new ArrayList<>();
                            if (StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getRecordPhoto())) {
                                photo = Arrays.asList(comSwSafetyWorkRecordVO.getRecordPhoto().split(","));
                            }
                            if (photo.size() != 0 && null != photo) {
                                if (photo.size() == 1){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 1) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 2){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 2) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 3){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 3) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 4){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 4) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 5){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 5) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 6){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 6) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 7){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 7) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 8){
                                    for (int i = 0; i < 9; i++){
                                        if (i < 8) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 9){
                                    for (int i = 0; i < 9; i++){
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    }
                                }
                            }else{
                                for (int i = 0; i < 9; i++){
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                }
                            }
                            //备注
                            dataMap.put("remark", comSwSafetyWorkRecordVO.getRemark());
                            //巡查时间
                            dataMap.put("patrolTime", new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getPatrolTime()));
                            //工作人员
                            dataMap.put("personName", comSwSafetyWorkRecordVO.getPersonName());
                            //填报人员
                            dataMap.put("createName", comSwSafetyWorkRecordVO.getCreateName());
                            //填报时间
                            dataMap.put("createAt", new SimpleDateFormat("yyyy-MM-dd").format(comSwSafetyWorkRecordVO.getCreateAt()));
                            //获取请求url
                            String url = Constants.G_D_WEATHER_URL;
                            //获取请求参数
                            String param = "key=" + Constants.G_D_WEATHER_KEY + "&city=510400";
                            String result = HttpUtils.sendGet(url,param);
                            R r = R.ok(JSON.parseObject(result));
                            WeatherVO weatherVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), WeatherVO.class);if (null != weatherVO) {
                                LiveVO liveVO = weatherVO.getLives().get(0);
                                //城市
                                dataMap.put("city", liveVO.getCity());
                                //天气
                                dataMap.put("weather", liveVO.getWeather());
                                //温度
                                dataMap.put("temperature", liveVO.getTemperature());
                                //风向
                                dataMap.put("winddirection", liveVO.getWinddirection());
                                //风力
                                dataMap.put("windpower", liveVO.getWindpower());
                            }
                            Configuration configuration = new Configuration(new Version("2.3.0"));

                            configuration.setDefaultEncoding("utf-8");
                            /**
                             * 以下是两种指定ftl文件所在目录路径的方式，注意这两种方式都是
                             * 指定ftl文件所在目录的路径，而不是ftl文件的路径
                             */
                            //指定路径的第一种方式（根据某个类的相对路径指定）
                            //                configuration.setClassForTemplateLoading(this.getClass(), "");

                            //指定路径的第二种方式，我的路径是C：/a.ftl
                            configuration.setDirectoryForTemplateLoading(new File("c:/"));

                            //输出文档路径及名称
    //                    File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc");
                            File file = new File(fileName);

                            //以utf-8的编码读取ftl文件
                            Template template = configuration.getTemplate("安全工作记录.ftl", "utf-8");
                            Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "utf-8"), 10240);
                            template.process(dataMap, out);
                            out.close();
                            inputStream = new FileInputStream(file);
                            sftp.uploadMore(ftpUrl, name, inputStream);
                            sftp.logout();
                            inputStream.close();
                            String absolutePath = file.getAbsolutePath();
                            boolean delete = file.delete();
                            log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                        } finally {
                            // 千万别忘记finish 会帮忙关闭流
                            if (inputStream != null) {
                                inputStream.close();
                            }
                        }
                    }
                    downLoadUrl.add(excelUrl + name);
                }
                return R.ok(downLoadUrl);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
            }
        return R.fail();
    }

    @ApiOperation(value = "下载巡查记录报告")
    @PostMapping("/export/patrolRecord")
    public R exportPatrolRecord(@RequestBody List<Long> ids){
        Long communityId = this.getLoginUserInfo().getCommunityId();
        List<String> downLoadUrl = new ArrayList<>();
        try {
            for (Long id : ids) {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                Map<String, Object> dataMap = new HashMap<String, Object>();
                ComSwPatrolRecordVO comSwPatrolRecordVO = JSONObject.parseObject(JSONObject.toJSONString(communityService.detailPatrolRecord(id).getData()), ComSwPatrolRecordVO.class);
                //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
                String ftpUrl = "/mnt/data/web/excel/";
                String name = "巡查记录_" + comSwPatrolRecordVO.getId() + ".doc";

                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        //日期
                        dataMap.put("date", new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
                        //巡查类型
                        dataMap.put("patrolType", comSwPatrolRecordVO.getPatrolType());
                        //社区名称
                        //                    dataMap.put("communityName", comSwPatrolRecordVO.getCommunityName());
                        //地址
                        dataMap.put("address", comSwPatrolRecordVO.getAddress());
                        //记录内容
                        dataMap.put("recordContent", comSwPatrolRecordVO.getRecordContent());
                        //发现记录
                        dataMap.put("findRecord", comSwPatrolRecordVO.getFindRecord());
                        //记录照片
                        List<String> photo = new ArrayList<>();
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRecordPhoto())) {
                            photo = Arrays.asList(comSwPatrolRecordVO.getRecordPhoto().split(","));
                        }
                        if (photo.size() != 0 && null != photo) {
                            if (photo.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                            }
                        }
                        //备注
                        dataMap.put("remark", comSwPatrolRecordVO.getRemark());
                        //巡查时间
                        //                    dataMap.put("patrolTime", new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
                        //工作人员
                        //                    dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
                        //巡查人员
                        dataMap.put("personName", comSwPatrolRecordVO.getPersonName());
                        //接班时间
                        dataMap.put("successionTime", new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getSuccessionTime()));
                        //接班人员
                        dataMap.put("successionPerson", comSwPatrolRecordVO.getSuccessionPerson());
                        //填报人员
                        dataMap.put("createName", comSwPatrolRecordVO.getCreateName());
                        //填报时间
                        dataMap.put("createAt", new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getCreateAt()));
                        //获取请求url
                        String url = Constants.G_D_WEATHER_URL;
                        //获取请求参数
                        String param = "key=" + Constants.G_D_WEATHER_KEY + "&city=510400";
                        String result = HttpUtils.sendGet(url, param);
                        R r = R.ok(JSON.parseObject(result));
                        WeatherVO weatherVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), WeatherVO.class);
                        if (null != weatherVO) {
                            LiveVO liveVO = weatherVO.getLives().get(0);
                            //城市
                            dataMap.put("city", liveVO.getCity());
                            //天气
                            dataMap.put("weather", liveVO.getWeather());
                            //温度
                            dataMap.put("temperature", liveVO.getTemperature());
                            //风向
                            dataMap.put("winddirection", liveVO.getWinddirection());
                            //风力
                            dataMap.put("windpower", liveVO.getWindpower());
                        }
                        Configuration configuration = new Configuration(new Version("2.3.0"));

                        configuration.setDefaultEncoding("utf-8");
                        /**
                         * 以下是两种指定ftl文件所在目录路径的方式，注意这两种方式都是
                         * 指定ftl文件所在目录的路径，而不是ftl文件的路径
                         */
                        //指定路径的第一种方式（根据某个类的相对路径指定）
                        //                configuration.setClassForTemplateLoading(this.getClass(), "");

                        //指定路径的第二种方式，我的路径是C：/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("c:/"));

                        //输出文档路径及名称
                        //                    File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc");
                        File file = new File(fileName);

                        //以utf-8的编码读取ftl文件
                        Template template = configuration.getTemplate("巡查记录.ftl", "utf-8");
                        Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "utf-8"), 10240);
                        template.process(dataMap, out);
                        out.close();
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                    }
                }
                downLoadUrl.add(excelUrl + name);
            }
            return R.ok(downLoadUrl);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
        }
        return R.fail();
    }

    @ApiOperation(value = "下载隐患报告")
    @PostMapping("/export/DangerReport")
    public R exportDangerReport(@RequestBody List<Long> ids){
        Long communityId = this.getLoginUserInfo().getCommunityId();
        List<String> downLoadUrl = new ArrayList<>();
        try {
            for (Long id : ids) {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                Map<String, Object> dataMap = new HashMap<String, Object>();
                ComSwDangerReportVO comSwDangerReportVO = JSONObject.parseObject(JSONObject.toJSONString(communityService.detailDangerReport(id).getData()), ComSwDangerReportVO.class);
                //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
                String ftpUrl = "/mnt/data/web/excel/";
                String name = "隐患报告_" + comSwDangerReportVO.getId() + ".doc";

                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        //日期
                        dataMap.put("date", comSwDangerReportVO.getCheckTime());
                        //巡查类型
                        dataMap.put("patrolType", comSwDangerReportVO.getPatrolType());
                        //地址
                        dataMap.put("address", comSwDangerReportVO.getAddress());
                        //隐患名称
                        dataMap.put("dangerName", comSwDangerReportVO.getDangerName());
                        //排查时间
                        dataMap.put("checkTime", comSwDangerReportVO.getCheckTime());
                        //排查人员
                        dataMap.put("ppersonName", comSwDangerReportVO.getPPersonName());
                        //填报人员
                        dataMap.put("createName", comSwDangerReportVO.getCreateName());
                        //填报时间
                        dataMap.put("createAt", new SimpleDateFormat("yyyy-MM-dd").format(comSwDangerReportVO.getCreateAt()));
                        //隐患编号
                        dataMap.put("dangerNo", comSwDangerReportVO.getDangerNo());
                        //主体部门、单位或个人全称
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getUnitName())) {
                            dataMap.put("unitName", comSwDangerReportVO.getUnitName());
                        }else {
                            dataMap.put("unitName", "");
                        }
                        //隐患简述
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getDagerDescription())) {
                            dataMap.put("dagerDescription", comSwDangerReportVO.getDagerDescription());
                        }else {
                            dataMap.put("dagerDescription", "");
                        }
                        //已采取的措施
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getTakeSteps())) {
                            dataMap.put("takeSteps", comSwDangerReportVO.getTakeSteps());
                        }else {
                            dataMap.put("takeSteps", "");
                        }
                        //措施照片
                        List<String> stepsPhoto = new ArrayList<>();
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getStepsPhoto())) {
                            stepsPhoto = Arrays.asList(comSwDangerReportVO.getStepsPhoto().split(","));
                        }
                        if (stepsPhoto.size() != 0 && null != stepsPhoto) {
                            if (stepsPhoto.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                }
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                            }
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                            }
                        }
                        //社区处理建议
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getCommunitySuggestion())) {
                            dataMap.put("communitySuggestion", comSwDangerReportVO.getCommunitySuggestion());
                        }else {
                            dataMap.put("communitySuggestion", "");
                        }
                        //街道安全管理人员建议
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getStreetSuggestion())) {
                            dataMap.put("streetSuggestion", comSwDangerReportVO.getStreetSuggestion());
                        }else {
                            dataMap.put("streetSuggestion", "");
                        }
                        //领导意见
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getLeaderSuggestion())) {
                            dataMap.put("leaderSuggestion", comSwDangerReportVO.getLeaderSuggestion());
                        }else {
                            dataMap.put("leaderSuggestion", "");
                        }
                        //承办记录
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getUndertakeRecord())) {
                            dataMap.put("undertakeRecord", comSwDangerReportVO.getUndertakeRecord());
                        }else {
                            dataMap.put("undertakeRecord", "");
                        }
                        //巡查记录
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getRecordContent())) {
                            dataMap.put("recordContent", comSwDangerReportVO.getRecordContent());
                        }else {
                            dataMap.put("recordContent", "");
                        }
                        //发现记录
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getFindRecord())) {
                            dataMap.put("findRecord", comSwDangerReportVO.getFindRecord());
                        }else {
                            dataMap.put("findRecord", "");
                        }
                        //记录照片
                        List<String> photo = new ArrayList<>();
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getRecordPhoto())) {
                            photo = Arrays.asList(comSwDangerReportVO.getRecordPhoto().split(","));
                        }
                        if (photo.size() != 0 && null != photo) {
                            if (photo.size() == 1) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 2) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 3) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 4) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 5) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 6) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 7) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 8) {
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                            }
                        }
                        //备注
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getRemark())) {
                            dataMap.put("remark", comSwDangerReportVO.getRemark());
                        }else {
                            dataMap.put("remark", "");
                        }
                        //整改时间
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getRectifyTime())) {
                            dataMap.put("rectifyTime", comSwDangerReportVO.getRectifyTime());
                        }else {
                            dataMap.put("rectifyTime", "");
                        }
                        //整改人员
                        if (StringUtils.isNotEmpty(comSwDangerReportVO.getDPersonName())) {
                            dataMap.put("dpersonName", comSwDangerReportVO.getDPersonName());
                        }else {
                            dataMap.put("dpersonName", "");
                        }

                        //获取请求url
                        String url = Constants.G_D_WEATHER_URL;
                        //获取请求参数
                        String param = "key=" + Constants.G_D_WEATHER_KEY + "&city=510400";
                        String result = HttpUtils.sendGet(url, param);
                        R r = R.ok(JSON.parseObject(result));
                        WeatherVO weatherVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), WeatherVO.class);
                        if (null != weatherVO) {
                            LiveVO liveVO = weatherVO.getLives().get(0);
                            //城市
                            dataMap.put("city", liveVO.getCity());
                            //天气
                            dataMap.put("weather", liveVO.getWeather());
                            //温度
                            dataMap.put("temperature", liveVO.getTemperature());
                            //风向
                            dataMap.put("winddirection", liveVO.getWinddirection());
                            //风力
                            dataMap.put("windpower", liveVO.getWindpower());
                        }
                        Configuration configuration = new Configuration(new Version("2.3.0"));

                        configuration.setDefaultEncoding("utf-8");
                        /**
                         * 以下是两种指定ftl文件所在目录路径的方式，注意这两种方式都是
                         * 指定ftl文件所在目录的路径，而不是ftl文件的路径
                         */
                        //指定路径的第一种方式（根据某个类的相对路径指定）
                        //                configuration.setClassForTemplateLoading(this.getClass(), "");

                        //指定路径的第二种方式，我的路径是C：/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("c:/"));

                        //输出文档路径及名称
                        //                    File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc");
                        File file = new File(fileName);

                        //以utf-8的编码读取ftl文件
                        Template template = configuration.getTemplate("隐患报告.ftl", "utf-8");
                        Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "utf-8"), 10240);
                        template.process(dataMap, out);
                        out.close();
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                    }
                }
                downLoadUrl.add(excelUrl + name);
            }
            return R.ok(downLoadUrl);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
        }
        return R.fail();
    }

    private List<List<String>> headDataFilling(){
        List<List<String>> list = new ArrayList<List<String>>();
        List<String> head0 = new ArrayList<String>();
@@ -438,9 +1319,9 @@
        List<String> head2 = new ArrayList<String>();
        head2.add("值班人员联系电话（多个用\"、\"隔开，请安姓名顺序）");
        List<String> head3 = new ArrayList<String>();
        head3.add("值班领导（多个用\"、\"隔开）");
        head3.add("值班领导");
        List<String> head4 = new ArrayList<String>();
        head4.add("值班领导联系电话（多个用\"、\"隔开，请安姓名顺序）");
        head4.add("值班领导联系电话");
        List<String> head5 = new ArrayList<String>();
        head5.add("");
        list.add(head0);
@@ -457,11 +1338,51 @@
        data.add("2021-01-01");
        data.add("张三、李四、王二");
        data.add("138000000、138000000、138000000");
        data.add("王五、王六");
        data.add("138000000、138000000");
        data.add("王五");
        data.add("138000000");
        data.add("示例");
        return data;
    }

    public String getImageStr(String fileName) {
        String imgFile = fileName;
        InputStream in = null;
        byte[] data = null;
        try {
            in = new FileInputStream(imgFile);
            data = new byte[in.available()];
            in.read(data);
            in.close();
        } catch (Exception e) {
            e.printStackTrace();
        }
        BASE64Encoder encoder = new BASE64Encoder();
        return encoder.encode(data);
    }

    public String downloadPicture(String urlString, String fileName) throws Exception {
        // 构造URL
        URL url = new URL(urlString);
        // 打开连接
        URLConnection con = url.openConnection();
        // 输入流
        InputStream is = con.getInputStream();
        // 1K的数据缓冲
        byte[] bs = new byte[1024];
        // 读取到的数据长度
        int len;
        // 输出的文件流
        String filename = "d:/" + fileName + ".jpg";  //下载路径及下载图片名称
        File file = new File(filename);
        FileOutputStream os = new FileOutputStream(file, true);
        // 开始读取
        while ((len = is.read(bs)) != -1) {
            os.write(bs, 0, len);
        }
        // 完毕，关闭所有链接
        os.close();
        is.close();
        return filename;
    }
}


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

@@ -460,7 +460,7 @@
        return communityService.specialInputUser(pageInputUserDTO);
    }

    @ApiOperation(value = "特殊群体统计接口", response = ComMngPopulationVO.class)
    @ApiOperation(value = "实有单位统计接口", response = ComMngPopulationVO.class)
    @PostMapping("/special/statistics")
    public R getComMngRealCompanyTotalByAdmin() {
        //获取登陆用户绑定社区id
@@ -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/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -8,11 +8,13 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import io.swagger.annotations.Api;
@@ -333,8 +335,13 @@
                            String openid = userResult.getData().toString();
                            WxXCXTempSend util = new WxXCXTempSend();
                            try {
                                String result = comActMicroWishVO1.getRejectReason();
                                if(StringUtils.isNotEmpty(result)){
                                    result = result.substring(0,4);
                                    result += "…";
                                }
                                WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"微心愿"
                                        , DateUtils.format(comActMicroWishVO1.getExamineAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + comActMicroWishVO1.getRejectReason());
                                        , DateUtils.format(comActMicroWishVO1.getExamineAt(),DateUtils.ymdhms_format),result);
                            }catch (Exception e){
                                log.error("消息推送失败，失败原因：" + e.getMessage());
                            }
@@ -396,12 +403,23 @@
        return userService.listActivityManager(param, communityId);
    }

    @ApiOperation(value = "微心愿人员下拉搜索")
    @GetMapping("listmanagers2")
    @ApiImplicitParam(name = "param", value = "搜索参数【不传返回所有后台人员】", required = false)
    public R listManagers2(String param) {
        Long communityId = this.getCommunityId();
        if (ObjectUtils.isEmpty(param)) {
            param = "";
        }
        return userService.listActivityManager2(param, communityId);
    }

    @ApiOperation(value = "审核、反馈随手拍")
    @PutMapping("puteasyphoto")
    public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long userId = this.getUserId();
        Integer type = comActEasyPhotoVO.getType();
        if (null == type || type > 3 || type < 1) {
        if (null == type || type > 4 || type < 1) {
            return R.fail("操作类型错误");
        }
        Long id = comActEasyPhotoVO.getId();
@@ -437,8 +455,13 @@
                        String openid = userResult.getData().toString();
                        WxXCXTempSend util = new WxXCXTempSend();
                        try {
                            String result = comActEasyPhotoVO1.getRejectReason();
                            if(StringUtils.isNotEmpty(result)){
                                result = result.substring(0,4);
                                result += "…";
                            }
                            WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"随手拍"
                                    , DateUtils.format(comActEasyPhotoVO1.getExamineAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + comActEasyPhotoVO.getRejectReason());
                                    , DateUtils.format(comActEasyPhotoVO1.getExamineAt(),DateUtils.ymdhms_format),result);
                        }catch (Exception e){
                            log.error("消息推送失败，失败原因：" + e.getMessage());
                        }
@@ -481,7 +504,7 @@
        return communityService.deletemicrowish(id);
    }

    @ApiOperation(value = "随手拍统计")
    @ApiOperation(value = "随手拍统计",response = ComActEasyPhotoStatisticsVO.class)
    @GetMapping("pageeasyphoto/statistics")
    public R easyPhotoStatistics() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();

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

@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.community.ExcelHouseDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.vos.AppletUserInfoVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
@@ -118,11 +119,11 @@
        return r;
    }

    @ApiOperation(value = "分页查询人口管理",response = LoginUserInfoVO.class)
    @ApiOperation(value = "分页查询人口管理",response = AppletUserInfoVO.class)
    @PutMapping("pageuser")
    public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO){
        loginUserInfoVO.setCommunityId(this.getCommunityId());
        return userService.pageUser(loginUserInfoVO);
    public R pageUser(@RequestBody AppletUserInfoVO userInfoVO){
        userInfoVO.setCommunityId(this.getCommunityId());
        return userService.pageUser(userInfoVO);
    }

    @ApiOperation(value = "查询所有人员标签")
@@ -623,6 +624,7 @@
        String url=excelUrl;
        String uuid= UUID.randomUUID().toString().replace("-","");
        String name=uuid+".xlsx";
        String _name="小程序用户管理.xlsx";
        String ftpUrl="/mnt/data/web/excel/";
//        用户搜索了就下载搜索的用户否则下载所有用户
        R r=userService.export(exportUserDTO);

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

@@ -10,6 +10,10 @@
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -64,6 +68,10 @@
            return R.fail("房屋租售id主键不能为空");
        }
        R r =  communityService.putOpsHouse(comOpsHouseVO);

        Date nowDate = new Date();
        //查询用户openid
        R userResult = userService.getUserOpenId(comOpsHouseVO.getUserId());
        if(R.isOk(r) && 1==comOpsHouseVO.getStatus()) {
            //审核通过添加提示信息
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
@@ -80,6 +88,17 @@
            R r2 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r2)) {
                log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }

            if(R.isOk(userResult)){
                String openid = userResult.getData().toString();
                WxXCXTempSend util = new WxXCXTempSend();
                try {
                    WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"房屋租售"
                            , DateUtils.format(nowDate,DateUtils.ymdhms_format),"审核通过");
                }catch (Exception e){
                    log.error("消息推送失败，失败原因：" + e.getMessage());
                }
            }
        }else if(R.isOk(r) && 2==comOpsHouseVO.getStatus()){
            //您提交的xxxx房屋出租审核已经审核通过/被驳回
@@ -100,6 +119,22 @@
            if (R.isOk(r2)) {
                log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }

            if(R.isOk(userResult)){
                String openid = userResult.getData().toString();
                WxXCXTempSend util = new WxXCXTempSend();
                try {
                    String result = comOpsHouseVO.getReason();
                    if(StringUtils.isNotEmpty(result)){
                        result = result.substring(0,4);
                        result += "…";
                    }
                    WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"房屋租售"
                            , DateUtils.format(nowDate,DateUtils.ymdhms_format),result);
                }catch (Exception e){
                    log.error("消息推送失败，失败原因：" + e.getMessage());
                }
            }
        }
        return r;
    }

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

@@ -266,6 +266,24 @@
        return R.ok();
    }

    @ApiOperation(value = "excel导入低保户")
    @PostMapping(value = "/serve/importLowSecurity", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R importLowSecurity(@RequestParam MultipartFile file, HttpServletRequest request) {
        //获取文件名
        String fileName = file.getOriginalFilename();
        log.info("传入文件名字【{}】", fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            ComMngPopulationLowSecurityExcelListen mngPopulationDisabilityExcelListen = new ComMngPopulationLowSecurityExcelListen(communityService, this.getCommunityId(),userName,password,host,port,excelUrl,stringRedisTemplate);
            EasyExcel.read(inputStream, null, mngPopulationDisabilityExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
            e.printStackTrace();
        }
        return R.ok();
    }

    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
@@ -426,9 +444,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"吸毒人员".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("吸毒人员导入模板").doWrite(dataList);
@@ -484,9 +504,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"社区矫正".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("社区矫正人员导入模板").doWrite(dataList);
@@ -542,9 +564,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"精神障碍患者".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("重精人员导入模板").doWrite(dataList);
@@ -600,9 +624,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"邪教人员".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("邪教人员导入模板").doWrite(dataList);
@@ -658,9 +684,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"刑满释放".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("刑释人员导入模板").doWrite(dataList);
@@ -717,9 +745,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"重点人员".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("重点上访人员导入模板").doWrite(dataList);
@@ -774,9 +804,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"服刑人员".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("服刑人员导入模板").doWrite(dataList);
@@ -832,9 +864,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"退役军人".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("退役军人导入模板").doWrite(dataList);
@@ -890,9 +924,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"残疾人".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("残疾人导入模板").doWrite(dataList);
@@ -948,9 +984,11 @@
                        List<String> TagsList = (List<String>)tagsResult.getData();
                        //动态加载标签列表到表头
                        for (int i = 0; i < TagsList.size(); i++) {
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i) + "(是/否)");
                            list.add(head);
                            if (!"低保户".equals(TagsList.get(i))) {
                                List<String> head = new ArrayList<>();
                                head.add(TagsList.get(i) + "(是/否)");
                                list.add(head);
                            }
                        }
                    }
                    EasyExcel.write(fileName).head(list).sheet("低保户导入模板").doWrite(dataList);
@@ -998,9 +1036,9 @@
        List<String> head5 = new ArrayList<String>();
        head5.add("与户主关系");
        List<String> head6 = new ArrayList<String>();
        head6.add("街/路/巷");
        head6.add("*街/路/巷");
        List<String> head7 = new ArrayList<String>();
        head7.add("小区号（政府对于每个小区都有特定编号）");
        head7.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head8 = new ArrayList<String>();
        head8.add("楼排号");
        List<String> head9 = new ArrayList<String>();
@@ -1138,25 +1176,47 @@
        List<String> head6 = new ArrayList<String>();
        head6.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head7 = new ArrayList<String>();
        head7.add("*楼排号");
        head7.add("楼排号");
        List<String> head8 = new ArrayList<String>();
        head8.add("*单元号");
        head8.add("单元号");
        List<String> head9 = new ArrayList<String>();
        head9.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head9.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head10 = new ArrayList<String>();
        head10.add("*是否租住（自住/租住）");
        head10.add("是否租住（是/否）");
        List<String> head11 = new ArrayList<String>();
        head11.add("*房屋状态(自住/租住/其他)");
        head11.add("房屋状态(自住/租住/其他)");
        List<String> head12 = new ArrayList<String>();
        head12.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head12.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head13 = new ArrayList<String>();
        head13.add("*管控状态(常规/关注/管控)");
        head13.add("管控状态(常规/关注/管控)");
        List<String> head14 = new ArrayList<String>();
        head14.add("本地/外地");
        List<String> head15 = new ArrayList<String>();
        head15.add("户口所在地");
        List<String> head16 = new ArrayList<String>();
        head16.add("备注");
        head16.add("初次发现日期");
        List<String> head17 = new ArrayList<String>();
        head17.add("管控情况");
        List<String> head18 = new ArrayList<String>();
        head18.add("管控人姓名");
        List<String> head19 = new ArrayList<String>();
        head19.add("管控人联系方式");
        List<String> head20 = new ArrayList<String>();
        head20.add("帮扶情况");
        List<String> head21 = new ArrayList<String>();
        head21.add("帮扶人姓名");
        List<String> head22 = new ArrayList<String>();
        head22.add("帮扶人联系方式");
        List<String> head23 = new ArrayList<String>();
        head23.add("吸毒原因");
        List<String> head24 = new ArrayList<String>();
        head24.add("吸毒后果");
        List<String> head25 = new ArrayList<String>();
        head25.add("有无犯罪史");
        List<String> head26 = new ArrayList<String>();
        head26.add("违法犯罪情况");
        List<String> head27 = new ArrayList<String>();
        head27.add("备注");
        list.add(head0);
        list.add(head1);
        list.add(head2);
@@ -1174,6 +1234,17 @@
        list.add(head14);
        list.add(head15);
        list.add(head16);
        list.add(head17);
        list.add(head18);
        list.add(head19);
        list.add(head20);
        list.add(head21);
        list.add(head22);
        list.add(head23);
        list.add(head24);
        list.add(head25);
        list.add(head26);
        list.add(head27);
        return list;
    }

@@ -1195,33 +1266,85 @@
        List<String> head6 = new ArrayList<String>();
        head6.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head7 = new ArrayList<String>();
        head7.add("*楼排号");
        head7.add("楼排号");
        List<String> head8 = new ArrayList<String>();
        head8.add("*单元号");
        head8.add("单元号");
        List<String> head9 = new ArrayList<String>();
        head9.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head9.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head10 = new ArrayList<String>();
        head10.add("*是否租住（自住/租住）");
        head10.add("是否租住（是/否）");
        List<String> head11 = new ArrayList<String>();
        head11.add("*房屋状态(自住/租住/其他)");
        head11.add("房屋状态(自住/租住/其他)");
        List<String> head12 = new ArrayList<String>();
        head12.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head12.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head13 = new ArrayList<String>();
        head13.add("*管控状态(常规/关注/管控)");
        head13.add("控状态(常规/关注/管控)");
        List<String> head14 = new ArrayList<String>();
        head14.add("本地/外地");
        List<String> head15 = new ArrayList<String>();
        head15.add("户口所在地");
        List<String> head16 = new ArrayList<String>();
        head16.add("*矫正开始时间");
        head16.add("学历");
        List<String> head17 = new ArrayList<String>();
        head17.add("矫正结束时间");
        head17.add("社区矫正人员编号");
        List<String> head18 = new ArrayList<String>();
        head18.add("矫正类型");
        head18.add("原羁押场所");
        List<String> head19 = new ArrayList<String>();
        head19.add("罪名");
        head19.add("矫正类别");
        List<String> head20 = new ArrayList<String>();
        head20.add("备注");
        head20.add("案件类别");
        List<String> head21 = new ArrayList<String>();
        head21.add("具体罪名");
        List<String> head22 = new ArrayList<String>();
        head22.add("原判刑期");
        List<String> head23 = new ArrayList<String>();
        head23.add("原判刑开始日期");
        List<String> head24 = new ArrayList<String>();
        head24.add("原判刑结束日期");
        List<String> head25 = new ArrayList<String>();
        head25.add("矫正开始日期");
        List<String> head26 = new ArrayList<String>();
        head26.add("矫正结束日期");
        List<String> head27 = new ArrayList<String>();
        head27.add("接收方式");
        List<String> head28 = new ArrayList<String>();
        head28.add("是否累惯犯");
        List<String> head29 = new ArrayList<String>();
        head29.add("四史情况");
        List<String> head30 = new ArrayList<String>();
        head30.add("三涉情况");
        List<String> head31 = new ArrayList<String>();
        head31.add("是否建立矫正小组");
        List<String> head32 = new ArrayList<String>();
        head32.add("矫正小组人员组成情况");
        List<String> head33 = new ArrayList<String>();
        head33.add("矫正解除（终止）类型");
        List<String> head34 = new ArrayList<String>();
        head34.add("是否有脱管");
        List<String> head35 = new ArrayList<String>();
        head35.add("脱管原因");
        List<String> head36 = new ArrayList<String>();
        head36.add("脱管纠正情况");
        List<String> head37 = new ArrayList<String>();
        head37.add("检察监督脱管情况");
        List<String> head38 = new ArrayList<String>();
        head38.add("是否有漏管");
        List<String> head39 = new ArrayList<String>();
        head39.add("漏管原因");
        List<String> head40 = new ArrayList<String>();
        head40.add("漏管纠正情况");
        List<String> head41 = new ArrayList<String>();
        head41.add("检察监督漏管情况");
        List<String> head42 = new ArrayList<String>();
        head42.add("奖惩情况");
        List<String> head43 = new ArrayList<String>();
        head43.add("是否重新犯罪");
        List<String> head44 = new ArrayList<String>();
        head44.add("重新犯罪名称");
        List<String> head45 = new ArrayList<String>();
        head45.add("刑罚变更执行情况");
        List<String> head46 = new ArrayList<String>();
        head46.add("备注");
        list.add(head0);
        list.add(head1);
        list.add(head2);
@@ -1243,6 +1366,32 @@
        list.add(head18);
        list.add(head19);
        list.add(head20);
        list.add(head21);
        list.add(head22);
        list.add(head23);
        list.add(head24);
        list.add(head25);
        list.add(head26);
        list.add(head27);
        list.add(head28);
        list.add(head29);
        list.add(head30);
        list.add(head31);
        list.add(head32);
        list.add(head33);
        list.add(head34);
        list.add(head35);
        list.add(head36);
        list.add(head37);
        list.add(head38);
        list.add(head39);
        list.add(head40);
        list.add(head41);
        list.add(head42);
        list.add(head43);
        list.add(head44);
        list.add(head45);
        list.add(head46);
        return list;
    }

@@ -1260,19 +1409,19 @@
        List<String> head4 = new ArrayList<String>();
        head4.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head5 = new ArrayList<String>();
        head5.add("*楼排号");
        head5.add("楼排号");
        List<String> head6 = new ArrayList<String>();
        head6.add("*单元号");
        head6.add("单元号");
        List<String> head7 = new ArrayList<String>();
        head7.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head7.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head8 = new ArrayList<String>();
        head8.add("*是否租住（自住/租住）");
        head8.add("是否租住（是/否）");
        List<String> head9 = new ArrayList<String>();
        head9.add("*房屋状态(自住/租住/其他)");
        head9.add("房屋状态(自住/租住/其他)");
        List<String> head10 = new ArrayList<String>();
        head10.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head10.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head11 = new ArrayList<String>();
        head11.add("*管控状态(常规/关注/管控)");
        head11.add("控状态(常规/关注/管控)");
        List<String> head12 = new ArrayList<String>();
        head12.add("本地/外地");
        List<String> head13 = new ArrayList<String>();
@@ -1282,15 +1431,31 @@
        List<String> head15 = new ArrayList<String>();
        head15.add("经济状况");
        List<String> head16 = new ArrayList<String>();
        head16.add("监护人");
        head16.add("人员类型");
        List<String> head17 = new ArrayList<String>();
        head17.add("监护人电话");
        head17.add("家庭情况");
        List<String> head18 = new ArrayList<String>();
        head18.add("与患者关系");
        head18.add("监护人姓名");
        List<String> head19 = new ArrayList<String>();
        head19.add("目前诊断");
        head19.add("与监护人关系");
        List<String> head20 = new ArrayList<String>();
        head20.add("其他");
        head20.add("监护人公民身份号码");
        List<String> head21 = new ArrayList<String>();
        head21.add("监护人联系方式");
        List<String> head22 = new ArrayList<String>();
        head22.add("监护人居住详址");
        List<String> head23 = new ArrayList<String>();
        head23.add("帮扶人姓名");
        List<String> head24 = new ArrayList<String>();
        head24.add("帮扶人联系方式");
        List<String> head25 = new ArrayList<String>();
        head25.add("帮扶手段");
        List<String> head26 = new ArrayList<String>();
        head26.add("帮扶情况");
        List<String> head27 = new ArrayList<String>();
        head27.add("是否违法犯罪");
        List<String> head28 = new ArrayList<String>();
        head28.add("违法犯罪情况");
        list.add(head0);
        list.add(head1);
        list.add(head2);
@@ -1312,6 +1477,14 @@
        list.add(head18);
        list.add(head19);
        list.add(head20);
        list.add(head21);
        list.add(head22);
        list.add(head23);
        list.add(head24);
        list.add(head25);
        list.add(head26);
        list.add(head27);
        list.add(head28);
        return list;
    }

@@ -1339,29 +1512,33 @@
        List<String> head9 = new ArrayList<String>();
        head9.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head10 = new ArrayList<String>();
        head10.add("*楼排号");
        head10.add("楼排号");
        List<String> head11 = new ArrayList<String>();
        head11.add("*单元号");
        head11.add("单元号");
        List<String> head12 = new ArrayList<String>();
        head12.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head12.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head13 = new ArrayList<String>();
        head13.add("*是否租住（自住/租住）");
        head13.add("是否租住（是/否）");
        List<String> head14 = new ArrayList<String>();
        head14.add("*房屋状态(自住/租住/其他)");
        head14.add("房屋状态(自住/租住/其他)");
        List<String> head15 = new ArrayList<String>();
        head15.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head15.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head16 = new ArrayList<String>();
        head16.add("*管控状态(常规/关注/管控)");
        head16.add("控状态(常规/关注/管控)");
        List<String> head17 = new ArrayList<String>();
        head17.add("本地/外地");
        List<String> head18 = new ArrayList<String>();
        head18.add("户口所在地");
        List<String> head19 = new ArrayList<String>();
        head19.add("邪教名称");
        head19.add("邪教名称（涉邪组织）");
        List<String> head20 = new ArrayList<String>();
        head20.add("基本情况");
        head20.add("基本情况（参加邪教的活动情况）");
        List<String> head21 = new ArrayList<String>();
        head21.add("备注");
        head21.add("参加邪教时间");
        List<String> head22 = new ArrayList<String>();
        head22.add("是否对外宣传");
        List<String> head23 = new ArrayList<String>();
        head23.add("备注");
        list.add(head0);
        list.add(head1);
        list.add(head2);
@@ -1384,6 +1561,8 @@
        list.add(head19);
        list.add(head20);
        list.add(head21);
        list.add(head22);
        list.add(head23);
        return list;
    }

@@ -1407,19 +1586,19 @@
        List<String> head7 = new ArrayList<String>();
        head7.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head8 = new ArrayList<String>();
        head8.add("*楼排号");
        head8.add("楼排号");
        List<String> head9 = new ArrayList<String>();
        head9.add("*单元号");
        head9.add("单元号");
        List<String> head10 = new ArrayList<String>();
        head10.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head10.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head11 = new ArrayList<String>();
        head11.add("*是否租住（自住/租住）");
        head11.add("是否租住（是/否）");
        List<String> head12 = new ArrayList<String>();
        head12.add("*房屋状态(自住/租住/其他)");
        head12.add("房屋状态(自住/租住/其他)");
        List<String> head13 = new ArrayList<String>();
        head13.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head13.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head14 = new ArrayList<String>();
        head14.add("*管控状态(常规/关注/管控)");
        head14.add("控状态(常规/关注/管控)");
        List<String> head15 = new ArrayList<String>();
        head15.add("本地/外地");
        List<String> head16 = new ArrayList<String>();
@@ -1433,7 +1612,41 @@
        List<String> head20 = new ArrayList<String>();
        head20.add("是否列管");
        List<String> head21 = new ArrayList<String>();
        head21.add("备注");
        head21.add("是否累犯");
        List<String> head22 = new ArrayList<String>();
        head22.add("原判刑期");
        List<String> head23 = new ArrayList<String>();
        head23.add("服刑日期");
        List<String> head24 = new ArrayList<String>();
        head24.add("原罪名");
        List<String> head25 = new ArrayList<String>();
        head25.add("释放日期");
        List<String> head26 = new ArrayList<String>();
        head26.add("服刑场所");
        List<String> head27 = new ArrayList<String>();
        head27.add("危险性评估");
        List<String> head28 = new ArrayList<String>();
        head28.add("衔接日期");
        List<String> head29 = new ArrayList<String>();
        head29.add("衔接情况");
        List<String> head30 = new ArrayList<String>();
        head30.add("是否重新犯罪");
        List<String> head31 = new ArrayList<String>();
        head31.add("重新犯罪罪名");
        List<String> head32 = new ArrayList<String>();
        head32.add("安置情况");
        List<String> head33 = new ArrayList<String>();
        head33.add("安置日期");
        List<String> head34 = new ArrayList<String>();
        head34.add("未安置原因");
        List<String> head35 = new ArrayList<String>();
        head35.add("帮教开始");
        List<String> head36 = new ArrayList<String>();
        head36.add("帮教结束");
        List<String> head37 = new ArrayList<String>();
        head37.add("帮教情况");
        List<String> head38 = new ArrayList<String>();
        head38.add("备注");
        list.add(head0);
        list.add(head1);
        list.add(head2);
@@ -1456,6 +1669,23 @@
        list.add(head19);
        list.add(head20);
        list.add(head21);
        list.add(head22);
        list.add(head23);
        list.add(head24);
        list.add(head25);
        list.add(head26);
        list.add(head27);
        list.add(head28);
        list.add(head29);
        list.add(head30);
        list.add(head31);
        list.add(head32);
        list.add(head33);
        list.add(head34);
        list.add(head35);
        list.add(head36);
        list.add(head37);
        list.add(head38);
        return list;
    }

@@ -1479,19 +1709,19 @@
        List<String> head7 = new ArrayList<String>();
        head7.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head8 = new ArrayList<String>();
        head8.add("*楼排号");
        head8.add("楼排号");
        List<String> head9 = new ArrayList<String>();
        head9.add("*单元号");
        head9.add("单元号");
        List<String> head10 = new ArrayList<String>();
        head10.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head10.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head11 = new ArrayList<String>();
        head11.add("*是否租住（自住/租住）");
        head11.add("是否租住（是/否）");
        List<String> head12 = new ArrayList<String>();
        head12.add("*房屋状态(自住/租住/其他)");
        head12.add("房屋状态(自住/租住/其他)");
        List<String> head13 = new ArrayList<String>();
        head13.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head13.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head14 = new ArrayList<String>();
        head14.add("*管控状态(常规/关注/管控)");
        head14.add("控状态(常规/关注/管控)");
        List<String> head15 = new ArrayList<String>();
        head15.add("本地/外地");
        List<String> head16 = new ArrayList<String>();
@@ -1541,19 +1771,19 @@
        List<String> head8 = new ArrayList<String>();
        head8.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head9 = new ArrayList<String>();
        head9.add("*楼排号");
        head9.add("楼排号");
        List<String> head10 = new ArrayList<String>();
        head10.add("*单元号");
        head10.add("单元号");
        List<String> head11 = new ArrayList<String>();
        head11.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head11.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head12 = new ArrayList<String>();
        head12.add("*是否租住（自住/租住）");
        head12.add("是否租住（是/否）");
        List<String> head13 = new ArrayList<String>();
        head13.add("*房屋状态(自住/租住/其他)");
        head13.add("房屋状态(自住/租住/其他)");
        List<String> head14 = new ArrayList<String>();
        head14.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head14.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head15 = new ArrayList<String>();
        head15.add("*管控状态(常规/关注/管控)");
        head15.add("控状态(常规/关注/管控)");
        List<String> head16 = new ArrayList<String>();
        head16.add("本地/外地");
        List<String> head17 = new ArrayList<String>();
@@ -1600,13 +1830,13 @@
        List<String> head0 = new ArrayList<String>();
        head0.add("序号");
        List<String> head1 = new ArrayList<String>();
        head1.add("*人员状态");
        head1.add("人员状态");
        List<String> head2 = new ArrayList<String>();
        head2.add("机构");
        List<String> head3 = new ArrayList<String>();
        head3.add("姓名");
        head3.add("*姓名");
        List<String> head4 = new ArrayList<String>();
        head4.add("身份证号码");
        head4.add("*身份证号码");
        List<String> head5 = new ArrayList<String>();
        head5.add("联系电话");
        List<String> head6 = new ArrayList<String>();
@@ -1622,19 +1852,19 @@
        List<String> head11 = new ArrayList<String>();
        head11.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head12 = new ArrayList<String>();
        head12.add("*楼排号");
        head12.add("楼排号");
        List<String> head13 = new ArrayList<String>();
        head13.add("*单元号");
        head13.add("单元号");
        List<String> head14 = new ArrayList<String>();
        head14.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head14.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head15 = new ArrayList<String>();
        head15.add("*是否租住（自住/租住）");
        head15.add("是否租住（是/否）");
        List<String> head16 = new ArrayList<String>();
        head16.add("*房屋状态(自住/租住/其他)");
        head16.add("房屋状态(自住/租住/其他)");
        List<String> head17 = new ArrayList<String>();
        head17.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head17.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head18 = new ArrayList<String>();
        head18.add("*管控状态(常规/关注/管控)");
        head18.add("控状态(常规/关注/管控)");
        List<String> head19 = new ArrayList<String>();
        head19.add("入伍时间");
        List<String> head20 = new ArrayList<String>();
@@ -1812,19 +2042,19 @@
        List<String> head10 = new ArrayList<String>();
        head10.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head11 = new ArrayList<String>();
        head11.add("*楼排号");
        head11.add("楼排号");
        List<String> head12 = new ArrayList<String>();
        head12.add("*单元号");
        head12.add("单元号");
        List<String> head13 = new ArrayList<String>();
        head13.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head13.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head14 = new ArrayList<String>();
        head14.add("*是否租住（自住/租住）");
        head14.add("是否租住（是/否）");
        List<String> head15 = new ArrayList<String>();
        head15.add("*房屋状态(自住/租住/其他)");
        head15.add("房屋状态(自住/租住/其他)");
        List<String> head16 = new ArrayList<String>();
        head16.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head16.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head17 = new ArrayList<String>();
        head17.add("*管控状态(常规/关注/管控)");
        head17.add("控状态(常规/关注/管控)");
        List<String> head18 = new ArrayList<String>();
        head18.add("本地/外地");
        List<String> head19 = new ArrayList<String>();
@@ -1881,73 +2111,75 @@
        List<String> head10 = new ArrayList<String>();
        head10.add("户主身份证号");
        List<String> head11 = new ArrayList<String>();
        head11.add("*街/路/巷");
        head11.add("户主编码");
        List<String> head12 = new ArrayList<String>();
        head12.add("*小区号（政府对于每个小区都有特定编号）");
        head12.add("*街/路/巷");
        List<String> head13 = new ArrayList<String>();
        head13.add("*楼排号");
        head13.add("*小区号（政府对于每个小区都有特定编号）");
        List<String> head14 = new ArrayList<String>();
        head14.add("*单元号");
        head14.add("楼排号");
        List<String> head15 = new ArrayList<String>();
        head15.add("*户室（四位数表示。前两位楼层，后两位户号）");
        head15.add("单元号");
        List<String> head16 = new ArrayList<String>();
        head16.add("*是否租住（自住/租住）");
        head16.add("户室（四位数表示。前两位楼层，后两位户号）");
        List<String> head17 = new ArrayList<String>();
        head17.add("*房屋状态(自住/租住/其他)");
        head17.add("是否租住（是/否）");
        List<String> head18 = new ArrayList<String>();
        head18.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
        head18.add("房屋状态(自住/租住/其他)");
        List<String> head19 = new ArrayList<String>();
        head19.add("*管控状态(常规/关注/管控)");
        head19.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
        List<String> head20 = new ArrayList<String>();
        head20.add("本地/外地");
        head20.add("控状态(常规/关注/管控)");
        List<String> head21 = new ArrayList<String>();
        head21.add("户口所在地");
        head21.add("本地/外地");
        List<String> head22 = new ArrayList<String>();
        head22.add("居住地邮编");
        head22.add("户口所在地");
        List<String> head23 = new ArrayList<String>();
        head23.add("救助证号");
        head23.add("居住地邮编");
        List<String> head24 = new ArrayList<String>();
        head24.add("保障人口数");
        head24.add("救助证号");
        List<String> head25 = new ArrayList<String>();
        head25.add("家庭人口数");
        head25.add("保障人口数");
        List<String> head26 = new ArrayList<String>();
        head26.add("开户人");
        head26.add("家庭人口数");
        List<String> head27 = new ArrayList<String>();
        head27.add("开户银行");
        head27.add("开户人");
        List<String> head28 = new ArrayList<String>();
        head28.add("开户人身份证号");
        head28.add("开户银行");
        List<String> head29 = new ArrayList<String>();
        head29.add("银行账号");
        head29.add("开户人身份证号");
        List<String> head30 = new ArrayList<String>();
        head30.add("供养机构");
        head30.add("银行账号");
        List<String> head31 = new ArrayList<String>();
        head31.add("资金发放方式");
        head31.add("供养机构");
        List<String> head32 = new ArrayList<String>();
        head32.add("保障金额");
        head32.add("资金发放方式");
        List<String> head33 = new ArrayList<String>();
        head33.add("调剂金额");
        head33.add("保障金额");
        List<String> head34 = new ArrayList<String>();
        head34.add("差额救助金额");
        head34.add("调剂金额");
        List<String> head35 = new ArrayList<String>();
        head35.add("分类施保金额");
        head35.add("差额救助金额");
        List<String> head36 = new ArrayList<String>();
        head36.add("家庭月总收入");
        head36.add("分类施保金额");
        List<String> head37 = new ArrayList<String>();
        head37.add("家庭月均收入");
        head37.add("家庭月总收入");
        List<String> head38 = new ArrayList<String>();
        head38.add("家庭月支出");
        head38.add("家庭月均收入");
        List<String> head39 = new ArrayList<String>();
        head39.add("经度");
        head39.add("家庭月支出");
        List<String> head40 = new ArrayList<String>();
        head40.add("纬度");
        head40.add("经度");
        List<String> head41 = new ArrayList<String>();
        head41.add("始发年月");
        head41.add("纬度");
        List<String> head42 = new ArrayList<String>();
        head42.add("护理费");
        head42.add("始发年月");
        List<String> head43 = new ArrayList<String>();
        head43.add("申请理由");
        head43.add("护理费");
        List<String> head44 = new ArrayList<String>();
        head44.add("审核意见");
        head44.add("申请理由");
        List<String> head45 = new ArrayList<String>();
        head45.add("审核意见");
        list.add(head0);
        list.add(head1);
        list.add(head2);
@@ -1993,6 +2225,7 @@
        list.add(head42);
        list.add(head43);
        list.add(head44);
        list.add(head45);
        return list;
    }

@@ -2758,4 +2991,60 @@
            return R.fail();
        }
    }

    @ApiOperation(value = "下载导入失败低保户数据")
    @PostMapping("/download/error/populationLowSecurity")
    public R downloadErrorLowSecurityPopulation(@RequestParam(value = "key") String key) {
        List<ComMngPopulationLowSecurityMistakeExcelVO> list = new ArrayList<>();
        Boolean isExits = stringRedisTemplate.hasKey(key);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        if(isExits){
            String json = valueOperations.get(key);
            list= JSONArray.parseArray(json,ComMngPopulationLowSecurityMistakeExcelVO.class);
        }
//        List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class);
        //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name =  "低保户错误数据" + nowDate +".xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngPopulationLowSecurityMistakeExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("低保户错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(excelUrl + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml

@@ -20,3 +20,16 @@
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: communitybackstage

 springcloud_k8s_panzhihuazhihuishequ/config_server/pom.xml

@@ -40,7 +40,15 @@
            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
        </dependency>


        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>

    </dependencies>


 springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml

@@ -26,3 +26,16 @@
          password: huanghongfa123456
#          basedir: F:\nahan\config-repo\config-repo

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: config

 springcloud_k8s_panzhihuazhihuishequ/eureka_server/pom.xml

@@ -25,7 +25,15 @@
            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
        </dependency>


        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>

    </dependencies>


 springcloud_k8s_panzhihuazhihuishequ/eureka_server/src/main/resources/application.yml

@@ -14,3 +14,16 @@
        enable-self-preservation: false  #是否开启自我保护模式
        eviction‐interval‐timer‐in‐ms: 10000 #服务注册表清理间隔（单位毫秒，默认是60*1000)

management:
    endpoints:
        web:
            exposure:
                include: '*'

    endpoint:
        health:
            show-details: always

    metrics:
        tags:
            application: eureka

 springcloud_k8s_panzhihuazhihuishequ/grid_app/pom.xml

@@ -48,6 +48,15 @@
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>

    <build>

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml

@@ -20,3 +20,16 @@
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: gridapp

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/pom.xml

@@ -48,6 +48,15 @@
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>

    <build>

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml

@@ -20,3 +20,16 @@
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: gridbackstage

 springcloud_k8s_panzhihuazhihuishequ/pom.xml

@@ -185,6 +185,17 @@
                <artifactId>feign-httpclient</artifactId>
                <version>${feign-httpclient.version}</version>
            </dependency>
            <!--添加监控依赖包-->
            <dependency>
                <groupId>io.micrometer</groupId>
                <artifactId>micrometer-registry-prometheus</artifactId>
                <version>1.5.1</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-actuator</artifactId>
                <version>2.3.4.RELEASE</version>
            </dependency>

        </dependencies>
    </dependencyManagement>

 springcloud_k8s_panzhihuazhihuishequ/service_community/pom.xml

@@ -73,6 +73,15 @@
            <artifactId>commons-lang</artifactId>
            <version>2.6</version>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActUserWalletApi.java

@@ -42,10 +42,41 @@
        return comActUserWalletService.userWalletSettlementAdmin(settlementAdminDTO);
    }

    /**
     * 分页查询交易记录
     *
     * @param pageTradeAdminDTO 请求参数
     * @return 交易记录列表
     */
    @PostMapping("/trade/page")
    public R tradePage(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return comActUserWalletTradeService.pageUserWalletTradeAdmin(pageTradeAdminDTO);
    }

    /**
     * 查询用户交易记录总额
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录总额
     */
    @PostMapping("/trade/total")
    public R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return comActUserWalletTradeService.getTradeUserTotalWalletTradeAdmin(pageTradeAdminDTO);
    }

    @PostMapping("/trade/statistics")
    public R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return comActUserWalletTradeService.getTradeUserStatisticsAdmin(pageTradeAdminDTO);
    }

    @PostMapping("/trade/export")
    public R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return comActUserWalletTradeService.getTradeUserTotalWalletTradeExportAdmin(pageTradeAdminDTO);
    }

    @PostMapping("/trade/reward/export")
    public R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return comActUserWalletTradeService.getTradeUserTotalJLWalletTradeExportAdmin(pageTradeAdminDTO);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComCorrectPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 16:45:25
 * @describe 社区矫正人员表前端控制器
 */
@RestController
@RequestMapping("/correct/population")
public class ComCorrectPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComCultPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 17:40:24
 * @describe 邪教人员表前端控制器
 */
@RestController
@RequestMapping("/cult/population")
public class ComCultPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComDisabilityPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 19:54:57
 * @describe 实有人口导入》残疾人表前端控制器
 */
@RestController
@RequestMapping("/disability/population")
public class ComDisabilityPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComDrugPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 15:37:19
 * @describe 吸毒人员表前端控制器
 */
@RestController
@RequestMapping("/drug/population")
public class ComDrugPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComKeyPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 17:41:05
 * @describe 前端控制器
 */
@RestController
@RequestMapping("/key/population")
public class ComKeyPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComLowSecurityPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 19:52:55
 * @describe 实有人口导入》低保户人员表前端控制器
 */
@RestController
@RequestMapping("/lowSecurity/population")
public class ComLowSecurityPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMajorPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 17:14:17
 * @describe 重精人员表前端控制器
 */
@RestController
@RequestMapping("/major/population")
public class ComMajorPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComRehabilitationPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 17:40:41
 * @describe 前端控制器
 */
@RestController
@RequestMapping("/rehabilitation/population")
public class ComRehabilitationPopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSentencePopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 17:41:26
 * @describe 前端控制器
 */
@RestController
@RequestMapping("/sentence/population")
public class ComSentencePopulationApi {

}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComVeteransPopulationApi.java

New file
@@ -0,0 +1,16 @@
package com.panzhihua.service_community.api;

import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @auther txb
 * @create 2021-08-09 19:56:46
 * @describe 实有人口导入》退役军人表前端控制器
 */
@RestController
@RequestMapping("/veterans/population")
public class ComVeteransPopulationApi {

}


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

@@ -447,6 +447,19 @@
    }

    /**
     * 批量导入低保户
     *
     * @param list        低保户数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("/population/importLowSecurity")
    public R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId) {
        return comMngPopulationService.listSaveLowSecurityPopulation(list, communityId);
    }

    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list        用户信息

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -169,6 +169,8 @@
            ")t order by t.create_at desc "+
            "</script>")
    IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);

    IPage<ComActEasyPhotoVO> pageEasyPhotoAdmin(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
    @Select("SELECT  " +
            "p.id, " +
            "p.sponsor_id, " +
@@ -178,6 +180,7 @@
            "u.`name` sponsorName, " +
            "u.nick_name userNickName, " +
            "su.`name` handlerName, " +
            "su1.`name` completeName, " +
            "u.`image_url`, " +
            "u.phone, " +
            "p.detail, " +
@@ -200,6 +203,7 @@
            "com_act_easy_photo p " +
            "JOIN sys_user u on p.sponsor_id=u.user_id " +
            "LEFT JOIN sys_user su on p.handler_id=su.user_id " +
            "LEFT JOIN sys_user su1 on p.complete_id=su1.user_id " +
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
            "WHERE p.del_tag = 0 and p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
@@ -303,15 +307,15 @@
            "FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ")
    EastPhotoVO countByTime(@Param("start")String start, @Param("end")String end, @Param("nowDate")String nowDate, @Param("communityId")Long communityId);

    @Select("SELECT " +
            " count( id ) AS examineNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} and del_tag = 0 ) AS verificationNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} and del_tag = 0 ) AS rejectNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} and del_tag = 0 ) AS completeNum  " +
            "FROM " +
            " com_act_easy_photo  " +
            "WHERE " +
            " `status` = 1  " +
            " AND community_id = #{communityId} and del_tag = 0")
//    @Select("SELECT " +
//            " count( id ) AS examineNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} and del_tag = 0 ) AS verificationNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} and del_tag = 0 ) AS rejectNum, " +
//            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} and del_tag = 0 ) AS completeNum  " +
//            "FROM " +
//            " com_act_easy_photo  " +
//            "WHERE " +
//            " `status` = 1  " +
//            " AND community_id = #{communityId} and del_tag = 0")
    ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoFeedbackMapper.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoFeedbackVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoFeedbackDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther lyq
 * @create 2021-08-13 14:40:06
 * @describe mapper类
 */
@Mapper
public interface ComActEasyPhotoFeedbackMapper extends BaseMapper<ComActEasyPhotoFeedbackDO> {

    List<ComActEasyPhotoFeedbackVO> getPhotoFeedbackList(@Param("easyId") Long easyId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -54,10 +54,10 @@
            "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')   " +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == &quot;&quot;'>" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id  " +
            "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            " JOIN sys_user su ON w.responsible_id = su.user_id  " +
            " JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')   " +
            " </if> " +
            " <where>" +
@@ -130,7 +130,7 @@
            "FROM " +
            "com_act_micro_wish w " +
            "JOIN sys_user u ON w.sponsor_id = u.user_id " +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id  " +
            "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id  " +
            "WHERE " +
            "w.id =#{id}"+
@@ -195,7 +195,7 @@
            "FROM " +
            " com_act_micro_wish AS camw " +
            " LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " +
            " LEFT JOIN sys_user AS su1 ON su1.user_id = camw.responsible_id " +
            " LEFT JOIN com_pb_service_team AS su1 ON su1.id = camw.responsible_id " +
            " <where> " +
            "<if test='microListDTO.status != null'>" +
            "AND camw.`status` =#{microListDTO.status}  " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -42,6 +42,7 @@
            "canc.last_fabulous_num," +
            "canc.last_views_num," +
            "canc.type," +
            "canc.topic_id," +
            "su.nick_name as name," +
            "su.community_id," +
            "canct.name as topicName," +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletTradeMapper.java

@@ -5,11 +5,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.community.ComActUserWalletTradeExcelVO;
import com.panzhihua.common.model.vos.community.ComActUserWalletTradeRewardExcelVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeAdminVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeVO;
import com.panzhihua.service_community.model.dos.ComActUserWalletTradeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
import java.util.List;

/**
 * @auther lyq
@@ -26,5 +32,24 @@
     */
    IPage<ComActWalletTradeVO> getUserWalletTradeList(Page page, @Param("walletTradeDTO") PageComActWalletTradeDTO walletTradeDTO);

    /**
     * 分页查询交易记录
     *
     * @param pageTradeAdminDTO 请求参数
     * @return 交易记录列表
     */
    IPage<ComActWalletTradeAdminVO> getUserWalletTradeAdmin(Page page, @Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询用户交易记录总额
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录总额
     */
    BigDecimal getTradeUserTotalWalletTradeAdmin(@Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    List<ComActUserWalletTradeExcelVO> getTradeUserTotalWalletTradeExportAdmin(@Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    List<ComActUserWalletTradeRewardExcelVO> getTradeUserTotalJLWalletTradeExportAdmin(@Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    ComActWalletTradeStatisticsAdminVO getTradeUserStatisticsAdmin(@Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCorrectPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComCorrectPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 16:45:25
 * @describe 社区矫正人员表mapper类
 */
@Mapper
public interface ComCorrectPopulationDAO extends BaseMapper<ComCorrectPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCultPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComCultPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 17:40:24
 * @describe 邪教人员表mapper类
 */
@Mapper
public interface ComCultPopulationDAO extends BaseMapper<ComCultPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComDisabilityPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComDisabilityPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 19:54:57
 * @describe 实有人口导入》残疾人表mapper类
 */
@Mapper
public interface ComDisabilityPopulationDAO extends BaseMapper<ComDisabilityPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComDrugPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComDrugPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 15:37:19
 * @describe 吸毒人员表mapper类
 */
@Mapper
public interface ComDrugPopulationDAO extends BaseMapper<ComDrugPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComKeyPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComKeyPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 17:41:05
 * @describe mapper类
 */
@Mapper
public interface ComKeyPopulationDAO extends BaseMapper<ComKeyPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComLowSecurityPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComLowSecurityPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 19:52:55
 * @describe 实有人口导入》低保户人员表mapper类
 */
@Mapper
public interface ComLowSecurityPopulationDAO extends BaseMapper<ComLowSecurityPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMajorPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComMajorPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 17:14:17
 * @describe 重精人员表mapper类
 */
@Mapper
public interface ComMajorPopulationDAO extends BaseMapper<ComMajorPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -153,6 +153,7 @@
            "cmp.label,  " +
            "cmp.marriage,  " +
            "cmp.culture_level,  " +
            "cmp.profession,  " +
            "cmp.out_or_local,  " +
            "cmp.census_register,  " +
            "cmp.healthy,  " +
@@ -274,6 +275,15 @@
            ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
            ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','刑满释放','%')) as rehabilitationTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal " +
            " from com_mng_population as cmp where act_id = #{communityId}")
    ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseDAO.java

@@ -28,7 +28,7 @@
@Mapper
public interface ComMngPopulationHouseDAO extends BaseMapper<ComMngPopulationHouseDO> {

    @Select("select cmphu.house_id,cmph.address,cmph.status,cmphu.popul_id,cmphu.popul_id,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu " +
    @Select("select cmphu.house_id,cmph.address,cmph.status,cmphu.popul_id,cmphu.residence,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu " +
            " left join com_mng_population_house as cmph on cmph.id = cmphu.house_id " +
            " where cmphu.popul_id = #{populId}")
    List<ComMngHouseVo> getPopulHouseListByPopulId(@Param("populId")Long populId);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComRehabilitationPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComRehabilitationPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 17:40:41
 * @describe mapper类
 */
@Mapper
public interface ComRehabilitationPopulationDAO extends BaseMapper<ComRehabilitationPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSentencePopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComSentencePopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 17:41:26
 * @describe mapper类
 */
@Mapper
public interface ComSentencePopulationDAO extends BaseMapper<ComSentencePopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComVeteransPopulationDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComVeteransPopulationDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @auther txb
 * @create 2021-08-09 19:56:46
 * @describe 实有人口导入》退役军人表mapper类
 */
@Mapper
public interface ComVeteransPopulationDAO extends BaseMapper<ComVeteransPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -141,6 +141,10 @@
     * 活动奖励金额
     */
    private BigDecimal activityAmount;
    /**
     * 完成人id
     */
    private Long completeId;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通 4.一般）

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoFeedbackDO.java

New file
@@ -0,0 +1,66 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther lyq
 * @create 2021-08-13 14:40:06
 * @describe 实体类
 */

@Data
@TableName("com_act_easy_photo_feedback")
public class ComActEasyPhotoFeedbackDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 随手拍id
     */
    private Long easyId;

    /**
     * 反馈内容
     */
    private String feedbackContent;

    /**
     * 反馈图片地址，多个以,隔开
     */
    private String feedbackImg;

    /**
     * 反馈时间
     */
    private Date createAt;

    /**
     * 反馈人
     */
    private Long createBy;

    @Override
    public String toString() {
        return "ComActEasyPhotoFeedbackDO{" +
                "id=" + id +
                ", easyId=" + easyId +
                ", feedbackContent=" + feedbackContent +
                ", feedbackImg=" + feedbackImg +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java

New file
@@ -0,0 +1,286 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:57:35
 * @describe 社区矫正人员表实体类
 */

@Data
@TableName("com_correct_population")
@EncryptDecryptClass
public class ComCorrectPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 名字
    */
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    private String phone;

    /**
    * 矫正类别
    */
    private String correctType;

    /**
    * 矫正开始时间
    */
    private Date correctBegin;

    /**
    * 矫正结束时间
    */
    private Date correctEnd;

    /**
    * 接收方式
    */
    private String receiveMethod;

    /**
    * 是否累惯犯（1.是 0.否）
    */
    private Integer isRecidivist;

    /**
    * 四史情况
    */
    private String fourHistory;

    /**
    * 三涉情况
    */
    private String threeInvovle;

    /**
    * 是否建立矫正小组（1.是 0.否）
    */
    private Integer isCorrectGroup;

    /**
    * 矫正小组人员组成情况
    */
    private String correctGroupConstitute;

    /**
    * 矫正解除（终止）类型
    */
    private String correctRelieveType;

    /**
    * 是否有脱管（1.是 0.否）
    */
    private Integer isOutControl;

    /**
    * 脱管原因
    */
    private String outControlReason;

    /**
    * 脱管纠正情况
    */
    private String outControlCorrect;

    /**
    * 检察监督脱管情况
    */
    private String inspectOutControl;

    /**
    * 是否有漏管（1.是 0.否）
    */
    private Integer isMissControl;

    /**
    * 漏管原因
    */
    private String missControlReason;

    /**
    * 漏管纠正情况
    */
    private String missControlCorrect;

    /**
    * 检察监督漏管
    */
    private String inspectMissControl;

    /**
    * 奖惩情况
    */
    private String rewardAndPunishiment;

    /**
    * 是否重新犯罪（1.是 0.否）
    */
    private Integer isAgainCrime;

    /**
    * 重新犯罪名称
    */
    private String againCrimeName;

    /**
    * 刑罚变更执行情况
    */
    private String pubishmentChange;

    /**
    * 案件类别
    */
    private String caseType;

    /**
    * 具体罪名
    */
    private String specificCharge;

    /**
    * 原判刑期
    */
    private String originalTerm;

    /**
    * 原判刑开始日期
    */
    private Date originalTermBegin;

    /**
    * 原判刑结束日期
    */
    private Date originalTermEnd;

    /**
    * 学历
    */
    private Integer cultureLevel;

    /**
    * 社区矫正人员编号
    */
    private String correctPersonCode;

    /**
    * 原羁押场所
    */
    private String originalCustodyplace;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComCorrectPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", correctType=" + correctType +
                ", correctBegin=" + correctBegin +
                ", correctEnd=" + correctEnd +
                ", receiveMethod=" + receiveMethod +
                ", isRecidivist=" + isRecidivist +
                ", fourHistory=" + fourHistory +
                ", threeInvovle=" + threeInvovle +
                ", isCorrectGroup=" + isCorrectGroup +
                ", correctGroupConstitute=" + correctGroupConstitute +
                ", correctRelieveType=" + correctRelieveType +
                ", isOutControl=" + isOutControl +
                ", outControlReason=" + outControlReason +
                ", outControlCorrect=" + outControlCorrect +
                ", inspectOutControl=" + inspectOutControl +
                ", isMissControl=" + isMissControl +
                ", missControlReason=" + missControlReason +
                ", missControlCorrect=" + missControlCorrect +
                ", inspectMissControl=" + inspectMissControl +
                ", rewardAndPunishiment=" + rewardAndPunishiment +
                ", isAgainCrime=" + isAgainCrime +
                ", againCrimeName=" + againCrimeName +
                ", pubishmentChange=" + pubishmentChange +
                ", caseType=" + caseType +
                ", specificCharge=" + specificCharge +
                ", originalTerm=" + originalTerm +
                ", originalTermBegin=" + originalTermBegin +
                ", originalTermEnd=" + originalTermEnd +
                ", cultureLevel=" + cultureLevel +
                ", correctPersonCode=" + correctPersonCode +
                ", originalCustodyplace=" + originalCustodyplace +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCultPopulationDO.java

New file
@@ -0,0 +1,124 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:58:07
 * @describe 邪教人员表实体类
 */

@Data
@TableName("com_cult_population")
@EncryptDecryptClass
public class ComCultPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 名字
    */
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 邪教名称
    */
    private String cultName;

    /**
    * 基本情况（参加邪教的活动情况）
    */
    private String basicSituation;

    /**
    * 参加邪教时间
    */
    private Date joinCultDate;

    /**
    * 是否对外宣传（1.是 0.否）
    */
    private Integer isExternalPublicity;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComCultPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", cultName=" + cultName +
                ", basicSituation=" + basicSituation +
                ", joinCultDate=" + joinCultDate +
                ", isExternalPublicity=" + isExternalPublicity +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDisabilityPopulationDO.java

New file
@@ -0,0 +1,124 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 19:48:22
 * @describe 实有人口导入》残疾人表实体类
 */

@Data
@TableName("com_disability_population")
@EncryptDecryptClass
public class ComDisabilityPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
                @TableId(type = IdType.INPUT)
                private Long id;

    /**
    * 人口id
    */
        private Long populationId;

    /**
    * 街道id
    */
        private Long streetId;

    /**
    * 社区id
    */
        private Long communityId;

    /**
    * 名字
    */
        private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
        private String cardNo;

    /**
    * 联系电话
    */
        private String phone;

    /**
    * 办证状况
    */
        private String certificateSituation;

    /**
    * 残疾类别
    */
        private String disType;

    /**
    * 残疾等级
    */
        private String disLevel;

    /**
    * 备注
    */
        private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
        private Date createAt;

    /**
    * 创建用户
    */
        private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
        private Date updateAt;

    /**
    * 修改用户
    */
        private Long updateBy;

@Override
public String toString() {
        return "ComDisabilityPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", certificateSituation=" + certificateSituation +
                ", disType=" + disType +
                ", disLevel=" + disLevel +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComDrugPopulationDO.java

New file
@@ -0,0 +1,172 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:57:18
 * @describe 吸毒人员表实体类
 */

@Data
@TableName("com_drug_population")
@EncryptDecryptClass
public class ComDrugPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 名字
    */
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    private String phone;

    /**
    * 初次发现日期
    */
    private Date firstDate;

    /**
    * 管控情况
    */
    private String controlSituation;

    /**
    * 管控人姓名
    */
    private String controlPerson;

    /**
    * 管控人联系方式
    */
    private String controlPersonPhone;

    /**
    * 帮扶情况
    */
    private String helpSituation;

    /**
    * 帮扶人姓名
    */
    private String helpPerson;

    /**
    * 帮扶人联系方式
    */
    private String helpPersonPhone;

    /**
    * 吸毒原因
    */
    private String drugReason;

    /**
    * 吸毒后果
    */
    private String drugResult;

    /**
    * 有无犯罪史
    */
    private String haveCrime;

    /**
    * 违法犯罪情况
    */
    private String crimeSutiation;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComDrugPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", firstDate=" + firstDate +
                ", controlSituation=" + controlSituation +
                ", controlPerson=" + controlPerson +
                ", controlPersonPhone=" + controlPersonPhone +
                ", helpSituation=" + helpSituation +
                ", helpPerson=" + helpPerson +
                ", helpPersonPhone=" + helpPersonPhone +
                ", drugReason=" + drugReason +
                ", drugResult=" + drugResult +
                ", haveCrime=" + haveCrime +
                ", crimeSutiation=" + crimeSutiation +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComKeyPopulationDO.java

New file
@@ -0,0 +1,88 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 17:41:05
 * @describe 实体类
 */

@Data
@TableName("com_key_population")
@EncryptDecryptClass
public class ComKeyPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 名字
    */
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    private String phone;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComLowSecurityPopulationDO.java

New file
@@ -0,0 +1,240 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 19:48:38
 * @describe 实有人口导入》低保户人员表实体类
 */

@Data
@TableName("com_low_security_population")
@EncryptDecryptClass
public class ComLowSecurityPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
                @TableId(type = IdType.INPUT)
                private Long id;

    /**
    * 人口id
    */
        private Long populationId;

    /**
    * 街道id
    */
        private Long streetId;

    /**
    * 社区id
    */
        private Long communityId;

    /**
    * 名字
    */
        private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
        private String cardNo;

    /**
    * 联系电话
    */
        private String phone;

    /**
    * 地区
    */
        private String region;

    /**
    * 家庭编码
    */
        private String familyCode;

    /**
    * 组名称
    */
        private String groupName;

    /**
    * 分类救助类别
    */
        private String classifiedRescueCategory;

    /**
    * 申请日期
    */
        private Date applyDate;

    /**
    * 户主姓名
    */
        private String houseHolderName;

    /**
    * 户主身份证
    */
        private String houseHolderCardNo;

    /**
    * 户主编码
    */
        private String houseHolderCode;

    /**
    * 居住地邮编
    */
        private String residencePostalCode;

    /**
    * 救助证号
    */
        private String salvageCertificateNo;

    /**
    * 保障人口数
    */
        private Integer guaranteedPopulationNumber;

    /**
    * 家庭人口数
    */
        private Integer familyPopulationNumber;

    /**
    * 开户人
    */
        private String accountPerson;

    /**
    * 开户银行
    */
        private String accountBank;

    /**
    * 开户人身份证号
    */
        private String accountCardNo;

    /**
    * 银行账号
    */
        private String bankAccount;

    /**
    * 供养机构
    */
        private String supportInstitutions;

    /**
    * 资金发放方式
    */
        private String distributionMethod;

    /**
    * 保障金额
    */
        private BigDecimal guaranteedAmount;

    /**
    * 调剂金额
    */
        private BigDecimal reallocationAmount;

    /**
    * 差额救助金额
    */
        private BigDecimal differenceReliefAmount;

    /**
    * 分类施保金额
    */
        private BigDecimal classifiedInsuredAmount;

    /**
    * 家庭月总收入
    */
        private BigDecimal totalMonthlyFamilyIncome;

    /**
    * 家庭月均收入
    */
        private BigDecimal averageMonthlyFamilyIncome;

    /**
    * 家庭月支出
    */
        private BigDecimal totalMonthlyFamilyExpenditure;

    /**
    * 经度
    */
        private String lng;

    /**
    * 纬度
    */
        private String lat;

    /**
    * 始发年月
    */
        private Date originateDate;

    /**
    * 护理费
    */
        private BigDecimal nursingFee;

    /**
    * 申请理由
    */
        private String applyReason;

    /**
    * 审核意见
    */
        private String reviewComment;

    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 创建用户
     */
    private Long createBy;

    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
     * 修改用户
     */
    private Long updateBy;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java

New file
@@ -0,0 +1,178 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:57:54
 * @describe 重精人员表实体类
 */

@Data
@TableName("com_major_population")
@EncryptDecryptClass
public class ComMajorPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 名字
    */
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 经济状况
    */
    private String economicCondition;

    /**
    * 人员类型
    */
    private String personType;

    /**
    * 家庭情况
    */
    private String familySituation;

    /**
    * 监护人姓名
    */
    private String custodyPerson;

    /**
    * 与监护人关系
    */
    private Integer custodyRelation;

    /**
    * 监护人公民身份号码
    */
    private String custodyCardNo;

    /**
    * 监护人联系方式
    */
    private String custodyPersonPhone;

    /**
    * 监护人居住详址
    */
    private String custodyAddress;

    /**
    * 帮扶人姓名
    */
    private String helpPerson;

    /**
    * 帮扶人联系方式
    */
    private String helpPersonPhone;

    /**
    * 帮扶手段
    */
    private String helpMethod;

    /**
    * 帮扶情况
    */
    private String helpSituation;

    /**
    * 是否违法犯罪（1.是 0.否）
    */
    private Integer isCrime;

    /**
    * 违法犯罪情况
    */
    private String crimeSutiation;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComMajorPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", economicCondition=" + economicCondition +
                ", personType=" + personType +
                ", familySituation=" + familySituation +
                ", custodyPerson=" + custodyPerson +
                ", custodyRelation=" + custodyRelation +
                ", custodyCardNo=" + custodyCardNo +
                ", custodyPersonPhone=" + custodyPersonPhone +
                ", custodyAddress=" + custodyAddress +
                ", helpPerson=" + helpPerson +
                ", helpPersonPhone=" + helpPersonPhone +
                ", helpMethod=" + helpMethod +
                ", helpSituation=" + helpSituation +
                ", isCrime=" + isCrime +
                ", crimeSutiation=" + crimeSutiation +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java

New file
@@ -0,0 +1,226 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-10 15:58:23
 * @describe 实体类
 */

@Data
@TableName("com_rehabilitation_population")
@EncryptDecryptClass
public class ComRehabilitationPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 名字
    */
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    private String phone;

    /**
    * 与人员关系
    */
    private Integer patientRelation;

    /**
    * 列管原因及类型
    */
    private String rehabReasonAndType;

    /**
    * 是否列管（1.是 0.否）
    */
    private Integer isRehab;

    /**
    * 是否累惯犯（1.是 0.否）
    */
    private Integer isRecidivist;

    /**
    * 原判刑期
    */
    private String originalTerm;

    /**
    * 服刑日期
    */
    private Date sentenceBegin;

    /**
    * 原罪名
    */
    private String originalCharge;

    /**
    * 释放日期
    */
    private Date sentenceEnd;

    /**
    * 服刑场所
    */
    private String sentencePlace;

    /**
    * 危险性评估
    */
    private String riskAssessment;

    /**
    * 衔接日期
    */
    private Date joinDate;

    /**
    * 衔接情况
    */
    private String joinSituation;

    /**
    * 是否重新犯罪（1.是 0.否）
    */
    private Integer isAgainCrime;

    /**
    * 重新犯罪名称
    */
    private String againCrimeName;

    /**
    * 安置情况
    */
    private String placeSituation;

    /**
    * 安置日期
    */
    private Date placeDate;

    /**
    * 未安置原因
    */
    private String notPlaceReason;

    /**
    * 帮教开始
    */
    private Date helpBegin;

    /**
    * 帮教结束
    */
    private Date helpEnd;

    /**
    * 帮教情况
    */
    private String helpSituation;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComRehabilitationPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", patientRelation=" + patientRelation +
                ", rehabReasonAndType=" + rehabReasonAndType +
                ", isRehab=" + isRehab +
                ", isRecidivist=" + isRecidivist +
                ", originalTerm=" + originalTerm +
                ", sentenceBegin=" + sentenceBegin +
                ", originalCharge=" + originalCharge +
                ", sentenceEnd=" + sentenceEnd +
                ", sentencePlace=" + sentencePlace +
                ", riskAssessment=" + riskAssessment +
                ", joinDate=" + joinDate +
                ", joinSituation=" + joinSituation +
                ", isAgainCrime=" + isAgainCrime +
                ", againCrimeName=" + againCrimeName +
                ", placeSituation=" + placeSituation +
                ", placeDate=" + placeDate +
                ", notPlaceReason=" + notPlaceReason +
                ", helpBegin=" + helpBegin +
                ", helpEnd=" + helpEnd +
                ", helpSituation=" + helpSituation +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSentencePopulationDO.java

New file
@@ -0,0 +1,130 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 17:41:26
 * @describe 实体类
 */

@Data
@TableName("com_sentence_population")
@EncryptDecryptClass
public class ComSentencePopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
    private Long communityId;

    /**
    * 名字
    */
    private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
    private String cardNo;

    /**
    * 联系电话
    */
    private String phone;

    /**
    * 配偶
    */
    private String spouse;

    /**
    * 服刑开始时间
    */
    private Date sentenceBegin;

    /**
    * 服刑结束时间
    */
    private Date sentenceEnd;

    /**
    * 罪名
    */
    private String charge;

    /**
    * 备注
    */
    private String remark;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
    * 创建用户
    */
    private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;

    /**
    * 修改用户
    */
    private Long updateBy;

@Override
public String toString() {
        return "ComSentencePopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", spouse=" + spouse +
                ", sentenceBegin=" + sentenceBegin +
                ", sentenceEnd=" + sentenceEnd +
                ", charge=" + charge +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java

New file
@@ -0,0 +1,358 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther txb
 * @create 2021-08-09 19:48:54
 * @describe 实有人口导入》退役军人表实体类
 */

@Data
@TableName("com_veterans_population")
@EncryptDecryptClass
public class ComVeteransPopulationDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
    * 主键id
    */
    @TableId(type = IdType.INPUT)
    private Long id;

    /**
    * 人口id
    */
    private Long populationId;

    /**
    * 街道id
    */
    private Long streetId;

    /**
    * 社区id
    */
        private Long communityId;

    /**
    * 名字
    */
        private String name;

    /**
    * 身份证号码
    */
    @EncryptDecryptField
        private String cardNo;

    /**
    * 联系电话
    */
        private String phone;

    /**
    * 人员状态：正常、失联、出国(取字典表）
    */
        private String personStatus;

    /**
    * 机构
    */
        private String organization;

    /**
    * 照片
    */
        private String photo;

    /**
    * 户籍性质（1.城镇户口 2.农村户口）
    */
        private Integer regiterNature;

    /**
    * 入伍时间
    */
        private Date enlistDate;

    /**
    * 退伍时间
    */
        private Date retireDate;

    /**
    * 人员类别
    */
        private String personCategory;

    /**
    * 住房状况
    */
        private String houseSituation;

    /**
    * 住房状况其他
    */
        private String houseSituationOther;

    /**
    * 建筑面积
    */
        private String buildArea;

    /**
    * 现就业情况
    */
        private String employmentSituation;

    /**
    * 在职情况类型
    */
        private String incumbencyType;

    /**
    * 现就业情况其他
    */
        private String employmentSituationOther;

    /**
    * 养老保险
    */
        private String endowmentInsurance;

    /**
    * 医疗保险
    */
        private String medicalInsurance;

    /**
    * 现个人年收入（单位：元）
    */
        private String annualIncome;

    /**
    * 父亲健康状况
    */
        private String fatherHealthy;

    /**
    * 母亲健康状况
    */
        private String motherHealthy;

    /**
    * 配偶健康状况
    */
        private String spouseHealthy;

    /**
    * 儿子健康状况
    */
        private String sonHealthy;

    /**
    * 女儿健康状况
    */
        private String daughterDealthy;

    /**
    * 主要困难
    */
        private String mainDifficulty;

    /**
    * 其他困难
    */
        private String otherDifficulty;

    /**
    * 主要诉求
    */
        private String mainDemand;

    /**
    * 主要诉求其他事项问题（手填）
    */
        private String mainDemandOther;

    /**
    * 需参加的学历培训
    */
        private String academicTraining;

    /**
    * 是否已参加退役军人培训（政府性质）1.是 2.否
    */
        private Integer isVeteransTraining;

    /**
    * 入伍前学历
    */
        private String educationBeforeEnlistment;

    /**
    * 再教育学历
    */
        private String reEducation;

    /**
    * 所学专业
    */
        private String major;

    /**
    * 所学专业其他
    */
        private String majorOther;

    /**
    * 曾从事行业（含现从事行业）
    */
        private String onceEngagedIndustry;

    /**
    * 曾从事行业（含现从事行业）其他（手填）
    */
        private String onceEngagedIndustryOther;

    /**
    * 意向就业地点
    */
        private String intendedPlaceOfEmployment;

    /**
    * 意向就业地点其他地区（手填）
    */
        private String intendedPlaceOfEmploymentOther;

    /**
    * 待业期间的求职意向
    */
        private String unemploymedEngagedIndustry;

    /**
    * 待业期间的求职意向其他（手填）
    */
        private String unemploymedEngagedIndustryOther;

    /**
    * 是否有创业意愿（1.是 2.否）
    */
        private Integer isBusiness;

    /**
    * 创业意愿
    */
        private String businessDesire;

    /**
    * 备注
    */
        private String remark;

    /**
    * 填表单位
    */
        private String fillUnit;

    /**
    * 填表人
    */
        private String fillPerson;

    /**
    * 填表人联系电话
    */
        private String fillPersonPhone;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
        private Date createAt;

    /**
    * 创建用户
    */
        private Long createBy;

    /**
    * 修改时间
    */
    @TableField(fill = FieldFill.INSERT_UPDATE)
        private Date updateAt;

    /**
    * 修改用户
    */
        private Long updateBy;

@Override
public String toString() {
        return "ComVeteransPopulationDO{" +
                "id=" + id +
                ", populationId=" + populationId +
                ", streetId=" + streetId +
                ", communityId=" + communityId +
                ", name=" + name +
                ", cardNo=" + cardNo +
                ", phone=" + phone +
                ", personStatus=" + personStatus +
                ", organization=" + organization +
                ", photo=" + photo +
                ", regiterNature=" + regiterNature +
                ", enlistDate=" + enlistDate +
                ", retireDate=" + retireDate +
                ", personCategory=" + personCategory +
                ", houseSituation=" + houseSituation +
                ", houseSituationOther=" + houseSituationOther +
                ", buildArea=" + buildArea +
                ", employmentSituation=" + employmentSituation +
                ", incumbencyType=" + incumbencyType +
                ", employmentSituationOther=" + employmentSituationOther +
                ", endowmentInsurance=" + endowmentInsurance +
                ", medicalInsurance=" + medicalInsurance +
                ", annualIncome=" + annualIncome +
                ", fatherHealthy=" + fatherHealthy +
                ", motherHealthy=" + motherHealthy +
                ", spouseHealthy=" + spouseHealthy +
                ", sonHealthy=" + sonHealthy +
                ", daughterDealthy=" + daughterDealthy +
                ", mainDifficulty=" + mainDifficulty +
                ", otherDifficulty=" + otherDifficulty +
                ", mainDemand=" + mainDemand +
                ", mainDemandOther=" + mainDemandOther +
                ", academicTraining=" + academicTraining +
                ", isVeteransTraining=" + isVeteransTraining +
                ", educationBeforeEnlistment=" + educationBeforeEnlistment +
                ", reEducation=" + reEducation +
                ", major=" + major +
                ", majorOther=" + majorOther +
                ", onceEngagedIndustry=" + onceEngagedIndustry +
                ", onceEngagedIndustryOther=" + onceEngagedIndustryOther +
                ", intendedPlaceOfEmployment=" + intendedPlaceOfEmployment +
                ", intendedPlaceOfEmploymentOther=" + intendedPlaceOfEmploymentOther +
                ", unemploymedEngagedIndustry=" + unemploymedEngagedIndustry +
                ", unemploymedEngagedIndustryOther=" + unemploymedEngagedIndustryOther +
                ", isBusiness=" + isBusiness +
                ", businessDesire=" + businessDesire +
                ", remark=" + remark +
                ", fillUnit=" + fillUnit +
                ", fillPerson=" + fillPerson +
                ", fillPersonPhone=" + fillPersonPhone +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
        "}";
        }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoFeedbackService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoFeedbackDO;

/**
 * @auther lyq
 * @create 2021-08-13 14:40:06
 * @describe 服务类
 */
public interface ComActEasyPhotoFeedbackService extends IService<ComActEasyPhotoFeedbackDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActUserWalletTradeService.java

@@ -36,5 +36,24 @@
     */
    Long addWalletTrade(Long userId, Long communityId, Long serviceId, BigDecimal amount,Integer type,String remark,Long createBy,Long walletId,Integer changeType);

    /**
     * 分页查询交易记录
     *
     * @param pageTradeAdminDTO 请求参数
     * @return 交易记录列表
     */
    R pageUserWalletTradeAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询用户交易记录总额
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录总额
     */
    R getTradeUserTotalWalletTradeAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    R getTradeUserTotalWalletTradeExportAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    R getTradeUserTotalJLWalletTradeExportAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    R getTradeUserStatisticsAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCorrectPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComCorrectPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 16:45:25
 * @describe 社区矫正人员表服务类
 */
public interface ComCorrectPopulationService extends IService<ComCorrectPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCultPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComCultPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 17:40:24
 * @describe 邪教人员表服务类
 */
public interface ComCultPopulationService extends IService<ComCultPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComDisabilityPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComDisabilityPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 19:54:57
 * @describe 实有人口导入》残疾人表服务类
 */
public interface ComDisabilityPopulationService extends IService<ComDisabilityPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComDrugPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComDrugPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 15:37:19
 * @describe 吸毒人员表服务类
 */
public interface ComDrugPopulationService extends IService<ComDrugPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComKeyPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComKeyPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 17:41:05
 * @describe 服务类
 */
public interface ComKeyPopulationService extends IService<ComKeyPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComLowSecurityPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComLowSecurityPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 19:52:55
 * @describe 实有人口导入》低保户人员表服务类
 */
public interface ComLowSecurityPopulationService extends IService<ComLowSecurityPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMajorPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComMajorPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 17:14:17
 * @describe 重精人员表服务类
 */
public interface ComMajorPopulationService extends IService<ComMajorPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -162,6 +162,14 @@
    R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId);

    /**
     * 批量导入低保户
     *
     * @param list        低保户数据
     * @param communityId 社区id
     * @return 导入结果
     */
    R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId);
    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list        用户信息

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComRehabilitationPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComRehabilitationPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 17:40:41
 * @describe 服务类
 */
public interface ComRehabilitationPopulationService extends IService<ComRehabilitationPopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSentencePopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComSentencePopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 17:41:26
 * @describe 服务类
 */
public interface ComSentencePopulationService extends IService<ComSentencePopulationDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComVeteransPopulationService.java

New file
@@ -0,0 +1,13 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComVeteransPopulationDO;

/**
 * @auther txb
 * @create 2021-08-09 19:56:46
 * @describe 实有人口导入》退役军人表服务类
 */
public interface ComVeteransPopulationService extends IService<ComVeteransPopulationDO> {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComActEasyPhotoFeedbackMapper;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoFeedbackDO;
import com.panzhihua.service_community.service.ComActEasyPhotoFeedbackService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther lyq
 * @create 2021-08-13 14:40:06
 * @describe 服务实现类
 */
@Slf4j
@Service
public class ComActEasyPhotoFeedbackServiceImpl extends ServiceImpl<ComActEasyPhotoFeedbackMapper, ComActEasyPhotoFeedbackDO> implements ComActEasyPhotoFeedbackService {

}

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

@@ -53,6 +53,8 @@
    @Resource
    private ComActActSignDAO comActActSignDAO;
    @Resource
    private ComActEasyPhotoFeedbackMapper comActEasyPhotoFeedbackMapper;
    @Resource
    private ComActQuestnaireDAO comActQuestnaireDAO;
    /**
     * 分页查询随手拍
@@ -74,7 +76,7 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhoto(page, comActEasyPhotoVO);
        IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoAdmin(page, comActEasyPhotoVO);
        List<ComActEasyPhotoVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActEasyPhotoVO1 -> {
@@ -133,12 +135,19 @@
            }
        }

        if (status.intValue()==4) {
            Date feedbackAt = comActEasyPhotoVO.getFeedbackAt();
            if (null==feedbackAt) {
                comActEasyPhotoVO.setFeedbackAt(comActEasyPhotoVO.getExamineAt());
            }
//        if (status.equals(4)) {
//            Date feedbackAt = comActEasyPhotoVO.getFeedbackAt();
//            if (null==feedbackAt) {
//                comActEasyPhotoVO.setFeedbackAt(comActEasyPhotoVO.getExamineAt());
//            }
//        }

        //查询反馈信息
        List<ComActEasyPhotoFeedbackVO> photoFeedbackList = comActEasyPhotoFeedbackMapper.getPhotoFeedbackList(id);
        if(!photoFeedbackList.isEmpty()){
            comActEasyPhotoVO.setPhotoFeedbackList(photoFeedbackList);
        }

        comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone()));
        if(comActEasyPhotoVO.getAddrRemark()==null){
            comActEasyPhotoVO.setAddrRemark("");
@@ -229,53 +238,91 @@
    @Override
    public R putEasypHotoStatus(ComActEasyPhotoVO comActEasyPhotoVO) {
        Integer type = comActEasyPhotoVO.getType();
//        操作类型 1审核通过 2驳回  3反馈
        ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
        cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());
//        cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
        Date date = new Date();
        comActEasyPhotoVO.setIsNeedFeedBack(1);
        Date nowDate = new Date();
//        操作类型 1审核通过 2驳回  3反馈 4完成随手拍
        ComActEasyPhotoDO cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
        if(cmActEasyPhotoDO == null){
            return R.fail("未查询到随手拍记录");
        }
        switch (type){
            case 1:
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                }
                Integer isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack();
                if (isNeedFeedBack==1) {
                    cmActEasyPhotoDO.setStatus(2);//进行中
                    cmActEasyPhotoDO.setIsNeedFeedBack(1);
                }else{
                    cmActEasyPhotoDO.setStatus(4);//已完成
                }
                cmActEasyPhotoDO.setStatus(2);//进行中
                cmActEasyPhotoDO.setIsNeedFeedBack(1);
                cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                cmActEasyPhotoDO.setExamineAt(date);
                cmActEasyPhotoDO.setExamineAt(nowDate);
                cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
                if(StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult()) || StringUtils.isNotEmpty(comActEasyPhotoVO.getHandlePhotoList())){
                    //说明此处有反馈,需要给随手拍新增反馈信息
                    ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO();
                    photoFeedbackDO.setEasyId(comActEasyPhotoVO.getId());
                    photoFeedbackDO.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
                    photoFeedbackDO.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
                    photoFeedbackDO.setCreateAt(nowDate);
                    photoFeedbackDO.setCreateBy(comActEasyPhotoVO.getUserId());
                    comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
                }
                //审核通过判断随手拍是否有活动并计算用户收益
                comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
                break;
            case 2:
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                }
                cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                cmActEasyPhotoDO.setStatus(3);//已驳回
                cmActEasyPhotoDO.setExamineAt(date);
                cmActEasyPhotoDO.setExamineAt(nowDate);
                cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
                break;
            case 3:
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)){
                    return R.fail("该随手拍不是待反馈状态，不可进行反馈");
                }
                cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult());
                cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList());
                cmActEasyPhotoDO.setStatus(4);//已完成
                cmActEasyPhotoDO.setFeedbackAt(date);
                //给随手拍新增反馈信息
                ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO();
                photoFeedbackDO.setEasyId(comActEasyPhotoVO.getId());
                photoFeedbackDO.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
                photoFeedbackDO.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
                photoFeedbackDO.setCreateAt(nowDate);
                photoFeedbackDO.setCreateBy(comActEasyPhotoVO.getUserId());
                comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
                break;
            case 4:
                if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)){
                    return R.fail("该随手拍已完成，不可重复操作");
                }
                if(StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult()) || StringUtils.isNotEmpty(comActEasyPhotoVO.getHandlePhotoList())){
                    //说明此处有反馈,需要给随手拍新增反馈信息
                    ComActEasyPhotoFeedbackDO photoFeedback = new ComActEasyPhotoFeedbackDO();
                    photoFeedback.setEasyId(comActEasyPhotoVO.getId());
                    photoFeedback.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
                    photoFeedback.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
                    photoFeedback.setCreateAt(nowDate);
                    photoFeedback.setCreateBy(comActEasyPhotoVO.getUserId());
                    comActEasyPhotoFeedbackMapper.insert(photoFeedback);
                }
                if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    cmActEasyPhotoDO.setExamineAt(nowDate);
                    cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                    cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
                    //审核通过判断随手拍是否有活动并计算用户收益
                    comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
                }
                cmActEasyPhotoDO.setFeedbackAt(nowDate);
                cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
                cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
                break;
            default:break;
        }
        int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);
        if (update>0) {
        if(!type.equals(3)){
            int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);
            if (update>0) {
                return R.ok();
            }
        }else{
            return R.ok();
        }
        return R.fail();

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

@@ -79,7 +79,7 @@
                    .lambda().eq(ComActNeighborCircleTopicDO::getName,addCircleTopicAdminDTO.getName())
                    .eq(ComActNeighborCircleTopicDO::getCommunityId,addCircleTopicAdminDTO.getCommunityId())
                    .ne(ComActNeighborCircleTopicDO::getId,circleTopicDO.getId()));
            if(oldCircleTopicDO != null){
            if(oldCircleTopicDO != null && !oldCircleTopicDO.getId().equals(addCircleTopicAdminDTO.getId())){
                return R.fail("该话题已存在");
            }
        }

 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/ComActUserWalletServiceImpl.java

@@ -12,10 +12,9 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActEasyPhotoActivityMapper;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoRewardMapper;
import com.panzhihua.service_community.dao.ComActUserWalletMapper;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActUserWalletChangeService;
import com.panzhihua.service_community.service.ComActUserWalletService;
@@ -27,6 +26,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.Map;

@@ -51,6 +51,8 @@
    private ComActUserWalletChangeService comActUserWalletChangeService;
    @Resource
    private ComActEasyPhotoRewardMapper comActEasyPhotoRewardMapper;
    @Resource
    private ComActActSignDAO comActActSignDAO;

    /**
     * 查询用户钱包信息
@@ -130,17 +132,27 @@
        }

        //查询随手拍活动
//        ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(easyPhotoDO.getActivityId());
//        if(photoActivityDO == null){
//            log.error("给用户添加收益失败，原因：未查到活动记录，活动id：" + easyPhotoDO.getActivityId());
//            return;
//        }
        ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(easyPhotoDO.getActivityId());
        if(photoActivityDO == null){
            log.error("给用户添加收益失败，原因：未查到活动记录，活动id：" + easyPhotoDO.getActivityId());
            return;
        }

//        if(photoActivityDO.getStatus() != ComActEasyPhotoActivityDO.status.jxz){
//            log.error("给用户添加收益失败，原因：活动未在进行中，活动id：" + easyPhotoDO.getActivityId());
//            return;
//        }

        //计算收益
        if(activityType.equals(ComActEasyPhotoDO.activityType.yz)){
            amount = photoActivityDO.getGoodReward();
        }else if(activityType.equals(ComActEasyPhotoDO.activityType.jl)){
            amount = photoActivityDO.getExcellentReward();
        }else if(activityType.equals(ComActEasyPhotoDO.activityType.pt)){
            amount = photoActivityDO.getOrdinaryReward();
        }else if(activityType.equals(ComActEasyPhotoDO.activityType.yb)){
            amount = photoActivityDO.getCommonlyReward();
        }

//        Date nowDate = new Date();
        //查询用户钱包
@@ -174,7 +186,7 @@

            //新增钱包资金交易记录
            Long tradeId = comActUserWalletTradeService.addWalletTrade(easyPhotoDO.getSponsorId(),easyPhotoDO.getCommunityId()
                    ,easyPhotoDO.getId(),amount, ComActUserWalletTradeDO.type.fb,"发布随手拍"
                    ,easyPhotoDO.getId(),amount, ComActUserWalletTradeDO.type.fb,easyPhotoDO.getDetail()
                    ,userId,userWalletDO.getId(),ComActUserWalletTradeDO.changeType.add);

            //新增钱包资金变动记录
@@ -205,6 +217,28 @@
        easyPhotoDO.setActivityType(activityType);
        easyPhotoDO.setActivityAmount(amount);
        comActEasyPhotoDAO.updateById(easyPhotoDO);

        String activityTypeName = "";
        if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){
            activityTypeName = "优质";
        }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){
            activityTypeName = "精良";
        }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){
            activityTypeName = "普通";
        }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
            activityTypeName = "一般";
        }
        //发放奖励以后给用户推送消息
        Map<String,String> map = comActActSignDAO.getUserOpenId(easyPhotoDO.getSponsorId());
        if(map != null){
            String openid = map.get("openid");
            WxXCXTempSend util = new WxXCXTempSend();
            try {
                WxUtil.sendSubscribeJLDZ(openid,util.getAppAccessToken(),"随手拍有奖活动",amount.setScale(2, RoundingMode.HALF_UP),activityTypeName);
            }catch (Exception e){
                log.error("消息推送失败，失败原因：" + e.getMessage());
            }
        }
    }

    /**

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActUserWalletTradeRewardExcelVO;
import com.panzhihua.service_community.dao.ComActUserWalletTradeMapper;
import com.panzhihua.service_community.model.dos.ComActUserWalletTradeDO;
import com.panzhihua.service_community.service.ComActUserWalletTradeService;
@@ -13,6 +14,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @auther lyq
@@ -63,9 +65,50 @@
        return walletTradeDO.getId();
    }

    /**
     * 分页查询交易记录
     *
     * @param pageTradeAdminDTO 请求参数
     * @return 交易记录列表
     */
    @Override
    public R pageUserWalletTradeAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return R.ok(this.baseMapper.getUserWalletTradeAdmin(new Page(pageTradeAdminDTO.getPageNum(),pageTradeAdminDTO.getPageSize()),pageTradeAdminDTO));
    }

    /**
     * 查询用户交易记录总额
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录总额
     */
    @Override
    public R getTradeUserTotalWalletTradeAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        BigDecimal total = this.baseMapper.getTradeUserTotalWalletTradeAdmin(pageTradeAdminDTO);
        if(total == null){
            total = BigDecimal.ZERO;
        }
        return R.ok(total);
    }

    @Override
    public R getTradeUserTotalWalletTradeExportAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return R.ok(this.baseMapper.getTradeUserTotalWalletTradeExportAdmin(pageTradeAdminDTO));
    }

    @Override
    public R getTradeUserTotalJLWalletTradeExportAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        List<ComActUserWalletTradeRewardExcelVO> tradeList = this.baseMapper.getTradeUserTotalJLWalletTradeExportAdmin(pageTradeAdminDTO);
        tradeList.forEach(trade -> {
            if(trade.getType().equals("1")){
                trade.setType("发布随手拍");
            }
        });
        return R.ok(tradeList);
    }

    @Override
    public R getTradeUserStatisticsAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return R.ok(this.baseMapper.getTradeUserStatisticsAdmin(pageTradeAdminDTO));
    }

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComCorrectPopulationDAO;
import com.panzhihua.service_community.model.dos.ComCorrectPopulationDO;
import com.panzhihua.service_community.service.ComCorrectPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 16:45:25
 * @describe 社区矫正人员表服务实现类
 */
@Slf4j
@Service
public class ComCorrectPopulationServiceImpl extends ServiceImpl<ComCorrectPopulationDAO, ComCorrectPopulationDO> implements ComCorrectPopulationService {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComCultPopulationDAO;
import com.panzhihua.service_community.model.dos.ComCultPopulationDO;
import com.panzhihua.service_community.service.ComCultPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 17:40:24
 * @describe 邪教人员表服务实现类
 */
@Slf4j
@Service
public class ComCultPopulationServiceImpl extends ServiceImpl<ComCultPopulationDAO, ComCultPopulationDO> implements ComCultPopulationService {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComDisabilityPopulationDAO;
import com.panzhihua.service_community.model.dos.ComDisabilityPopulationDO;
import com.panzhihua.service_community.service.ComDisabilityPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 19:54:57
 * @describe 实有人口导入》残疾人表服务实现类
 */
@Slf4j
@Service
public class ComDisabilityPopulationServiceImpl extends ServiceImpl<ComDisabilityPopulationDAO, ComDisabilityPopulationDO> implements ComDisabilityPopulationService {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComDrugPopulationDAO;
import com.panzhihua.service_community.model.dos.ComDrugPopulationDO;
import com.panzhihua.service_community.service.ComDrugPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 15:37:19
 * @describe 吸毒人员表服务实现类
 */
@Slf4j
@Service
public class ComDrugPopulationServiceImpl extends ServiceImpl<ComDrugPopulationDAO, ComDrugPopulationDO> implements ComDrugPopulationService {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComKeyPopulationDAO;
import com.panzhihua.service_community.model.dos.ComKeyPopulationDO;
import com.panzhihua.service_community.service.ComKeyPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 17:41:05
 * @describe 服务实现类
 */
@Slf4j
@Service
public class ComKeyPopulationServiceImpl extends ServiceImpl<ComKeyPopulationDAO, ComKeyPopulationDO> implements ComKeyPopulationService {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComLowSecurityPopulationDAO;
import com.panzhihua.service_community.model.dos.ComLowSecurityPopulationDO;
import com.panzhihua.service_community.service.ComLowSecurityPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 19:52:55
 * @describe 实有人口导入》低保户人员表服务实现类
 */
@Slf4j
@Service
public class ComLowSecurityPopulationServiceImpl extends ServiceImpl<ComLowSecurityPopulationDAO, ComLowSecurityPopulationDO> implements ComLowSecurityPopulationService {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComMajorPopulationDAO;
import com.panzhihua.service_community.model.dos.ComMajorPopulationDO;
import com.panzhihua.service_community.service.ComMajorPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 17:14:17
 * @describe 重精人员表服务实现类
 */
@Slf4j
@Service
public class ComMajorPopulationServiceImpl extends ServiceImpl<ComMajorPopulationDAO, ComMajorPopulationDO> implements ComMajorPopulationService {

}

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

@@ -92,6 +92,26 @@
    private BigScreenDAO bigScreenDAO;
    @Resource
    private ComMngUserTagDAO comMngUserTagDAO;
    @Resource
    private ComDrugPopulationDAO comDrugPopulationDAO;
    @Resource
    private ComCorrectPopulationDAO comCorrectPopulationDAO;
    @Resource
    private ComMajorPopulationDAO comMajorPopulationDAO;
    @Resource
    private ComCultPopulationDAO comCultPopulationDAO;
    @Resource
    private ComRehabilitationPopulationDAO comRehabilitationPopulationDAO;
    @Resource
    private ComKeyPopulationDAO comKeyPopulationDAO;
    @Resource
    private ComSentencePopulationDAO comSentencePopulationDAO;
    @Resource
    private ComVeteransPopulationDAO comVeteransPopulationDAO;
    @Resource
    private ComDisabilityPopulationDAO comDisabilityPopulationDAO;
    @Resource
    private ComLowSecurityPopulationDAO comLowSecurityPopulationDAO;
    @Value("${domain.aesKey:}")
    private String aesKey;

@@ -221,6 +241,123 @@
        List<ComMngPopulationCarVO> carList = comMngCarDAO.getPopulationCarListByIdCard(comMngPopulationDO.getCardNo());
        if (!carList.isEmpty()) {
            comMngPopulationVO.setCarList(carList);
        }

        //吸毒信息
        List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
        List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(new QueryWrapper<ComDrugPopulationDO>().
                lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
        if (!comDrugPopulationDOs.isEmpty()) {
            comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
                ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
                BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
                comDrugPopulationVOs.add(comDrugPopulationVO);
                comMngPopulationVO.setComDrugPopulationVOs(comDrugPopulationVOs);
            });
        }

        //社区矫正信息
        List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
        List<ComCorrectPopulationDO> comCorrectPopulationDOS = comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().
                lambda().eq(ComCorrectPopulationDO::getPopulationId, populationId));
        if (!comCorrectPopulationDOS.isEmpty()) {
            comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
                ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
                BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
                comCorrectPopulationVOS.add(comCorrectPopulationVO);
                comMngPopulationVO.setComCorrectPopulationVOs(comCorrectPopulationVOS);
            });
        }

        //精神障碍信息
        List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
        List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(new QueryWrapper<ComMajorPopulationDO>().
                lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
        if (!comMajorPopulationDOs.isEmpty()) {
            comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
                ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
                BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
                comMajorPopulationVOS.add(comMajorPopulationVO);
                comMngPopulationVO.setComMajorPopulationVOs(comMajorPopulationVOS);
            });
        }

        //邪教信息
        List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
        List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(new QueryWrapper<ComCultPopulationDO>().
                lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
        if (!comCultPopulationDOS.isEmpty()) {
            comCultPopulationDOS.forEach(comCultPopulationDO -> {
                ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
                BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
                comCultPopulationVOS.add(comCultPopulationVO);
                comMngPopulationVO.setComCultPopulationVOs(comCultPopulationVOS);
            });
        }

        //刑释信息
        List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
        List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS = comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().
                lambda().eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
        if (!comRehabilitationPopulationDOS.isEmpty()) {
            comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
                ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
                BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
                comRehabilitationPopulationVOS.add(comRehabilitationPopulationVO);
                comMngPopulationVO.setComRehabilitationPopulationVOs(comRehabilitationPopulationVOS);
            });
        }

        //上访信息
        List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
        List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(new QueryWrapper<ComKeyPopulationDO>().
                lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
        if (!comKeyPopulationDOS.isEmpty()) {
            comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
                ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
                BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
                comKeyPopulationVOS.add(comKeyPopulationVO);
                comMngPopulationVO.setComKeyPopulationVOs(comKeyPopulationVOS);
            });
        }

        //退役军人信息
        List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
        List<ComVeteransPopulationDO> comVeteransPopulationDOS = comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().
                lambda().eq(ComVeteransPopulationDO::getPopulationId, populationId));
        if (!comVeteransPopulationDOS.isEmpty()) {
            comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
                ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
                BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
                comVeteransPopulationVOS.add(comVeteransPopulationVO);
                comMngPopulationVO.setComVeteransPopulationVOs(comVeteransPopulationVOS);
            });
        }

        //残疾人信息
        List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
        List<ComDisabilityPopulationDO> comDisabilityPopulationDOS = comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().
                lambda().eq(ComDisabilityPopulationDO::getPopulationId, populationId));
        if (!comDisabilityPopulationDOS.isEmpty()) {
            comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
                ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
                BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
                comDisabilityPopulationVOS.add(comDisabilityPopulationVO);
                comMngPopulationVO.setComDisabilityPopulationVOs(comDisabilityPopulationVOS);
            });
        }

        //低保户信息
        List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
        List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS = comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().
                lambda().eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
        if (!comLowSecurityPopulationDOS.isEmpty()) {
            comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
                ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
                BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
                comLowSecurityPopulationVOS.add(comLowSecurityPopulationVO);
                comMngPopulationVO.setComLowSecurityPopulationVOs(comLowSecurityPopulationVOS);
            });
        }
        return R.ok(comMngPopulationVO);
    }
@@ -427,14 +564,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -453,9 +596,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -499,6 +649,12 @@
                    populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
                    ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,labelList);
                    updateList.add(updatePopulationDO);

                    ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                    BeanUtils.copyProperties(vo,mistake);
                    setMistake(mistake, vo);
                    mistake.setMistake("该实有人口已存在，执行更新，社区id：："+ populationDO.getActId());
                    mistakes.add(mistake);
                }else{
                    //不存在实有人口,则新增
                    populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO,labelList);
@@ -630,14 +786,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -656,9 +818,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -833,14 +1002,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -859,9 +1034,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -1036,14 +1218,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -1062,9 +1250,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -1239,14 +1434,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -1265,9 +1466,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -1442,14 +1650,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -1468,9 +1682,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -1645,14 +1866,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -1671,9 +1898,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -1848,14 +2082,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -1874,9 +2114,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -2051,14 +2298,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -2077,9 +2330,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -2254,14 +2514,20 @@
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if(vo.getFloor().contains("栋")){
                    vo.setFloor(vo.getFloor().replace("栋",""));
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if(vo.getUnitNo().contains("单元")){
                    vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if(vo.getHouseNo().contains("号")){
                    vo.setHouseNo(vo.getHouseNo().replace("号",""));
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
@@ -2280,9 +2546,16 @@
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
                        .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");

                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

@@ -2387,6 +2660,226 @@
        return R.ok(mistakes);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId) {
        //需要新增的房屋集合
        List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
        //需要新增的人口集合
        List<ComMngPopulationDO> saveList = new ArrayList<>();
        //需要修改的人口集合
        List<ComMngPopulationDO> updateList = new ArrayList<>();
        //需要新增的吸毒人员集合
        List<ComDrugPopulationDO> saveDrugList = new ArrayList<>();
        //需要修改的吸毒人员集合
        List<ComDrugPopulationDO> updateDrugList = new ArrayList<>();
        //需要新增的人口与房屋关系集合
        List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();

        log.info("开始处理导入数据");
        List<ComMngPopulationLowSecurityMistakeExcelVO> mistakes = new ArrayList<>();
        try {
            //查询社区信息
            log.info("开始查询社区信息数据");
            ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
            if(populationActVO == null){
                log.error("未查询到社区信息");
                return R.fail("未查询到社区信息");
            }
            log.info("开始查询社区信息数据完成");

            //查询当前社区标签列表
            List<String> labelList = new ArrayList<>();
            List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
            if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
                labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
            }

            StringBuilder areaPath = new StringBuilder();
            areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
            //处理实有人口信息
            Integer nub = 1;

            //查询所有人口数据放入HashMap中
            List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
            HashMap<String,Object> populationMap = new HashMap<>();
            populationList.forEach(population -> {
                String key = population.getCardNo();
                populationMap.put(key,population);
            });
            //查询所有房屋信息放入到HashMap中
            List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
            HashMap<String,Object> houseMap = new HashMap<>();
            houseLists.forEach(house -> {
                String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
                houseMap.put(key,house);
            });

            List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
            HashMap<String,Object> villageMap = new HashMap<>();
            villageList.forEach(village -> {
                String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
                villageMap.put(key,village);
            });

            List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
            HashMap<String,Object> houseUserMap = new HashMap<>();
            houseUserLists.forEach(houseUser -> {
                String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
                houseUserMap.put(key,houseUser);
            });


            for (ComMngPopulationLowSecurityExcelVO vo : list) {
                if (vo.getDoorNo().contains("号")) {
                    vo.setDoorNo(vo.getDoorNo().replace("号",""));
                }
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    if(vo.getFloor().contains("栋")){
                        vo.setFloor(vo.getFloor().replace("栋",""));
                    }
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    if(vo.getUnitNo().contains("单元")){
                        vo.setUnitNo(vo.getUnitNo().replace("单元",""));
                    }
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    if(vo.getHouseNo().contains("号")){
                        vo.setHouseNo(vo.getHouseNo().replace("号",""));
                    }
                }
                log.info("开始查询小区街路巷是否存在");
                //查询小区街路巷是否存在
                ComMngVillageDO comMngVillageDO = null;
                String villageKey = communityId + vo.getRoad() + vo.getDoorNo();
                if(!isOnly(villageKey,villageMap)){
                    comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
                }else{
                    ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
                    BeanUtils.copyProperties(vo,mistake);
                    setLowSecurityMistake(mistake, vo);
                    mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
                    mistakes.add(mistake);
                    log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
                    continue;
                }
                StringBuilder address = new StringBuilder();
                address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
                        .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
                if (StringUtils.isNotEmpty(vo.getFloor())) {
                    address.append(vo.getFloor()).append("栋");
                }
                if (StringUtils.isNotEmpty(vo.getUnitNo())) {
                    address.append(vo.getUnitNo()).append("单元");
                }
                if (StringUtils.isNotEmpty(vo.getHouseNo())) {
                    address.append(vo.getHouseNo()).append("号");
                }
                vo.setAddress(address.toString());
                log.info("开始查询小区街路巷是否存在完成");

                log.info("开始查询房屋是否存在");
                //先判断房屋是否存在
                ComMngPopulationHouseDO populationHouseDO = null;
                String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
                if(isOnly(houseKey,houseMap)){
                    if(!houseList.isEmpty()){
                        for (ComMngPopulationHouseDO house:houseList) {
                            if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
                                    && house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
                                    && house.getHouseNo().equals(vo.getHouseNo())){
                                populationHouseDO = house;
                                break;
                            }
                        }
                    }
                    if(populationHouseDO == null){
                        //房屋信息不存在建立房屋信息
                        populationHouseDO = saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
                        houseList.add(populationHouseDO);
                    }
                }else{
                    populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
                }
                vo.setHouseId(populationHouseDO.getId());
                log.info("开始查询房屋是否存在完成");

                if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
                    //空户处理完房屋信息，直接返回
                    continue;
                }
                String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
                //判断实有人口是否已存在
                log.info("开始查询实有人口是否已存在");
                ComMngPopulationDO populationDO = null;
                String populationKey = vo.getCardNo();
                if(!isOnly(populationKey,populationMap)){
                    //存在实有人口信息，则更新
                    populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
                    ComMngPopulationDO updatePopulationDO = updateLowSecurityPopulationDO(vo,populationDO,labelList);
                    updateList.add(updatePopulationDO);
                }else{
                    //不存在实有人口,则新增
                    populationDO = saveLowSecurityPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
                    saveList.add(populationDO);
                }
                log.info("开始查询实有人口是否已存在完成");

                log.info("开始查询实有人口房屋居住信息");
                //处理实有人口房屋居住信息
                if (populationDO != null) {
                    ComMngPopulationHouseUserDO populationHouseUserDO = null;
                    String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
                    if(isOnly(houseUserKey,houseUserMap)){
                        populationHouseUserDO = new ComMngPopulationHouseUserDO();
                        populationHouseUserDO.setId(Snowflake.getId());
                        populationHouseUserDO.setHouseId(populationHouseDO.getId());
                        populationHouseUserDO.setPopulId(populationDO.getId());
//                        populationHouseUserDO.setRelation(vo.getRelation());
                        populationHouseUserDO.setRelationId(vo.getIsRent());
//                        populationHouseUserDO.setResidence(vo.getResidence());
                        houseUserList.add(populationHouseUserDO);
                    }
                }
                log.info("开始查询实有人口房屋居住信息完成");
            }
        }catch (Exception e){
            log.info("出现错误，错误原因：" + e.getMessage());
        }
        log.info("处理完成导入数据");

        log.info("开始执行数据库导入");
        if(!houseList.isEmpty()){
            log.info("执行数据库导入房屋");
            comMngPopulationHouseDAO.insertAll(houseList);
            log.info("执行数据库导入房屋完成");
        }
        if(!saveList.isEmpty()){
            log.info("执行数据库导入人口");
            this.baseMapper.insertAll(saveList);
            log.info("执行数据库导入人口完成");
        }
        if(!updateList.isEmpty()){
            log.info("执行数据库更新人口");
            this.baseMapper.updateAll(updateList);
//            this.updateBatchById(updateList);
            log.info("执行数据库更新人口完成");
        }
        if(!houseUserList.isEmpty()){
            log.info("执行数据库导入人口房屋关系");
            comMngPopulationHouseUserService.saveBatch(houseUserList);
            log.info("执行数据库导入人口房屋关系完成");
        }
        log.info("执行数据库导入完成");

        if (!mistakes.isEmpty()) {
            log.info("返回错误数据");
            return R.fail(mistakes);
        }
        return R.ok(mistakes);
    }


    private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
@@ -2411,6 +2904,8 @@

    private ComMngPopulationDO updateDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>().lambda()
                .eq(ComDrugPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2427,11 +2922,27 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);

        if (comDrugPopulationDO != null) {
            BeanUtils.copyProperties(vo, comDrugPopulationDO);
            comDrugPopulationDO.setCardNo(cardNoAES);
            comDrugPopulationDAO.updateById(comDrugPopulationDO);
        }else {
            comDrugPopulationDO = new ComDrugPopulationDO();
            BeanUtils.copyProperties(vo, comDrugPopulationDO);
            comDrugPopulationDO.setId(Snowflake.getId());
            comDrugPopulationDO.setPopulationId(populationDO.getId());
            comDrugPopulationDO.setCommunityId(populationDO.getActId());
            comDrugPopulationDO.setStreetId(populationDO.getStreetId());
            comDrugPopulationDAO.insert(comDrugPopulationDO);
        }
        return populationDO;
    }

    private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().lambda()
                .eq(ComCorrectPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2448,11 +2959,26 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comCorrectPopulationDO != null) {
            BeanUtils.copyProperties(vo, comCorrectPopulationDO);
            comCorrectPopulationDO.setCardNo(cardNoAES);
            comCorrectPopulationDAO.updateById(comCorrectPopulationDO);
        }else {
            comCorrectPopulationDO = new ComCorrectPopulationDO();
            BeanUtils.copyProperties(vo, comCorrectPopulationDO);
            comCorrectPopulationDO.setId(Snowflake.getId());
            comCorrectPopulationDO.setPopulationId(populationDO.getId());
            comCorrectPopulationDO.setCommunityId(populationDO.getActId());
            comCorrectPopulationDO.setStreetId(populationDO.getStreetId());
            comCorrectPopulationDAO.insert(comCorrectPopulationDO);
        }
        return populationDO;
    }

    private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().lambda()
                .eq(ComMajorPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2469,11 +2995,26 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comMajorPopulationDO != null) {
            BeanUtils.copyProperties(vo, comMajorPopulationDO);
            comMajorPopulationDO.setCardNo(cardNoAES);
            comMajorPopulationDAO.updateById(comMajorPopulationDO);
        }else {
            comMajorPopulationDO = new ComMajorPopulationDO();
            BeanUtils.copyProperties(vo, comMajorPopulationDO);
            comMajorPopulationDO.setId(Snowflake.getId());
            comMajorPopulationDO.setPopulationId(populationDO.getId());
            comMajorPopulationDO.setCommunityId(populationDO.getActId());
            comMajorPopulationDO.setStreetId(populationDO.getStreetId());
            comMajorPopulationDAO.insert(comMajorPopulationDO);
        }
        return populationDO;
    }

    private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>().lambda().
                eq(ComCultPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2490,11 +3031,26 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comCultPopulationDO != null) {
            BeanUtils.copyProperties(vo, comCultPopulationDO);
            comCultPopulationDO.setCardNo(cardNoAES);
            comCultPopulationDAO.updateById(comCultPopulationDO);
        }else {
            comCultPopulationDO = new ComCultPopulationDO();
            BeanUtils.copyProperties(vo, comCultPopulationDO);
            comCultPopulationDO.setId(Snowflake.getId());
            comCultPopulationDO.setPopulationId(populationDO.getId());
            comCultPopulationDO.setCommunityId(populationDO.getActId());
            comCultPopulationDO.setStreetId(populationDO.getStreetId());
            comCultPopulationDAO.insert(comCultPopulationDO);
        }
        return populationDO;
    }

    private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().lambda().
                eq(ComRehabilitationPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2511,11 +3067,27 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comRehabilitationPopulationDO != null) {
            BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
            comRehabilitationPopulationDO.setCardNo(cardNoAES);
            comRehabilitationPopulationDAO.updateById(comRehabilitationPopulationDO);
        }else {
            comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
            BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
            comRehabilitationPopulationDO.setId(Snowflake.getId());
            comRehabilitationPopulationDO.setPopulationId(populationDO.getId());
            comRehabilitationPopulationDO.setCommunityId(populationDO.getActId());
            comRehabilitationPopulationDO.setStreetId(populationDO.getStreetId());
            comRehabilitationPopulationDAO.insert(comRehabilitationPopulationDO);
        }

        return populationDO;
    }

    private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>().lambda().
                eq(ComKeyPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2532,11 +3104,26 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comKeyPopulationDO != null) {
            BeanUtils.copyProperties(vo, comKeyPopulationDO);
            comKeyPopulationDO.setCardNo(cardNoAES);
            comKeyPopulationDAO.updateById(comKeyPopulationDO);
        }else {
            comKeyPopulationDO = new ComKeyPopulationDO();
            BeanUtils.copyProperties(vo, comKeyPopulationDO);
            comKeyPopulationDO.setId(Snowflake.getId());
            comKeyPopulationDO.setPopulationId(populationDO.getId());
            comKeyPopulationDO.setCommunityId(populationDO.getActId());
            comKeyPopulationDO.setStreetId(populationDO.getStreetId());
            comKeyPopulationDAO.insert(comKeyPopulationDO);
        }
        return populationDO;
    }

    private ComMngPopulationDO updateSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComSentencePopulationDO comSentencePopulationDO = comSentencePopulationDAO.selectOne(new QueryWrapper<ComSentencePopulationDO>().lambda().
                eq(ComSentencePopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2553,11 +3140,26 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comSentencePopulationDO != null) {
            BeanUtils.copyProperties(vo, comSentencePopulationDO);
            comSentencePopulationDO.setCardNo(cardNoAES);
            comSentencePopulationDAO.updateById(comSentencePopulationDO);
        }else {
            comSentencePopulationDO = new ComSentencePopulationDO();
            BeanUtils.copyProperties(vo, comSentencePopulationDO);
            comSentencePopulationDO.setId(Snowflake.getId());
            comSentencePopulationDO.setPopulationId(populationDO.getId());
            comSentencePopulationDO.setCommunityId(populationDO.getActId());
            comSentencePopulationDO.setStreetId(populationDO.getStreetId());
            comSentencePopulationDAO.insert(comSentencePopulationDO);
        }
        return populationDO;
    }

    private ComMngPopulationDO updateVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().lambda().
                eq(ComVeteransPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2574,10 +3176,25 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comVeteransPopulationDO != null) {
            BeanUtils.copyProperties(vo, comVeteransPopulationDO);
            comVeteransPopulationDO.setCardNo(cardNoAES);
            comVeteransPopulationDAO.updateById(comVeteransPopulationDO);
        }else {
            comVeteransPopulationDO = new ComVeteransPopulationDO();
            BeanUtils.copyProperties(vo, comVeteransPopulationDO);
            comVeteransPopulationDO.setId(Snowflake.getId());
            comVeteransPopulationDO.setPopulationId(populationDO.getId());
            comVeteransPopulationDO.setCommunityId(populationDO.getActId());
            comVeteransPopulationDO.setStreetId(populationDO.getStreetId());
            comVeteransPopulationDAO.insert(comVeteransPopulationDO);
        }
        return populationDO;
    }
    private ComMngPopulationDO updateDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().lambda().
                eq(ComDisabilityPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
@@ -2594,6 +3211,55 @@
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comDisabilityPopulationDO != null) {
            BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
            comDisabilityPopulationDO.setCardNo(cardNoAES);
            comDisabilityPopulationDAO.updateById(comDisabilityPopulationDO);
        }else {
            comDisabilityPopulationDO = new ComDisabilityPopulationDO();
            BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
            comDisabilityPopulationDO.setId(Snowflake.getId());
            comDisabilityPopulationDO.setPopulationId(populationDO.getId());
            comDisabilityPopulationDO.setCommunityId(populationDO.getActId());
            comDisabilityPopulationDO.setStreetId(populationDO.getStreetId());
            comDisabilityPopulationDAO.insert(comDisabilityPopulationDO);
        }
        return populationDO;
    }

    private ComMngPopulationDO updateLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
        BeanUtils.copyProperties(vo, populationDO);
        ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().lambda().
                eq(ComLowSecurityPopulationDO::getPopulationId, populationDO.getId()));
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
        while (iterator.hasNext()) {
            String s = iterator.next();
            if (!labelList.contains(s))
                iterator.remove();
        }
        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setCardNo(cardNoAES);
        if (comLowSecurityPopulationDO != null) {
            BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
            comLowSecurityPopulationDO.setCardNo(cardNoAES);
            comLowSecurityPopulationDAO.updateById(comLowSecurityPopulationDO);
        }else {
            comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
            BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
            comLowSecurityPopulationDO.setId(Snowflake.getId());
            comLowSecurityPopulationDO.setPopulationId(populationDO.getId());
            comLowSecurityPopulationDO.setCommunityId(populationDO.getActId());
            comLowSecurityPopulationDO.setStreetId(populationDO.getStreetId());
            comLowSecurityPopulationDAO.insert(comLowSecurityPopulationDO);
        }
        return populationDO;
    }

@@ -2640,7 +3306,11 @@
    private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComDrugPopulationDO comDrugPopulationDO = new ComDrugPopulationDO();
        BeanUtils.copyProperties(vo, comDrugPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comDrugPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2657,6 +3327,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2666,13 +3344,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comDrugPopulationDO.setId(Snowflake.getId());
        comDrugPopulationDO.setCommunityId(comActDO.getCommunityId());
        comDrugPopulationDO.setStreetId(comActDO.getStreetId());
        comDrugPopulationDAO.insert(comDrugPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComCorrectPopulationDO comCorrectPopulationDO = new ComCorrectPopulationDO();
        BeanUtils.copyProperties(vo, comCorrectPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comCorrectPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2689,6 +3375,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2698,13 +3392,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comCorrectPopulationDO.setId(Snowflake.getId());
        comCorrectPopulationDO.setCommunityId(comActDO.getCommunityId());
        comCorrectPopulationDO.setStreetId(comActDO.getStreetId());
        comCorrectPopulationDAO.insert(comCorrectPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComMajorPopulationDO comMajorPopulationDO = new ComMajorPopulationDO();
        BeanUtils.copyProperties(vo, comMajorPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comMajorPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2721,6 +3423,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2730,13 +3440,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comMajorPopulationDO.setId(Snowflake.getId());
        comMajorPopulationDO.setCommunityId(comActDO.getCommunityId());
        comMajorPopulationDO.setStreetId(comActDO.getStreetId());
        comMajorPopulationDAO.insert(comMajorPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComCultPopulationDO comCultPopulationDO = new ComCultPopulationDO();
        BeanUtils.copyProperties(vo, comCultPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comCultPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2753,6 +3471,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2762,13 +3488,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comCultPopulationDO.setId(Snowflake.getId());
        comCultPopulationDO.setCommunityId(comActDO.getCommunityId());
        comCultPopulationDO.setStreetId(comActDO.getStreetId());
        comCultPopulationDAO.insert(comCultPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComRehabilitationPopulationDO comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
        BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comRehabilitationPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2785,6 +3519,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2794,13 +3536,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comRehabilitationPopulationDO.setId(Snowflake.getId());
        comRehabilitationPopulationDO.setCommunityId(comActDO.getCommunityId());
        comRehabilitationPopulationDO.setStreetId(comActDO.getStreetId());
        comRehabilitationPopulationDAO.insert(comRehabilitationPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComKeyPopulationDO comKeyPopulationDO = new ComKeyPopulationDO();
        BeanUtils.copyProperties(vo, comKeyPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comKeyPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2817,6 +3567,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2826,13 +3584,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comKeyPopulationDO.setId(Snowflake.getId());
        comKeyPopulationDO.setCommunityId(comActDO.getCommunityId());
        comKeyPopulationDO.setStreetId(comActDO.getStreetId());
        comKeyPopulationDAO.insert(comKeyPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComSentencePopulationDO comSentencePopulationDO = new ComSentencePopulationDO();
        BeanUtils.copyProperties(vo, comSentencePopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comSentencePopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2849,6 +3615,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2858,13 +3632,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comSentencePopulationDO.setId(Snowflake.getId());
        comSentencePopulationDO.setCommunityId(comActDO.getCommunityId());
        comSentencePopulationDO.setStreetId(comActDO.getStreetId());
        comSentencePopulationDAO.insert(comSentencePopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComVeteransPopulationDO comVeteransPopulationDO = new ComVeteransPopulationDO();
        BeanUtils.copyProperties(vo, comVeteransPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comVeteransPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2881,6 +3663,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2890,13 +3680,21 @@
//        }

//        this.baseMapper.insert(populationDO);
        comVeteransPopulationDO.setId(Snowflake.getId());
        comVeteransPopulationDO.setCommunityId(comActDO.getCommunityId());
        comVeteransPopulationDO.setStreetId(comActDO.getStreetId());
        comVeteransPopulationDAO.insert(comVeteransPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        ComDisabilityPopulationDO comDisabilityPopulationDO = new ComDisabilityPopulationDO();
        BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comDisabilityPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -2913,6 +3711,14 @@
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
@@ -2922,6 +3728,58 @@
//        }

//        this.baseMapper.insert(populationDO);
        comDisabilityPopulationDO.setId(Snowflake.getId());
        comDisabilityPopulationDO.setCommunityId(comActDO.getCommunityId());
        comDisabilityPopulationDO.setStreetId(comActDO.getStreetId());
        comDisabilityPopulationDAO.insert(comDisabilityPopulationDO);
        return populationDO;
    }

    private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
        ComMngPopulationDO populationDO = new ComMngPopulationDO();
        ComLowSecurityPopulationDO comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
        BeanUtils.copyProperties(vo, populationDO);
        BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
        Long populationId = Snowflake.getId();
        populationDO.setId(populationId);
        comLowSecurityPopulationDO.setPopulationId(populationId);
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());

        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
        while (iterator.hasNext()) {
            String s = iterator.next();
            if (!labelList.contains(s))
                iterator.remove();
        }
        populationDO.setVillageId(comMngVillageDO.getVillageId());
        populationDO.setActId(comActDO.getCommunityId());
        populationDO.setStreetId(comActDO.getStreetId());
        populationDO.setLabel(Joiner.on(",").join(userTag));
        populationDO.setVillageName(comMngVillageDO.getGroupAt());
        populationDO.setCardNoStr(vo.getCardNo());
        populationDO.setUpdateAt(new Date());

        String cardNoAES = populationDO.getCardNo();
        try {
            cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
        }catch (Exception e){
            log.error("身份证加密失败");
        }
        populationDO.setCardNo(cardNoAES);
        //新增的时候默认绑定房屋id
//        if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
//                (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
//            populationDO.setHouseId(vo.getHouseId());
//        }else{
//            populationDO.setHouseId(null);
//        }

//        this.baseMapper.insert(populationDO);
        comLowSecurityPopulationDO.setId(Snowflake.getId());
        comLowSecurityPopulationDO.setCommunityId(comActDO.getCommunityId());
        comLowSecurityPopulationDO.setStreetId(comActDO.getStreetId());
        comLowSecurityPopulationDAO.insert(comLowSecurityPopulationDO);
        return populationDO;
    }

@@ -3335,6 +4193,47 @@
        return populationHouseDO;
    }

    private ComMngPopulationHouseDO saveLowSecurityPopulationHouse(ComMngPopulationLowSecurityExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
        //查询该房屋未建立，执行建立房屋信息
        ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
        populationHouseDO.setId(Snowflake.getId());
        populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
        populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
        populationHouseDO.setAlley(vo.getRoad());
        populationHouseDO.setHouseNum(vo.getDoorNo());
        populationHouseDO.setStatus(vo.getIsRent());
        populationHouseDO.setCommunityId(communityId);
        populationHouseDO.setFloor(vo.getFloor());
        populationHouseDO.setUnitNo(vo.getUnitNo());
        populationHouseDO.setHouseNo(vo.getHouseNo());
        populationHouseDO.setCode(vo.getHouseNo());
        populationHouseDO.setAddress(vo.getAddress());
        populationHouseDO.setUpdateAt(new Date());
//        populationHouseDO.setConstructPurpose(vo.getHousePurpose());
        StringBuilder housePath = new StringBuilder();
        housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
        populationHouseDO.setPath(areaPath.toString() + housePath.toString());
//        try {
//            populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
//        } catch (Exception e) {
//        }

        if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
            populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
        }
        if (vo.getHouseStatus() != null) {
            populationHouseDO.setStatus(vo.getHouseStatus());
        }
        if (vo.getHousePurpose() != null) {
            populationHouseDO.setPurpose(vo.getHousePurpose());
        }
        if (vo.getControlStatus() != null) {
            populationHouseDO.setControlStatus(vo.getControlStatus());
        }
//        comMngPopulationHouseDAO.insert(populationHouseDO);
        return populationHouseDO;
    }

    private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo, ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
        //查询该房屋未建立，执行建立房屋信息
        ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
@@ -3672,7 +4571,8 @@
            }
        } else {
            //新增
            Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
            Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
            .eq(ComMngUserTagDO::getCommunityId, comMngTagVO.getCommunityId()));
            if (count > 0) {
                return R.fail("该标签已存在，标签名称重复");
            }
@@ -4211,9 +5111,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);
@@ -4696,9 +5596,14 @@
        mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
        mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
        mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
//        mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
        mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
//        mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
        mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
        mvo.setIsCorrectGroup(PopulHouseUseEnum.getCnDescByName(vo.getIsCorrectGroup()));
        mvo.setIsMissControl(PopulHouseUseEnum.getCnDescByName(vo.getIsMissControl()));
        mvo.setIsAgainCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsAgainCrime()));
        mvo.setIsOutControl(PopulHouseUseEnum.getCnDescByName(vo.getIsOutControl()));
        mvo.setIsRecidivist(PopulHouseUseEnum.getCnDescByName(vo.getIsRecidivist()));
//        mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
//        mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
//        mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4707,7 +5612,7 @@
    private void setMajorMistake(ComMngPopulationMajorMistakeExcelVO mvo, ComMngPopulationMajorExcelVO vo){
//        mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
        mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
        mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
        mvo.setCustodyRelation(PopulRelationEnum.getCnDescByName(vo.getCustodyRelation()));
//        mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
        mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
        mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
@@ -4715,6 +5620,7 @@
        mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
//        mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
        mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
        mvo.setIsCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsCrime()));
//        mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
//        mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
//        mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4730,6 +5636,7 @@
        mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
        mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
        mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
        mvo.setIsExternalPublicity(PopulHouseUseEnum.getCnDescByName(vo.getIsExternalPublicity()));
//        mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
//        mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
//        mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4746,6 +5653,8 @@
//        mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
        mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
        mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
        mvo.setIsRecidivist(PopulHouseUseEnum.getCnDescByName(vo.getIsRecidivist()));
        mvo.setIsAgainCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsAgainCrime()));
//        mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
//        mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
//        mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
@@ -4821,6 +5730,25 @@
//        mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
    }

    private void setLowSecurityMistake(ComMngPopulationLowSecurityMistakeExcelVO mvo, ComMngPopulationLowSecurityExcelVO vo){
//        mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
//        mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
        mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
//        mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
        mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
        mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
        mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
//        mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
//        mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
        mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
//        mvo.setIsVeteransTraining(PopulHouseUseEnum.getCnDescByName(vo.getIsVeteransTraining()));
//        mvo.setIsBusiness(PopulHouseUseEnum.getCnDescByName(vo.getIsBusiness()));
//        mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
//        mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
//        mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
//        mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
    }

    /**
     * 判重方法
     * @param key   主键

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComRehabilitationPopulationDAO;
import com.panzhihua.service_community.model.dos.ComRehabilitationPopulationDO;
import com.panzhihua.service_community.service.ComRehabilitationPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 17:40:41
 * @describe 服务实现类
 */
@Slf4j
@Service
public class ComRehabilitationPopulationServiceImpl extends ServiceImpl<ComRehabilitationPopulationDAO, ComRehabilitationPopulationDO> implements ComRehabilitationPopulationService {

}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComSentencePopulationDAO;
import com.panzhihua.service_community.model.dos.ComSentencePopulationDO;
import com.panzhihua.service_community.service.ComSentencePopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 17:41:26
 * @describe 服务实现类
 */
@Slf4j
@Service
public class ComSentencePopulationServiceImpl extends ServiceImpl<ComSentencePopulationDAO, ComSentencePopulationDO> implements ComSentencePopulationService {

}

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

@@ -96,6 +96,8 @@
            BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
        }

        BeanUtils.copyProperties(swSafetyWorkRecordDO, comSwSafetyWorkRecordVO);

        //组装巡查类型
        if(StringUtils.isNotEmpty(comSwSafetyWorkRecordVO.getPatrolType())){
            StringBuilder sb = new StringBuilder();
@@ -143,6 +145,7 @@

    @Override
    public R detailSafetyWorkRecordByPrId(Long patrolRecordId, Long communityId) {
        ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
        ComSwPatrolRecordDO comSwPatrolRecordDO = comSwPatrolRecordDAO.selectById(patrolRecordId);
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = comSwPatrolRecordReportDAO.selectOne(new QueryWrapper<ComSwPatrolRecordReportDO>().lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
        if (null != comSwPatrolRecordReportDO) {
@@ -150,9 +153,9 @@
            if (null == comSwSafetyWorkRecordDO) {
                return R.fail("该安全工作记录不存在");
            }
            BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
            BeanUtils.copyProperties(comSwSafetyWorkRecordDO, comSwSafetyWorkRecordVO);
        }
        ComSwSafetyWorkRecordVO comSwSafetyWorkRecordVO = new ComSwSafetyWorkRecordVO();
        BeanUtils.copyProperties(comSwPatrolRecordDO, comSwSafetyWorkRecordVO);
        //所属社区名称
        comSwSafetyWorkRecordVO.setCommunityName(comActDAO.selectById(communityId).getName());
        return R.ok(comSwSafetyWorkRecordVO);

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComVeteransPopulationDAO;
import com.panzhihua.service_community.model.dos.ComVeteransPopulationDO;
import com.panzhihua.service_community.service.ComVeteransPopulationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * @auther txb
 * @create 2021-08-09 19:56:46
 * @describe 实有人口导入》退役军人表服务实现类
 */
@Slf4j
@Service
public class ComVeteransPopulationServiceImpl extends ServiceImpl<ComVeteransPopulationDAO, ComVeteransPopulationDO> implements ComVeteransPopulationService {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml

@@ -28,3 +28,16 @@
  aesKey: Ryo7M3n8loC5
  sensitive: true

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: community

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

New file
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActEasyPhotoDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActEasyPhotoDO">
        <id column="id" property="id" />
        <result column="sponsor_id" property="sponsorId" />
        <result column="happen_addr" property="happenAddr" />
        <result column="addr_remark" property="addrRemark" />
        <result column="status" property="status" />
        <result column="handler_id" property="handlerId" />
        <result column="create_at" property="createAt" />
        <result column="examine_at" property="examineAt" />
        <result column="detail" property="detail" />
        <result column="photo_path_list" property="photoPathList" />
        <result column="handle_result" property="handleResult" />
        <result column="handle_photo_list" property="handlePhotoList" />
        <result column="community_id" property="communityId" />
        <result column="is_hide" property="isHide" />
        <result column="is_need_feed_back" property="isNeedFeedBack" />
        <result column="feedback_at" property="feedbackAt" />
        <result column="reject_reason" property="rejectReason" />
        <result column="del_tag" property="delTag" />
        <result column="is_report" property="isReport" />
        <result column="is_publicity" property="isPublicity" />
        <result column="handle_status" property="handleStatus" />
        <result column="lng_lat" property="lngLat" />
        <result column="activity_type" property="activityType" />
        <result column="activity_amount" property="activityAmount" />
        <result column="activity_id" property="activityId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, sponsor_id, happen_addr, addr_remark, status, handler_id, create_at, examine_at, detail, photo_path_list, handle_result, handle_photo_list, community_id, is_hide, is_need_feed_back, feedback_at, reject_reason, del_tag, is_report, is_publicity, handle_status, lng_lat, activity_type, activity_amount, activity_id
    </sql>

    <select id="pageEasyPhotoAdmin" parameterType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO"
            resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO">
        SELECT
            p.id,
            u.`name` sponsor_name,
            u.phone phone,
            count( pu.id ) giveThumbsUpNum,
            u.image_url,
            p.happen_addr,
            su.`name` handler_name,
            p.`status`,
            p.`detail`,
            p.`is_need_feed_back`,
            p.`photo_path_list`,
            p.create_at,
            p.feedback_at,
            p.is_report,
            p.is_publicity,
            p.activity_type,
            p.activity_amount,
            p.activity_id,
            p.examine_at
        FROM
            com_act_easy_photo p
            LEFT JOIN sys_user u ON p.sponsor_id = u.user_id
            LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
            LEFT JOIN sys_user su ON p.handler_id = su.user_id
        WHERE
            p.del_tag = 0
        <if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>
          and p.community_id=#{comActEasyPhotoVO.communityId}
        </if>
        <if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >
          AND p.`status` = #{comActEasyPhotoVO.status}
        </if>
        <if test='comActEasyPhotoVO.createBegin != null  '>
        AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin}
        AND #{comActEasyPhotoVO.createEnd}
        </if>
        <if test='comActEasyPhotoVO.activityType != null'>
            AND p.activity_type =#{comActEasyPhotoVO.activityType}
        </if>

        <if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>
            AND (u.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or
            p.happen_addr like concat(#{comActEasyPhotoVO.keyWord},'%') or
            su.`name` like concat(#{comActEasyPhotoVO.keyWord},'%')
            )
        </if>
        GROUP BY
            p.id
        ORDER BY
            p.create_at DESC

    </select>

    <select id="getEasyPhotoStatistics" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO">
        SELECT
            count( id ) AS examineNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} AND del_tag = 0 ) AS verificationNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} AND del_tag = 0 ) AS rejectNum,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} AND del_tag = 0 ) AS completeNum,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 1) as yzAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 1 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as yzDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 2) as jlAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 2 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as jlDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 3) as ptAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 3 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ptDayTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 4) as ybAllTotal,
            (select count(id) from com_act_easy_photo where `status` in (2,4) AND community_id = #{communityId} and del_tag = 0 and activity_type = 4 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as ybDayTotal,
            (select IFNULL(sum(activity_amount),0) from com_act_easy_photo where `status` in (2,4) AND community_id = 2 and del_tag = 0) as allRewardAmount,
            (select IFNULL(sum(activity_amount),0)  from com_act_easy_photo where `status` in (2,4) AND community_id = 2 and del_tag = 0 and examine_at between timestamp(date_add(curdate(), interval - 0 day)) and now()) as dayRewardAmount
        FROM
            com_act_easy_photo
        WHERE
            `status` = 1
            AND community_id = #{communityId}
            AND del_tag = 0
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoFeedbackDOMapper.xml

New file
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActEasyPhotoFeedbackMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActEasyPhotoFeedbackDO">
        <id column="id" property="id" />
        <result column="easy_id" property="easyId" />
        <result column="feedback_content" property="feedbackContent" />
        <result column="feedback_img" property="feedbackImg" />
        <result column="create_at" property="createAt" />
        <result column="create_by" property="createBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, easy_id, feedback_content, feedback_img, create_at, create_by
    </sql>

    <select id="getPhotoFeedbackList" resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoFeedbackVO">
        SELECT
            caepf.id,
            caepf.easy_id,
            caepf.feedback_content,
            caepf.feedback_img,
            caepf.create_at,
            caepf.create_by,
            su.`name` as createByName,
            su.image_url as createByImage
        FROM
            com_act_easy_photo_feedback AS caepf
            LEFT JOIN sys_user AS su ON su.user_id = caepf.create_by
        WHERE
            caepf.easy_id = #{easyId}
        ORDER BY caepf.create_at desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleTopicDOMapper.xml

@@ -39,6 +39,7 @@
                and canct.name like concat(#{circleTopicAdminDTO.name},'%')
            </if>
        </where>
        order by canct.create_at desc
    </select>

    <select id="getNeighborTopicByApp" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActUserWalletTradeDOMapper.xml

@@ -47,6 +47,8 @@
            cauwt.id,
            su.user_id,
            cauwt.amount,
            cauwt.service_id,
            cauwt.remark,
            cauwt.type,
            su.`name` AS userName,
            su.nick_name,
@@ -62,8 +64,14 @@
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
            </if>
            <if test="walletTradeDTO.type != null">
                and cauwt.type = #{walletTradeDTO.type}
            </if>
            <if test="walletTradeDTO.changeType != null">
                and cauwt.change_type = #{walletTradeDTO.changeType}
            </if>
            <if test="walletTradeDTO.name != null and walletTradeDTO.name != &quot;&quot;">
                AND (su.nick_name like concat (#{walletTradeDTO.name},'%') or su.name like concat (#{walletTradeDTO.name},'%'))
@@ -76,6 +84,15 @@
            </if>
            <if test="walletTradeDTO.endTime != null and walletTradeDTO.endTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[<=]]> #{walletTradeDTO.endTime}
            </if>
            <if test="walletTradeDTO.keyWord != null and walletTradeDTO.keyWord != &quot;&quot;">
                AND (su.phone like concat (#{walletTradeDTO.keyWord},'%') or su.name like concat (#{walletTradeDTO.keyWord},'%'))
            </if>
            <if test="walletTradeDTO.expenditureKeyWord != null and walletTradeDTO.expenditureKeyWord != &quot;&quot;">
                AND (cauwt.remark like concat (#{walletTradeDTO.expenditureKeyWord},'%') or su1.name like concat (#{walletTradeDTO.expenditureKeyWord},'%'))
            </if>
            <if test="walletTradeDTO.remark != null and walletTradeDTO.remark != &quot;&quot;">
                AND cauwt.remark like concat (#{walletTradeDTO.remark},'%')
            </if>
        </where>
        <if test="walletTradeDTO.sort == null">
@@ -90,4 +107,167 @@

    </select>

    <select id="getTradeUserTotalWalletTradeAdmin" resultType="java.math.BigDecimal"
            parameterType="com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO">
        SELECT
        sum(cauwt.amount)
        FROM
        com_act_user_wallet_trade AS cauwt
        LEFT JOIN sys_user AS su ON su.user_id = cauwt.user_id
        LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.create_by
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
            </if>
            <if test="walletTradeDTO.type != null">
                and cauwt.type = #{walletTradeDTO.type}
            </if>
            <if test="walletTradeDTO.changeType != null">
                and cauwt.change_type = #{walletTradeDTO.changeType}
            </if>
            <if test="walletTradeDTO.keyWord != null and walletTradeDTO.keyWord != &quot;&quot;">
                AND (su.phone like concat (#{walletTradeDTO.keyWord},'%') or su.name like concat (#{walletTradeDTO.keyWord},'%'))
            </if>
            <if test="walletTradeDTO.expenditureKeyWord != null and walletTradeDTO.expenditureKeyWord != &quot;&quot;">
                AND (cauwt.remark like concat (#{walletTradeDTO.expenditureKeyWord},'%') or su1.name like concat (#{walletTradeDTO.expenditureKeyWord},'%'))
            </if>
            <if test="walletTradeDTO.phone != null and walletTradeDTO.phone != &quot;&quot;">
                AND su.phone like concat (#{walletTradeDTO.phone},'%')
            </if>
            <if test="walletTradeDTO.remark != null and walletTradeDTO.remark != &quot;&quot;">
                AND cauwt.remark like concat (#{walletTradeDTO.remark},'%')
            </if>
            <if test="walletTradeDTO.startTime != null and walletTradeDTO.startTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[>=]]> #{walletTradeDTO.startTime}
            </if>
            <if test="walletTradeDTO.endTime != null and walletTradeDTO.endTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[<=]]> #{walletTradeDTO.endTime}
            </if>
        </where>

        <if test="walletTradeDTO.sort == null">
            order by cauwt.create_at desc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 1">
            order by cauwt.amount asc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 2">
            order by cauwt.amount desc
        </if>
    </select>

    <select id="getTradeUserTotalWalletTradeExportAdmin" parameterType="com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO"
            resultType="com.panzhihua.common.model.vos.community.ComActUserWalletTradeExcelVO">
        SELECT
            cauwt.amount,su1.`name` as userName,su1.phone,cauwt.create_at,su.`name` as createBy
        FROM
            com_act_user_wallet_trade AS cauwt
            LEFT JOIN sys_user AS su ON su.user_id = cauwt.create_by
            LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.user_id
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
            </if>
            <if test="walletTradeDTO.type != null">
                and cauwt.type = #{walletTradeDTO.type}
            </if>
            <if test="walletTradeDTO.changeType != null">
                and cauwt.change_type = #{walletTradeDTO.changeType}
            </if>
            <if test="walletTradeDTO.keyWord != null and walletTradeDTO.keyWord != &quot;&quot;">
                AND (su.phone like concat (#{walletTradeDTO.keyWord},'%') or su.name like concat (#{walletTradeDTO.keyWord},'%'))
            </if>
            <if test="walletTradeDTO.startTime != null and walletTradeDTO.startTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[>=]]> #{walletTradeDTO.startTime}
            </if>
            <if test="walletTradeDTO.endTime != null and walletTradeDTO.endTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[<=]]> #{walletTradeDTO.endTime}
            </if>
            <if test="walletTradeDTO.tradeIds != null and walletTradeDTO.tradeIds.size > 0">
                AND cauwt.id in
                <foreach collection='walletTradeDTO.tradeIds' item='id' index='index' open='(' close=')' separator=',' >
                    #{id}
                </foreach>
            </if>
        </where>

        <if test="walletTradeDTO.sort == null">
            order by cauwt.create_at desc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 1">
            order by cauwt.amount asc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 2">
            order by cauwt.amount desc
        </if>

    </select>

    <select id="getTradeUserTotalJLWalletTradeExportAdmin" parameterType="com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO"
            resultType="com.panzhihua.common.model.vos.community.ComActUserWalletTradeRewardExcelVO">
        SELECT
        cauwt.amount,su1.`name` as userName,su1.phone,cauwt.create_at,su.`name` as createBy,cauwt.type,cauwt.remark
        FROM
        com_act_user_wallet_trade AS cauwt
        LEFT JOIN sys_user AS su ON su.user_id = cauwt.create_by
        LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.user_id
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.userId != null">
                and cauwt.user_id = #{walletTradeDTO.userId}
            </if>
            <if test="walletTradeDTO.type != null">
                and cauwt.type = #{walletTradeDTO.type}
            </if>
            <if test="walletTradeDTO.changeType != null">
                and cauwt.change_type = #{walletTradeDTO.changeType}
            </if>
            <if test="walletTradeDTO.keyWord != null and walletTradeDTO.keyWord != &quot;&quot;">
                AND (su.phone like concat (#{walletTradeDTO.keyWord},'%') or su.name like concat (#{walletTradeDTO.keyWord},'%'))
            </if>
            <if test="walletTradeDTO.startTime != null and walletTradeDTO.startTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[>=]]> #{walletTradeDTO.startTime}
            </if>
            <if test="walletTradeDTO.endTime != null and walletTradeDTO.endTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[<=]]> #{walletTradeDTO.endTime}
            </if>
            <if test="walletTradeDTO.tradeIds != null and walletTradeDTO.tradeIds.size > 0">
                AND cauwt.id in
                <foreach collection='walletTradeDTO.tradeIds' item='id' index='index' open='(' close=')' separator=',' >
                    #{id}
                </foreach>
            </if>
        </where>

        <if test="walletTradeDTO.sort == null">
            order by cauwt.create_at desc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 1">
            order by cauwt.amount asc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 2">
            order by cauwt.amount desc
        </if>

    </select>

    <select id="getTradeUserStatisticsAdmin" parameterType="com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO"
            resultType="com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeStatisticsAdminVO">
        SELECT
            sum( amount ) as dayTotal,
            (select sum(amount) from com_act_user_wallet_trade where community_id = #{walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType} and create_at between timestamp(DATE_ADD(curdate(),interval -day(curdate())+1 day)) and now()) as monthTotal,
            (select sum(amount) from com_act_user_wallet_trade where community_id = #{walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType}) as total
        FROM
            com_act_user_wallet_trade
            where community_id = #{walletTradeDTO.communityId} and change_type = #{walletTradeDTO.changeType}
            and create_at between timestamp(date_add(curdate(), interval - 0 day)) and now()
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComCorrectPopulationMapper.xml

New file
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComCorrectPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComCorrectPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="phone" property="phone" />
                    <result column="correct_type" property="correctType" />
                    <result column="correct_begin" property="correctBegin" />
                    <result column="correct_end" property="correctEnd" />
                    <result column="receive_method" property="receiveMethod" />
                    <result column="is_recidivist" property="isRecidivist" />
                    <result column="four_history" property="fourHistory" />
                    <result column="three_invovle" property="threeInvovle" />
                    <result column="is_correct_group" property="isCorrectGroup" />
                    <result column="correct_group_constitute" property="correctGroupConstitute" />
                    <result column="correct_relieve_type" property="correctRelieveType" />
                    <result column="is_out_control" property="isOutControl" />
                    <result column="out_control_reason" property="outControlReason" />
                    <result column="out_control_correct" property="outControlCorrect" />
                    <result column="inspect_out_control" property="inspectOutControl" />
                    <result column="is_miss_control" property="isMissControl" />
                    <result column="miss_control_reason" property="missControlReason" />
                    <result column="miss_control_correct" property="missControlCorrect" />
                    <result column="inspect_miss_control" property="inspectMissControl" />
                    <result column="reward_and_punishiment" property="rewardAndPunishiment" />
                    <result column="is_again_crime" property="isAgainCrime" />
                    <result column="again_crime_name" property="againCrimeName" />
                    <result column="pubishment_change" property="pubishmentChange" />
                    <result column="case_type" property="caseType" />
                    <result column="specific_charge" property="specificCharge" />
                    <result column="original_term" property="originalTerm" />
                    <result column="original_term_begin" property="originalTermBegin" />
                    <result column="originalTermEnd" property="originalTermEnd" />
                    <result column="culture_level" property="cultureLevel" />
                    <result column="correct_person_code" property="correctPersonCode" />
                    <result column="original_custodyplace" property="originalCustodyplace" />
                    <result column="remark" property="remark" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, correct_type, correct_begin, correct_end, receive_method, is_recidivist, four_history, three_invovle, is_correct_group, correct_group_constitute, correct_relieve_type, is_out_control, out_control_reason, out_control_correct, inspect_out_control, is_miss_control, miss_control_reason, miss_control_correct, inspect_miss_control, reward_and_punishiment, is_again_crime, again_crime_name, pubishment_change, case_type, specific_charge, original_term, original_term_begin, originalTermEnd, culture_level, correct_person_code, original_custodyplace, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComCultPopulationMapper.xml

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComCultPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComCultPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="cult_name" property="cultName" />
                    <result column="basic_situation" property="basicSituation" />
                    <result column="join_cult_date" property="joinCultDate" />
                    <result column="is_external_publicity" property="isExternalPublicity" />
                    <result column="remark" property="remark" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, cult_name, basic_situation, join_cult_date, is_external_publicity, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComDisabilityPopulationMapper.xml

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComDisabilityPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComDisabilityPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="phone" property="phone" />
                    <result column="certificate_situation" property="certificateSituation" />
                    <result column="dis_type" property="disType" />
                    <result column="dis_level" property="disLevel" />
                    <result column="remark" property="remark" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, certificate_situation, dis_type, dis_level, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComDrugPopulationMapper.xml

New file
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComDrugPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComDrugPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="phone" property="phone" />
                    <result column="first_date" property="firstDate" />
                    <result column="control_situation" property="controlSituation" />
                    <result column="control_person" property="controlPerson" />
                    <result column="control_person_phone" property="controlPersonPhone" />
                    <result column="help_situation" property="helpSituation" />
                    <result column="help_person" property="helpPerson" />
                    <result column="help_person_phone" property="helpPersonPhone" />
                    <result column="drug_reason" property="drugReason" />
                    <result column="drug_result" property="drugResult" />
                    <result column="have_crime" property="haveCrime" />
                    <result column="crime_sutiation" property="crimeSutiation" />
                    <result column="remark" property="remark" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, first_date, control_situation, control_person, control_person_phone, help_situation, help_person, help_person_phone, drug_reason, drug_result, have_crime, crime_sutiation, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComKeyPopulationMapper.xml

New file
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComKeyPopulationDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComKeyPopulationDO">
                <id column="id" property="id" />
                <result column="population_id" property="populationId" />
                <result column="street_id" property="streetId" />
                <result column="community_id" property="communityId" />
                <result column="name" property="name" />
                <result column="card_no" property="cardNo" />
                <result column="phone" property="phone" />
                <result column="remark" property="remark" />
                <result column="create_at" property="createAt" />
                <result column="create_by" property="createBy" />
                <result column="update_at" property="updateAt" />
                <result column="update_by" property="updateBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComLowSecurityPopulationMapper.xml

New file
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComLowSecurityPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComLowSecurityPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="phone" property="phone" />
                    <result column="region" property="region" />
                    <result column="family_code" property="familyCode" />
                    <result column="group_name" property="groupName" />
                    <result column="classified_rescue_category" property="classifiedRescueCategory" />
                    <result column="apply_date" property="applyDate" />
                    <result column="house_holder_name" property="houseHolderName" />
                    <result column="house_holder_card_no" property="houseHolderCardNo" />
                    <result column="house_holder_code" property="houseHolderCode" />
                    <result column="residence_postal_code" property="residencePostalCode" />
                    <result column="salvage_certificate_no" property="salvageCertificateNo" />
                    <result column="guaranteed_population_number" property="guaranteedPopulationNumber" />
                    <result column="family_population_number" property="familyPopulationNumber" />
                    <result column="account_person" property="accountPerson" />
                    <result column="account_bank" property="accountBank" />
                    <result column="account_card_no" property="accountCardNo" />
                    <result column="bank_account" property="bankAccount" />
                    <result column="support_institutions" property="supportInstitutions" />
                    <result column="distribution_method" property="distributionMethod" />
                    <result column="guaranteed_amount" property="guaranteedAmount" />
                    <result column="reallocation_amount" property="reallocationAmount" />
                    <result column="difference_relief_amount" property="differenceReliefAmount" />
                    <result column="classified_insured_amount" property="classifiedInsuredAmount" />
                    <result column="total_monthly_family_income" property="totalMonthlyFamilyIncome" />
                    <result column="average_monthly_family_income" property="averageMonthlyFamilyIncome" />
                    <result column="total_monthly_family_expenditure" property="totalMonthlyFamilyExpenditure" />
                    <result column="lng" property="lng" />
                    <result column="lat" property="lat" />
                    <result column="originate_date" property="originateDate" />
                    <result column="nursing_fee" property="nursingFee" />
                    <result column="apply_reason" property="applyReason" />
                    <result column="review_comment" property="reviewComment" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, region, family_code, group_name, classified_rescue_category, apply_date, house_holder_name, house_holder_card_no, house_holder_code, residence_postal_code, salvage_certificate_no, guaranteed_population_number, family_population_number, account_person, account_bank, account_card_no, bank_account, support_institutions, distribution_method, guaranteed_amount, reallocation_amount, difference_relief_amount, classified_insured_amount, total_monthly_family_income, average_monthly_family_income, total_monthly_family_expenditure, lng, lat, originate_date, nursing_fee, apply_reason, review_comment, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMajorPopulationMapper.xml

New file
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComMajorPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComMajorPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="economic_condition" property="economicCondition" />
                    <result column="person_type" property="personType" />
                    <result column="family_situation" property="familySituation" />
                    <result column="custody_person" property="custodyPerson" />
                    <result column="custody_relation" property="custodyRelation" />
                    <result column="custody_card_no" property="custodyCardNo" />
                    <result column="custody_person_phone" property="custodyPersonPhone" />
                    <result column="custody_address" property="custodyAddress" />
                    <result column="help_person" property="helpPerson" />
                    <result column="help_person_phone" property="helpPersonPhone" />
                    <result column="help_method" property="helpMethod" />
                    <result column="help_situation" property="helpSituation" />
                    <result column="is_crime" property="isCrime" />
                    <result column="crime_sutiation" property="crimeSutiation" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, economic_condition, person_type, family_situation, custody_person, custody_relation, custody_card_no, custody_person_phone, custody_address, help_person, help_person_phone, help_method, help_situation, is_crime, crime_sutiation, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComRehabilitationPopulationMapper.xml

New file
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComRehabilitationPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComRehabilitationPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="phone" property="phone" />
                    <result column="patient_relation" property="patientRelation" />
                    <result column="rehab_reason_and_type" property="rehabReasonAndType" />
                    <result column="is_rehab" property="isRehab" />
                    <result column="is_recidivist" property="isRecidivist" />
                    <result column="original_term" property="originalTerm" />
                    <result column="sentence_begin" property="sentenceBegin" />
                    <result column="original_charge" property="originalCharge" />
                    <result column="sentence_end" property="sentenceEnd" />
                    <result column="sentence_place" property="sentencePlace" />
                    <result column="risk_assessment" property="riskAssessment" />
                    <result column="join_date" property="joinDate" />
                    <result column="join_situation" property="joinSituation" />
                    <result column="is_again_crime" property="isAgainCrime" />
                    <result column="again_crime_name" property="againCrimeName" />
                    <result column="place_situation" property="placeSituation" />
                    <result column="place_date" property="placeDate" />
                    <result column="not_place_reason" property="notPlaceReason" />
                    <result column="help_begin" property="helpBegin" />
                    <result column="help_end" property="helpEnd" />
                    <result column="help_situation" property="helpSituation" />
                    <result column="remark" property="remark" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, patient_relation, rehab_reason_and_type, is_rehab, is_recidivist, original_term, sentence_begin, original_charge, sentence_end, sentence_place, risk_assessment, join_date, join_situation, is_again_crime, again_crime_name, place_situation, place_date, not_place_reason, help_begin, help_end, help_situation, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSentencePopulationMapper.xml

New file
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComSentencePopulationDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComSentencePopulationDO">
                <id column="id" property="id" />
                <result column="population_id" property="populationId" />
                <result column="street_id" property="streetId" />
                <result column="community_id" property="communityId" />
                <result column="name" property="name" />
                <result column="card_no" property="cardNo" />
                <result column="phone" property="phone" />
                <result column="spouse" property="spouse" />
                <result column="sentence_begin" property="sentenceBegin" />
                <result column="sentence_end" property="sentenceEnd" />
                <result column="charge" property="charge" />
                <result column="remark" property="remark" />
                <result column="create_at" property="createAt" />
                <result column="create_by" property="createBy" />
                <result column="update_at" property="updateAt" />
                <result column="update_by" property="updateBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, spouse, sentence_begin, sentence_end, charge, remark, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComVeteransPopulationMapper.xml

New file
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComVeteransPopulationDAO">

        <!-- 通用查询映射结果 -->
        <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComVeteransPopulationDO">
                    <id column="id" property="id" />
                    <result column="population_id" property="populationId" />
                    <result column="street_id" property="streetId" />
                    <result column="community_id" property="communityId" />
                    <result column="name" property="name" />
                    <result column="card_no" property="cardNo" />
                    <result column="phone" property="phone" />
                    <result column="person_status" property="personStatus" />
                    <result column="organization" property="organization" />
                    <result column="photo" property="photo" />
                    <result column="regiter_nature" property="regiterNature" />
                    <result column="enlist_date" property="enlistDate" />
                    <result column="retire_date" property="retireDate" />
                    <result column="person_category" property="personCategory" />
                    <result column="house_situation" property="houseSituation" />
                    <result column="house_situation_other" property="houseSituationOther" />
                    <result column="build_area" property="buildArea" />
                    <result column="employment_situation" property="employmentSituation" />
                    <result column="incumbency_type" property="incumbencyType" />
                    <result column="employment_situation_other" property="employmentSituationOther" />
                    <result column="endowment_insurance" property="endowmentInsurance" />
                    <result column="medical_insurance" property="medicalInsurance" />
                    <result column="annual_income" property="annualIncome" />
                    <result column="father_healthy" property="fatherHealthy" />
                    <result column="mother_healthy" property="motherHealthy" />
                    <result column="spouse_healthy" property="spouseHealthy" />
                    <result column="son_healthy" property="sonHealthy" />
                    <result column="daughter_dealthy" property="daughterDealthy" />
                    <result column="main_difficulty" property="mainDifficulty" />
                    <result column="other_difficulty" property="otherDifficulty" />
                    <result column="main_demand" property="mainDemand" />
                    <result column="main_demand_other" property="mainDemandOther" />
                    <result column="academic_training" property="academicTraining" />
                    <result column="is_veterans_training" property="isVeteransTraining" />
                    <result column="education_before_enlistment" property="educationBeforeEnlistment" />
                    <result column="re_education" property="reEducation" />
                    <result column="major" property="major" />
                    <result column="major_other" property="majorOther" />
                    <result column="once_engaged_industry" property="onceEngagedIndustry" />
                    <result column="once_engaged_industry_other" property="onceEngagedIndustryOther" />
                    <result column="intended_place_of_employment" property="intendedPlaceOfEmployment" />
                    <result column="intended_place_of_employment_other" property="intendedPlaceOfEmploymentOther" />
                    <result column="unemploymed_engaged_industry" property="unemploymedEngagedIndustry" />
                    <result column="unemploymed_engaged_industry_other" property="unemploymedEngagedIndustryOther" />
                    <result column="is_business" property="isBusiness" />
                    <result column="business_desire" property="businessDesire" />
                    <result column="remark" property="remark" />
                    <result column="fill_unit" property="fillUnit" />
                    <result column="fill_person" property="fillPerson" />
                    <result column="fill_person_phone" property="fillPersonPhone" />
                    <result column="create_at" property="createAt" />
                    <result column="create_by" property="createBy" />
                    <result column="update_at" property="updateAt" />
                    <result column="update_by" property="updateBy" />
        </resultMap>

        <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, population_id, street_id, community_id, name, card_no, phone, person_status, organization, photo, regiter_nature, enlist_date, retire_date, person_category, house_situation, house_situation_other, build_area, employment_situation, incumbency_type, employment_situation_other, endowment_insurance, medical_insurance, annual_income, father_healthy, mother_healthy, spouse_healthy, son_healthy, daughter_dealthy, main_difficulty, other_difficulty, main_demand, main_demand_other, academic_training, is_veterans_training, education_before_enlistment, re_education, major, major_other, once_engaged_industry, once_engaged_industry_other, intended_place_of_employment, intended_place_of_employment_other, unemploymed_engaged_industry, unemploymed_engaged_industry_other, is_business, business_desire, remark, fill_unit, fill_person, fill_person_phone, create_at, create_by, update_at, update_by
    </sql>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/pom.xml

@@ -73,6 +73,15 @@
            <artifactId>commons-lang</artifactId>
            <version>2.6</version>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml

@@ -23,3 +23,16 @@
  aesKey: Ryo7M3n8loC5
  sensitive: true

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: grid

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/pom.xml

@@ -59,6 +59,15 @@
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-redis</artifactId>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml

@@ -16,3 +16,16 @@
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: partybuilding

 springcloud_k8s_panzhihuazhihuishequ/service_user/pom.xml

@@ -71,7 +71,15 @@
            <groupId>com.netflix.hystrix</groupId>
            <artifactId>hystrix-javanica</artifactId>
        </dependency>

        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -6,10 +6,7 @@
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.utlis.ClazzUtils;
@@ -125,6 +122,17 @@
    }

    /**
     * 微心愿搜索社区团队人员列表
     * @param param 请求参数
     * @param communityId   社区id
     * @return  社区团队人员列表
     */
    @PostMapping("listactivitymanager2")
    public R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId") Long communityId) {
        return userService.listActivityManager2(param, communityId);
    }

    /**
     * 分页查询人脸识别
     *
     * @param loginUserInfoVO 查询参数
@@ -149,12 +157,12 @@
    /**
     * 分页查询人口管理
     *
     * @param loginUserInfoVO 查询参数
     * @param userInfoVO 查询参数
     * @return 分页数据
     */
    @PostMapping("pageuser")
    public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
        return userService.pageUser(loginUserInfoVO);
    public R pageUser(@RequestBody AppletUserInfoVO userInfoVO) {
        return userService.pageUser(userInfoVO);
    }

    /**

 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/dao/UserDao.java

@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.vos.AppletUserInfoVO;
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -18,6 +19,8 @@
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
@@ -78,43 +81,43 @@
            "</script>")
    IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);

    @Select("<script> " +
            "SELECT\n" +
            "u.user_id,\n" +
            "u.`name`,\n" +
            "u.`sex`,\n" +
            "u.nick_name,\n" +
            "u.phone,\n" +
            "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n"+
            "1 isRegister,\n"+
            "v.political_face political_outlook,\n"+
            "u.id_card,\n" +
            "u.job,\n" +
            "c.area_name communityName,\n" +
            "u.tags,\n" +
            "u.create_at \n" +
            "FROM\n" +
            "sys_user u\n" +
            "left join com_mng_volunteer_mng v on u.phone=v.phone \n"+
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.trim() == &quot;&quot;'>" +
            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
            " </if> " +
            " where u.community_id=#{loginUserInfoVO.communityId} and u.type=1 " +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
            " </if> " +
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
            " </if> " +
            " order by u.user_id desc " +
            "</script>")
    IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
//    @Select("<script> " +
//            "SELECT\n" +
//            "u.user_id,\n" +
//            "u.`name`,\n" +
//            "u.`sex`,\n" +
//            "u.nick_name,\n" +
//            "u.phone,\n" +
//            "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n"+
//            "1 isRegister,\n"+
//            "v.political_face political_outlook,\n"+
//            "u.id_card,\n" +
//            "u.job,\n" +
//            "c.area_name communityName,\n" +
//            "u.tags,\n" +
//            "u.create_at \n" +
//            "FROM\n" +
//            "sys_user u\n" +
//            "left join com_mng_volunteer_mng v on u.phone=v.phone \n"+
//            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
//            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
//            " </if> " +
//            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.trim() == &quot;&quot;'>" +
//            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
//            " </if> " +
//            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
//            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
//            " </if> " +
//            " where u.community_id=#{loginUserInfoVO.communityId} and u.type=1 " +
//            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
//            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
//            " </if> " +
//            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
//            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
//            " </if> " +
//            " order by u.user_id desc " +
//            "</script>")
    IPage<AppletUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") AppletUserInfoVO userInfoVO);

    @Select("<script> " +
            "SELECT\n" +
@@ -432,4 +435,12 @@
    @Select("select user_id,nick_name,phone from sys_user where type = 6 and community_id = #{communityId} limit 3")
    List<EventGridMemberVO> getGridsMemberList(@Param("communityId") Long communityId);

    @Select("<script>" +
            "select id as managerId,`name` from com_pb_service_team where community_id = #{communityId}" +
            "<if test='param != null and param != &quot;&quot;'>" +
            "AND `name` like concat(#{param},'%') " +
            " </if> " +
            "</script>")
    List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param, @Param("communityId") Long communityId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -8,10 +8,7 @@
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.web.bind.annotation.PostMapping;
@@ -80,6 +77,14 @@
     * @return 人员集合
     */
    R listActivityManager(String param, Long communityId);

    /**
     * 微心愿搜索社区团队人员列表
     * @param param 请求参数
     * @param communityId   社区id
     * @return  社区团队人员列表
     */
    R listActivityManager2(String param, Long communityId);
    /**
     *分页查询人脸识别
     * @param loginUserInfoVO 查询参数
@@ -94,10 +99,10 @@
    R putUserFace(LoginUserInfoVO loginUserInfoVO);
    /**
     *分页查询人口管理
     * @param loginUserInfoVO 查询参数
     * @param userInfoVO 查询参数
     * @return 分页数据
     */
    R pageUser(LoginUserInfoVO loginUserInfoVO);
    R pageUser(AppletUserInfoVO userInfoVO);
    /**
     * 查询所有人员标签
     * @return 标签集合

 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,16 +356,16 @@
            comMngUserTagDO.setTagName(comMngTagVO.getTagName());
            comMngUserTagDAO.updateById(comMngUserTagDO);
        }else{
            int count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
            if(count>0){
               return R.fail("标签重复");
            ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.getSpecialInputUserTagsByVO(comMngTagVO);
            if(comMngUserTagDO != null && comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId())){
                return R.fail("标签重复");
            }
            ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
            comMngUserTagDO.setTagName(comMngTagVO.getTagName());
            comMngUserTagDO.setCommunityId(comMngTagVO.getCommunityId());
            comMngUserTagDO.setSysFlag(0);
            comMngUserTagDO.setCreateAt(new Date());
            comMngUserTagDAO.insert(comMngUserTagDO);
            ComMngUserTagDO comMngUserTagDO1 = new ComMngUserTagDO();
            comMngUserTagDO1.setTagName(comMngTagVO.getTagName());
            comMngUserTagDO1.setCommunityId(comMngTagVO.getCommunityId());
            comMngUserTagDO1.setSysFlag(0);
            comMngUserTagDO1.setCreateAt(new Date());
            comMngUserTagDAO.insert(comMngUserTagDO1);
        }
        return R.ok();
    }

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

@@ -20,6 +20,8 @@
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
//import com.panzhihua.common.service.grid.GridService;
@@ -334,6 +336,17 @@
    }

    /**
     * 微心愿搜索社区团队人员列表
     * @param param 请求参数
     * @param communityId   社区id
     * @return  社区团队人员列表
     */
    @Override
    public R listActivityManager2(String param, Long communityId) {
        return R.ok(userDao.getServiceTeamList(param,communityId));
    }

    /**
     * 分页查询人脸识别
     *
     * @param loginUserInfoVO 查询参数
@@ -396,23 +409,12 @@
    /**
     * 分页查询人口管理
     *
     * @param loginUserInfoVO 查询参数
     * @param userInfoVO 查询参数
     * @return 分页数据
     */
    @Override
    public R pageUser(LoginUserInfoVO loginUserInfoVO) {
        Page page = new Page<>();
        Long pageNum = loginUserInfoVO.getPageNum();
        Long pageSize = loginUserInfoVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO);
    public R pageUser(AppletUserInfoVO userInfoVO) {
        IPage<AppletUserInfoVO> iPage = userDao.pageUser(new Page<>(userInfoVO.getPageNum(),userInfoVO.getPageSize()), userInfoVO);
        iPage.getRecords().forEach(record -> {
            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
            record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
@@ -600,6 +602,7 @@
     */
    @Override
    public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {

        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
//        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml

@@ -16,3 +16,16 @@
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: user

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

New file
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_user.dao.UserDao">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_user.model.dos.SysUserDO">
        <id column="user_id" property="userId" />
        <result column="account" property="account" />
        <result column="password" property="password" />
        <result column="openid" property="openid" />
        <result column="session_key" property="sessionKey" />
        <result column="unionid" property="unionid" />
        <result column="phone" property="phone" />
        <result column="nick_name" property="nickName" />
        <result column="name" property="name" />
        <result column="community_id" property="communityId" />
        <result column="sex" property="sex" />
        <result column="id_card" property="idCard" />
        <result column="birthday" property="birthday" />
        <result column="image_url" property="imageUrl" />
        <result column="type" property="type" />
        <result column="job" property="job" />
        <result column="is_volunteer" property="isVolunteer" />
        <result column="is_partymember" property="isPartymember" />
        <result column="status" property="status" />
        <result column="create_at" property="createAt" />
        <result column="last_login_time" property="lastLoginTime" />
        <result column="tags" property="tags" />
        <result column="family_id" property="familyId" />
        <result column="face_url" property="faceUrl" />
        <result column="face_state" property="faceState" />
        <result column="reject_reson" property="rejectReson" />
        <result column="area_id" property="areaId" />
        <result column="card_photo_front" property="cardPhotoFront" />
        <result column="card_photo_back" property="cardPhotoBack" />
        <result column="family_book" property="familyBook" />
        <result column="continuous_landing_days" property="continuousLandingDays" />
        <result column="is_tips" property="isTips" />
        <result column="work_status" property="workStatus" />
        <result column="work_start_time" property="workStartTime" />
        <result column="work_end_time" property="workEndTime" />
        <result column="big_age_tips" property="bigAgeTips" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        user_id, account, password, openid, session_key, unionid, phone, nick_name, name, community_id, sex, id_card, birthday, image_url, type, job, is_volunteer, is_partymember, status, create_at, last_login_time, tags, family_id, face_url, face_state, reject_reson, area_id, card_photo_front, card_photo_back, family_book, continuous_landing_days, is_tips, work_status, work_start_time, work_end_time, big_age_tips
    </sql>

    <select id="pageUser" parameterType="com.panzhihua.common.model.vos.AppletUserInfoVO"
            resultType="com.panzhihua.common.model.vos.AppletUserInfoVO">
        SELECT
            u.user_id,
            u.`name`,
            u.`sex`,
            u.nick_name,
            u.phone,
            u.birthday,
            YEAR (
                now()) - YEAR (
            substring( u.id_card, 7, 8 )) age,
            1 isRegister,
            v.political_face political_outlook,
            u.id_card,
            u.job,
            c.`name` communityName,
            u.tags,
            cauw.id as walletId,
            IFNULL(cauw.income_amount,0) as income_amount,
            IFNULL(cauw.available_amount,0) as available_amount,
            IFNULL(cauw.settlement_amount,0) as settlement_amount,
            IFNULL(caiu.integral_sum,0) as integral_sum,
            IFNULL(caiu.integral_available_sum,0) as integral_available_sum,
            IFNULL(caiu.integral_frozen_sum,0) as integral_frozen_sum,
            IF(u.id_card,1,2) as isRealNamed,
            u.create_at
        FROM
            sys_user u
            LEFT JOIN com_mng_volunteer_mng v ON u.phone = v.phone
            LEFT JOIN com_act AS c ON c.community_id = u.community_id
            LEFT JOIN com_act_user_wallet as cauw on u.user_id = cauw.user_id and u.community_id = cauw.community_id
            LEFT JOIN com_act_integral_user as caiu on u.user_id = caiu.user_id and u.community_id = caiu.community_id
        WHERE
            u.community_id = #{loginUserInfoVO.communityId}
            AND u.type = 1
        <if test='loginUserInfoVO.keyWord != null and loginUserInfoVO.keyWord.trim() != &quot;&quot;'>
            AND (u.phone like concat(#{loginUserInfoVO.keyWord},'%') or
             u.`name` like concat(#{loginUserInfoVO.keyWord},'%') or c.`name` like concat(#{loginUserInfoVO.keyWord},'%'))
        </if>
        <if test='loginUserInfoVO.isRealNamed != null and loginUserInfoVO.isRealNamed == 1'>
            AND u.id_card is not null
        </if>
        <if test='loginUserInfoVO.isRealNamed != null and loginUserInfoVO.isRealNamed == 2'>
            AND u.id_card is null
        </if>
        ORDER BY
            u.user_id DESC
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/pom.xml

@@ -47,6 +47,15 @@
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>

    <build>

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/bootstrap.yml

@@ -20,3 +20,16 @@
    service-url:
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka

management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: shopbackstage

 springcloud_k8s_panzhihuazhihuishequ/timejob/pom.xml

@@ -48,6 +48,15 @@
            <artifactId>xxl-job-core</artifactId>
            <version>2.2.0</version>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml

@@ -17,5 +17,17 @@
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka


management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: timejob


 springcloud_k8s_panzhihuazhihuishequ/zuul/pom.xml

@@ -56,6 +56,15 @@
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
        </dependency>
        <!--添加监控依赖包-->
        <dependency>
            <groupId>io.micrometer</groupId>
            <artifactId>micrometer-registry-prometheus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml

@@ -84,4 +84,19 @@
      - POST:/api/applets/user/pagemicrowish
      - POST:/api/applets/user/pageeasyphoto
      - POST:/api/applets/neighbor/user/page
      - GET:/api/applets/user/listfamily
      - GET:/api/applets/user/listfamily


management:
  endpoints:
    web:
      exposure:
        include: '*'

  endpoint:
    health:
      show-details: always

  metrics:
    tags:
      application: zuul