防火防汛接口问题修复，实有人口接口改动

huanghongfa

2021-07-31 1709a4d554eca49bf37348d1551c60d3fa12a7d9

防火防汛接口问题修复，实有人口接口改动

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

@@ -43,7 +43,7 @@
    @PostMapping("/app/pagePatrolRecord")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        if (comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
        if (!comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
            comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getUserId()));
        }
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
@@ -60,6 +60,7 @@
    public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordAddDTO.setCommunityId(communityId);
        comSwPatrolRecordAddDTO.setCreateBy(this.getUserId());
        return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }


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

@@ -115,7 +115,7 @@
            int index = 2;
            try {
                ArrayList<ComMngPopulationServeExcelVO> voList = Lists.newArrayList();
                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ArrayList<ComMngPopulationMistakeExcelVO> mistakes = Lists.newArrayList();
                for (Map<Integer, String> oneData : list) {
                    ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO();
@@ -123,10 +123,10 @@
                    if(StringUtils.isNotEmpty(oneData.get(0)) || StringUtils.isNotEmpty(oneData.get(1))){
                        if(StringUtils.isEmpty(oneData.get(0))){
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第1列");
                            importErrorVO.setErrorMsg("名字不可为空，请填写姓名");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第1列");
//                            importErrorVO.setErrorMsg("名字不可为空，请填写姓名");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("名字不可为空，请填写姓名");
@@ -135,11 +135,11 @@
                        }
                        vo.setName(oneData.get(0));
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第2列"+oneData.get(1));
                            importErrorVO.setErrorMsg("身份证号不可为空，请填写身份证号");
                            populationImportErrorVOList.add(importErrorVO);
//                            importErrorVO.setErrorPosition("第" + index + "行，第2列"+oneData.get(1));
//                            importErrorVO.setErrorMsg("身份证号不可为空，请填写身份证号");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            setMistake(oneData, mistake);
                            mistake.setMistake("身份证号不可为空，请填写身份证号");
@@ -149,10 +149,10 @@

                        //判断身份证号码位数
                        if(oneData.get(1).length() != 18){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第2列"+oneData.get(1));
                            importErrorVO.setErrorMsg("身份证号位数有误，请检查身份证号码是否正确");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第2列"+oneData.get(1));
//                            importErrorVO.setErrorMsg("身份证号位数有误，请检查身份证号码是否正确");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -196,10 +196,10 @@
                        vo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3)));
                        Integer isOk = PopulPoliticalOutlookEnum.getCodeByName(oneData.get(3));
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第4列");
                            importErrorVO.setErrorMsg("您填写的政治面貌有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第4列");
//                            importErrorVO.setErrorMsg("您填写的政治面貌有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -212,10 +212,10 @@
                    if(StringUtils.isNotEmpty(oneData.get(4))){
                        Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(4));
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第5列");
                            importErrorVO.setErrorMsg("您填写的是否租住有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第5列");
//                            importErrorVO.setErrorMsg("您填写的是否租住有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -248,10 +248,10 @@

                        if(isOk.equals(-1)){
//                        vo.setMarriageStr(ma);
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第6列");
                            importErrorVO.setErrorMsg("您填写的与户主关系有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第6列");
//                            importErrorVO.setErrorMsg("您填写的与户主关系有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -263,10 +263,10 @@
                        }
                    }
                    if(StringUtils.isEmpty(oneData.get(6))){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第7列");
                        importErrorVO.setErrorMsg("街路巷不可为空");
                        populationImportErrorVOList.add(importErrorVO);
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第7列");
//                        importErrorVO.setErrorMsg("街路巷不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
@@ -276,10 +276,10 @@
                    }
                    vo.setRoad(oneData.get(6));
                    if(StringUtils.isEmpty(oneData.get(7))){
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第8列");
                        importErrorVO.setErrorMsg("小区号不可为空");
                        populationImportErrorVOList.add(importErrorVO);
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第8列");
//                        importErrorVO.setErrorMsg("小区号不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
@@ -289,10 +289,10 @@
                    }
                    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);
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第9列");
//                        importErrorVO.setErrorMsg("楼排号不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
@@ -302,10 +302,10 @@
                    }
                    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);
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第10列");
//                        importErrorVO.setErrorMsg("单元号不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
@@ -315,10 +315,10 @@
                    }
                    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);
//                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                        importErrorVO.setErrorPosition("第" + index + "行，第11列");
//                        importErrorVO.setErrorMsg("户室不可为空");
//                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                        setMistake(oneData, mistake);
@@ -336,10 +336,10 @@
                    if(StringUtils.isNotEmpty(oneData.get(13))){
                        Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(13).trim());
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第14列");
                            importErrorVO.setErrorMsg("您填写的房屋状态有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第14列");
