root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 2 Wiki Activity

海康区域树条件查询补充 #106

Merged
root merged 1 commits from cgt into master 2025-01-26 15:23:15 +08:00
Conversation 0 Commits 1 Files Changed 2 +7 -2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/dal/mysql/camera/CameraMapper.java
View File

@ -43,4 +43,9 @@ public interface CameraMapper extends BaseMapperX<CameraDO> {
default List<CameraDO> selectCameraByRegionIndexCodeAndCameraNamePage(String regionIndexCode, String cameraName, Integer start, Integer end) { default List<CameraDO> selectCameraByRegionIndexCodeAndCameraNamePage(String regionIndexCode, String cameraName, Integer start, Integer end) {
return selectList(new LambdaQueryWrapperX<CameraDO>().eq(CameraDO::getRegionIndexCode, regionIndexCode).like(CameraDO::getCameraName, cameraName).last("limit " + start + "," + end)); return selectList(new LambdaQueryWrapperX<CameraDO>().eq(CameraDO::getRegionIndexCode, regionIndexCode).like(CameraDO::getCameraName, cameraName).last("limit " + start + "," + end));
} }
default Long selectCameraByRegionIndexCodeAndCameraNameTotal(String regionIndexCode, String cameraName) {
return selectCount(new LambdaQueryWrapperX<CameraDO>().eq(CameraDO::getRegionIndexCode, regionIndexCode).like(CameraDO::getCameraName, cameraName));
}
} }

4
ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java
View File

@ -126,14 +126,14 @@ public class RegionServiceImpl implements RegionService {
regionMap.put(regionDO.getIndexCode(), temp); regionMap.put(regionDO.getIndexCode(), temp);
} }
System.out.println("regionMap:"+regionMap); // System.out.println("regionMap:"+regionMap);
// 用于存储已经添加到 parent 的子区域，避免重复添加 // 用于存储已经添加到 parent 的子区域，避免重复添加
Set<RegionCameraListDTO> addedChildren = new HashSet<>(); Set<RegionCameraListDTO> addedChildren = new HashSet<>();
for (RegionCameraListDTO regionDTO : regions) { for (RegionCameraListDTO regionDTO : regions) {
if(regionDTO.getParentIndexCode() != null && !"-1".equals(regionDTO.getParentIndexCode())) { if(regionDTO.getParentIndexCode() != null && !"-1".equals(regionDTO.getParentIndexCode())) {
System.out.println("regionchild:"+regionDTO); // System.out.println("regionchild:"+regionDTO);
RegionCameraListDTO parentRegion = regionMap.get(regionDTO.getParentIndexCode()); RegionCameraListDTO parentRegion = regionMap.get(regionDTO.getParentIndexCode());
if (parentRegion != null) { if (parentRegion != null) {
parentRegion.getChildren().add(regionDTO); parentRegion.getChildren().add(regionDTO);