chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ruoyi转换分页返回集合后导致总数不对问题

Browse Source
This commit is contained in:
akun 2024-05-15 17:52:16 +08:00
parent 87eec45a52
commit 90efb2bf18
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sf-common/src/main/java/com/sf/common/core/page/TableDataInfo.java
View File

@ -63,6 +63,12 @@ public class TableDataInfo implements Serializable
this.rows = rows;
}
public TableDataInfo rows(List<?> rows)
{
this.rows = rows;
return this;
}
public int getCode()
{
return code;

3
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java
View File

@ -70,6 +70,7 @@ public class GatewayInterfaceInfoController extends BaseController {
gatewayInterfaceInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader());
startPage();
List<GatewayInterfaceInfo> list = gatewayInterfaceInfoService.selectGatewayInterfaceInfoList(gatewayInterfaceInfo);
TableDataInfo tableDataInfo = getDataTable(list);
Set<Long> serverIds = list.stream().map(GatewayInterfaceInfo::getServerId).collect(Collectors.toSet());
List<GatewayServer> serverList = gatewayServerService.selectGatewayServerByIds(serverIds);
Map<Long, GatewayServer> serverMap = serverList.stream().collect(Collectors.toMap(GatewayServer::getId, Function.identity()));
@ -80,7 +81,7 @@ public class GatewayInterfaceInfoController extends BaseController {
vo.setAverageResponseTime(0L);
return vo;
}).collect(Collectors.toList());
return getDataTable(voList);
return tableDataInfo.rows(voList);
}
@ApiOperation("导出接口信息列表")

3
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java
View File

@ -52,8 +52,9 @@ public class GatewayRouteController extends BaseController
{
startPage();
List<GatewayRoute> list = gatewayRouteService.selectGatewayRouteList(gatewayRoute);
TableDataInfo tableDataInfo = getDataTable(list);
List<GatewayRouteListVO> voList = list.stream().map(GatewayRouteListVO::convert).collect(Collectors.toList());
return getDataTable(voList);
return tableDataInfo.rows(voList);
}
/**

3
sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java
View File

@ -68,6 +68,7 @@ public class GatewayServerController extends BaseController {
gatewayServer.setAppCode(AppUtils.getAppCodeFromRequestHeader());
startPage();
List<GatewayServer> list = gatewayServerService.selectGatewayServerList(gatewayServer);
TableDataInfo tableDataInfo = getDataTable(list);
// 如果是路由模式的服务，查询对应的路由服务信息
Collection<Long> routeIds = list.stream().filter(item -> GatewayServiceModel.ROUTE.getCode().equals(item.getServiceModel()))
.map(GatewayServer::getRouteId)
@ -77,7 +78,7 @@ public class GatewayServerController extends BaseController {
List<GatewayServerListVO> voList = list.stream()
.map(item -> GatewayServerListVO.convert(item,GatewayServiceModel.ROUTE.getCode().equals(item.getServiceModel()) ? routeMap.get(item.getRouteId()) : new GatewayRoute()))
.collect(Collectors.toList());
return getDataTable(voList);
return tableDataInfo.rows(voList);
}
/**