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-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java index dfb0505..f92969f 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java @@ -20,7 +20,7 @@ public class CameraInfoCO implements Serializable { @ApiModelProperty(value = "摄像头id") private String cameraId; //摄像头类型,1:固定摄像头,2:移动摄像头 - @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") + @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头") private Integer cameraType; @ApiModelProperty(value = "摄像头名称") diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java index 77355f8..f22c5be 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java @@ -26,7 +26,7 @@ public class CameraListCmd extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询,对应SQL的!=操作符 */ - @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") + @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头") @NotNull(message = "摄像头类型不能为空") private Integer cameraType; 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, "移动摄像头"); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java index dfa4b78..eaa3a7d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java @@ -20,7 +20,7 @@ public class CameraInfoDO implements Serializable { @ApiModelProperty(value = "摄像头id") private String cameraId; //摄像头类型,1:固定摄像头,2:移动摄像头 - @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") + @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头") private Integer cameraType; @ApiModelProperty(value = "摄像头名称")