From d6053a8bfbca590c08e37c11c7fd39e0364144b4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 5 Aug 2020 09:35:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B8=BA=E5=89=8D=E5=A4=A9=E7=9A=84=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E8=A2=AB=E4=BD=BF=E7=94=A8=E6=AC=A1=E6=95=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/voice/ArticleDao.java | 8 +++++--- .../epmet/service/impl/StatsPublicityServiceImpl.java | 6 +++--- .../java/com/epmet/service/voice/ArticleService.java | 8 +++++--- .../com/epmet/service/voice/impl/ArticleServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/voice/ArticleDao.xml | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java index 8ad5156de5..1d0d92784b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java @@ -23,6 +23,7 @@ import com.epmet.entity.voice.ArticleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -45,11 +46,12 @@ public interface ArticleDao extends BaseDao { List getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType); /** - * desc:根据客户Id 和发布时间 获取文章数据 + * desc:根据客户Id 和创建时间 获取文章数据 * * @param customerId - * @param publishDate + * @param startTime + * @param endTime * @return */ - List getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate); + List getPublishedArticleByDay(@Param("customerId") String customerId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index bcc55ede28..e507b0e8ec 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -598,14 +598,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { //转换为 需要插入的Entity Map dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o)); + Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); + Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN); //获取当天的业务数据 //1获取文章及机关id,网格Id - List publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate)); + List publishedArticleList = articleService.getPublishedArticleByCreateTime(customerId, startTime, endTime); if (!CollectionUtils.isEmpty(publishedArticleList)) { //KEY 文章Id Map articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o)); - Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); - Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN); //2 获取文章标签 List articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime); if (!CollectionUtils.isEmpty(articleTagsList)) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java index ce6025a17a..0cd4e5838a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO; import com.epmet.entity.voice.ArticleEntity; +import java.util.Date; import java.util.List; /** @@ -56,12 +57,13 @@ public interface ArticleService extends BaseService { List getAllGridPublishedCount(String customerId, String publishDate); /** - * desc：根据客户id，发布时间 获取文章数据 + * desc：根据客户id，创建时间 获取文章数据，因为存在当天可以发布之前时间点的数据 所以采用创建时间 * @param customerId - * @param publishDate + * @param startTime + * @param endTime * @return */ - List getPublishedArticleByPublishTime(String customerId, String publishDate); + List getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime); ArticleEntity selectArticleById(String articleId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java index 2a9bd8d17e..8325d99fb0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.service.voice.ArticleService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -63,9 +64,11 @@ public class ArticleServiceImpl extends BaseServiceImpl getPublishedArticleByPublishTime(String customerId, String publishDate) { - checkParam(customerId, publishDate); - return baseDao.getPublishedArticleByDay(customerId,publishDate); + public List getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime) { + if (StringUtils.isBlank(customerId) || startTime == null || endTime == null) { + throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + } + return baseDao.getPublishedArticleByDay(customerId, startTime, endTime); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml index 0ecf25fb1b..4ac5086bf9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml @@ -65,7 +65,7 @@ FROM article WHERE - PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR} + CREATED_TIME BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP} AND DEL_FLAG = 0 AND TAGS IS NOT NULL AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}