From 90efb2bf18b57620a2066f8e08cc60d13ad26a18 Mon Sep 17 00:00:00 2001 From: akun <957746831@qq.com> Date: Wed, 15 May 2024 17:52:16 +0800 Subject: [PATCH] =?UTF-8?q?ruoyi=E8=BD=AC=E6=8D=A2=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=9B=86=E5=90=88=E5=90=8E=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sf/common/core/page/TableDataInfo.java | 10 ++++++++-- .../controller/GatewayInterfaceInfoController.java | 3 ++- .../gateway/controller/GatewayRouteController.java | 3 ++- .../gateway/controller/GatewayServerController.java | 3 ++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sf-common/src/main/java/com/sf/common/core/page/TableDataInfo.java b/sf-common/src/main/java/com/sf/common/core/page/TableDataInfo.java index 24191a0..d62cf68 100644 --- a/sf-common/src/main/java/com/sf/common/core/page/TableDataInfo.java +++ b/sf-common/src/main/java/com/sf/common/core/page/TableDataInfo.java @@ -5,7 +5,7 @@ import java.util.List; /** * 表格分页数据对象 - * + * * @author ztzh */ public class TableDataInfo implements Serializable @@ -33,7 +33,7 @@ public class TableDataInfo implements Serializable /** * 分页 - * + * * @param list 列表数据 * @param total 总记录数 */ @@ -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; diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java index 0397cf4..8f0bffb 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayInterfaceInfoController.java @@ -70,6 +70,7 @@ public class GatewayInterfaceInfoController extends BaseController { gatewayInterfaceInfo.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = gatewayInterfaceInfoService.selectGatewayInterfaceInfoList(gatewayInterfaceInfo); + TableDataInfo tableDataInfo = getDataTable(list); Set serverIds = list.stream().map(GatewayInterfaceInfo::getServerId).collect(Collectors.toSet()); List serverList = gatewayServerService.selectGatewayServerByIds(serverIds); Map 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("导出接口信息列表") diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java index f8a0e5d..5621379 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayRouteController.java @@ -52,8 +52,9 @@ public class GatewayRouteController extends BaseController { startPage(); List list = gatewayRouteService.selectGatewayRouteList(gatewayRoute); + TableDataInfo tableDataInfo = getDataTable(list); List voList = list.stream().map(GatewayRouteListVO::convert).collect(Collectors.toList()); - return getDataTable(voList); + return tableDataInfo.rows(voList); } /** diff --git a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java index 1851e05..38f6b2b 100644 --- a/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java +++ b/sf-service/src/main/java/com/sf/service/gateway/controller/GatewayServerController.java @@ -68,6 +68,7 @@ public class GatewayServerController extends BaseController { gatewayServer.setAppCode(AppUtils.getAppCodeFromRequestHeader()); startPage(); List list = gatewayServerService.selectGatewayServerList(gatewayServer); + TableDataInfo tableDataInfo = getDataTable(list); // 如果是路由模式的服务，查询对应的路由服务信息 Collection routeIds = list.stream().filter(item -> GatewayServiceModel.ROUTE.getCode().equals(item.getServiceModel())) .map(GatewayServer::getRouteId) @@ -77,7 +78,7 @@ public class GatewayServerController extends BaseController { List 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); } /**