修改shop接口

src/main/java/com/edgec/browserbackend/browser/controller/ShopController.java

@@ -2,13 +2,13 @@ package com.edgec.browserbackend.browser.controller;
 
 import com.edgec.browserbackend.account.dto.ResultDto;
 import com.edgec.browserbackend.browser.domain.Shop;
+import com.edgec.browserbackend.browser.dto.ShopPageResultDto;
 import com.edgec.browserbackend.browser.dto.ShopDto;
 import com.edgec.browserbackend.browser.dto.ShopRequestDto;
 import com.edgec.browserbackend.browser.dto.ShopStringResultDto;
 import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -151,7 +151,7 @@ public class ShopController {
     public ResultDto getShopList(Principal principal, @RequestBody ShopRequestDto shopRequestDto) {
         ResultDto resultDto = new ResultDto();
         try {
-            List<ShopDto> shopDtos = shopService.getShopList(principal.getName(), shopRequestDto.getGroup(), shopRequestDto.getPage(),
+            ShopPageResultDto shopDtos = shopService.getShopList(principal.getName(), shopRequestDto.getGroup(), shopRequestDto.getPage(),
                     shopRequestDto.getAmount(), shopRequestDto.getFilter());
             resultDto.setData(shopDtos);
             resultDto.setStatus(0);

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

+package com.edgec.browserbackend.browser.dto;
+
+public class ShopPageInfo {
+    int currentPage;
+    int totalPage;
+    int totalShops;
+
+    public int getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(int currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public int getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(int totalPage) {
+        this.totalPage = totalPage;
+    }
+
+    public int getTotalShops() {
+        return totalShops;
+    }
+
+    public void setTotalShops(int totalShops) {
+        this.totalShops = totalShops;
+    }
+}

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

+package com.edgec.browserbackend.browser.dto;
+
+import java.util.List;
+
+public class ShopPageResultDto {
+    List<ShopDto> shopList;
+    ShopPageInfo shopPage;
+
+    public List<ShopDto> getShopList() {
+        return shopList;
+    }
+
+    public void setShopList(List<ShopDto> shopList) {
+        this.shopList = shopList;
+    }
+
+    public ShopPageInfo getShopPage() {
+        return shopPage;
+    }
+
+    public void setShopPage(ShopPageInfo shopPage) {
+        this.shopPage = shopPage;
+    }
+}

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

 package com.edgec.browserbackend.browser.service.Impl;
 
 import com.edgec.browserbackend.account.domain.Account;
-import com.edgec.browserbackend.account.domain.User;
 import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.account.repository.AccountRepository;
 import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
@@ -11,6 +10,8 @@ import com.edgec.browserbackend.browser.domain.Shop;
 import com.edgec.browserbackend.browser.domain.UserShop;
 import com.edgec.browserbackend.browser.dto.FilterDto;
 import com.edgec.browserbackend.browser.dto.ShopDto;
+import com.edgec.browserbackend.browser.dto.ShopPageInfo;
+import com.edgec.browserbackend.browser.dto.ShopPageResultDto;
 import com.edgec.browserbackend.browser.repository.GroupRepository;
 import com.edgec.browserbackend.browser.repository.IpResourceRepository;
 import com.edgec.browserbackend.browser.repository.ShopRepository;
@@ -18,17 +19,16 @@ import com.edgec.browserbackend.browser.repository.UserShopRepository;
 import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import org.apache.commons.lang3.StringUtils;
-import org.omg.CORBA.UNKNOWN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.jws.soap.SOAPBinding;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -263,7 +263,7 @@ public class ShopServiceImpl implements ShopService {
     }
 
     @Override
-    public List<ShopDto> getShopList(String username, String groupId, int page, int amout, FilterDto filterDto) {
+    public ShopPageResultDto getShopList(String username, String groupId, int page, int amout, FilterDto filterDto) {
         if (amout > 100)
             amout = 100;
         Pageable pageable = PageRequest.of(page, amout);
@@ -296,12 +296,20 @@ public class ShopServiceImpl implements ShopService {
         else
             shops = shopRepository.findByIdIn(shopIds, pageable);
         if (shops == null || shops.getNumberOfElements() < 1)
-            return new ArrayList<>();
+            return new ShopPageResultDto();
         List<ShopDto> shopDtos = new ArrayList<>();
         shops.stream().forEach(x -> {
             IpResource ipResource = ipResourceRepository.findByAddrAndIsDeleted(x.getIp(), false);
             shopDtos.add(ShopDto.of(x, ipResource));
         });
-        return shopDtos;
+        Page<ShopDto> shopDtoPage = new PageImpl<>(shopDtos, pageable, shopDtos.size());
+        ShopPageResultDto shopPageResultDto = new ShopPageResultDto();
+        shopPageResultDto.setShopList(shopDtoPage.getContent());
+        ShopPageInfo shopPageInfo = new ShopPageInfo();
+        shopPageInfo.setCurrentPage(shopDtoPage.getPageable().getPageNumber());
+        shopPageInfo.setTotalPage(shopDtoPage.getTotalPages());
+        shopPageInfo.setTotalShops(shopDtos.size());
+        shopPageResultDto.setShopPage(shopPageInfo);
+        return shopPageResultDto;
     }
 }

src/main/java/com/edgec/browserbackend/browser/service/ShopService.java

@@ -2,8 +2,8 @@ package com.edgec.browserbackend.browser.service;
 
 import com.edgec.browserbackend.browser.domain.Shop;
 import com.edgec.browserbackend.browser.dto.FilterDto;
+import com.edgec.browserbackend.browser.dto.ShopPageResultDto;
 import com.edgec.browserbackend.browser.dto.ShopDto;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -25,5 +25,5 @@ public interface ShopService {
 
     void assignShops(String username, List<String> shopIds, List<String> users);
 
-    List<ShopDto> getShopList(String username, String groupId, int page, int amount, FilterDto filterDto);
+    ShopPageResultDto getShopList(String username, String groupId, int page, int amount, FilterDto filterDto);
 }