//                            importErrorVO.setErrorMsg("您填写的房屋状态有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -352,10 +352,10 @@
                    if(StringUtils.isNotEmpty(oneData.get(14))){
                        Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim());
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第15列");
                            importErrorVO.setErrorMsg("您填写的房屋用途有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第15列");
//                            importErrorVO.setErrorMsg("您填写的房屋用途有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -368,10 +368,10 @@
                    if(StringUtils.isNotEmpty(oneData.get(15))){
                        Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(15));
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第16列");
                            importErrorVO.setErrorMsg("您填写的管控状态有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第16列");
//                            importErrorVO.setErrorMsg("您填写的管控状态有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -392,10 +392,10 @@
                        vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(18)));
                        Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(18));
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第19列");
                            importErrorVO.setErrorMsg("您填写的文化程度有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第19列");
//                            importErrorVO.setErrorMsg("您填写的文化程度有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -410,10 +410,10 @@
                        Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(19));
                        if(isOk.equals(-1)){
//                        vo.setMarriageStr(ma);
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第20列");
                            importErrorVO.setErrorMsg("您填写的婚姻状况有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第20列");
//                            importErrorVO.setErrorMsg("您填写的婚姻状况有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -444,10 +444,10 @@
                    if(StringUtils.isNotEmpty(oneData.get(25))){
                        Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(25));
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第26列");
                            importErrorVO.setErrorMsg("您填写的本地/外地有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第26列");
//                            importErrorVO.setErrorMsg("您填写的本地/外地有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -470,10 +470,10 @@
                    if(StringUtils.isNotEmpty(oneData.get(28))){
                        Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(28));
                        if(isOk.equals(-1)){
                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                            importErrorVO.setErrorPosition("第" + index + "行，第29列");
                            importErrorVO.setErrorMsg("您填写的人员类型有误");
                            populationImportErrorVOList.add(importErrorVO);
//                            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                            importErrorVO.setErrorPosition("第" + index + "行，第29列");
//                            importErrorVO.setErrorMsg("您填写的人员类型有误");
//                            populationImportErrorVOList.add(importErrorVO);
                            index++;
                            ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                            setMistake(oneData, mistake);
@@ -558,47 +558,34 @@
                R r = communityService.listSavePopulationServeExcelVO(newVoList, communityId);
                if (!R.isOk(r)) {
                    List<ComMngPopulationMistakeExcelVO> list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationMistakeExcelVO.class);
                    String errMsg = r.getMsg();
                    List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
                    if(!errorList.isEmpty()){
                        populationImportErrorVOList.addAll(errorList);
                    }
//                    String errMsg = r.getMsg();
//                    List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
//                    if(!errorList.isEmpty()){
//                        populationImportErrorVOList.addAll(errorList);
//                    }
                    mistakes.addAll(list);
                    R result = mistakeExportPopulation(mistakes);
                    loadUrl = (String)result.getData();
                    ComMngPopulationImportErrorVO comMngPopulationImportErrorVO = new ComMngPopulationImportErrorVO();
                    comMngPopulationImportErrorVO.setErrorPosition("loadUrl");
                    comMngPopulationImportErrorVO.setErrorMsg(loadUrl);
                    populationImportErrorVOList.add(comMngPopulationImportErrorVO);
                    throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
                    throw new ServiceException("500", JSON.toJSONString(mistakes));
                }else{
//                mistakes.addAll((List<ComMngPopulationMistakeExcelVO>)r.getData());
                    R result = mistakeExportPopulation(mistakes);
                    loadUrl = (String)result.getData();
                    if(!populationImportErrorVOList.isEmpty()){
                        ComMngPopulationImportErrorVO comMngPopulationImportErrorVO = new ComMngPopulationImportErrorVO();
                        comMngPopulationImportErrorVO.setErrorPosition("loadUrl");
                        comMngPopulationImportErrorVO.setErrorMsg(loadUrl);
                        populationImportErrorVOList.add(comMngPopulationImportErrorVO);
                        throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
                    if(!mistakes.isEmpty()){
                        throw new ServiceException("500", JSON.toJSONString(mistakes));
                    }
                }
            } catch (NumberFormatException e) {
                e.printStackTrace();
                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                importErrorVO.setErrorPosition("第" + index + "行");
                importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
                populationImportErrorVOList.add(importErrorVO);
                throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                importErrorVO.setErrorPosition("第" + index + "行");
//                importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
//                populationImportErrorVOList.add(importErrorVO);
                throw new ServiceException("500", "导入失败");
            } catch (ParseException e1) {
                e1.printStackTrace();
                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                importErrorVO.setErrorPosition("第" + index + "行");
                importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
                populationImportErrorVOList.add(importErrorVO);
                throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
//                List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                importErrorVO.setErrorPosition("第" + index + "行");
//                importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
//                populationImportErrorVOList.add(importErrorVO);
                throw new ServiceException("500", "导入失败");
            }
        }


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

