海康区域树条件查询补充

This commit is contained in:
punchhhh 2025-01-26 15:22:18 +08:00
parent fed667d49c
commit 9f0b9d7d34
2 changed files with 7 additions and 2 deletions

View File

@ -43,4 +43,9 @@ public interface CameraMapper extends BaseMapperX<CameraDO> {
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));
}
default Long selectCameraByRegionIndexCodeAndCameraNameTotal(String regionIndexCode, String cameraName) {
return selectCount(new LambdaQueryWrapperX<CameraDO>().eq(CameraDO::getRegionIndexCode, regionIndexCode).like(CameraDO::getCameraName, cameraName));
}
}

View File

@ -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<RegionCameraListDTO> 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);