From 9b6ae38295257ec73739feefb415ff530ce72ae9 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 29 Apr 2024 15:01:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TerminalExtController.java           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 813bfc0..8153fe0 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,12 +53,14 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithAll")
     @ApiOperation("查询附带全部额外信息")
     public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search,
+                                                                                  Integer isonline, Integer protocol,
                                                                                   Long start, Long end,
                                                                                   Integer channelId,
                                                                                   Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
         TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
+                isonline,protocol,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@@ -81,10 +83,12 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithGPS")
     @ApiOperation("查询附带定位")
     public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithGPS(Integer dyId, Integer lineId, Integer towerId, String search,
+                                                                                  Integer isonline, Integer protocol,
                                                                                   Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
         TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
+                isonline,protocol,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@@ -99,12 +103,14 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithPhoto")
     @ApiOperation("查询附带图片统计")
     public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithPhoto(Integer dyId, Integer lineId, Integer towerId, String search,
+                                                                                    Integer isonline, Integer protocol,
                                                                                     @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<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
+                isonline,protocol,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@@ -118,10 +124,12 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithWeather")
     @ApiOperation("查询附带天气")
     public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search,
+                                                                                      Integer isonline, Integer protocol,
                                                                                       Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
         TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
+                isonline,protocol,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@@ -137,10 +145,12 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithLeadPull")
     @ApiOperation("查询附带拉力")
     public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search,
+                                                                                       Integer isonline, Integer protocol,
                                                                                        Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
         TableDataInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search,
+                isonline,protocol,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@@ -161,12 +171,15 @@ public class TerminalExtController extends BaseController {
     }
 
     private TableDataInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search,
+                                                                        Integer isonline, Integer protocol,
                                                                         Integer pageNum, Integer pageSize) {
         TerminalSelectVo vo = new TerminalSelectVo();
         vo.setDyId(dyId);
         vo.setLineId(lineId);
         vo.setTowerId(towerId);
         vo.setSearch(search);
+        vo.setIsonline(isonline);
+        vo.setProtocol(protocol);
         vo.setPageindex(pageNum);
         vo.setPagesize(pageSize);
         TableDataInfo<View_Dy_Line_Tower_Terminals> result = terminalService.getTerminalList(vo).getData();