Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev

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<ArticleEntity> {
 	List<ArticleGridPublishedSummaryDTO> 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<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate);
+	List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 }

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<String, DimAgencyEntity> 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<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate));
+		List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByCreateTime(customerId, startTime, endTime);
 		if (!CollectionUtils.isEmpty(publishedArticleList)) {
 			//KEY 文章Id
 			Map<String, ArticleEntity> 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<ArticleTagsEntity> articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime);
 			if (!CollectionUtils.isEmpty(articleTagsList)) {

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<ArticleEntity> {
 	List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, String publishDate);
 
 	/**
-	 * desc：根据客户id，发布时间 获取文章数据
+	 * desc：根据客户id，创建时间 获取文章数据，因为存在当天可以发布之前时间点的数据 所以采用创建时间
 	 * @param customerId
-	 * @param publishDate
+	 * @param startTime
+	 * @param endTime
 	 * @return
 	 */
-	List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate);
+	List<ArticleEntity> getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime);
 
 	ArticleEntity selectArticleById(String articleId);
 }

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<ArticleDao, ArticleEntit
 
 
 	@Override
-	public List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate) {
-		checkParam(customerId, publishDate);
-		return baseDao.getPublishedArticleByDay(customerId,publishDate);
+	public List<ArticleEntity> 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

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}