diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java index 58c01a9..70af8d9 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java @@ -59,6 +59,9 @@ public class KeyProjectCameraQueryExe { if(KeyProjectCameraTypeEnum.MOBILE_CAMERA.getCode().equals(cameraListCmd.getCameraType())){ pageResponse = keyProjectCameraRepository.listMobileCameraAll(params); } + if(KeyProjectCameraTypeEnum.ALL_CAMERA.getCode().equals(cameraListCmd.getCameraType())){ + pageResponse = keyProjectCameraRepository.listAllCamera(params); + } List examCenterCOS = keyProjectCameraCoConvertor.converCameraDOsToCOs(pageResponse.getData()); pageResponse.setPageSize(examCenterCOS.size()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-domain/src/main/java/com/zcloud/key/project/domain/enums/KeyProjectCameraTypeEnum.java b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/KeyProjectCameraTypeEnum.java index 36aaaba..3bc447c 100644 --- a/web-domain/src/main/java/com/zcloud/key/project/domain/enums/KeyProjectCameraTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/key/project/domain/enums/KeyProjectCameraTypeEnum.java @@ -7,6 +7,7 @@ import lombok.Getter; */ @Getter public enum KeyProjectCameraTypeEnum { + ALL_CAMERA(0, "全部摄像头"), FIXED_CAMERA(1, "固定摄像头"), MOBILE_CAMERA(2, "移动摄像头");