From b20b221257c32e76e783ddec94e3cface369c146 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 30 Jun 2020 13:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/group/impl/GroupDataServiceImpl.java | 6 +++--- .../java/com/epmet/service/impl/StatsGroupServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java index ace321cba1..2b37f81ed6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java @@ -97,9 +97,9 @@ public class GroupDataServiceImpl implements GroupDataService { List value = everyGroup.getValue(); String key = everyGroup.getKey(); List groupPeopleSorted = value.stream().sorted(Comparator.comparing(GridGroupPeopleResultDTO::getGroupCount).reversed()).collect(Collectors.toList()); - Integer groupPeopleMedian = groupPeopleSorted.size() % 2 == 0 ? - (groupPeopleSorted.get(groupPeopleSorted.size() / 2 - 1).getGroupCount() + groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount()) / 2 : - groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount(); + Integer groupPeopleMedian = groupPeopleSorted.size() % NumConstant.TWO == NumConstant.ZERO ? + (groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO - NumConstant.ONE).getGroupCount() + groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO).getGroupCount()) / NumConstant.TWO : + groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO).getGroupCount(); result.forEach(grid -> { if (key.equals(grid.getGridId())){ grid.setGroupMedian(groupPeopleMedian);//中位数 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 77bbcd42ba..b9735e489c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -14,6 +14,7 @@ import com.epmet.service.stats.*; import com.epmet.util.DimIdGenerator; import com.epmet.util.ModuleConstant; import lombok.extern.slf4j.Slf4j; +import oracle.sql.NUMBER; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -155,7 +156,7 @@ public class StatsGroupServiceImpl implements StatsGroupService { if (allGrid.size() != NumConstant.ZERO) { // 1. 机关下有多少网格 List customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId); - AtomicReference gridSize = new AtomicReference<>(0); + AtomicReference gridSize = new AtomicReference<>(NumConstant.ZERO); if (customerGridIdList.size() != NumConstant.ZERO) { customerGridIdList.forEach(gridId -> { allGrid.forEach(allAgencyGrid -> {