huanghongfa
2021-03-31 002df95d5eb76568b348b490f11680ab36c0f66f
实有人口删除接口以及修改bug
7个文件已修改
100 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -84,8 +84,8 @@
                vo.setAge(Integer.valueOf(oneData.get(2)));
                vo.setIsRent(oneData.get(3));
                vo.setRoad(oneData.get(4));
                vo.setDoorNo(oneData.get(5));
                vo.setFloor(Integer.valueOf(oneData.get(6)));
                vo.setDoorNo(Integer.valueOf(oneData.get(5)));
                vo.setFloor(oneData.get(6));
                vo.setUnitNo(Integer.valueOf(oneData.get(7)));
                vo.setHouseNo(Integer.valueOf(oneData.get(8)));
                vo.setNation(oneData.get(9));
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -30,10 +30,10 @@
    private String road;
    @ExcelProperty(value = "门牌号", index = 5)
    private String doorNo;
    private Integer doorNo;
    @ExcelProperty(value = "楼排号", index = 6)
    private Integer floor;
    private String floor;
    @ExcelProperty(value = "单元号", index = 7)
    private Integer unitNo;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1608,4 +1608,13 @@
    @PostMapping("/common/data/population/editTag")
    R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
    /**
     * 批量删除实有人口
     *
     * @param Ids   实有人口id集合
     * @return  删除结果
     */
    @PostMapping("/common/data/population/delete")
    R deletePopulations(@RequestBody List<Long> Ids);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -738,6 +738,11 @@
                try {
                    List<List<String>> list = new ArrayList<>();
                    list = dataFilling();
                    //模拟数据集合
                    List<List<Object>> dataList = new ArrayList<>();
                    List<Object> data = new ArrayList<>();
                    data = dataListFilling();
                    //查询当前社区标签列表
                    R tagsResult = userService.listTags(communityId);
                    if(Constants.SUCCESS.equals(tagsResult.getCode())){
@@ -747,25 +752,10 @@
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i));
                            list.add(head);
                            data.add("否");
                        }
                    }
                    List<List<Object>> dataList = new ArrayList<>();
                    List<Object> data = new ArrayList<>();
                    data.add("张三");
                    data.add("男");
                    data.add(25);
                    data.add("是");
                    data.add("樱花街");
                    data.add(115);
                    data.add("15栋");
                    data.add(10);
                    data.add(1001);
                    data.add("汉族");
                    data.add("群众");
                    data.add("513421199508187219");
                    data.add("13768548521");
                    dataList.add(data);
                    EasyExcel.write(fileName).head(list).sheet("实有人口导入模板").doWrite(dataList);
                    File file = new File(fileName);
@@ -791,6 +781,11 @@
        }
    }
    @ApiOperation(value = "批量删除实有人口")
    @PostMapping("/population/delete")
    public R deletePopulations(@RequestBody List<Long> Ids){
        return communityService.deletePopulations(Ids);
    }
    private List<List<String>> dataFilling(){
        List<List<String>> list = new ArrayList<List<String>>();
@@ -841,4 +836,24 @@
        list.add(head15);
        return list;
    }
    private List<Object> dataListFilling(){
        List<Object> data = new ArrayList<>();
        data.add("张三");
        data.add("男");
        data.add(25);
        data.add("是");
        data.add("樱花街");
        data.add(115);
        data.add("15栋");
        data.add(10);
        data.add(1001);
        data.add("汉族");
        data.add("群众");
        data.add("513421199508187219");
        data.add("13768548521");
        data.add("中国");
        data.add("阿里巴巴");
        return data;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -294,4 +295,15 @@
    public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {
        return comMngPopulationService.editTagPopulation(populationTagDTO);
    }
    /**
     * 批量删除实有人口
     * @param Ids   删除id集合
     * @return  删除结果
     */
    @ApiOperation(value = "批量删除实有人口")
    @PostMapping("/population/delete")
    public R deletePopulations(@RequestBody List<Long> Ids) {
        return comMngPopulationService.deletePopulations(Ids);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -69,4 +69,14 @@
     * @return  修改结果
     */
    R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
    /**
     * 批量删除实有人口
     *
     * @param Ids   实有人口id集合
     * @return  删除结果
     */
    R deletePopulations(List<Long> Ids);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -322,4 +322,18 @@
        }
        return R.ok();
    }
    /**
     * 批量删除实有人口
     * @param Ids
     * @return
     */
    @Override
    public R deletePopulations(List<Long> Ids) {
        int delete = populationDAO.deleteBatchIds(Ids);
        if (delete > 0) {
            return R.ok();
        }
        return R.fail();
    }
}