Merge remote-tracking branch 'origin/bugfix-20211003'

src/main/java/com/tanpu/feo/feojob/config/MorningPaperProperties.java

 package com.tanpu.feo.feojob.config;
 
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.format.TextStyle;
 import java.util.List;
+import java.util.Locale;
 
+@Slf4j
 @Data
 @Configuration
 @ConfigurationProperties(prefix = "morning-paper")
 public class MorningPaperProperties {
     private List<String> mainTitles;
     private String subTitle;
+
+    public String getTodayMailTitle() {
+        DayOfWeek dayOfWeek = LocalDate.now().plusDays(1).getDayOfWeek();
+        String displayName = dayOfWeek.getDisplayName(TextStyle.SHORT, Locale.CHINA);
+        int value = dayOfWeek.getValue();
+        log.info("displayName: {}, value: {}", displayName, value);
+        if (value <= mainTitles.size()) {
+            return mainTitles.get(value - 1);
+        }
+        return mainTitles.get(0);
+    }
 }

src/main/java/com/tanpu/feo/feojob/jobs/DaySubJob.java

@@ -77,8 +77,7 @@ public class DaySubJob {
             return;
         }
         Map<String, List<DaySubjectEntity>> stringListMap = daySubjectList.stream().collect(Collectors.groupingBy(DaySubjectEntity::getDsPt));
-        int size = morningPaperProperties.getMainTitles().size();
-        String mainTitle = morningPaperProperties.getMainTitles().get(RandomUtil.randomInt(0, size));
+        String mainTitle = getOneMorningTitle();
         for (String orgId : stringListMap.keySet()) {
             log.info("开始推送机构(orgId={})的早报", orgId);
             //查询orgCode
@@ -212,8 +211,7 @@ public class DaySubJob {
     }
 
     public String getOneMorningTitle() {
-        int size = morningPaperProperties.getMainTitles().size();
-        return morningPaperProperties.getMainTitles().get(RandomUtil.randomInt(0, size));
+        return morningPaperProperties.getTodayMailTitle();
     }