|
@@ -28,14 +28,15 @@ func (s *securityService) GetCameraLiveList(tenantId int) ([]model.CameraLiveDet
|
|
poleGroupName = cameraDevice.DeviceName + "在线"
|
|
poleGroupName = cameraDevice.DeviceName + "在线"
|
|
}
|
|
}
|
|
cameraList = append(cameraList, model.CameraLive{
|
|
cameraList = append(cameraList, model.CameraLive{
|
|
- Id: cameraDevice.ID,
|
|
|
|
- DeviceName: cameraDevice.DeviceName,
|
|
|
|
- DeviceSn: cameraDevice.DeviceSN,
|
|
|
|
- PoleGroupName: poleGroupName,
|
|
|
|
- MonitorAddress: cameraDevice.MonitorAddress,
|
|
|
|
- StreamId: cameraDevice.StreamId,
|
|
|
|
- RunState: state,
|
|
|
|
- CameraType: cameraDevice.CameraType,
|
|
|
|
|
|
+ Id: cameraDevice.ID,
|
|
|
|
+ DeviceName: cameraDevice.DeviceName,
|
|
|
|
+ DeviceSn: cameraDevice.DeviceSN,
|
|
|
|
+ PoleGroupName: poleGroupName,
|
|
|
|
+ MonitorAddress: cameraDevice.MonitorAddress,
|
|
|
|
+ StreamId: cameraDevice.StreamId,
|
|
|
|
+ RunState: state,
|
|
|
|
+ CameraType: cameraDevice.CameraType,
|
|
|
|
+ LampPoleLocation: cameraDevice.LampPoleLocation,
|
|
})
|
|
})
|
|
}
|
|
}
|
|
rsp = append(rsp, model.CameraLiveDetail{
|
|
rsp = append(rsp, model.CameraLiveDetail{
|