From e43cb0e334daec6f38d9fd83fdccabea0ddc92d5 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 14:04:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84=E3=80=81?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3....?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/group/constant/GroupConstant.java | 4 ++++ .../group/dto/result/GroupSummaryInfoResultDTO.java | 9 +++++---- .../java/com/epmet/topic/constant/TopicConstant.java | 7 +++++++ .../com/epmet/service/group/impl/GroupServiceImpl.java | 9 ++++++++- .../com/epmet/service/topic/impl/TopicServiceImpl.java | 2 ++ 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java index cfc64da174..85323027b5 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java +++ b/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 = ""; + } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java index a3e72d6f3a..d424014202 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/dto/result/GroupSummaryInfoResultDTO.java +++ b/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; /** * 数据更新至 时间 diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java index 46259526ce..94d4b37e7d 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java +++ b/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 = ""; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java index 21fdfac41b..57214b658a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java +++ b/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; } /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index 339737305e..0ab00e729b 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/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 topicStatus = topicDao.getTopicStatus(agencyId); result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString());