ip过期短信

src/main/java/com/edgec/browserbackend/browser/repository/IpResourceRepository.java

@@ -28,7 +28,7 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
 
     List<IpResource> findByStatusAndLockedAndLockTimestampLessThan(int status, boolean locked, long timestamp);
 
-    List<IpResource> findByValidTimeBetween(long beginTime, long endTime);
+    List<IpResource> findByValidTimeBetweenAndIsDeleted(long beginTime, long endTime, boolean isDeleted);
 
     IpResource findByShopIdAndIsDeleted(String shopId, boolean isDeleted);
 

src/main/java/com/edgec/browserbackend/browser/task/ExpireSoonWarn.java

@@ -34,13 +34,15 @@ public class ExpireSoonWarn {
     private void sendExpiredIpAccount(int day) {
         List<IpResource> ipResources = null;
         if (day == 7) {
-            ipResources = ipResourceRepository.findByValidTimeBetween(
+            ipResources = ipResourceRepository.findByValidTimeBetweenAndIsDeleted(
                     Instant.now().atZone(ZoneOffset.UTC).plusDays(day - 1).toEpochSecond() * 1000,
-                    Instant.now().atZone(ZoneOffset.UTC).plusDays(day).toEpochSecond() * 1000);
+                    Instant.now().atZone(ZoneOffset.UTC).plusDays(day).toEpochSecond() * 1000,
+                    false);
         } else {
-            ipResources = ipResourceRepository.findByValidTimeBetween(
+            ipResources = ipResourceRepository.findByValidTimeBetweenAndIsDeleted(
                     Instant.now().atZone(ZoneOffset.UTC).minusDays(1).toEpochSecond() * 1000,
-                    Instant.now().atZone(ZoneOffset.UTC).plusDays(day).toEpochSecond() * 1000);
+                    Instant.now().atZone(ZoneOffset.UTC).plusDays(day).toEpochSecond() * 1000,
+                    false);
         }
 
         if (ipResources != null && ipResources.size() > 0) {