球队分页

score-common/src/main/java/com/live/common/domain/dto/api/GetTeamInfoListResponse.java

 package com.live.common.domain.dto.api;
 
+import com.live.common.domain.ResultPage;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,7 +16,7 @@ public class GetTeamInfoListResponse {
 
     private List<GetTeamInfoInfoResponse> hotTeam;
 
-    private List<GetTeamInfoInfoResponse> otherTeam;
+    private ResultPage<List<GetTeamInfoInfoResponse>> otherTeam;
 
     @Data
     @Builder

score-common/src/main/java/com/live/common/service/MatchService.java

@@ -16,7 +16,7 @@ public interface MatchService {
 
     ResponseData<?> getMatchTypeInfoList(HttpServletRequest request);
 
-    ResponseData<?> getTeamInfoList(HttpServletRequest request);
+    ResponseData<?> getTeamInfoList(CommonPage commonPage, HttpServletRequest request);
 
     ResponseData<?> getPlayerList(CommonPage commonPage, HttpServletRequest request);
 

score-common/src/main/java/com/live/common/service/impl/MatchServiceImpl.java

@@ -262,8 +262,9 @@ public class MatchServiceImpl implements MatchService {
     }
 
     @Override
-    public ResponseData<?> getTeamInfoList(HttpServletRequest request) {
-        String key = RedisKeySplicing.requestLock("getTeamInfoList", "0");
+    public ResponseData<?> getTeamInfoList(CommonPage commonPage, HttpServletRequest request) {
+        int jumpNum = (commonPage.getPageNum() - 1) * commonPage.getPageSize();
+        String key = RedisKeySplicing.requestLock("getTeamInfoList", JSON.toJSONString(commonPage));
 
         if (redisUtilsService.existsKey(key)) {
             String cacheInfo = redisUtilsService.getCacheStringInfo(key);
@@ -274,12 +275,12 @@ public class MatchServiceImpl implements MatchService {
         List<Team> teams = teamMapper.selectList(Wrappers.<Team>lambdaQuery()
                 .eq(Team::getDeleted, 0)
                 .eq(Team::getOriginalType, 1)
-                .orderByDesc(Team::getCreateTime)
+                .eq(Team::getHotTeam, 1)
+                .orderByDesc(Team::getUpdateTime)
         );
 
         GetTeamInfoListResponse response = new GetTeamInfoListResponse();
         response.setHotTeam(new ArrayList<>());
-        response.setOtherTeam(new ArrayList<>());
         for (Team team : teams) {
             GetTeamInfoListResponse.GetTeamInfoInfoResponse teamInfo = GetTeamInfoListResponse.GetTeamInfoInfoResponse.builder()
                     .id(team.getId())
@@ -288,12 +289,34 @@ public class MatchServiceImpl implements MatchService {
                     .teamNameEn(team.getTeamNameEn())
                     .build();
 
-            if (team.getHotTeam() == 1) {
             response.getHotTeam().add(teamInfo);
-            } else if (team.getHotTeam() == 0) {
-                response.getOtherTeam().add(teamInfo);
         }
+
+        long count = teamMapper.selectCount(Wrappers.<Team>lambdaQuery()
+                .eq(Team::getDeleted, 0)
+                .eq(Team::getOriginalType, 1)
+                .eq(Team::getHotTeam, 0)
+        );
+        teams = teamMapper.selectList(Wrappers.<Team>lambdaQuery()
+                .eq(Team::getDeleted, 0)
+                .eq(Team::getOriginalType, 1)
+                .eq(Team::getHotTeam, 0)
+                .last(String.format(" limit %s,%s", jumpNum, commonPage.getPageSize()))
+                .orderByDesc(Team::getUpdateTime)
+        );
+
+        response.setOtherTeam(new ResultPage<>(commonPage.getPageNum(), commonPage.getPageSize(), (int) count, new ArrayList<>()));
+        for (Team team : teams) {
+            GetTeamInfoListResponse.GetTeamInfoInfoResponse teamInfo = GetTeamInfoListResponse.GetTeamInfoInfoResponse.builder()
+                    .id(team.getId())
+                    .teamIcon(team.getTeamIcon())
+                    .teamName(team.getTeamName())
+                    .teamNameEn(team.getTeamNameEn())
+                    .build();
+
+            response.getOtherTeam().getDataList().add(teamInfo);
         }
+
         redisUtilsService.cacheStringInfoByDay(key, JSON.toJSONString(response), 7);
         return ResponseData.successResponse(response);
     }

score-server/src/main/java/com/live/server/controller/MatchDataController.java

@@ -34,7 +34,7 @@ public class MatchDataController {
     }
 
     @PostMapping(value = "/getTeamInfoList")
-    @ApiOperation(value = "获取 所有 球队列表")
+    @ApiOperation(value = "获取球队列表 其他球队分页")
     @ApiResponses({
             @ApiResponse(code = 200, message = "成功处理请求"),
             @ApiResponse(code = 401, message = "没有权限访问该服务"),
@@ -42,8 +42,8 @@ public class MatchDataController {
             @ApiResponse(code = 404, message = "未发现该服务"),
             @ApiResponse(code = 500, message = "服务器内部错误")
     })
-    public ResponseData<?> getTeamInfoList(HttpServletRequest request) {
-        return matchService.getTeamInfoList(request);
+    public ResponseData<?> getTeamInfoList(@RequestBody CommonPage commonPage, HttpServletRequest request) {
+        return matchService.getTeamInfoList(commonPage, request);
     }
 
     @PostMapping(value = "/getPlayerList")