Merge branch 'staging' into 'master'

Staging

See merge request !121

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

@@ -9,6 +9,7 @@ import com.edgec.browserbackend.browser.domain.*;
 import com.edgec.browserbackend.browser.dto.*;
 import com.edgec.browserbackend.browser.repository.*;
 import com.edgec.browserbackend.browser.service.IpAndShopService;
+import com.edgec.browserbackend.browser.service.IpResourceService;
 import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.common.utils.FileUtil;
@@ -34,6 +35,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -61,6 +63,9 @@ public class ShopServiceImpl implements ShopService {
     @Autowired
     IpAndShopService ipAndShopService;
 
+    @Autowired
+    IpResourceService ipResourceService;
+
     @Autowired
     SpecialLineRepository specialLineRepository;
 
@@ -418,6 +423,46 @@ public class ShopServiceImpl implements ShopService {
         List<ShopResultDto> shopResultDtos = new ArrayList<>();
         shops.getContent().stream().forEach(x -> {
             IpResource ipResource = ipResourceRepository.findFirstByShopIdAndIsDeleted(x.getShopId(), false);
+            if (ipResource != null) {
+                if (StringUtils.isNotBlank(ipResource.getAddr())) {
+                    if (ipResource.getValidTime() <= Instant.now().plusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getValidTime() > Instant.now().toEpochMilli()) {
+                        if (ipResource.getStatus() != 5 && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) {
+                            ipResource.setStatus(2);
+                            ipResourceRepository.save(ipResource);
+                        }
+                    } else if (ipResource.getValidTime() <= Instant.now().minusSeconds(60 * 60 * 24 * 7).toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) {
+                        if (ipResource.getIpType() == IpType.VENDOR) {
+                            IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
+                            ipResourceRequestDto1.setAddr(Arrays.asList(ipResource.getAddr()));
+                            try {
+                                ipResourceService.deleteIp(username, ipResourceRequestDto1);
+                            } catch (Exception e) {
+                                logger.error(e.getMessage(), e);
+                            }
+                        } else {
+                            IpResourceRequestDto ipResourceRequestDto1 = new IpResourceRequestDto();
+                            ipResourceRequestDto1.setIpId(Arrays.asList(ipResource.getId()));
+                            try {
+                                ipResourceService.deleteIp(username, ipResourceRequestDto1);
+                            } catch (Exception e) {
+                                logger.error(e.getMessage(), e);
+                            }
+                        }
+                        return;
+                    } else if (ipResource.getValidTime() <= Instant.now().toEpochMilli() && ipResource.getStatus() != 3 && ipResource.getStatus() != 6) {
+                        ipResource.setStatus(1);
+                        ipResourceRepository.save(ipResource);
+                    } else {
+                        if ((ipResource.getStatus() == 0 || ipResource.getStatus() == 1 || ipResource.getStatus() == 2) && ipResource.getVendor() != Vendor.local) {
+                            ipResource.setStatus(0);
+                            ipResourceRepository.save(ipResource);
+                        } else if (ipResource.getIpType().equals(IpType.LOCAL) && (ipResource.getStatus() == 1 || ipResource.getStatus() == 2) && ipResource.getAddr().equals("本地Ip未使用")) {
+                            ipResource.setStatus(4);
+                            ipResourceRepository.save(ipResource);
+                        }
+                    }
+                }
+            }
             if (ipResource == null)
                 ipResource = new IpResource();
             String group1 = userShopRepository.findByUsernameAndShopId(username, x.getShopId()).getGroupId();