From 7285ede61c00364d12855591bc55adc5ef80cfe5 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 18 Jul 2024 09:44:50 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8F=AF=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=8A=A0=E5=87=8F=E8=BF=94=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalExtController.java | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 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 312e526..2207594 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 @@ -118,10 +118,13 @@ public class TerminalExtController extends BaseController { public ResponseReult> listWithAll(Integer dyId, Integer lineId, Integer towerId, String search, Integer isonline, Integer protocol, Integer devType, String cmdid, Long start, Long end, - Integer channelId, Integer activityId, + Integer channelId, Integer activityId, String dataFlag, Integer pageNum, Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); + if (dataFlag == null) { + dataFlag = ""; + } long cost = System.currentTimeMillis(); PageInfo result = this.getTerminalPage(dyId, lineId, towerId, search, cmdid, isonline, protocol, devType, activityId, @@ -131,19 +134,31 @@ public class TerminalExtController extends BaseController { if (!CollectionUtils.isEmpty(result.getList())) { cost = System.currentTimeMillis(); for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { - TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId()) - .getData(); - terminal.setLastGps(last); - PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end); - terminal.setPhotoInfo(photoInfo); - TerminalStatus status = terminalStatusDao.selectByPrimaryKey(terminal.getId()); - terminal.setWorkingStatus(status); - TerminalPositions positions = terminalPositionsDao.selectByPrimaryKey(terminal.getId()); - terminal.setPositions(positions); - long rebootCount = infoHistoryService.count(terminal.getId(), start, end); - terminal.setRebootCount(rebootCount); - TerminalBasicInfoHistory info = infoHistoryService.getLast(terminal.getId()); - terminal.setLastInfo(info); + if (dataFlag.contains("G")) { + TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId()) + .getData(); + terminal.setLastGps(last); + } + if (dataFlag.contains("P")) { + PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end); + terminal.setPhotoInfo(photoInfo); + } + if (dataFlag.contains("S")) { + TerminalStatus status = terminalStatusDao.selectByPrimaryKey(terminal.getId()); + terminal.setWorkingStatus(status); + } + if (dataFlag.contains("O")) { + TerminalPositions positions = terminalPositionsDao.selectByPrimaryKey(terminal.getId()); + terminal.setPositions(positions); + } + if (dataFlag.contains("C")) { + long rebootCount = infoHistoryService.count(terminal.getId(), start, end); + terminal.setRebootCount(rebootCount); + } + if (dataFlag.contains("B")) { + TerminalBasicInfoHistory info = infoHistoryService.getLast(terminal.getId()); + terminal.setLastInfo(info); + } } cost = System.currentTimeMillis() - cost; log.info("listWithAll cost=" + cost);