优化导入导出接口,新增实有人口导出接口

huanghongfa

2021-03-31 376e1f1c688c71a31ee321805e443af8e92c8d5e

优化导入导出接口,新增实有人口导出接口

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

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

import lombok.Getter;

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

    private final Integer code;
    private final String name;

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

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

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

}

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

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

import lombok.Getter;

/**
 * 政治面貌
 * 
 * @author huanghongfa
 */
@Getter
public enum PopulPoliticalOutlookEnum
{
    PARTY_MEMBER(1, "中共党员"),
    PROBATIONARY_PARTY_MEMBER(2, "中共预备党员"),
    COMMUNIST_YOUTH_LEAGUE_MEMBER(3, "共青团员"),
    MEMBERS_OF_THE_DEMOCRATIC_REVOLUTION(4, "民革党员"),
    LEAGUE_MEMBER(5, "民盟盟员"),
    MEMBER_OF_CIVIL_CONSTRUCTION(6, "民建会员"),
    A_MEMBER_OF_THE_RURAL_LABOR_PARTY(8, "农工党党员"),
    ZHIGONG_PARTY_MEMBER(9, "致公党党员"),
    MEMBER_OF_JIUSAN_SOCIETY(10, "九三学社社员"),
    MEMBER_OF_THE_TAIWAN_LEAGUE(11, "台盟盟员"),
    INDEPENDENTS(12, "无党派人士"),
    THE_MASSES(13, "群众");

    private final Integer code;
    private final String name;

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

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

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

}

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

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

import lombok.Getter;

/**
 * 性别枚举
 *
 * @author huanghongfa
 */
@Getter
public enum PopulSexEnum {
    nan(1, "男"), nv(2, "女"), weizhi(3, "未知");

    private final Integer code;
    private final String name;

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

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

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


}

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

@@ -4,6 +4,9 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.PopulIsOkEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulSexEnum;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
@@ -80,16 +83,34 @@
            for (Map<Integer, String> oneData : list) {
                ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO();
                vo.setName(oneData.get(0));
                vo.setSex(oneData.get(1));
                vo.setSex(PopulSexEnum.getCodeByName(oneData.get(1)));
                if(oneData.get(2) == null){
                    throw new ServiceException("500", "年龄不可为空:第" + index + "行,第3列");
                }
                vo.setAge(Integer.valueOf(oneData.get(2)));
                vo.setIsRent(oneData.get(3));
                if(oneData.get(3) == null){
                    throw new ServiceException("500", "是否租住不可为空:第" + index + "行,第4列");
                }
                vo.setIsRent(PopulIsOkEnum.getCodeByName(oneData.get(3)));
                vo.setRoad(oneData.get(4));
                if(oneData.get(5) == null){
                    throw new ServiceException("500", "门牌号不可为空:第" + index + "行,第6列");
                }
                vo.setDoorNo(Integer.valueOf(oneData.get(5)));
                vo.setFloor(oneData.get(6));
                if(oneData.get(7) == null){
                    throw new ServiceException("500", "单元号不可为空:第" + index + "行,第8列");
                }
                vo.setUnitNo(Integer.valueOf(oneData.get(7)));
                if(oneData.get(8) == null){
                    throw new ServiceException("500", "户室不可为空:第" + index + "行,第9列");
                }
                vo.setHouseNo(Integer.valueOf(oneData.get(8)));
                vo.setNation(oneData.get(9));
                vo.setPoliticalOutlook(oneData.get(10));
                if(oneData.get(10) == null){
                    throw new ServiceException("500", "政治面貌不可为空:第" + index + "行,第11列");
                }
                vo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCodeByName(oneData.get(10)));
                vo.setCardNo(oneData.get(11));
                vo.setPhone(oneData.get(12));
                vo.setNativePlace(oneData.get(13));
@@ -107,7 +128,7 @@
                throw new ServiceException(r.getMsg());
            }
        } catch (NumberFormatException e) {
            throw new ServiceException("500", "填写数据类型错误:第" + index + "行" + e.getMessage());
            throw new ServiceException("500", "填写数据格式错误:第" + index + "行" + e.getMessage());
        }
    }
}

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

@Data
public class ComMngPopulationExcelVo {

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

    @ExcelProperty(value = "性别" ,index = 1)
    private String sex;

    @ExcelProperty(value = "年龄" ,index = 2)
    private Integer age;

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

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

