Browse Source

Merge branch 'dev-xym-fix1' of Server/long-article-recommend into master

xueyiming 2 months ago
parent
commit
08691a03f2

+ 9 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java

@@ -2932,8 +2932,12 @@ public class DataDashboardService {
 
     @XxlJob("buildCoverStatisticDataExportJob")
     public ReturnT<String> buildCoverStatisticDataExportJob(String param) {
-        String dateStr = DateUtils.getDateString(System.currentTimeMillis() - 24 * 60 * 60 * 1000, "yyyMMdd");
-        coverStatisticDataExport(dateStr);
+        if(StringUtils.hasText(param)){
+            coverStatisticDataExport(param);
+        }else {
+            String dateStr = DateUtils.getDateString(System.currentTimeMillis() - 24 * 60 * 60 * 1000, "yyyMMdd");
+            coverStatisticDataExport(dateStr);
+        }
         return ReturnT.SUCCESS;
     }
 
@@ -3028,6 +3032,9 @@ public class DataDashboardService {
         List<String> rootSourceIdList = new ArrayList<>();
         for (Article article : articleList) {
             List<String> rootSourceIds = JSONArray.parseArray(article.getRootSourceIdList(), String.class);
+            if(CollectionUtils.isEmpty(rootSourceIds)){
+                continue;
+            }
             rootSourceIdMap.put(article.getWxSn(), rootSourceIds);
             rootSourceIdList.addAll(rootSourceIds);
         }