Преглед на файлове

去除绿洲,对top五十按照价格估算降序排序

sunkean преди 3 години
родител
ревизия
6aab9ad9bb
променени са 2 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 1 1
      src/main/java/com/izouma/nineth/repo/AssetRepo.java
  2. 5 1
      src/main/java/com/izouma/nineth/web/UserHoldCountController.java

+ 1 - 1
src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -104,7 +104,7 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     List<Asset> findAllByUserIdAndTypeAndOpened(Long userId, CollectionType type, Boolean opened);
 
-    @Query(nativeQuery = true, value = "SELECT asset.user_id userId,user.nickname nickname,user.username username,user.avatar avatar,asset.name,asset.prefix_name prefixName,count(*) num FROM asset left join user on asset.user_id = user.id where asset.user_id not in (1435297,4273750) and asset.status in ('NORMAL','TRADING','GIFTING','MINTING','AUCTIONING') GROUP BY asset.user_id ORDER BY count(*) DESC limit ?1,?2")
+    @Query(nativeQuery = true, value = "SELECT asset.user_id userId,user.nickname nickname,user.username username,user.avatar avatar,asset.name,asset.prefix_name prefixName,count(*) num FROM asset left join user on asset.user_id = user.id where asset.user_id not in (1435297,4273750, 56302) and asset.status in ('NORMAL','TRADING','GIFTING','MINTING','AUCTIONING') GROUP BY asset.user_id ORDER BY count(*) DESC limit ?1,?2")
     List<Map<String, String>> findByPage(int start, int end);
 
     @Query(nativeQuery = true, value = "SELECT count(distinct user_id) FROM asset where status in ('NORMAL','TRADING','GIFTING','MINTING','AUCTIONING') ")

+ 5 - 1
src/main/java/com/izouma/nineth/web/UserHoldCountController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.List;
 
 @RestController
@@ -29,7 +30,10 @@ public class UserHoldCountController {
         PageQuery pageQuery = new PageQuery();
         pageQuery.setPage(0);
         pageQuery.setSize(50);
-        return userHoldCountService.all(pageQuery).getContent();
+        List<UserHoldDTO> userHoldDTOs = userHoldCountService.all(pageQuery).getContent();
+        userHoldDTOs.sort(Comparator.comparing(UserHoldDTO::getPrice).reversed());
+        return userHoldDTOs;
+
     }
 
     @GetMapping("/excel")