    @ExcelProperty(value = "楼排号" ,index = 5)
    private Integer doorNo;

    @ExcelProperty(value = "门牌号" ,index = 6)
    private String floor;

    @ExcelProperty(value = "单元号" ,index = 7)
    private Integer unitNo;

    @ExcelProperty(value = "户室" ,index = 8)
    private Integer houseNo;

    @ExcelProperty(value = "民族" ,index = 9)
    private String nation;

    @ExcelProperty(value = "政治面貌" ,index = 10)
    private String politicalOutlook;

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

    @ExcelProperty(value = "联系方式" ,index = 12)
    private String phone;

    @ExcelProperty(value = "籍贯" ,index = 13)
    private String nativePlace;

    @ExcelProperty(value = "工作单位" ,index = 14)
    private String workCompany;

    @ExcelProperty(value = "标签" ,index = 15)
    private String label;
}

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

@@ -18,13 +18,13 @@
    private String name;

    @ExcelProperty(value = "性别（1.男 2.女 3.未知）", index = 1)
    private String sex;
    private Integer sex;

    @ExcelProperty(value = "年龄", index = 2)
    private Integer age;

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

    @ExcelProperty(value = "街路巷", index = 4)
    private String road;
@@ -45,7 +45,7 @@
    private String nation;

    @ExcelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)", index = 10)
    private String politicalOutlook;
    private Integer politicalOutlook;

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

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

@@ -160,4 +160,32 @@
    @ApiModelProperty("是否租住")
    @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
    private Integer isRent;

    /**
     * 性别（1.男 2.女 3.未知）
     */
    public interface sex{
        int nan = 1;
        int nv = 2;
        int no = 3;
    }

    /**
     * 是否租住
     */
    public interface isOk{
        int yes = 1;
        int no = 0;
    }

    /**
     * 政治面貌
     */
    public interface politicalOutlook{
        int dang = 1;
        int tuan = 3;
        int wu = 12;
        int qun = 13;
        int no = 13;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1482,8 +1482,8 @@
    /**
     * 查询省下所有区域  tree结构
     *
     * @param provinceAdcode
     * @return
     * @param provinceAdcode    省份code
     * @return  查询结果
     */
    @GetMapping("/common/data/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
@@ -1491,8 +1491,8 @@
    /**
     * 分页查询街道
     *
     * @param pageComStreetDTO
     * @return
     * @param pageComStreetDTO  查询条件
     * @return  查询结果
     */
    @PostMapping("/pagestreet")
    R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO);
@@ -1500,8 +1500,8 @@
    /**
     * 新增街道
     *
     * @param comStreetVOO
     * @return
     * @param comStreetVOO  需要新增的街道数据
     * @return  新增结果
     */
    @PostMapping("/addstreet")
    R pageStreet(@RequestBody ComStreetVO comStreetVOO);
@@ -1509,8 +1509,8 @@
    /**
     * 删除街道
     *
     * @param Ids
     * @return
     * @param Ids   需要删除街道id集合
     * @return  删除结果
     */
    @PostMapping("/deletestreet")
    R delectStreat(@RequestBody List<Long> Ids);
@@ -1518,8 +1518,8 @@
    /**
     * 查询街道
     *
     * @param comStreetVO
     * @return
     * @param comStreetVO   查询条件
     * @return  返回结果
     */
    @PostMapping("/liststreet")
    R listStreet(ComStreetVO comStreetVO);
@@ -1527,8 +1527,8 @@
    /**
     * 分页查询实有房屋
     *
     * @param pageComMngVillageDTO
     * @return
     * @param pageComMngVillageDTO  查询条件
     * @return  返回结果
     */
    @PostMapping("/pagevillage")
    R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO);
@@ -1536,8 +1536,8 @@
    /**
     * 新增实有房屋
     *
     * @param comMngVillageVO
     * @return
     * @param comMngVillageVO   新增的实有房屋数据
     * @return  新增结果
     */
    @PostMapping("/addvillage")
    R addVillage(@RequestBody ComMngVillageVO comMngVillageVO);
@@ -1545,8 +1545,8 @@
    /**
     * 删除实有房屋
     *
     * @param Ids
     * @return
     * @param Ids   需要删除的id集合
     * @return  删除结果
     */
    @PostMapping("/deletevillage")
    R delectVillage(@RequestBody List<Long> Ids);
