push 去掉没到推送时间的

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinUpushServiceImpl.java

@@ -11,6 +11,9 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Iterator;
 import java.util.LinkedList;
 
 /**
@@ -50,7 +53,15 @@ public class KylinUpushServiceImpl {
         } else {
             LinkedList<AdminUpushVo> pushList = (LinkedList<AdminUpushVo>) adminUpushVo;
             Integer num = 0;
-            for (AdminUpushVo info : pushList) {
+            for (Iterator<AdminUpushVo> it = pushList.iterator(); it.hasNext(); ) {
+                AdminUpushVo info = it.next();
+                String pushTime = info.getPushTime();
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                LocalDateTime pushTimeL = LocalDateTime.parse(pushTime, formatter);
+                if (pushTimeL.isAfter(LocalDateTime.now())) {
+                    it.remove();
+                    continue;
+                }
                 if (num == 0) {
                     redisUtil.set(KylinRedisConst.ADMIN_UPUSH_LIST_READ_UID.concat(uid), info.getUpushId());
                 }
@@ -92,13 +103,19 @@ public class KylinUpushServiceImpl {
 
         Integer num = 0;
         String pushId = (String) obj;
-        for (AdminUpushVo info : pushList) {
+        for (Iterator<AdminUpushVo> it = pushList.iterator(); it.hasNext(); ) {
+            AdminUpushVo info = it.next();
             if (info.getUpushId().equals(pushId)) {
                 break;
             } else {
+                String pushTime = info.getPushTime();
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                LocalDateTime pushTimeL = LocalDateTime.parse(pushTime, formatter);
+                if (pushTimeL.isBefore(LocalDateTime.now())) {
                     num++;
                 }
             }
+        }
         return num;
     }
 }