|
@@ -58,6 +58,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
+import javax.validation.constraints.NotNull;
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
import java.text.Collator;
|
|
import java.text.Collator;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
@@ -441,7 +442,7 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
|
|
|
@ApiOperation("查询录像")
|
|
@ApiOperation("查询录像")
|
|
@GetMapping("/api/records/{cameraCode}")
|
|
@GetMapping("/api/records/{cameraCode}")
|
|
- public AjaxResult apiRecords(@PathVariable String cameraCode) {
|
|
|
|
|
|
+ public AjaxResult apiRecords(@PathVariable @NotNull(message = "相机编码不能为空") String cameraCode) {
|
|
LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
|
|
lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
|
|
BaseCameraManagement one = baseCameraManagementService.getOne(lw);
|
|
BaseCameraManagement one = baseCameraManagementService.getOne(lw);
|
|
@@ -451,6 +452,27 @@ public class BaseCameraManagementController extends BaseController {
|
|
return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
|
|
return new AjaxResult(200, "ok", CameraUtil.getPlayFlv(cameraCode, one.getChannel()));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ApiOperation("批量查询录像")
|
|
|
|
+ @GetMapping("/api/recordsList")
|
|
|
|
+ public AjaxResult apiRecordsList(@RequestBody
|
|
|
|
+ @NotNull(message = "相机编码不能为空")
|
|
|
|
+ List<String> cameraCodes) {
|
|
|
|
+ List<String> list = new ArrayList<>();
|
|
|
|
+ for (String cameraCode : cameraCodes) {
|
|
|
|
+ LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
|
|
|
|
+ lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
|
|
|
|
+ BaseCameraManagement one = baseCameraManagementService.getOne(lw);
|
|
|
|
+ if (ObjectUtils.isEmpty(one)) {
|
|
|
|
+ throw new BaseException("相机编号【" + cameraCode + "】不存在");
|
|
|
|
+ }
|
|
|
|
+ String playFlv = CameraUtil.getPlayFlv(cameraCode, one.getChannel());
|
|
|
|
+ list.add(playFlv);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return new AjaxResult(200, "ok", list);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
@ApiOperation("播放回放-废弃")
|
|
@ApiOperation("播放回放-废弃")
|
|
@PostMapping("/api/invite")
|
|
@PostMapping("/api/invite")
|
|
public AjaxResult apiInvite(@Validated @RequestBody BaseCameraResVo vo) {
|
|
public AjaxResult apiInvite(@Validated @RequestBody BaseCameraResVo vo) {
|