feat(): 补充分支合并遗漏代码-2
parent
77e65e3af6
commit
7e1693414b
|
|
@ -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());
|
||||||
|
|
|
||||||
|
|
@ -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, "移动摄像头");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue