|
@@ -129,12 +129,7 @@ public class DataDashboardService {
|
|
|
String sheetToken, String sheetId) {
|
|
|
String minDate = dateStrList.stream().min(String::compareTo).orElse("");
|
|
|
String maxDate = dateStrList.stream().max(String::compareTo).orElse("");
|
|
|
- List<NewSortStrategyExport> newContentsYesData = newSortStrategyData(minDate, maxDate, articleType);
|
|
|
- if (CollectionUtil.isNotEmpty(newContentsYesData) && filter == StatusEnum.ONE.getCode()) {
|
|
|
- newContentsYesData = newContentsYesData.stream()
|
|
|
- .filter(o -> Objects.nonNull(o.getPublishMiniProgramNum()) && o.getPublishMiniProgramNum() > 0)
|
|
|
- .collect(Collectors.toList());
|
|
|
- }
|
|
|
+ List<NewSortStrategyExport> newContentsYesData = newSortStrategyData(minDate, maxDate, articleType, filter);
|
|
|
if (CollectionUtil.isEmpty(newContentsYesData)) {
|
|
|
return;
|
|
|
}
|
|
@@ -177,7 +172,8 @@ public class DataDashboardService {
|
|
|
doSendFeishuSheet(dateStrList, sheetToken, sheetId, rowNum, rows, 2, styles);
|
|
|
}
|
|
|
|
|
|
- private List<NewSortStrategyExport> newSortStrategyData(String beginDate, String endDate, String articleType) {
|
|
|
+ private List<NewSortStrategyExport> newSortStrategyData(String beginDate, String endDate,
|
|
|
+ String articleType, Integer filter) {
|
|
|
long beginTimestamp = DateUtils.dateStrToTimestamp(beginDate, "yyyyMMdd");
|
|
|
long endTimestamp = DateUtils.dateStrToTimestamp(endDate, "yyyyMMdd") + 86400;
|
|
|
List<AccountAvgInfo> accountAvgInfoList = accountAvgInfoRepository.findAll();
|
|
@@ -365,14 +361,20 @@ public class DataDashboardService {
|
|
|
result.add(obj);
|
|
|
}
|
|
|
log.info("newSortStrategyData buildData finish");
|
|
|
+ if (CollectionUtil.isNotEmpty(result) && filter == StatusEnum.ONE.getCode()) {
|
|
|
+ result = result.stream()
|
|
|
+ .filter(o -> Objects.nonNull(o.getPublishMiniProgramNum()) && o.getPublishMiniProgramNum() > 0)
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ }
|
|
|
result.sort(Comparator.comparing(NewSortStrategyExport::getDateStr).reversed()
|
|
|
.thenComparing(NewSortStrategyExport::getGhId).thenComparing(NewSortStrategyExport::getPosition));
|
|
|
if (CollectionUtils.isNotEmpty(result)) {
|
|
|
- longArticleBaseMapper.deleteByDateStrBetween(beginDate, endDate);
|
|
|
+ longArticleBaseMapper.deleteByDateStrBetween(beginDate, endDate, articleType);
|
|
|
List<DatastatSortStrategy> saveList = new ArrayList<>();
|
|
|
for (NewSortStrategyExport newSortStrategyExport : result) {
|
|
|
DatastatSortStrategy item = new DatastatSortStrategy();
|
|
|
BeanUtils.copyProperties(newSortStrategyExport, item);
|
|
|
+ item.setType(articleType);
|
|
|
PublishAccount publishAccount = publishAccountMap.get(item.getGhId());
|
|
|
item.setAccountCreateTimestamp(publishAccount.getCreateTimestamp() / 1000);
|
|
|
Article article = wxSnMap.get(item.getWxSn());
|