删除IPbug

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

@@ -33,8 +33,8 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto
         Document doc = new Document();
         BasicQuery basicQuery = new BasicQuery(doc);
         Criteria criteria = new Criteria();
-        criteria.orOperator(where("id").is(ipResource.getId()).and("isLocked").is(false).and("status").is(ipResource.getStatus()),
-                where("lockTimestamp").lte(Instant.now().minusSeconds(300).toEpochMilli()).and("status").is(ipResource.getStatus()));
+        criteria.orOperator(where("id").is(ipResource.getId()).and("isLocked").is(false).and("status").is(ipResource.getStatus()).and("isDeleted").is("false"),
+                where("lockTimestamp").lte(Instant.now().minusSeconds(300).toEpochMilli()).and("status").is(ipResource.getStatus())).and("isDeleted").is("false");
         basicQuery.addCriteria(criteria);
         Update update = new Update();
         update.set("isLocked", true).set("lockTimestamp", Instant.now().toEpochMilli());
@@ -64,8 +64,8 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto
     @Override
     public List<IpResource> sampleTasks(int status, long timestamp) {
         Criteria matchCriteria  = new Criteria();
-        matchCriteria.orOperator(where("status").is(status).and("isLocked").is(false),
-                where("isLocked").is(true).and("lockTimeStamp").lte(timestamp));
+        matchCriteria.orOperator(where("status").is(status).and("isLocked").is(false).and("isDeleted").is("false"),
+                where("isLocked").is(true).and("lockTimeStamp").lte(timestamp)).and("isDeleted").is("false");
 
         MatchOperation match = Aggregation.match(matchCriteria);
 

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -379,8 +379,12 @@ public class IpResourceServiceImpl implements IpResourceService {
                 try {
                     ResponseEntity<String> result = restTemplate.exchange(URL + "/intelligroup/ipresources?accountId=browser&ip={ip}", HttpMethod.DELETE, httpEntity, String.class, ipAddr);
                     DeleteIpResultDto deleteIpResultDto = JSON.parseObject(result.getBody(), DeleteIpResultDto.class);
+                    if (ipResource.getStatus() == 6)
+                        ipResourceRepository.delete(ipResource);
+                    else {
                         ipResource.setDeleted(true);
                         ipResourceRepository.save(ipResource);
+                    }
                     if (userShop != null){
                         Shop shop = shopRepository.findById(ipResource.getShopId()).orElse(null);
                         if (shop != null) {