From 3e0b7a44347dd6c43677b812ca22176dfc465811 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Dec 2021 16:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=AD=E5=BF=83=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/AgencyServiceImpl.java | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index e9747050e3..4fecffafe7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -19,7 +19,6 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -46,7 +45,6 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.CustomerAgencyRedis; -import com.epmet.send.SendMqMsgUtil; import com.epmet.service.AgencyService; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerOrgParameterService; @@ -547,14 +545,25 @@ public class AgencyServiceImpl implements AgencyService { formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setLevel(OrgInfoConstant.AGENCY); } + if (StringUtils.isNotBlank(customerAgencyEntity.getLatitude())){ + result.setLatitude(new BigDecimal(customerAgencyEntity.getLatitude())); + } + if (StringUtils.isNotBlank(customerAgencyEntity.getLongitude())){ + result.setLongitude(new BigDecimal(customerAgencyEntity.getLongitude())); + } if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)){ CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId()); result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class); result.setName(entity.getOrganizationName()); result.setLevel(formDTO.getLevel()); result.setAgencyLevel(entity.getLevel()); - result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude())); - result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude())); + //经纬度 如果本级没有则取根级组织的 根级没有就空着 + if (StringUtils.isNotBlank(entity.getLatitude()){ + result.setLatitude(new BigDecimal(entity.getLatitude())); + } + if (StringUtils.isNotBlank(entity.getLongitude()){ + result.setLongitude(new BigDecimal(entity.getLongitude())); + } if (entity.getLevel().equals(OrgInfoConstant.COMMUNITY)){ List son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.GRID); if (CollectionUtils.isNotEmpty(son)){ @@ -576,12 +585,9 @@ public class AgencyServiceImpl implements AgencyService { if (CollectionUtils.isNotEmpty(directlySub)){ dtoList.addAll(directlySub); } - if (CollectionUtils.isNotEmpty(dtoList)){ - MapOrgResultDTO finalResult1 = result; - dtoList.forEach(d -> { - d.setLatitude(StringUtils.isBlank(d.getLatitudeOrigin()) ? finalResult1.getLatitude() : new BigDecimal(d.getLatitudeOrigin())); - d.setLongitude(StringUtils.isBlank(d.getLongitudeOrigin()) ? finalResult1.getLongitude() : new BigDecimal(d.getLongitudeOrigin())); - }); + for (MapSonOrgResultDTO d : dtoList) { + d.setLatitude(StringUtils.isBlank(d.getLatitudeOrigin()) ? result.getLatitude() : new BigDecimal(d.getLatitudeOrigin())); + d.setLongitude(StringUtils.isBlank(d.getLongitudeOrigin()) ? result.getLongitude() : new BigDecimal(d.getLongitudeOrigin())); } result.setChildren(dtoList); } @@ -591,15 +597,19 @@ public class AgencyServiceImpl implements AgencyService { result.setName(entity.getGridName()); result.setLevel(formDTO.getLevel()); result.setAgencyLevel(OrgInfoConstant.GRID); - result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude())); - result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude())); + //经纬度 如果本级没有则取根级组织的 根级没有就空着 + if (StringUtils.isNotBlank(entity.getLatitude()){ + result.setLatitude(new BigDecimal(entity.getLatitude())); + } + if (StringUtils.isNotBlank(entity.getLongitude()){ + result.setLongitude(new BigDecimal(entity.getLongitude())); + } List son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.NEIGHBOR_HOOD); if (CollectionUtils.isNotEmpty(son)){ - MapOrgResultDTO finalResult2 = result; - son.forEach(s -> { - s.setLatitude(StringUtils.isBlank(s.getLatitudeOrigin()) ? finalResult2.getLatitude() : new BigDecimal(s.getLatitudeOrigin())); - s.setLongitude(StringUtils.isBlank(s.getLongitudeOrigin()) ? finalResult2.getLongitude() : new BigDecimal(s.getLongitudeOrigin())); - }); + for (MapSonOrgResultDTO s : son) { + s.setLatitude(StringUtils.isBlank(s.getLatitudeOrigin()) ? result.getLatitude() : new BigDecimal(s.getLatitudeOrigin())); + s.setLongitude(StringUtils.isBlank(s.getLongitudeOrigin()) ? result.getLongitude() : new BigDecimal(s.getLongitudeOrigin())); + } } result.setChildren(CollectionUtils.isEmpty(son) ? new ArrayList<>() : son); } @@ -671,4 +681,4 @@ public class AgencyServiceImpl implements AgencyService { return insertEntity; } -} \ No newline at end of file +}