zcloud_gbs
/
zcloud_gbs_key_project
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(): 补充分支合并遗漏代码

dev
lishiwei 2026-07-20 09:10:30 +08:00
parent f7b904591e
commit 5f3d891cef
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectCameraQueryExe.java
View File

@ -59,6 +59,9 @@ public class KeyProjectCameraQueryExe {
if(KeyProjectCameraTypeEnum.MOBILE_CAMERA.getCode().equals(cameraListCmd.getCameraType())){ if(KeyProjectCameraTypeEnum.MOBILE_CAMERA.getCode().equals(cameraListCmd.getCameraType())){
pageResponse = keyProjectCameraRepository.listMobileCameraAll(params); pageResponse = keyProjectCameraRepository.listMobileCameraAll(params);
} }
if(KeyProjectCameraTypeEnum.ALL_CAMERA.getCode().equals(cameraListCmd.getCameraType())){
pageResponse = keyProjectCameraRepository.listAllCamera(params);
}
List<CameraInfoCO> examCenterCOS = keyProjectCameraCoConvertor.converCameraDOsToCOs(pageResponse.getData()); List<CameraInfoCO> examCenterCOS = keyProjectCameraCoConvertor.converCameraDOsToCOs(pageResponse.getData());
pageResponse.setPageSize(examCenterCOS.size()); pageResponse.setPageSize(examCenterCOS.size());
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());

2
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CameraInfoCO.java
View File

@ -20,7 +20,7 @@ public class CameraInfoCO implements Serializable {
@ApiModelProperty(value = "摄像头id") @ApiModelProperty(value = "摄像头id")
private String cameraId; private String cameraId;
//摄像头类型,1:固定摄像头,2:移动摄像头 //摄像头类型,1:固定摄像头,2:移动摄像头
@ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头")
private Integer cameraType; private Integer cameraType;
@ApiModelProperty(value = "摄像头名称") @ApiModelProperty(value = "摄像头名称")

2
web-client/src/main/java/com/zcloud/key/project/dto/project/CameraListCmd.java
View File

@ -26,7 +26,7 @@ public class CameraListCmd extends PageQuery {
* - `le`: 小于等于比较查询 * - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符 * - `ne`: 不等比较查询，对应SQL的!=操作符
*/ */
@ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头")
@NotNull(message = "摄像头类型不能为空") @NotNull(message = "摄像头类型不能为空")
private Integer cameraType; private Integer cameraType;

1
web-domain/src/main/java/com/zcloud/key/project/domain/enums/KeyProjectCameraTypeEnum.java
View File

@ -7,6 +7,7 @@ import lombok.Getter;
*/ */
@Getter @Getter
public enum KeyProjectCameraTypeEnum { public enum KeyProjectCameraTypeEnum {
ALL_CAMERA(0, "全部摄像头"),
FIXED_CAMERA(1, "固定摄像头"), FIXED_CAMERA(1, "固定摄像头"),
MOBILE_CAMERA(2, "移动摄像头"); MOBILE_CAMERA(2, "移动摄像头");

2
web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CameraInfoDO.java
View File

@ -20,7 +20,7 @@ public class CameraInfoDO implements Serializable {
@ApiModelProperty(value = "摄像头id") @ApiModelProperty(value = "摄像头id")
private String cameraId; private String cameraId;
//摄像头类型,1:固定摄像头,2:移动摄像头 //摄像头类型,1:固定摄像头,2:移动摄像头
@ApiModelProperty(value = "摄像头类型,1:固定摄像头,2:移动摄像头") @ApiModelProperty(value = "摄像头类型,0:查全部,1:固定摄像头,2:移动摄像头")
private Integer cameraType; private Integer cameraType;
@ApiModelProperty(value = "摄像头名称") @ApiModelProperty(value = "摄像头名称")