From 02c0c718f02c29181de2b1e57ed67a52bf3ab6b4 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 18 Apr 2024 16:04:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=9A=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xymanager_admin/controller/TerminalExtController.java | 3 ++- .../xymanager_service/impl/TerminalPhotoServiceImpl.java | 5 ++++- .../shxy/xymanager_service/service/TerminalPhotoService.java | 2 +- 3 files changed, 7 insertions(+), 3 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 a05a4f4..38c7f8c 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 @@ -63,6 +63,7 @@ public class TerminalExtController extends BaseController { @ApiOperation("查询附带图片统计") public ResponseReult> listWithPhoto(Integer dyId, Integer lineId, Integer towerId, @NotNull(message = "start不能为空!") Long start, @NotNull(message = "end不能为空!") Long end, + Integer channelId, Integer pageNum, Integer pageSize) { pageNum = this.initPageNum(pageNum); pageSize = this.initPageSize(pageSize); @@ -70,7 +71,7 @@ public class TerminalExtController extends BaseController { pageNum, pageSize); if (!CollectionUtils.isEmpty(result.getList())) { for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { - PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), start, end); + PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end); terminal.setPhotoInfo(photoInfo); } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index b7aca23..41f5a66 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -795,11 +795,14 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } @Override - public PhotoDayModel getDayModel(Integer termid, Long start, Long end) { + public PhotoDayModel getDayModel(Integer termid, Integer channelId, Long start, Long end) { TerminalPhotoExample example = new TerminalPhotoExample(); TerminalPhotoExample.Criteria criteria = example.createCriteria(); criteria.andTermIdEqualTo(termid); criteria.andPhotoTimeBetween(start, end); + if (channelId != null){ + criteria.andChannelIdEqualTo(channelId); + } example.setOrderByClause("photo_time desc"); List list = terminalPhotoDao.selectByExample(example); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java index 381d87e..7a7dcd2 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java @@ -109,5 +109,5 @@ public interface TerminalPhotoService { ServiceBody uploadPhoto(MultipartFile file, Integer termid, String cmdid, Integer channel, BigInteger phototime) throws IOException; - PhotoDayModel getDayModel(Integer termid, Long start, Long end); + PhotoDayModel getDayModel(Integer termid, Integer channelId, Long start, Long end); }