From 7c299692e1fef7b5c876c614dbdb36d5250ff374 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 9 Apr 2025 10:02:11 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E8=A3=85=E7=BD=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E5=B9=B6=E7=A7=BB=E5=88=B0?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalExtController.java | 34 +++++-------------- .../xymanager_common/vo/TerminalSelectVo.java | 1 + .../impl/TerminalExtServiceImpl.java | 27 ++++++++++++++- .../service/TerminalExtService.java | 5 +++ 4 files changed, 41 insertions(+), 26 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 c63061e..c5bf41e 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 @@ -129,7 +129,7 @@ public class TerminalExtController extends BaseController { @GetMapping("listWithAll") @ApiOperation("查询附带全部额外信息") @Log(title = "装置查询附带全部额外信息", type = "查询") - public ResponseReult> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search, + public ResponseReult> 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 result = this.getTerminalPage(dyId, lineId, towerId, search, cmdid, + PageInfo 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> listWithWeather(Integer dyId, Integer lineId, Integer towerId, String search, + public ResponseReult> 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 result = this.getTerminalPage(dyId, lineId, towerId, search, null, + PageInfo 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> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, String search, + public ResponseReult> 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 result = this.getTerminalPage(dyId, lineId, towerId, search, null, + PageInfo 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 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 result = terminalExtService.getTerminalList(vo); - return result; - } - @GetMapping("getSimcard") @ApiOperation("查询Simcard数据") @Log(title = "查询Simcard数据", type = "查询") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java index c061c98..089508a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java +++ b/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; diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java index 7634824..c0b5717 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java +++ b/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 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 result = this.getTerminalList(vo); + return result; + } + @Override public PageInfo 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); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalExtService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalExtService.java index 291f168..94beb3c 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalExtService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalExtService.java @@ -12,6 +12,11 @@ import java.util.List; public interface TerminalExtService { + PageInfo 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 getTerminalList(TerminalSelectVo vo); List getExtTerminalList(TerminalSelectVo vo);