ip健康检查过滤已过期ip

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

@@ -25,6 +25,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.mongodb.core.aggregation.ArrayOperators;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -238,7 +239,11 @@ public class BrowserTask {
             if (ipResourceRepository.healthLock(ipResource)) {
                 try {
                     QueryIpUrlList queryIpUrlList = queryIpUrlListRepository.findAll().get(0);
-                    if (ipResource.isSpecialLine()) {
+                    if (ipResource.getValidTime() <= Instant.now().toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) {
+                        ipResource.setStatus(1);
+                        ipResourceRepository.save(ipResource);
+                    }
+                    else if (ipResource.isSpecialLine()) {
                         Trans trans = new Trans(ipResource.getProxyUsername(), ipResource.getProxyPassword());
                         String sp_result = trans.get(queryIpUrlList.getUrl());
                         int failTime = 0;
@@ -296,7 +301,7 @@ public class BrowserTask {
                 IpCountRecord ipCountRecord = new IpCountRecord();
                 ipCountRecord.setUsername(x.getName());
                 ipCountRecord.setTimestamp(Instant.now().toEpochMilli());
-                long ipcount_using = ipResourceRepository.countAllByOwnerAndIsDeleted(x.getName(), false);
+                long ipcount_using = ipResourceRepository.countAllByOwnerAndIsDeletedAndValidTimeGreaterThan(x.getName(), false, Instant.now().toEpochMilli());
                 long ipcount_all = ipResourceRepository.countAllByOwner(x.getName());
                 ipCountRecord.setIp_all(ipcount_all);
                 ipCountRecord.setIp_using(ipcount_using);
@@ -305,7 +310,7 @@ public class BrowserTask {
             IpCountRecord ipCountRecord = new IpCountRecord();
             ipCountRecord.setUsername("all");
             ipCountRecord.setTimestamp(Instant.now().toEpochMilli());
-            long ipcount_using = ipResourceRepository.countAllByIsDeleted(false);
+            long ipcount_using = ipResourceRepository.countAllByIsDeletedAndValidTimeGreaterThan(false, Instant.now().toEpochMilli());
             long ipcount_all = ipResourceRepository.count();
             ipCountRecord.setIp_using(ipcount_using);
             ipCountRecord.setIp_all(ipcount_all);