修改shop接口

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

@@ -24,8 +24,8 @@ public class IpResource {
     private String details;
     List<String> bindHistory;
     private boolean isDeleted;
-    private String owner;
-    private String ownerParent;
+    private String username;
+    private String userParent;
     private String shopId;
     private String shopName;
 
@@ -133,20 +133,36 @@ public class IpResource {
         this.port = ports;
     }
 
-    public String getOwner() {
-        return owner;
+    public String getUsername() {
+        return username;
     }
 
-    public void setOwner(String owner) {
-        this.owner = owner;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
-    public String getOwnerParent() {
-        return ownerParent;
+    public List<Interval> getPort() {
+        return port;
+    }
+
+    public void setPort(List<Interval> port) {
+        this.port = port;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+
+    public void setAddr(String addr) {
+        this.addr = addr;
+    }
+
+    public String getUserParent() {
+        return userParent;
     }
 
-    public void setOwnerParent(String ownerParent) {
-        this.ownerParent = ownerParent;
+    public void setUserParent(String userParent) {
+        this.userParent = userParent;
     }
 
     public String getShopName() {

src/main/java/com/edgec/browserbackend/browser/dto/IpResourceDto.java

@@ -2,10 +2,12 @@ package com.edgec.browserbackend.browser.dto;
 
 import com.edgec.browserbackend.browser.domain.IpStatus;
 import com.edgec.browserbackend.browser.domain.IpType;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;
 
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class IpResourceDto {
     private String id;
     private String ipAddr;
@@ -17,6 +19,7 @@ public class IpResourceDto {
     private long createdAt;
     private long validTime;
     private long leftTime;
+    private String username;
     private String details;
     List<String> bindHistory;
     private String shopId;
@@ -134,4 +137,11 @@ public class IpResourceDto {
         this.details = details;
     }
 
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
 }

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

@@ -13,7 +13,12 @@ import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
@@ -32,6 +37,20 @@ public class IpResourceServiceImpl implements IpResourceService {
     @Autowired
     private IpResourceRepository ipResourceRepository;
 
+    public HttpHeaders buildHeader(String token) {
+        HttpHeaders header = new HttpHeaders();
+        // 需求需要传参为form-data格式
+        header.setContentType(MediaType.APPLICATION_JSON);
+        header.setBearerAuth(token);
+        return header;
+    }
+
+    public MultiValueMap<String, String> buildBody() {
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+
+        return map;
+    }
+
     @Override
     public IpResource getIpResourceByIpAddr(String ipAddr) {
         IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(ipAddr, false);
@@ -43,6 +62,9 @@ public class IpResourceServiceImpl implements IpResourceService {
     @Override
     public IpResourceDto buyIp(String username, IpResourceRequestDto ipResourceRequestDto) {
         RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders header = buildHeader("123");
+        MultiValueMap<String, String> map = buildBody();
+        HttpEntity<MultiValueMap<String, String>> httpEntity = new HttpEntity<>(map, header);
         return null;
     }
 

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

@@ -272,20 +272,16 @@ public class ShopServiceImpl implements ShopService {
             throw new ClientRequestException(AccountErrorCode.NAMENOTEXIST);
         }
         Group group = null;
-        if (groupId != null && !groupId.equals("-1"))
+        if (groupId != null)
             group = groupRepository.findById(groupId).orElse(null);
-        if (group == null && !groupId.equals("-1"))
+        if (group == null)
             throw new ClientRequestException(BrowserErrorCode.GROUPNOTEXIST);
-        if (account.getPermission() < 8 || (group != null && !group.getOwner().equals(username))) {
+        if (account.getPermission() < 8 || (group != null && group.getOwner() != null && !group.getOwner().equals(username))) {
             throw new ClientRequestException(AccountErrorCode.NOPERMISSION);
         }
         List<String> shopIds = new ArrayList<>();
-        if (groupId.equals("-1")){
-            shopIds = userShopRepository.findByUsername(username).stream().map(x -> x.getShopId()).collect(Collectors.toList());
-        } else {
-            shopIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().
+        shopIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().
                     map(x -> x.getShopId()).collect(Collectors.toList());
-        }
         Page<Shop> shops;
         if (filterDto != null && StringUtils.isNotBlank(filterDto.getIpRegion()))
             shops = shopRepository.findByIdInAndIpRegionLike(shopIds, filterDto.getIpRegion(), pageable);