@@ -1554,8 +1554,8 @@
    /**
     * 查询实有房屋
     *
     * @param comMngVillageVO
     * @return
     * @param comMngVillageVO   查询条件
     * @return  查询结果
     */
    @PostMapping("/listvillage")
    R listVillage(ComMngVillageVO comMngVillageVO);
@@ -1563,9 +1563,9 @@
    /**
     * 批量导入实有房屋
     *
     * @param list
     * @param communityId
     * @return
     * @param list  实有房屋数据
     * @param communityId   社区id
     * @return  导入结果
     */
    @PostMapping("/village/import")
    R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
@@ -1574,9 +1574,9 @@
    /**
     * 批量导入实有人口
     *
     * @param list
     * @param communityId
     * @return
     * @param list  实有人口数据
     * @param communityId   社区id
     * @return  导入结果
     */
    @PostMapping("/common/data/population/import")
    R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
@@ -1617,4 +1617,20 @@
    @PostMapping("/common/data/population/delete")
    R deletePopulations(@RequestBody List<Long> Ids);

    /**
     * 根据社区id查询所有实有人口
     * @param communityId   社区id
     * @return  查询结果
     */
    @PostMapping("/common/data/population/getAll")
    R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId);

    /**
     * 根据id集合查询实有人口
     * @param Ids   实有人口id集合
     * @return  查询结果
     */
    @PostMapping("/common/data/population/getList")
    R getPopulationLists(@RequestBody List<Long> Ids);

}

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

@@ -5,11 +5,15 @@
import com.alibaba.excel.enums.CellExtraTypeEnum;
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.jcraft.jsch.SftpException;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.PopulIsOkEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulSexEnum;
import com.panzhihua.common.listen.*;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.user.*;
@@ -32,6 +36,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -855,4 +860,78 @@
        data.add("阿里巴巴");
        return data;
    }

    @ApiOperation(value = "实有人口-数据导出")
    @PostMapping("/population/data/export")
    public R dataExportPopulation(@RequestBody List<Long> Ids) {
        //获取登陆用户
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        //获取登陆用户绑定社区id
        Long communityId = loginUserInfo.getCommunityId();
        //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "实有人口数据.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去写
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    List<ComMngPopulationVO> populList = null;
                    if(Ids.size() > 0){//导出部分
                        populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),ComMngPopulationVO.class);
                    }else{//导出全部
                        populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationListByCommunityId(communityId).getData()),ComMngPopulationVO.class);
                    }

                    List<ComMngPopulationExcelVo> populationExcelVoList = new ArrayList<>();
                    if(populList != null && populList.size() > 0){
                        for (ComMngPopulationVO popul:populList){
                            ComMngPopulationExcelVo populationExcelVo = new ComMngPopulationExcelVo();
                            BeanUtils.copyProperties(popul,populationExcelVo);
                            //设置性别
                            populationExcelVo.setSex(PopulSexEnum.getCnDescByName(popul.getSex()));
                            //设置政治面貌
                            populationExcelVo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(popul.getPoliticalOutlook()));
                            //设置是否租住
                            populationExcelVo.setIsRent(PopulIsOkEnum.getCnDescByName(popul.getIsRent()));
                            populationExcelVoList.add(populationExcelVo);
                        }
                    }

                    excelWriter = EasyExcel.write(fileName, ComMngPopulationExcelVo.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("实有人口导出数据").build();
                    excelWriter.write(populationExcelVoList, 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/java/com/panzhihua/community_backstage/excel/CustomSheetWriteHandler.java

@@ -29,9 +29,9 @@
        LOGGER.info("第{}个Sheet写入成功。", writeSheetHolder.getSheetNo());

        // 区间设置 第一列第一行和第二行的数据。由于第一行是头，所以第一、二行的数据实际上是第二三行
        CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 2000, 2, 2);
        CellRangeAddressList cellRangeAddressList1 = new CellRangeAddressList(1, 2000, 4 ,4);
        CellRangeAddressList cellRangeAddressList2 = new CellRangeAddressList(1, 2000, 11 ,11);
        CellRangeAddressList cellRangeAddressList = new CellRangeAddressList(1, 2000, 1, 1);
        CellRangeAddressList cellRangeAddressList1 = new CellRangeAddressList(1, 2000, 3 ,3);
        CellRangeAddressList cellRangeAddressList2 = new CellRangeAddressList(1, 2000, 10 ,10);
        DataValidationHelper helper = writeSheetHolder.getSheet().getDataValidationHelper();
        DataValidationConstraint constraint = helper.createExplicitListConstraint(new String[] {"是", "否"});
        DataValidationConstraint constraint1 = helper.createExplicitListConstraint(new String[] {"中共党员","中共预备党员","共青团员","民革党员","民盟盟员","民建会员","农工党党员","致公党党员","九三学社社员","台盟盟员","无党派人士","群众"});

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

@@ -306,4 +306,26 @@
    public R deletePopulations(@RequestBody List<Long> Ids) {
        return comMngPopulationService.deletePopulations(Ids);
    }

    /**
     * 根据社区id查询所有实有人口
     * @param communityId   社区id
     * @return  查询结果
     */
    @ApiOperation(value = "根据社区id查询所有实有人口")
    @PostMapping("/population/getAll")
    public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
        return comMngPopulationService.getPopulationListByCommunityId(communityId);
    }

    /**
     * 根据id集合查询实有人口
     * @param Ids   实有人口id集合
     * @return  查询结果
     */
    @ApiOperation(value = "批量删除实有人口")
    @PostMapping("/population/getList")
    public R getPopulationLists(@RequestBody List<Long> Ids) {
        return comMngPopulationService.getPopulationLists(Ids);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -78,5 +78,19 @@
     */
    R deletePopulations(List<Long> Ids);

    /**
     * 根据社区id查询所有实有人口
     * @param communityId   社区id
     * @return  查询结果
     */
    R getPopulationListByCommunityId(Long communityId);

    /**
     * 根据id集合查询实有人口
     * @param Ids   实有人口id集合
     * @return  查询结果
     */
    R getPopulationLists(List<Long> Ids);


}

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

