feat: 装置查询增加活动id参数

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);