修改工具类 修改命名

we-com-server/src/main/java/com/tzld/piaoquan/wecom/job/WeComMessageDataJob.java

@@ -41,10 +41,13 @@ public class WeComMessageDataJob {
     @Autowired
     private MessageService messageService;
 
-    private static final int sum = 3;
+    private static final int MAX_VIDEO_NUM = 3;
 
-    List<PushMessage> goodList = new ArrayList<>();
-    List<Long> saveList = new ArrayList<>();
+    //历史优质视频可推送用户列表
+    List<PushMessage> goodHistoryPushList = new ArrayList<>();
+
+    //保底视频列表
+    List<Long> guaranteedVideoIdList = new ArrayList<>();
 
     //初始化操作
     void init() {
@@ -62,7 +65,7 @@ public class WeComMessageDataJob {
             pushMessage.setUserIds(userIds);
             list.add(pushMessage);
         }
-        goodList = list;
+        goodHistoryPushList = list;
         List<Long> saveVideoIds = Objects.requireNonNull(redisTemplate.opsForList().range(GUARANTEED_MINIPROGRAM_KEY, 0, 2))
                 .stream().map(o -> (Integer) o).map(String::valueOf).map(Long::parseLong).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(saveVideoIds)) {
@@ -79,7 +82,7 @@ public class WeComMessageDataJob {
                 throw new RuntimeException("保底数据不是最新的");
             }
         }
-        saveList = saveVideoIds;
+        guaranteedVideoIdList = saveVideoIds;
     }
 
     public void assemble() {
@@ -112,7 +115,7 @@ public class WeComMessageDataJob {
     public String getPushKey(User user) {
         int n = 0;
         StringBuilder key = new StringBuilder();
-        for (PushMessage pushMessage : goodList) {
+        for (PushMessage pushMessage : goodHistoryPushList) {
             if (pushMessage.getUserIds().contains(user.getId())) {
                 if (key.length() == 0) {
                     key.append(pushMessage.getVideoId());
@@ -122,12 +125,12 @@ public class WeComMessageDataJob {
                     key.append(pushMessage.getVideoId());
                 }
                 n++;
-                if (n > sum) {
+                if (n > MAX_VIDEO_NUM) {
                     return key.toString();
                 }
             }
         }
-        for (Long videoId : saveList) {
+        for (Long videoId : guaranteedVideoIdList) {
             if (key.length() == 0) {
                 key.append(videoId);
                 n++;
@@ -136,7 +139,7 @@ public class WeComMessageDataJob {
                 key.append(videoId);
             }
             n++;
-            if (n > sum) {
+            if (n > MAX_VIDEO_NUM) {
                 return key.toString();
             }
         }

we-com-server/src/main/java/com/tzld/piaoquan/wecom/utils/DateUtil.java

@@ -1,7 +1,8 @@
 package com.tzld.piaoquan.wecom.utils;
 
 
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -18,13 +19,16 @@ public class DateUtil {
     }
 
     public static String getBeforeDayDateString() {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-        return dateFormat.format(new Date().getTime() - 86400000);
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyyMMdd");
+        LocalDate today = LocalDate.now();
+        LocalDate yesterday = today.minusDays(1);
+        return dateFormat.format(yesterday);
     }
 
     public static String getDayDateString(String pattern) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat(pattern);
-        return dateFormat.format(new Date().getTime());
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern(pattern);
+        LocalDate today = LocalDate.now();
+        return dateFormat.format(today);
     }