From 9f0b9d7d34c0955158a11a394f6f0cd8e79253ed Mon Sep 17 00:00:00 2001 From: punchhhh <87906027+punchhhh@users.noreply.github.com> Date: Sun, 26 Jan 2025 15:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E5=8C=BA=E5=9F=9F=E6=A0=91?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/hiking/dal/mysql/camera/CameraMapper.java | 5 +++++ .../module/hiking/service/region/RegionServiceImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/dal/mysql/camera/CameraMapper.java b/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/dal/mysql/camera/CameraMapper.java index 1f9ae1a03..e4401feb0 100644 --- a/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/dal/mysql/camera/CameraMapper.java +++ b/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/dal/mysql/camera/CameraMapper.java @@ -43,4 +43,9 @@ public interface CameraMapper extends BaseMapperX { default List selectCameraByRegionIndexCodeAndCameraNamePage(String regionIndexCode, String cameraName, Integer start, Integer end) { return selectList(new LambdaQueryWrapperX().eq(CameraDO::getRegionIndexCode, regionIndexCode).like(CameraDO::getCameraName, cameraName).last("limit " + start + "," + end)); } + + default Long selectCameraByRegionIndexCodeAndCameraNameTotal(String regionIndexCode, String cameraName) { + return selectCount(new LambdaQueryWrapperX().eq(CameraDO::getRegionIndexCode, regionIndexCode).like(CameraDO::getCameraName, cameraName)); + } + } \ No newline at end of file diff --git a/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java b/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java index 6fd53499e..cfbf445b3 100644 --- a/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java +++ b/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java @@ -126,14 +126,14 @@ public class RegionServiceImpl implements RegionService { regionMap.put(regionDO.getIndexCode(), temp); } - System.out.println("regionMap:"+regionMap); +// System.out.println("regionMap:"+regionMap); // 用于存储已经添加到 parent 的子区域，避免重复添加 Set addedChildren = new HashSet<>(); for (RegionCameraListDTO regionDTO : regions) { if(regionDTO.getParentIndexCode() != null && !"-1".equals(regionDTO.getParentIndexCode())) { - System.out.println("regionchild:"+regionDTO); +// System.out.println("regionchild:"+regionDTO); RegionCameraListDTO parentRegion = regionMap.get(regionDTO.getParentIndexCode()); if (parentRegion != null) { parentRegion.getChildren().add(regionDTO); -- 2.45.2