perf: 增加装置查询参数并移到通用层

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java

@@ -129,7 +129,7 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithAll")
     @ApiOperation("查询附带全部额外信息")
     @Log(title = "装置查询附带全部额外信息", type = "查询")
-    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search,
+    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, Integer termId, String search,
                                                                              Integer isonline, Integer protocol, Integer devType, String cmdid,
                                                                              Long start, Long end,
                                                                              Integer channelId, Integer activityId, String dataFlag,
@@ -140,7 +140,8 @@ public class TerminalExtController extends BaseController {
             dataFlag = "";
         }
         long cost = System.currentTimeMillis();
-        PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, cmdid,
+        PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalPage(dyId, lineId, towerId, termId,
+                search, cmdid,
                 isonline, protocol, devType, activityId,
                 pageNum, pageSize);
         cost = System.currentTimeMillis() - cost;
@@ -204,12 +205,13 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithWeather")
     @ApiOperation("查询附带天气")
     @Log(title = "覆冰查询附带天气", type = "查询")
-    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search,
+    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, Integer termId, String search,
                                                                                  Integer isonline, Integer protocol, Integer devType,
                                                                                  Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
-        PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, null,
+        PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalPage(dyId, lineId, towerId, termId,
+                search, null,
                 isonline, protocol, devType, null,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
@@ -228,12 +230,13 @@ public class TerminalExtController extends BaseController {
     @GetMapping("listWithLeadPull")
     @ApiOperation("查询附带拉力")
     @Log(title = "覆冰查询附带拉力", type = "查询")
-    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search,
+    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, Integer termId, String search,
                                                                                   Integer isonline, Integer protocol, Integer devType,
                                                                                   Integer pageNum, Integer pageSize) {
         pageNum = this.initPageNum(pageNum);
         pageSize = this.initPageSize(pageSize);
-        PageInfo<View_Dy_Line_Tower_Terminals> result = this.getTerminalPage(dyId, lineId, towerId, search, null,
+        PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalPage(dyId, lineId, towerId, termId,
+                search, null,
                 isonline, protocol, devType, null,
                 pageNum, pageSize);
         if (!CollectionUtils.isEmpty(result.getList())) {
@@ -259,25 +262,6 @@ public class TerminalExtController extends BaseController {
         return ResponseReult.success(list);
     }
 
-    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 activityId,
-                                                                   Integer pageNum, Integer pageSize) {
-        TerminalSelectVo vo = new TerminalSelectVo();
-        vo.setDyId(dyId);
-        vo.setLineId(lineId);
-        vo.setTowerId(towerId);
-        vo.setSearch(search);
-        vo.setCmdid(cmdid);
-        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);
-        return result;
-    }
-
     @GetMapping("getSimcard")
     @ApiOperation("查询Simcard数据")
     @Log(title = "查询Simcard数据", type = "查询")

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java

@@ -53,6 +53,7 @@ public class TerminalSelectVo {
     private Boolean oidExclude;
     private Integer activityId;
     private Integer mntn;
+    private Integer termId;
 
     // 运维统计用
     private Long end;

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java

@@ -55,6 +55,28 @@ public class TerminalExtServiceImpl implements TerminalExtService {
     MntnDayStatService mntnDayStatService;
 
 
+    @Override
+    public PageInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, Integer termId,
+                                                                  String search, String cmdid,
+                                                                  Integer isonline, Integer protocol, Integer devType, Integer activityId,
+                                                                  Integer pageNum, Integer pageSize) {
+        TerminalSelectVo vo = new TerminalSelectVo();
+        vo.setDyId(dyId);
+        vo.setLineId(lineId);
+        vo.setTowerId(towerId);
+        vo.setTermId(termId);
+        vo.setSearch(search);
+        vo.setCmdid(cmdid);
+        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 = this.getTerminalList(vo);
+        return result;
+    }
+
     @Override
     public PageInfo<View_Dy_Line_Tower_Terminals> getTerminalList(TerminalSelectVo vo) {
         if (vo.getCmaExclude() == null) {
@@ -88,6 +110,9 @@ public class TerminalExtServiceImpl implements TerminalExtService {
         } else if (vo.getDyId() != null && vo.getDyId() > 0) {
             criteria.andDyIdEqualTo(vo.getDyId());
         }
+        if (vo.getTermId() != null && vo.getTermId() > 0) {
+            criteria.andIdEqualTo(vo.getTermId());
+        }
         if (vo.getProtocol() != null && vo.getProtocol() > 0) {
             criteria.andProtocolEqualTo(vo.getProtocol());
         }
@@ -294,7 +319,7 @@ public class TerminalExtServiceImpl implements TerminalExtService {
                 channel.setChannelId(i);
                 channel.setCreateTime(now);
                 channel.setUpdateTime(now);
-                if (model.getPanChannel() != null && model.getPanChannel().intValue() == i){
+                if (model.getPanChannel() != null && model.getPanChannel().intValue() == i) {
                     channel.setType(1);
                 }
                 channelMapperDao.insertSelective(channel);

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalExtService.java

@@ -12,6 +12,11 @@ import java.util.List;
 
 public interface TerminalExtService {
 
+    PageInfo<View_Dy_Line_Tower_Terminals> getTerminalPage(Integer dyId, Integer lineId, Integer towerId, Integer termId,
+                                                           String search, String cmdid,
+                                                           Integer isonline, Integer protocol, Integer devType, Integer activityId,
+                                                           Integer pageNum, Integer pageSize);
+
     PageInfo<View_Dy_Line_Tower_Terminals> getTerminalList(TerminalSelectVo vo);
 
     List<View_Dy_Line_Tower_Terminals> getExtTerminalList(TerminalSelectVo vo);