springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -80,12 +80,12 @@ for (Map<Integer, String> oneData : list) { ComMngPopulationServeExcelVO vo = new ComMngPopulationServeExcelVO(); vo.setName(oneData.get(0)); vo.setSex(Integer.valueOf(oneData.get(1))); vo.setSex(oneData.get(1)); vo.setAge(Integer.valueOf(oneData.get(2))); vo.setIsRent(Integer.valueOf(oneData.get(3))); vo.setIsRent(oneData.get(3)); vo.setRoad(oneData.get(4)); vo.setDoorNo(Integer.valueOf(oneData.get(5))); vo.setFloor(Integer.valueOf(oneData.get(6))); 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
@@ -18,13 +18,13 @@ private String name; @ExcelProperty(value = "性别（1.男 2.女 3.未知）", index = 1) private Integer sex; private String sex; @ExcelProperty(value = "年龄", index = 2) private Integer age; @ExcelProperty(value = "是否租住", index = 3) private Integer isRent; private String isRent; @ExcelProperty(value = "街路巷", index = 4) private String road; @@ -33,7 +33,7 @@ private Integer doorNo; @ExcelProperty(value = "楼排号", index = 6) private Integer floor; private String floor; @ExcelProperty(value = "单元号", index = 7) private Integer unitNo; @@ -62,4 +62,22 @@ * 扩展字段用逗号隔开 */ private List<String> userTagStr = Lists.newArrayList(); public interface sex{ String nan = "男"; String nv = "女"; String no = "未知"; } public interface isOk{ String yes = "是"; String no = "否"; } public interface politicalOutlook{ String dang = "中共党员"; String tuan = "共青团员"; String wu = "无党派人员"; String qun = "群众"; } } 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/dao/ComMngPopulationDAO.java
@@ -114,7 +114,8 @@ "cmp.remark,\n" + "cmv.alley,\n" + "cmp.native_place,\n" + "cmp.nation \n" + "cmp.nation, \n" + "cmp.label \n" + "FROM \n" + "com_mng_population AS cmp " + "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -126,4 +126,23 @@ 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/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
@@ -27,6 +27,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.util.ArrayList; @@ -249,6 +250,38 @@ 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.setActId(comMngVillageDO.getVillageId()); comMngPopulationDO.setActId(comActDO.getCommunityId()); comMngPopulationDO.setStreetId(comActDO.getStreetId()); @@ -256,7 +289,7 @@ comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDOList.add(comMngPopulationDO); }); //this.saveBatch(populationDOList); this.saveBatch(populationDOList); return R.ok("共计导入实有人口数量：" + populationDOList.size()); } @@ -289,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(); } }