@@ -24,13 +24,13 @@
     * 分页-当前页数
     */
    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum;
    private Long pageNum = 1L;

    /**
     * 分页-每页记录数
     */
    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize;
    private Long pageSize = 10L;

    /**
     * 社区id

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

@@ -48,7 +48,7 @@
     * 巡查时间
     */
    @ApiModelProperty("巡查时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date patrolTime;

    /**
@@ -127,6 +127,7 @@
    * 接班时间
    */
    @ApiModelProperty("接班时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date successionTime;

    /**
@@ -145,6 +146,7 @@
    * 排查时间
    */
    @ApiModelProperty("排查时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date checkTime;

    /**
@@ -203,6 +205,9 @@
    @ApiModelProperty("创建人")
    private Long createBy;

    @ApiModelProperty("填报人名称")
    private String createName;

    /**
     * 安全记录/隐患报告显示按钮
     */

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

@@ -19,6 +19,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
@@ -575,4 +576,53 @@
        }
        return communityService.pageExServiceman(comExServicemanDTO);
    }

    @ApiOperation(value = "下载导入失败实有人口数据")
    @PostMapping("/download/error/population")
    public R downloadErrorPopulation(@RequestBody String mistakes) {
        List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class);
        //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateStr();
        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, ComMngPopulationMistakeExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new com.panzhihua.common.excel.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/service_community/src/main/java/com/panzhihua/service_community/dao/ComSwPatrolRecordDAO.java

@@ -10,6 +10,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.Map;

/**
 * @auther txb
 * @create 2021-07-23 14:38:38
@@ -24,4 +26,8 @@
     * @return 分页集合
     */
    IPage<ComSwPatrolRecordVO> pagePatrolRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    Map<String,String> getPbServiceTeamById(@Param("teamId") String teamId);

    String getCreateName(@Param("userId") Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java

@@ -33,7 +33,7 @@
    /**
     * 巡查时间
     */
    private String patrolTime;
    private Date patrolTime;

    /**
    * 巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开
@@ -98,7 +98,7 @@
    /**
    * 接班时间
    */
    private String successionTime;
    private Date successionTime;

    /**
    * 是否存在隐患（1是 、0否）

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

@@ -364,7 +364,7 @@
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception {
        List<ComMngPopulationMistakeExcelVO> mistakes = new ArrayList<>();
        List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//        List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
        //查询该社区
        ComActDO comActDO = comActDAO.selectById(communityId);
        //查询该社区的省市区地址
@@ -396,10 +396,10 @@
            //查询小区街路巷是否存在
            ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
            if (comMngVillageDO == null) {
                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                importErrorVO.setErrorMsg("街路巷或小区号不存在，请先在“小区管理”中添加该小区");
                importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
                populationImportErrorVOList.add(importErrorVO);
//                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
//                importErrorVO.setErrorMsg("街路巷或小区号不存在，请先在“小区管理”中添加该小区");
//                importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
//                populationImportErrorVOList.add(importErrorVO);
//                index++;
                ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
                BeanUtils.copyProperties(vo,mistake);
@@ -434,9 +434,10 @@
            }
            String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
            //判断实有人口是否已存在
            ComMngPopulationDO populationDO = this.baseMapper.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
                    .eq(ComMngPopulationDO::getCardNo, cardNoAES));
            if (populationDO == null) {
            List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda()
                    .eq(ComMngPopulationDO::getCardNo, cardNoAES).eq(ComMngPopulationDO::getActId,communityId));
            ComMngPopulationDO populationDO = null;
            if (populationDOList.isEmpty()) {
                //不存在实有人口,则新增
                populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);
//                ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO);
@@ -445,7 +446,7 @@
//                if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
//                    populationDO = updatePopulationDO(vo, populationDO);
//                }
                populationDO = updatePopulationDO(vo, comActDO, populationDO);
                populationDO = updatePopulationDO(vo, comActDO, populationDOList.get(0));
            }

            //处理实有人口房屋居住信息
@@ -472,8 +473,8 @@
        }
        this.saveBatch(populationDOList);*/

        if (!populationImportErrorVOList.isEmpty()) {
            return R.fail(mistakes,JSON.toJSONString(populationImportErrorVOList));
        if (!mistakes.isEmpty()) {
            return R.fail(mistakes);
        }
        return R.ok();
    }

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

@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComSwDangerReportDAO;
@@ -25,6 +26,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;

/**
 * @auther txb
@@ -49,19 +51,7 @@

    @Override
    public R pagePatrolRecord(ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO) {
        Page page = new Page<>();
        Long pageNum = comSwPatrolRecordPageDTO.getPageNum();
        Long pageSize = comSwPatrolRecordPageDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);

        IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(page, comSwPatrolRecordPageDTO);
        IPage<ComSwPatrolRecordVO> iPage = comSwPatrolRecordDAO.pagePatrolRecord(new Page(comSwPatrolRecordPageDTO.getPageNum(),comSwPatrolRecordPageDTO.getPageSize()), comSwPatrolRecordPageDTO);
        return R.ok(iPage);
    }

@@ -72,8 +62,27 @@
        BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO);
        Long patrolRecordId = Snowflake.getId();
        comSwPatrolRecordDO.setId(patrolRecordId);
        comSwPatrolRecordDO.setPersonName(comSwPatrolRecordAddDTO.getPPersonName());
        comSwPatrolRecordDO.setPersonPhone(comSwPatrolRecordAddDTO.getPPersonPhone());
        comSwPatrolRecordDO.setPatrolTime(new Date());
        comSwPatrolRecordDO.setSuccessionTime(DateUtils.stringToDate(comSwPatrolRecordAddDTO.getSuccessionTime(),DateUtils.yyyyMMdd_format));
        StringBuilder nameString = new StringBuilder();
        StringBuilder phoneString = new StringBuilder();
        //根据传递的巡查人员id查询巡查人员的名字和电话
        if(StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getPatrolPerson())){
            String[] personIds = comSwPatrolRecordAddDTO.getPatrolPerson().split(",");
            for (int i = 0; i < personIds.length ; i++) {
                Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
                if(person != null){
                    if(i != 0){
                        nameString.append(",");
                        phoneString.append(",");
                    }
                    nameString.append(person.get("name"));
                    phoneString.append(person.get("phone"));
                }
            }
        }
        comSwPatrolRecordDO.setPersonName(nameString.toString());
        comSwPatrolRecordDO.setPersonPhone(phoneString.toString());
        comSwPatrolRecordDAO.insert(comSwPatrolRecordDO);
        //巡查记录和关联报告信息
        ComSwPatrolRecordReportDO comSwPatrolRecordReportDO = new ComSwPatrolRecordReportDO();
@@ -132,6 +141,45 @@
                }
            }
        }

        //组装巡查类型
        if(StringUtils.isNotEmpty(comSwPatrolRecordVO.getPatrolType())){
            StringBuilder sb = new StringBuilder();
            String patrolTypes[] = comSwPatrolRecordVO.getPatrolType().split(",");
            for (int i = 0; i < patrolTypes.length; i++) {
                if(i != 0){
                    sb.append(",");
                }
                if(patrolTypes[i].equals("1")){
                    sb.append("防火巡查");
                }else if(patrolTypes[i].equals("2")){
                    sb.append("防汛巡查");
                }else if(patrolTypes[i].equals("3")){
                    sb.append("防疫巡查");
                }
            }
            comSwPatrolRecordVO.setPatrolType(sb.toString());
        }
        //查询接班人员信息
        if(StringUtils.isNotEmpty(comSwPatrolRecordVO.getSuccessionPerson())){
            StringBuilder sb = new StringBuilder();
            String personIds[] = comSwPatrolRecordVO.getSuccessionPerson().split(",");
            for (int i = 0; i < personIds.length; i++) {
                if(i != 0){
                    sb.append(",");
                }
                Map<String,String> personMap = comSwPatrolRecordDAO.getPbServiceTeamById(personIds[i]);
                if(personMap != null){
                    sb.append(personMap.get("name"));
                }
            }
            comSwPatrolRecordVO.setSuccessionPerson(sb.toString());
        }

        //查询填报人名称
        if(comSwPatrolRecordVO.getCreateBy() != null){
            comSwPatrolRecordVO.setCreateName(comSwPatrolRecordDAO.getCreateName(comSwPatrolRecordVO.getCreateBy()));
        }
        return R.ok(comSwPatrolRecordVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwPatrolRecordMapper.xml

@@ -60,7 +60,7 @@
                AND cspr.patrol_person LIKE concat('%',#{comSwPatrolRecordDTO.patrolPerson},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolType != null and comSwPatrolRecordDTO.patrolType != ""'>
                AND cspr.patrol_type = #{comSwPatrolRecordDTO.patrolType}
                AND cspr.patrol_type LIKE concat('%',#{comSwPatrolRecordDTO.patrolType},'%')
            </if>
            <if test='comSwPatrolRecordDTO.patrolAtBegin != null and comSwPatrolRecordDTO.patrolAtBegin != ""'>
                AND cspr.patrol_time <![CDATA[ >= ]]> #{comSwPatrolRecordDTO.patrolAtBegin}
@@ -72,4 +72,12 @@
        order by cspr.create_at desc
    </select>

    <select id="getPbServiceTeamById" resultType="Map">
        select `name`,phone from com_pb_service_team where id = #{teamId}
    </select>

    <select id="getCreateName" resultType="String">
        select `name` from sys_user where user_id = #{userId}
    </select>

</mapper>