广告投放页优化

src/main/java/com/example/afrishop_v3/controllers/AdvertisementController.java

@@ -14,10 +14,7 @@ import org.springframework.data.domain.Sort;
 import static org.springframework.data.domain.Sort.Order.asc;
 import static org.springframework.data.domain.Sort.Order.desc;
 
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * @Auther: wudepeng
@@ -61,8 +58,14 @@ public class AdvertisementController {
             if (now > endTime.getTime()) {
                 advertisement.setStatus(3);
             }
+            List<TbCfStationItem> itemList = new ArrayList<>();
+            if (StringUtils.isBlank(order)) {
 
-            List<TbCfStationItem> itemList = itemRepository.getAdvertisementItem(advertisement.getId(), PageRequest.of(pageNum, pageSize)).toList();
+                itemList = itemRepository.getAdvertisementItem(advertisement.getId(), PageRequest.of(pageNum, pageSize)).toList();
+            } else {
+                itemList = itemRepository.getAdvertisementItem2(advertisement.getId(), PageRequest.of(pageNum, pageSize, sort(order))).toList();
+
+            }
             advertisementMap.put("advertisement", advertisement);
             advertisementMap.put("itemList", itemList);
         }

src/main/java/com/example/afrishop_v3/repository/TbCfStationItemRepository.java

@@ -39,4 +39,7 @@ public interface TbCfStationItemRepository extends PagingAndSortingRepository<Tb
     @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1 order by a.sort")
     Page<TbCfStationItem> getAdvertisementItem(String adId, Pageable pageable);
 
+    @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1")
+    Page<TbCfStationItem> getAdvertisementItem2(String adId, Pageable pageable);
+
 }