删除ip

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

@@ -10,7 +10,9 @@ import java.util.List;
 
 public interface IpResourceRepository extends MongoRepository<IpResource, String>, IpResourceRepositoryCustom {
     IpResource findByAddr(String addr);
+    IpResource findByAddrAndIsDeletedAndIsLocked(String addr, boolean isDeleted, boolean isLocked);
     IpResource findByAddrAndIsDeleted(String addr, boolean isDeleted);
+    IpResource findByIdAndIsDeletedAndIsLocked(String id, boolean isDeleted, boolean isLocked);
     IpResource findByIdAndIsDeleted(String id, boolean isDeleted);
     List<IpResource> findByIdInAndIsDeleted(List<String> ipIds, boolean isDeleted);
     Page<IpResource> findByIdInAndIsDeletedOrderByPurchasedTimeDesc(List<String> ipIds, boolean isDeleted, Pageable pageable);

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

@@ -354,9 +354,14 @@ public class IpResourceServiceImpl implements IpResourceService {
         if (account == null)
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
         IpOperationResultDto ipOperationResultDto = new IpOperationResultDto();
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = buildGetHeader();
+        Map<String, String> params = new HashMap<String, String>();
+        HttpEntity<Map<String, String>> httpEntity = new HttpEntity<>(params, headers);
+
         if (ipResourceRequestDto.getAddr() != null && ipResourceRequestDto.getAddr().size() > 0) {
             ipResourceRequestDto.getAddr().forEach(ipAddr -> {
-                IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(ipAddr, false);
+                IpResource ipResource = ipResourceRepository.findByAddrAndIsDeletedAndIsLocked(ipAddr, false, false);
                 if (ipResource == null) {
                     ipOperationResultDto.getFailList().add(ipAddr);
                     return;
@@ -372,10 +377,6 @@ public class IpResourceServiceImpl implements IpResourceService {
                     ipOperationResultDto.getFailList().add(ipAddr);
                     return;
                 }
-                RestTemplate restTemplate = new RestTemplate();
-                HttpHeaders headers = buildGetHeader();
-                Map<String, String> params = new HashMap<String, String>();
-                HttpEntity<Map<String, String>> httpEntity = new HttpEntity<>(params, headers);
                 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);
@@ -406,11 +407,18 @@ public class IpResourceServiceImpl implements IpResourceService {
         }
         if (ipResourceRequestDto.getIpId() != null && ipResourceRequestDto.getIpId().size() > 0) {
             ipResourceRequestDto.getIpId().forEach(ipId -> {
-                IpResource ipResource = ipResourceRepository.findByIdAndIsDeleted(ipId, false);
+                IpResource ipResource = ipResourceRepository.findByIdAndIsDeletedAndIsLocked(ipId, false, false);
                 if (ipResource == null) {
                     ipOperationResultDto.getFailList().add(ipId);
                     return;
                 }
+                if (ipResource.getStatus() == 6)
+                    ipResourceRepository.delete(ipResource);
+                else if (ipResource.getStatus() == 3) {
+                    ResponseEntity<String> result = restTemplate.exchange(URL + "/intelligroup/ipresources?accountId=browser&ip={ip}",
+                            HttpMethod.DELETE, httpEntity, String.class, ipResource.getAddr());
+                    DeleteIpResultDto deleteIpResultDto = JSON.parseObject(result.getBody(), DeleteIpResultDto.class);
+                }
                 UserShop userShop = null;
                 if (ipResource.getShopId() != null) {
                     userShop = userShopRepository.findByUsernameAndShopId(username, ipResource.getShopId());