@@ -250,38 +250,6 @@
            if (comMngVillageDO == null) {
                throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
            }
            //性别判断
            if(!StringUtils.isEmpty(vo.getSex())){
                if(vo.getSex().equals(ComMngPopulationServeExcelVO.sex.nan)){
                    comMngPopulationDO.setSex(ComMngPopulationDO.sex.nan);
                }else if(vo.getSex().equals(ComMngPopulationServeExcelVO.sex.nv)){
                    comMngPopulationDO.setSex(ComMngPopulationDO.sex.nv);
                }else{
                    comMngPopulationDO.setSex(ComMngPopulationDO.sex.no);
                }
            }
            //是否租住判断
            if(!StringUtils.isEmpty(vo.getIsRent())){
                if(vo.getIsRent().equals(ComMngPopulationServeExcelVO.isOk.no)){
                    comMngPopulationDO.setIsRent(ComMngPopulationDO.isOk.no);
                }else{
                    comMngPopulationDO.setIsRent(ComMngPopulationDO.isOk.yes);
                }
            }
            //政治面貌判断
            if(!StringUtils.isEmpty(vo.getPoliticalOutlook())){
                if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.qun)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.qun);
                }else if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.tuan)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.tuan);
                }else if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.dang)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.dang);
                }else if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.wu)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.wu);
                }else{
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.no);
                }
            }
            comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());
            comMngPopulationDO.setActId(comActDO.getCommunityId());
            comMngPopulationDO.setStreetId(comActDO.getStreetId());
@@ -336,4 +304,42 @@
        }
        return R.fail();
    }

    /**
     * 根据社区id查询所有实有人口
     * @param communityId   社区id
     * @return  查询结果
     */
    @Override
    public R getPopulationListByCommunityId(Long communityId) {
        List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id",communityId));
        List<ComMngPopulationVO> resultList = new ArrayList<>();
        if(list.size() > 0){
            list.forEach(populationDO -> {
                ComMngPopulationVO populationVO=new ComMngPopulationVO();
                BeanUtils.copyProperties(populationDO,populationVO);
                resultList.add(populationVO);
            });
        }
        return R.ok(resultList);
    }

    /**
     * 根据id集合查询实有人口
     * @param Ids   实有人口id集合
     * @return  查询结果
     */
    @Override
    public R getPopulationLists(List<Long> Ids) {
        List<ComMngPopulationDO> list = populationDAO.selectBatchIds(Ids);
        List<ComMngPopulationVO> resultList = new ArrayList<>();
        if(list.size() > 0){
            list.forEach(populationDO -> {
                ComMngPopulationVO populationVO = new ComMngPopulationVO();
                BeanUtils.copyProperties(populationDO,populationVO);
                resultList.add(populationVO);
            });
        }
        return R.ok(resultList);
    }
}