From 0320bc934c244471b470320667388940d13af60d Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 29 Apr 2024 16:02:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0devtype=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalExtController.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java index 8153fe0..9cc2262 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java @@ -53,14 +53,14 @@ public class TerminalExtController extends BaseController { @GetMapping("listWithAll") @ApiOperation("查询附带全部额外信息") public ResponseReult> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search, - Integer isonline, Integer protocol, + Integer isonline, Integer protocol, Integer devType, Long start, Long end, Integer channelId, Integer pageNum, Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); TableDataInfo result = this.getTerminalPage(dyId, lineId, towerId, search, - isonline,protocol, + isonline, protocol, devType, pageNum, pageSize); if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { @@ -83,12 +83,12 @@ public class TerminalExtController extends BaseController { @GetMapping("listWithGPS") @ApiOperation("查询附带定位") public ResponseReult> listWithGPS(Integer dyId, Integer lineId, Integer towerId, String search, - Integer isonline, Integer protocol, + Integer isonline, Integer protocol, Integer devType, Integer pageNum, Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); TableDataInfo result = this.getTerminalPage(dyId, lineId, towerId, search, - isonline,protocol, + isonline, protocol, devType, pageNum, pageSize); if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { @@ -103,14 +103,14 @@ public class TerminalExtController extends BaseController { @GetMapping("listWithPhoto") @ApiOperation("查询附带图片统计") public ResponseReult> listWithPhoto(Integer dyId, Integer lineId, Integer towerId, String search, - Integer isonline, Integer protocol, + Integer isonline, Integer protocol, Integer devType, @NotNull(message = "start不能为空!") Long start, @NotNull(message = "end不能为空!") Long end, Integer channelId, Integer pageNum, Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); TableDataInfo result = this.getTerminalPage(dyId, lineId, towerId, search, - isonline,protocol, + isonline, protocol, devType, pageNum, pageSize); if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { @@ -124,12 +124,12 @@ public class TerminalExtController extends BaseController { @GetMapping("listWithWeather") @ApiOperation("查询附带天气") public ResponseReult> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search, - Integer isonline, Integer protocol, + Integer isonline, Integer protocol, Integer devType, Integer pageNum, Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); TableDataInfo result = this.getTerminalPage(dyId, lineId, towerId, search, - isonline,protocol, + isonline, protocol, devType, pageNum, pageSize); if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { @@ -145,12 +145,12 @@ public class TerminalExtController extends BaseController { @GetMapping("listWithLeadPull") @ApiOperation("查询附带拉力") public ResponseReult> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search, - Integer isonline, Integer protocol, + Integer isonline, Integer protocol, Integer devType, Integer pageNum, Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); TableDataInfo result = this.getTerminalPage(dyId, lineId, towerId, search, - isonline,protocol, + isonline, protocol, devType, pageNum, pageSize); if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { @@ -171,7 +171,7 @@ public class TerminalExtController extends BaseController { } private TableDataInfo getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search, - Integer isonline, Integer protocol, + Integer isonline, Integer protocol, Integer devType, Integer pageNum, Integer pageSize) { TerminalSelectVo vo = new TerminalSelectVo(); vo.setDyId(dyId); @@ -180,6 +180,7 @@ public class TerminalExtController extends BaseController { vo.setSearch(search); vo.setIsonline(isonline); vo.setProtocol(protocol); + vo.setDevType(devType); vo.setPageindex(pageNum); vo.setPagesize(pageSize); TableDataInfo result = terminalService.getTerminalList(vo).getData();