springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java
@@ -303,7 +303,16 @@ vo.setNativePlace(oneData.get(17).trim()); } if (StringUtils.isNotEmpty(oneData.get(18))) { 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); index++; continue; } vo.setCultureLevel(isOk); } if (StringUtils.isNotEmpty(oneData.get(19))) { // String ma = convertMarriage(oneData.get(19)); @@ -358,10 +367,7 @@ vo.setResidence(PopulIsOkEnum.getCodeByName(oneData.get(27).trim())); } if (StringUtils.isNotEmpty(oneData.get(28))) { vo.setAddress(oneData.get(28).trim()); } if (StringUtils.isNotEmpty(oneData.get(29))) { Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(29)); Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(28)); if (isOk.equals(-1)) { ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); importErrorVO.setErrorPosition("第" + index + "行，第30列"); @@ -372,48 +378,48 @@ } vo.setPersonType(isOk); } if (StringUtils.isNotEmpty(oneData.get(29))) { vo.setCountry(oneData.get(29).trim()); } if (StringUtils.isNotEmpty(oneData.get(30))) { vo.setCountry(oneData.get(30).trim()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss"); vo.setDateOfDeparture(simpleDateFormat.parse(oneData.get(30))); } if (StringUtils.isNotEmpty(oneData.get(31))) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss"); vo.setDateOfDeparture(simpleDateFormat.parse(oneData.get(31))); vo.setPersonStatus(oneData.get(31).trim()); } if (StringUtils.isNotEmpty(oneData.get(32))) { vo.setPersonStatus(oneData.get(32).trim()); vo.setMonthlyIncome(oneData.get(32).trim()); } if (StringUtils.isNotEmpty(oneData.get(33))) { vo.setMonthlyIncome(oneData.get(33).trim()); vo.setFamilyStatus(oneData.get(33).trim()); } if (StringUtils.isNotEmpty(oneData.get(34))) { vo.setFamilyStatus(oneData.get(34).trim()); vo.setGoalInChina(oneData.get(34).trim()); } if (StringUtils.isNotEmpty(oneData.get(35))) { vo.setGoalInChina(oneData.get(35).trim()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss"); vo.setDateOfArrival(simpleDateFormat.parse(oneData.get(35))); } if (StringUtils.isNotEmpty(oneData.get(36))) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss"); vo.setDateOfArrival(simpleDateFormat.parse(oneData.get(36))); } if (StringUtils.isNotEmpty(oneData.get(37))) { vo.setRemark(oneData.get(37).trim()); vo.setRemark(oneData.get(36).trim()); } if (StringUtils.isNotEmpty(oneData.get(37))) { vo.setIdCardPositive(oneData.get(37).trim()); } if (StringUtils.isNotEmpty(oneData.get(38))) { vo.setIdCardPositive(oneData.get(38).trim()); vo.setIdCardBack(oneData.get(38).trim()); } if (StringUtils.isNotEmpty(oneData.get(39))) { vo.setIdCardBack(oneData.get(39).trim()); vo.setHouseHold(oneData.get(39).trim()); } if (StringUtils.isNotEmpty(oneData.get(40))) { vo.setHouseHold(oneData.get(40).trim()); } if (StringUtils.isEmpty(oneData.get(41))) { if (StringUtils.isEmpty(oneData.get(40))) { vo.setDeath(0); } else { vo.setDeath(PopulIsOkEnum.getCodeByName(oneData.get(41).trim())); vo.setDeath(PopulIsOkEnum.getCodeByName(oneData.get(40).trim())); } for (int i = 42; i < headSize; i++) { for (int i = 41; 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/ComMngPopulationServeExcelListen.java
@@ -187,6 +187,7 @@ // } // String relation = convertMarriage(oneData.get(5)); Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5)); if(isOk.equals(-1)){ // vo.setMarriageStr(ma); ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngCarVO.java
@@ -3,6 +3,7 @@ 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; @@ -18,6 +19,7 @@ */ @Data @ApiModel("车辆管理") @EncryptDecryptClass public class ComMngCarVO implements Serializable { @ApiModelProperty("主键") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1667,6 +1667,15 @@ R listVillage(ComMngVillageVO comMngVillageVO); /** * 根据房屋id查询实有房屋 * * @param villageId 查询条件 * @return 查询结果 */ @PostMapping("/getVillageById") R getVillageById(@RequestParam(value = "villageId")Long villageId); /** * 批量导入实有房屋 * * @param list 实有房屋数据 @@ -1762,6 +1771,15 @@ R getPopulationLists(@RequestBody List<Long> Ids); /** * 根据小区id查询实有人口 * * @param villageId 小区id * @return 查询结果 */ @PostMapping("/common/data/population/getListByVillageId") R getPopulationListByVillageId(@RequestParam("villageId") Long villageId); /** * 创建调查问卷 * * @param questnaireVO springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
@@ -7,9 +7,7 @@ import com.alibaba.fastjson.JSON; import com.panzhihua.common.constants.Constants; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.enums.PopulOutOrLocalEnum; import com.panzhihua.common.enums.PopulPoliticalOutlookEnum; import com.panzhihua.common.enums.PopulSexEnum; import com.panzhihua.common.enums.*; import com.panzhihua.common.listen.ComMngPopulationConfirmServeExcelListen; import com.panzhihua.common.listen.ComMngPopulationServeExcelListen; import com.panzhihua.common.model.dtos.community.*; @@ -300,37 +298,35 @@ List<String> head27 = new ArrayList<String>(); 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("来华目的（境外人员填写）"); List<String> head36 = new ArrayList<String>(); head36.add("抵达日期（境外人员填写）"); head35.add("抵达日期（境外人员填写）"); List<String> head36 = new ArrayList<String>(); 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("户口本照片"); List<String> head41 = new ArrayList<String>(); head41.add("是否死亡(是/否)"); head40.add("是否死亡(是/否)"); list.add(head0); @@ -374,7 +370,6 @@ list.add(head38); list.add(head39); list.add(head40); list.add(head41); return list; } @@ -408,7 +403,6 @@ data.add("本地"); data.add("四川成都"); data.add("是"); data.add("四川成都高新"); data.add("户籍"); data.add("中国"); data.add(""); @@ -448,6 +442,13 @@ try { List<ComMngPopulationVO> populList = null; if(Ids.size() > 0){//导出部分 if (Ids.size() == 1) { R r =communityService.getVillageById(Ids.get(0)); if (R.isOk(r)){ populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationListByVillageId(Ids.get(0)).getData()),ComMngPopulationVO.class); } populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),ComMngPopulationVO.class); } populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationLists(Ids).getData()),ComMngPopulationVO.class); }else{//导出全部 populList = JSON.parseArray(JSON.toJSONString(communityService.getPopulationListByCommunityId(communityId).getData()),ComMngPopulationVO.class); @@ -465,7 +466,11 @@ //设置是否租住 // populationExcelVo.setIsRent(PopulIsOkEnum.getCnDescByName(popul.getIsRent())); //设置本地或外地 populationExcelVo.setOutOrLacal(PopulOutOrLocalEnum.getCnDescByName(popul.getPoliticalOutlook())); populationExcelVo.setOutOrLacal(PopulOutOrLocalEnum.getCnDescByName(popul.getOutOrLocal())); //设置婚姻状况 populationExcelVo.setMarriage(PopulMarriageEnum.getCnDescByName(popul.getMarriage())); //设置文化程度 populationExcelVo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(popul.getCultureLevel())); //设置年龄 if (StringUtils.isNotEmpty(popul.getBirthday())) { populationExcelVo.setAge(AgeUtils.getAgeFromBirthTimes(popul.getBirthday())); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -73,6 +73,18 @@ } /** * 根据房屋id查询实有房屋 * * @param villageId 查询条件 * @return 查询结果 */ @PostMapping("getVillageById") public R getVillageById(@RequestParam(value = "villageId")Long villageId){ R r = comMngVillageService.getVillageById(villageId); return R.ok(r); } /** * 删除实有房屋 * @param Ids 动态id * @return 删除结果 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -421,6 +421,17 @@ } /** * 根据小区id查询实有人口 * * @param villageId 小区id * @return 查询结果 */ @PostMapping("/population/getListByVillageId") R getPopulationListByVillageId(@RequestParam(value = "villageId") Long villageId){ return comMngPopulationService.getPopulationListByVillageId(villageId); } /** * 编辑实有人口 * * @param populationEditDTO springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -123,6 +123,14 @@ R getPopulationLists(List<Long> Ids); /** * 根据小区id查询实有人口 * * @param villageId 小区id * @return 查询结果 */ R getPopulationListByVillageId(Long villageId); /** * 编辑实有人口 * * @param populationEditDTO springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
@@ -8,6 +8,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -31,6 +32,14 @@ R listComActVillage(ComMngVillageVO comMngVillageVO); /** * 根据房屋id查询实有房屋 * * @param villageId 查询条件 * @return 查询结果 */ R getVillageById(Long villageId); /** * 分页查询实有房屋 * @param pageComMngVillageDTO 查询参数 * @return 分页集合 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -7,10 +7,8 @@ import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComActWorkGuideMaterialVO; import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.utlis.DifferentLongListUtil; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComActWorkGuideDAO; import com.panzhihua.service_community.dao.ComActWorkGuideMaterialDAO; @@ -31,6 +29,7 @@ */ @Service public class ComActWorkGuideServiceImpl extends ServiceImpl<ComActWorkGuideDAO, ComActWorkGuideDO> implements ComActWorkGuideService { static String AK = "W3x8DhCWKc2UFIwYgclpRBdL6BeGLLQt"; // 百度地图密钥 @Resource ComActWorkGuideMaterialDAO workGuideMaterialDAO; @Resource @@ -114,6 +113,11 @@ vo.setAddress(comActDO.getAddress()); vo.setPhone(comActDO.getContactsPhone()); } // List<String> list = getCoordinate(vo.getAddress()); // if (list !=null && list.size() > 0){ // vo.setLon(list.get(0)); // vo.setLat(list.get(1)); // } List<ComActWorkGuideMaterialDO> workGuideMaterialDOS = workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>() .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId)); workGuideMaterialDOS.forEach(workGuideMaterialDO -> { @@ -149,4 +153,47 @@ .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId)); return R.ok(); } // // 调用百度地图API根据地址，获取坐标 // public static List<String> getCoordinate(String address) { // List<String> list = new ArrayList<>(); // if (address != null && !"".equals(address)) { // address = address.replaceAll("\\s*", "").replace("#", "栋"); // String url = "http://api.map.baidu.com/geocoder/v3/?address=" + address + "&output=json&ak=" + AK; // String json = loadJSON(url); //// json = "{" + json; //// json = json + "}"; // if (json != null && !"".equals(json)) { // XMLSerializer xmlSerializer = new XMLSerializer(); // //将xml转为json（注：如果是元素的属性，会在json里的key前加一个@标识） // String result = xmlSerializer.read(json).toString(); // JSONObject obj = JSONObject.parseObject(json); // if ("0".equals(obj.getString("status"))) { // double lng = obj.getJSONObject("result").getJSONObject("location").getDouble("lng"); // 经度 // double lat = obj.getJSONObject("result").getJSONObject("location").getDouble("lat"); // 纬度 // DecimalFormat df = new DecimalFormat("#.######"); // list.add(df.format(lng)); // list.add(df.format(lat)); // return list; // } // } // } // return null; // } // // public static String loadJSON(String url) { // StringBuilder json = new StringBuilder(); // try { // URL oracle = new URL(url); // URLConnection yc = oracle.openConnection(); // BufferedReader in = new BufferedReader(new InputStreamReader(yc.getInputStream(), "UTF-8")); // String inputLine = null; // while ((inputLine = in.readLine()) != null) { // json.append(inputLine); // } // in.close(); // } catch (MalformedURLException e) {} catch (IOException e) {} // return json.toString(); // } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -419,9 +419,10 @@ // ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO); } else { //如果存在人口信息，且是自用房，则更新人口默认的房屋信息 if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) { populationDO = updatePopulationDO(vo, populationDO); } // if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) { // populationDO = updatePopulationDO(vo, populationDO); // } populationDO = updatePopulationDO(vo, populationDO); } //处理实有人口房屋居住信息 @@ -457,15 +458,16 @@ UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",populationDO.getId()); ComMngPopulationDO update = new ComMngPopulationDO(); update.setRoad(vo.getRoad()); update.setDoorNo(vo.getDoorNo()); update.setFloor(vo.getFloor()); update.setUnitNo(vo.getUnitNo()); update.setHouseNo(vo.getHouseNo()); update.setHouseId(vo.getHouseId()); if (StringUtils.isNotEmpty(populationDO.getPhone())) { update.setPhone(populationDO.getPhone()); } // update.setRoad(vo.getRoad()); // update.setDoorNo(vo.getDoorNo()); // update.setFloor(vo.getFloor()); // update.setUnitNo(vo.getUnitNo()); // update.setHouseNo(vo.getHouseNo()); // update.setHouseId(vo.getHouseId()); // if (StringUtils.isNotEmpty(populationDO.getPhone())) { // update.setPhone(populationDO.getPhone()); // } BeanUtils.copyProperties(vo, update); this.baseMapper.update(update,updateWrapper); return populationDO; } @@ -715,6 +717,20 @@ } @Override public R getPopulationListByVillageId(Long villageId) { List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId)); 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); } @Override public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception { ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId()); if (populationDO == null) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -93,6 +93,16 @@ return R.ok(vos); } @Override public R getVillageById(Long villageId) { ComMngVillageDO comMngVillageDO = new ComMngVillageDO(); comMngVillageDO = comActVillageDAO.selectById(villageId); if (comMngVillageDO != null) { return R.ok(comMngVillageDO); } return R.fail(); } @Override public R pageComActVillage(PageComMngVillageDTO pageComMngVillageDTO) {
