From b60b1ef91a79951a04f86fa63551a35fac24a1ec Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Thu, 11 Jun 2026 10:35:59 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/KeyProjectCameraQueryExe.java | 3 ++ .../clientobject/project/CameraInfoCO.java | 4 +-- .../project/dto/project/CameraListCmd.java | 2 +- .../enums/KeyProjectCameraTypeEnum.java | 1 + .../dataobject/project/CameraInfoDO.java | 4 +-- .../mapper/KeyProjectCameraMapper.java | 2 ++ .../KeyProjectCameraRepositoryImpl.java | 7 +++++ .../project/KeyProjectCameraRepository.java | 2 ++ .../mapper/KeyProjectCameraMapper.xml | 29 +++++++++++++++++++ 9 files changed, 49 insertions(+), 5 deletions(-) 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 0291a02..ba20bd2 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()); 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..0e65514 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 @@ -19,8 +19,8 @@ public class CameraInfoCO implements Serializable { //摄像头id @ApiModelProperty(value = "摄像头id") private String cameraId; - //摄像头类型,1:固定摄像头,2:移动摄像头 - @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") + //摄像头类型,0：查全部,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..2efdcbc 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 @@ -19,8 +19,8 @@ public class CameraInfoDO implements Serializable { //摄像头id @ApiModelProperty(value = "摄像头id") private String cameraId; - //摄像头类型,1:固定摄像头,2:移动摄像头 - @ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") + //摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头 + @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头") private Integer cameraType; @ApiModelProperty(value = "摄像头名称") diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java index 720d36c..0e3c9bb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectCameraMapper.java @@ -30,6 +30,8 @@ public interface KeyProjectCameraMapper extends BaseMapper { IPage listMobileCameraAll(IPage iPage, Map params); + IPage listAllCamera(IPage iPage, Map params); + List listCameraByProjectId(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java index a401782..5383eaf 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectCameraRepositoryImpl.java @@ -64,5 +64,12 @@ public class KeyProjectCameraRepositoryImpl extends BaseRepositoryImpl result = keyProjectCameraMapper.listMobileCameraAll(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public PageResponse listAllCamera(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = keyProjectCameraMapper.listAllCamera(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java index dec5e37..93d4b38 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectCameraRepository.java @@ -26,5 +26,7 @@ public interface KeyProjectCameraRepository extends BaseRepository listFixedCameraAll(Map params); PageResponse listMobileCameraAll(Map params); + + PageResponse listAllCamera(Map params); } diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml index d7bb47f..3c9a1bc 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml @@ -71,6 +71,35 @@ ) + +