解决报错

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java

@@ -36,7 +36,6 @@ public interface TopicService {
      * @Date 2020/9/15 18:12
      **/
     List<TopicOriginInfoDTO> queryTopicOriginInfoList(String customerId, String dateId);
-    void topicDataCleaning(String customerId, String dateId);
     /**
      * @Description  查询话题创建者信息
      * @param topicIds

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

@@ -233,9 +233,10 @@ public class TopicServiceImpl implements TopicService {
 
         List<ResiGroupTopicResultDTO> groupList = new LinkedList<>();
         for(Map.Entry<String,List<ResiGroupTopicResultDTO>> entry : gridGroupMap.entrySet()){
-            if(null != entry.getValue() && entry.getValue().size() > NumConstant.ZERO)
+            if(null != entry.getValue() && entry.getValue().size() > NumConstant.ZERO){
                 groupList.addAll(entry.getValue());
             }
+        }
 
         //key -> groupId
         Map<String,GroupTopicData> groupTopicData =  traverseGroupTopic(groupList,topicOperationMap);
@@ -367,9 +368,10 @@ public class TopicServiceImpl implements TopicService {
             List<ResiGroupTopicResultDTO> groupListBetweenTimeRange = new LinkedList<>();
 
             for(Map.Entry<String,List<ResiGroupTopicResultDTO>> entryBetweenTimeRange : GridGroupMapBetweenTimeRange.entrySet()){
-                if(null != entryBetweenTimeRange.getValue() && entryBetweenTimeRange.getValue().size() > NumConstant.ZERO)
+                if(null != entryBetweenTimeRange.getValue() && entryBetweenTimeRange.getValue().size() > NumConstant.ZERO){
                     groupListBetweenTimeRange.addAll(entryBetweenTimeRange.getValue());
                 }
+            }
             List<ResiTopicOperationResultDTO> operationsBetweenTimeRange =
                     topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDateCheck);
 
@@ -461,9 +463,9 @@ public class TopicServiceImpl implements TopicService {
      * @date 2020.06.22 16:03
     **/
     Map<String,GroupTopicData> traverseGroupTopic(List<ResiGroupTopicResultDTO> groups, Map<String,List<ResiTopicOperationResultDTO>> topicOperationMap){
-       if(null == groups || groups.size() < NumConstant.ONE)
+       if(null == groups || groups.size() < NumConstant.ONE){
            return null;
-
+       }
         Map<String , GroupTopicData> groupTopicStatistical = new HashMap<>();
 
         groups.forEach(group -> {
@@ -491,7 +493,9 @@ public class TopicServiceImpl implements TopicService {
                 //}else{
 
                 for (ResiTopicResultDTO topic : group.getTopics()) {
-                    if(StringUtils.isBlank(topic.getTopicId())) continue;
+                    if(StringUtils.isBlank(topic.getTopicId())){
+                        continue;
+                    }
                     if (StringUtils.equals(NumConstant.ONE_STR, topic.getIncrFlag())) {
                         groupTopicData.setTopicIncr(groupTopicData.getTopicIncr() + NumConstant.ONE);
                     }
@@ -980,9 +984,10 @@ public class TopicServiceImpl implements TopicService {
 
         List<ResiGroupTopicResultDTO> groupList = new LinkedList<>();
         for(Map.Entry<String,List<ResiGroupTopicResultDTO>> entry : gridGroupMap.entrySet()){
-            if(null != entry.getValue() && entry.getValue().size() > NumConstant.ZERO)
+            if(null != entry.getValue() && entry.getValue().size() > NumConstant.ZERO){
                 groupList.addAll(entry.getValue());
             }
+        }
 
         //key -> groupId
         Map<String,GroupTopicData> groupTopicData =  traverseGroupTopic(groupList,topicOperationMap);
@@ -1148,9 +1153,10 @@ public class TopicServiceImpl implements TopicService {
         List<ResiGroupTopicResultDTO> groupListBetweenTimeRange = new LinkedList<>();
 
         for(Map.Entry<String,List<ResiGroupTopicResultDTO>> entryBetweenTimeRange : GridGroupMapBetweenTimeRange.entrySet()){
-            if(null != entryBetweenTimeRange.getValue() && entryBetweenTimeRange.getValue().size() > NumConstant.ZERO)
+            if(null != entryBetweenTimeRange.getValue() && entryBetweenTimeRange.getValue().size() > NumConstant.ZERO){
                 groupListBetweenTimeRange.addAll(entryBetweenTimeRange.getValue());
             }
+        }
         List<ResiTopicOperationResultDTO> operationsBetweenTimeRange =
                 topicDao.selectTopicOperationRecordBetweenTimeRange(calendar.getTime(),targetDate);
 
@@ -1266,9 +1272,9 @@ public class TopicServiceImpl implements TopicService {
     }
 
     /**
-     * @return java.util.List<com.epmet.dto.topic.TopicOriginInfoDTO>
      * @param customerId
      * @param dateId
+     * @return java.util.List<com.epmet.dto.topic.TopicOriginInfoDTO>
      * @author yinzuomei
      * @description 根据日期查询resi_topic_operation，返回所有对话体的操作记录
      * @Date 2020/9/15 18:13