Browse Source

常量修改

dev_shibei_match
zxc 5 years ago
parent
commit
b20b221257
  1. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
  2. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

6
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<GridGroupPeopleResultDTO> value = everyGroup.getValue();
String key = everyGroup.getKey();
List<GridGroupPeopleResultDTO> 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);//中位数

3
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<GridIdListByCustomerResultDTO> customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId);
AtomicReference<Integer> gridSize = new AtomicReference<>(0);
AtomicReference<Integer> gridSize = new AtomicReference<>(NumConstant.ZERO);
if (customerGridIdList.size() != NumConstant.ZERO) {
customerGridIdList.forEach(gridId -> {
allGrid.forEach(allAgencyGrid -> {

Loading…
Cancel
Save