|
@@ -66,7 +66,7 @@ public class UpstreamController {
|
|
|
@GetMapping("/files")
|
|
@GetMapping("/files")
|
|
|
public HttpResultResponse<PaginationData<UpstreamMediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
|
|
public HttpResultResponse<PaginationData<UpstreamMediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
|
|
|
@RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
|
|
@RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
|
|
|
- String workspaceName,
|
|
|
|
|
|
|
+ // String workspaceName,
|
|
|
Long startTime,
|
|
Long startTime,
|
|
|
Long endTime,
|
|
Long endTime,
|
|
|
String workspaceId,
|
|
String workspaceId,
|
|
@@ -75,7 +75,7 @@ public class UpstreamController {
|
|
|
log.info("============================>Fetching files list with parameters - page: {}, pageSize: {}, startTime: {}, endTime: {}, workspaceId: {}, deviceSn: {}, pictureType: {}",
|
|
log.info("============================>Fetching files list with parameters - page: {}, pageSize: {}, startTime: {}, endTime: {}, workspaceId: {}, deviceSn: {}, pictureType: {}",
|
|
|
page, pageSize, startTime, endTime, workspaceId, deviceSn, pictureType);
|
|
page, pageSize, startTime, endTime, workspaceId, deviceSn, pictureType);
|
|
|
PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(
|
|
PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(
|
|
|
- workspaceName,
|
|
|
|
|
|
|
+ null,
|
|
|
startTime,
|
|
startTime,
|
|
|
endTime,
|
|
endTime,
|
|
|
page,
|
|
page,
|