shop接口bug修改

src/main/java/com/edgec/browserbackend/browser/domain/IpResource.java

@@ -14,11 +14,12 @@ public class IpResource {
     private String id;
     private String addr;
     private IpType ipType = IpType.VENDOR;
-    private String ipProvider;
+    private String vendor;
     private String ipRegion;
     private IpStatus ipStatus;
+    private Platform platform;
     private List<Interval> port;
-    private long createdAt;
+    private long purchasedTime;
     private long validTime;
     private long leftTime;
     private String details;
@@ -77,12 +78,12 @@ public class IpResource {
         this.bindHistory = bindHistory;
     }
 
-    public long getCreatedAt() {
-        return createdAt;
+    public long getPurchasedTime() {
+        return purchasedTime;
     }
 
-    public void setCreatedAt(long createdAt) {
-        this.createdAt = createdAt;
+    public void setPurchasedTime(long purchasedTime) {
+        this.purchasedTime = purchasedTime;
     }
 
     public long getLeftTime() {
@@ -109,12 +110,12 @@ public class IpResource {
         this.addr = ipAddr;
     }
 
-    public String getIpProvider() {
-        return ipProvider;
+    public String getVendor() {
+        return vendor;
     }
 
-    public void setIpProvider(String ipProvider) {
-        this.ipProvider = ipProvider;
+    public void setVendor(String vendor) {
+        this.vendor = vendor;
     }
 
     public boolean isDeleted() {
@@ -180,4 +181,12 @@ public class IpResource {
     public void setShopId(String shopId) {
         this.shopId = shopId;
     }
+
+    public Platform getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(Platform platform) {
+        this.platform = platform;
+    }
 }

src/main/java/com/edgec/browserbackend/browser/domain/Platform.java

+package com.edgec.browserbackend.browser.domain;
+
+public enum Platform {
+}

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

@@ -308,7 +308,7 @@ public class ShopServiceImpl implements ShopService {
         if (shops == null || shops.getNumberOfElements() < 1)
             return new ShopPageResultDto();
         List<ShopDto> shopDtos = new ArrayList<>();
-        shops.stream().forEach(x -> {
+        shops.getContent().stream().forEach(x -> {
             IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(x.getIp(), false);
             if (ipResource == null)
                 ipResource = new IpResource();