elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

话题统计-月逻辑修改

master
wangchao 5 years ago
parent
7ff5552a65
commit
ea873911fb
1 changed files with 3 additions and 3 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/topic/impl/TopicServiceImpl.java

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

@ -347,7 +347,7 @@ public class TopicServiceImpl implements TopicService {
gridDistinct.put(k,false); gridDistinct.put(k,false);
}); });
List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId()); List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId());
Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange = Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange =
topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId)); topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId));
List<ResiGroupTopicResultDTO> groupListBetweenTimeRange = new LinkedList<>(); List<ResiGroupTopicResultDTO> groupListBetweenTimeRange = new LinkedList<>();
@ -357,7 +357,7 @@ public class TopicServiceImpl implements TopicService {
groupListBetweenTimeRange.addAll(entryBetweenTimeRange.getValue()); groupListBetweenTimeRange.addAll(entryBetweenTimeRange.getValue());
} }
List<ResiTopicOperationResultDTO> operationsBetweenTimeRange = List<ResiTopicOperationResultDTO> operationsBetweenTimeRange =
topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDate); topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDateCheck);
Map<String,List<ResiTopicOperationResultDTO>> topicOperationMapBetweenTimeRange = Map<String,List<ResiTopicOperationResultDTO>> topicOperationMapBetweenTimeRange =
operationsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiTopicOperationResultDTO::getTopicId)); operationsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiTopicOperationResultDTO::getTopicId));
@ -1127,7 +1127,7 @@ public class TopicServiceImpl implements TopicService {
gridDistinct.put(k,false); gridDistinct.put(k,false);
}); });
List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDate,dataPacket.getCustomerId()); List<ResiGroupTopicResultDTO> topicsBetweenTimeRange = topicDao.selectGroupOrderByGridBetweenTimeRange(calendar.getTime(),targetDateCheck,dataPacket.getCustomerId());
//key : gridId //key : gridId
Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange = Map<String,List<ResiGroupTopicResultDTO>> GridGroupMapBetweenTimeRange =
topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId)); topicsBetweenTimeRange.stream().collect(Collectors.groupingBy(ResiGroupTopicResultDTO::getGridId));

Write Preview
Loading…
Cancel
Save