From f829323d5f9892a5a2354c3ca6ff0c1c1f1cbae2 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 8 Jul 2024 15:39:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A3=85=E7=BD=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8id=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TerminalExtController.java             | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 96b01d3..68ca20f 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
@@ -114,13 +114,13 @@ public class TerminalExtController extends BaseController {
     public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search,
                                                                              Integer isonline, Integer protocol, Integer devType, String cmdid,
                                                                              Long start, Long end,
-                                                                             Integer channelId,
+                                                                             Integer channelId, Integer activityId,
                                                                              Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
         long cost = System.currentTimeMillis();
         PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, cmdid,
-                isonline, protocol, devType,
+                isonline, protocol, devType, activityId,
                 pageNum, pageSize);
         cost = System.currentTimeMillis() - cost;
         log.info("getTerminalList cost=" + cost);
@@ -157,7 +157,7 @@ public class TerminalExtController extends BaseController {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
         PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, null,
-                isonline, protocol, devType,
+                isonline, protocol, devType, null,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@@ -181,7 +181,7 @@ public class TerminalExtController extends BaseController {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
         PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, null,
-                isonline, protocol, devType,
+                isonline, protocol, devType, null,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
@@ -207,7 +207,7 @@ public class TerminalExtController extends BaseController {
     }
 
     private PageInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, String search, String cmdid,
-                                                                   Integer isonline, Integer protocol, Integer devType,
+                                                                   Integer isonline, Integer protocol, Integer devType, Integer activityId,
                                                                    Integer pageNum, Integer pageSize) {
         TerminalSelectVo vo = new TerminalSelectVo();
         vo.setDyId(dyId);
@@ -218,6 +218,7 @@ public class TerminalExtController extends BaseController {
         vo.setIsonline(isonline);
         vo.setProtocol(protocol);
         vo.setDevType(devType);
+        vo.setActivityId(activityId);
         vo.setPageindex(pageNum);
         vo.setPagesize(pageSize);
         PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalList(vo);