|
|
@@ -28,7 +28,6 @@ public class UpstreamController {
|
|
|
@Autowired
|
|
|
private IDeviceService deviceService;
|
|
|
|
|
|
-
|
|
|
@Autowired
|
|
|
private IManageDeviceLivestreamUrlService livestreamUrlService;
|
|
|
|
|
|
@@ -40,34 +39,48 @@ public class UpstreamController {
|
|
|
* 上游系统获取设备列表信息
|
|
|
* @param searchInfo
|
|
|
* @param status
|
|
|
+ * @param workspaceId
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/devicesList")
|
|
|
public HttpResultResponse<List<UpstreamDeviceDTO>> getDevicesList(String searchInfo,
|
|
|
Integer status,
|
|
|
String workspaceId) {
|
|
|
- List<UpstreamDeviceDTO> devices = deviceService.selUpstreamDeviceList(searchInfo, status,workspaceId);
|
|
|
+ log.info("===========================>Fetching devices list with parameters - searchInfo: {}, status: {}, workspaceId: {}", searchInfo, status, workspaceId);
|
|
|
+ List<UpstreamDeviceDTO> devices = deviceService.selUpstreamDeviceList(searchInfo, status, workspaceId);
|
|
|
+ log.info("===========================>Fetched Return devices: {} ", devices);
|
|
|
return HttpResultResponse.success(devices);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 上游系统获取图片文件信息
|
|
|
- * @param workspaceName
|
|
|
* @param startTime
|
|
|
* @param endTime
|
|
|
+ * @param workspaceId
|
|
|
+ * @param deviceSn
|
|
|
+ * @param pictureType
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/files")
|
|
|
public HttpResultResponse<PaginationData<UpstreamMediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
|
|
|
@RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
|
|
|
- String workspaceName,
|
|
|
Long startTime,
|
|
|
Long endTime,
|
|
|
String workspaceId,
|
|
|
String deviceSn,
|
|
|
String pictureType) {
|
|
|
- PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(workspaceName, startTime,endTime, page, pageSize,workspaceId,deviceSn,
|
|
|
- pictureType);
|
|
|
+ log.info("============================>Fetching files list with parameters - page: {}, pageSize: {}, startTime: {}, endTime: {}, workspaceId: {}, deviceSn: {}, pictureType: {}",
|
|
|
+ page, pageSize, startTime, endTime, workspaceId, deviceSn, pictureType);
|
|
|
+ PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(
|
|
|
+ page,
|
|
|
+ pageSize,
|
|
|
+ startTime,
|
|
|
+ endTime,
|
|
|
+ workspaceId,
|
|
|
+ deviceSn,
|
|
|
+ pictureType
|
|
|
+ );
|
|
|
+ log.info("============================>Fetched Return filesList: {} ", filesList);
|
|
|
return HttpResultResponse.success(filesList);
|
|
|
}
|
|
|
|
|
|
@@ -95,7 +108,9 @@ public class UpstreamController {
|
|
|
public HttpResultResponse<List<UpstreamDeviceDetailDTO>> getDevicesDetailList(String searchInfo,
|
|
|
Integer status,
|
|
|
String workspaceId) {
|
|
|
- List<UpstreamDeviceDetailDTO> devices = deviceService.selUpstreamDeviceDetailList(searchInfo, status,workspaceId);
|
|
|
+ log.info("===========================>Fetching devices detail list with parameters - searchInfo: {}, status: {}, workspaceId: {}", searchInfo, status, workspaceId);
|
|
|
+ List<UpstreamDeviceDetailDTO> devices = deviceService.selUpstreamDeviceDetailList(searchInfo, status, workspaceId);
|
|
|
+ log.info("===========================>Fetched Return devices details: {} ", devices);
|
|
|
return HttpResultResponse.success(devices);
|
|
|
}
|
|
|
|