elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev

dev_shibei_match
jianjun 5 years ago
parent
0554622b11 9a448e8c8e
commit
e66646deb3
3 changed files with 13 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
  3. 16
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
View File

@ -97,9 +97,9 @@ public class GroupDataServiceImpl implements GroupDataService {
List<GridGroupPeopleResultDTO> value = everyGroup.getValue(); List<GridGroupPeopleResultDTO> value = everyGroup.getValue();
String key = everyGroup.getKey(); String key = everyGroup.getKey();
List<GridGroupPeopleResultDTO> groupPeopleSorted = value.stream().sorted(Comparator.comparing(GridGroupPeopleResultDTO::getGroupCount).reversed()).collect(Collectors.toList()); List<GridGroupPeopleResultDTO> groupPeopleSorted = value.stream().sorted(Comparator.comparing(GridGroupPeopleResultDTO::getGroupCount).reversed()).collect(Collectors.toList());
Integer groupPeopleMedian = groupPeopleSorted.size() % 2 == 0 ? Integer groupPeopleMedian = groupPeopleSorted.size() % NumConstant.TWO == NumConstant.ZERO ?
(groupPeopleSorted.get(groupPeopleSorted.size() / 2 - 1).getGroupCount() + groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount()) / 2 : (groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO - NumConstant.ONE).getGroupCount() + groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO).getGroupCount()) / NumConstant.TWO :
groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount(); groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO).getGroupCount();
result.forEach(grid -> { result.forEach(grid -> {
if (key.equals(grid.getGridId())){ if (key.equals(grid.getGridId())){
grid.setGroupMedian(groupPeopleMedian);//中位数 grid.setGroupMedian(groupPeopleMedian);//中位数

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.epmet.service.stats.*;
import com.epmet.util.DimIdGenerator; import com.epmet.util.DimIdGenerator;
import com.epmet.util.ModuleConstant; import com.epmet.util.ModuleConstant;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import oracle.sql.NUMBER;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -155,7 +156,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
if (allGrid.size() != NumConstant.ZERO) { if (allGrid.size() != NumConstant.ZERO) {
// 1. 机关下有多少网格 // 1. 机关下有多少网格
List<GridIdListByCustomerResultDTO> customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId); 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) { if (customerGridIdList.size() != NumConstant.ZERO) {
customerGridIdList.forEach(gridId -> { customerGridIdList.forEach(gridId -> {
allGrid.forEach(allAgencyGrid -> { allGrid.forEach(allAgencyGrid -> {

16
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
View File

@ -177,9 +177,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
if (statsDate == null) { if (statsDate == null) {
//当天的凌晨时间 即为今天之前的数据 //当天的凌晨时间 即为今天之前的数据
statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
} else { } else {
statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
} }
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
int pageNo = 1; int pageNo = 1;
@ -234,9 +234,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
if (statsDate == null) { if (statsDate == null) {
//当天的凌晨时间 即为今天之前的数据 //当天的凌晨时间 即为今天之前的数据
statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
} else { } else {
statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
} }
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
int pageNo = 1; int pageNo = 1;
@ -262,9 +262,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
if (statsDate == null) { if (statsDate == null) {
//当天的凌晨时间 即为今天之前的数据 //当天的凌晨时间 即为今天之前的数据
statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
} else { } else {
statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
} }
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
int pageNo = 1; int pageNo = 1;
@ -297,9 +297,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
if (statsDate == null) { if (statsDate == null) {
//当天的凌晨时间 即为今天之前的数据 //当天的凌晨时间 即为今天之前的数据
statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
} else { } else {
statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN); statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
} }
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
int pageNo = 1; int pageNo = 1;

Write Preview
Loading…
Cancel
Save