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

epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java

@@ -9,4 +9,8 @@ public interface GroupConstant {
     String MONTH = "month";
     String DATE = "day";
 
+    String RAIL = "-";
+
+    String NULL_CHAR_STRING = "";
+
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.group.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,22 +17,22 @@ public class GroupSummaryInfoResultDTO implements Serializable {
     /**
      * 网格总数量
      */
-    private Integer gridTotalCount;
+    private Integer gridTotalCount = NumConstant.ZERO;
 
     /**
      * 小组总数量
      */
-    private Integer groupTotalCount;
+    private Integer groupTotalCount = NumConstant.ZERO;
 
     /**
      * 小组平均人数
      */
-    private Integer groupPeopleAvg;
+    private Integer groupPeopleAvg = NumConstant.ZERO;
 
     /**
      * 小组人数中位数
      */
-    private Integer groupPeopleMedian;
+    private Integer groupPeopleMedian = NumConstant.ZERO;
 
     /**
      * 数据更新至 时间

epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java

@@ -25,6 +25,13 @@ public interface TopicConstant {
 
     String SHIFTED = "已转议题";
 
+    /**
+     * 话题分析的type    month,day
+     */
     String MONTH = "month";
     String DATE = "day";
+
+    String RAIL = "-";
+
+    String NULL_CHAR_STRING = "";
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -39,7 +40,13 @@ public class GroupServiceImpl implements GroupService {
     @Override
     public GroupSummaryInfoResultDTO summaryInfo(TokenDto tokenDto) {
         String agencyId = this.getLoginUserDetails(tokenDto);
-        return groupDao.summaryInfo(agencyId);
+        GroupSummaryInfoResultDTO result = groupDao.summaryInfo(agencyId);
+        if (null==result){
+            GroupSummaryInfoResultDTO resultDTO = new GroupSummaryInfoResultDTO();
+            resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.NULL_CHAR_STRING));
+            return resultDTO;
+        }
+        return result;
     }
 
     /**

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

@@ -6,6 +6,7 @@ import com.epmet.dao.topic.TopicDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.group.constant.GroupConstant;
 import com.epmet.service.topic.TopicService;
 import com.epmet.topic.constant.TopicConstant;
 import com.epmet.topic.dto.form.TopicIncrTrendFormDTO;
@@ -41,6 +42,7 @@ public class TopicServiceImpl implements TopicService {
     @Override
     public TopicSummaryResultDTO topicSummary(TokenDto tokenDto) {
         TopicSummaryResultDTO result = new TopicSummaryResultDTO();
+        result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.NULL_CHAR_STRING));
         String agencyId = this.getLoginUserDetails(tokenDto);
         List<TopicStatusResultDTO> topicStatus = topicDao.getTopicStatus(agencyId);
         result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString());