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

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

@ -5,7 +5,7 @@ import java.util.List;
/** /**
* 表格分页数据对象 * 表格分页数据对象
* *
* @author ztzh * @author ztzh
*/ */
public class TableDataInfo implements Serializable public class TableDataInfo implements Serializable
@ -33,7 +33,7 @@ public class TableDataInfo implements Serializable
/** /**
* 分页 * 分页
* *
* @param list 列表数据 * @param list 列表数据
* @param total 总记录数 * @param total 总记录数
*/ */
@ -63,6 +63,12 @@ public class TableDataInfo implements Serializable
this.rows = rows; this.rows = rows;
} }
public TableDataInfo rows(List<?> rows)
{
this.rows = rows;
return this;
}
public int getCode() public int getCode()
{ {
return code; 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()); gatewayInterfaceInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader());
startPage(); startPage();
List<GatewayInterfaceInfo> list = gatewayInterfaceInfoService.selectGatewayInterfaceInfoList(gatewayInterfaceInfo); List<GatewayInterfaceInfo> list = gatewayInterfaceInfoService.selectGatewayInterfaceInfoList(gatewayInterfaceInfo);
TableDataInfo tableDataInfo = getDataTable(list);
Set<Long> serverIds = list.stream().map(GatewayInterfaceInfo::getServerId).collect(Collectors.toSet()); Set<Long> serverIds = list.stream().map(GatewayInterfaceInfo::getServerId).collect(Collectors.toSet());
List<GatewayServer> serverList = gatewayServerService.selectGatewayServerByIds(serverIds); List<GatewayServer> serverList = gatewayServerService.selectGatewayServerByIds(serverIds);
Map<Long, GatewayServer> serverMap = serverList.stream().collect(Collectors.toMap(GatewayServer::getId, Function.identity())); 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); vo.setAverageResponseTime(0L);
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return getDataTable(voList); return tableDataInfo.rows(voList);
} }
@ApiOperation("导出接口信息列表") @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(); startPage();
List<GatewayRoute> list = gatewayRouteService.selectGatewayRouteList(gatewayRoute); List<GatewayRoute> list = gatewayRouteService.selectGatewayRouteList(gatewayRoute);
TableDataInfo tableDataInfo = getDataTable(list);
List<GatewayRouteListVO> voList = list.stream().map(GatewayRouteListVO::convert).collect(Collectors.toList()); 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()); gatewayServer.setAppCode(AppUtils.getAppCodeFromRequestHeader());
startPage(); startPage();
List<GatewayServer> list = gatewayServerService.selectGatewayServerList(gatewayServer); List<GatewayServer> list = gatewayServerService.selectGatewayServerList(gatewayServer);
TableDataInfo tableDataInfo = getDataTable(list);
// 如果是路由模式的服务，查询对应的路由服务信息 // 如果是路由模式的服务，查询对应的路由服务信息
Collection<Long> routeIds = list.stream().filter(item -> GatewayServiceModel.ROUTE.getCode().equals(item.getServiceModel())) Collection<Long> routeIds = list.stream().filter(item -> GatewayServiceModel.ROUTE.getCode().equals(item.getServiceModel()))
.map(GatewayServer::getRouteId) .map(GatewayServer::getRouteId)
@ -77,7 +78,7 @@ public class GatewayServerController extends BaseController {
List<GatewayServerListVO> voList = list.stream() List<GatewayServerListVO> voList = list.stream()
.map(item -> GatewayServerListVO.convert(item,GatewayServiceModel.ROUTE.getCode().equals(item.getServiceModel()) ? routeMap.get(item.getRouteId()) : new GatewayRoute())) .map(item -> GatewayServerListVO.convert(item,GatewayServiceModel.ROUTE.getCode().equals(item.getServiceModel()) ? routeMap.get(item.getRouteId()) : new GatewayRoute()))
.collect(Collectors.toList()); .collect(Collectors.toList());
return getDataTable(voList); return tableDataInfo.rows(voList);
} }
/** /**