Browse Source

fix:解决相机状态同步

master
wangguangyuan 4 weeks ago
parent
commit
752bf5c389
2 changed files with 36 additions and 1 deletions
  1. +10
    -0
      src/main/java/com/inspect/nvr/controller/IvsServerController.java
  2. +26
    -1
      src/main/java/com/inspect/nvr/domain/ivs/IvsDeviceListResponse.java

+ 10
- 0
src/main/java/com/inspect/nvr/controller/IvsServerController.java View File

@ -369,11 +369,21 @@ public class IvsServerController {
.build()) .build())
.build(); .build();
// 相机状态同步读取 cameraBriefInfosV2.cameraBriefInfoList.cameraBriefInfo。
IvsDeviceListResponse.CameraBriefInfosV2 cameraBriefInfosV2 =
IvsDeviceListResponse.CameraBriefInfosV2.builder()
.total(page.getTotal())
.cameraBriefInfoList(IvsDeviceListResponse.CameraBriefInfoList.builder()
.cameraBriefInfo(page.getCameras())
.build())
.build();
// 只要有 NVR 同步失败就返回非零结果码,同时仍保留成功同步的摄像机数据。 // 只要有 NVR 同步失败就返回非零结果码,同时仍保留成功同步的摄像机数据。
int resultCode = page.getSyncResult().getFailedNvrCount() == 0 ? 0 : 1; int resultCode = page.getSyncResult().getFailedNvrCount() == 0 ? 0 : 1;
// 组装 IVS 子设备列表响应,包含分页范围、总数和摄像机扩展信息。 // 组装 IVS 子设备列表响应,包含分页范围、总数和摄像机扩展信息。
return ResponseEntity.ok(IvsDeviceListResponse.builder() return ResponseEntity.ok(IvsDeviceListResponse.builder()
.resultCode(resultCode) .resultCode(resultCode)
.cameraBriefInfosV2(cameraBriefInfosV2)
.cameraBriefExInfos(cameraBriefExInfos) .cameraBriefExInfos(cameraBriefExInfos)
.build()); .build());
} }


+ 26
- 1
src/main/java/com/inspect/nvr/domain/ivs/IvsDeviceListResponse.java View File

@ -28,7 +28,7 @@ public class IvsDeviceListResponse implements Serializable {
private Object alarmBriefInfos; private Object alarmBriefInfos;
private Object cameraBriefInfosV2;
private CameraBriefInfosV2 cameraBriefInfosV2;
private Object shadowCameraBriefInfos; private Object shadowCameraBriefInfos;
@ -36,6 +36,31 @@ public class IvsDeviceListResponse implements Serializable {
private List<Object> exceptionDomain; private List<Object> exceptionDomain;
/** 摄像机 V2 列表,状态同步解析路径。 */
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class CameraBriefInfosV2 implements Serializable {
private static final long serialVersionUID = 1L;
private int total;
private CameraBriefInfoList cameraBriefInfoList;
}
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public static class CameraBriefInfoList implements Serializable {
private static final long serialVersionUID = 1L;
private List<IvsCamera> cameraBriefInfo;
}
@Data @Data
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor


Loading…
Cancel
Save