|
@@ -98,12 +98,12 @@ public class TraceController {
|
|
|
@ApiImplicitParam(paramType = "query", name = "endTime", value = "结束时间(yyyy-MM-dd HH:mm:ss)")
|
|
|
|
|
|
})
|
|
|
- public Result<CameraVideoVO> getCameraVideoList(HttpServletRequest request, @RequestHeader("token") String token,
|
|
|
+ public Result<List<CameraVideoVO>> getCameraVideoList(HttpServletRequest request, @RequestHeader("token") String token,
|
|
|
@RequestParam(value = "cameraId", required = false) Long cameraId,
|
|
|
@RequestParam(value = "beginTime", required = false) String beginTime,
|
|
|
@RequestParam(value = "endTime", required = false) String endTime){
|
|
|
- this.traceService.getCameraVideoList(cameraId,beginTime,endTime);
|
|
|
- return Result.success("查询成功!");
|
|
|
+ List<CameraVideoVO> datas = this.traceService.getCameraVideoList(cameraId,beginTime,endTime);
|
|
|
+ return Result.success("查询成功!",datas);
|
|
|
}
|
|
|
|
|
|
/**
|