Commit 5bf11b28 authored by maoying's avatar maoying

添加视频返回类型

parent 4846056a
package com.yeejoin.equipmanage.common.entity.vo; package com.yeejoin.equipmanage.common.entity.vo;
import org.springframework.beans.factory.annotation.Value;
import lombok.Data; import lombok.Data;
/** /**
...@@ -23,4 +25,6 @@ public class VideoVO { ...@@ -23,4 +25,6 @@ public class VideoVO {
private String code; private String code;
private String presetPosition; private String presetPosition;
private String vedioFormat;
} }
...@@ -90,6 +90,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec ...@@ -90,6 +90,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
@Autowired @Autowired
private IVideoService videoService; private IVideoService videoService;
@Value("${window.vedioFormat}")
String vedioFormat;
@Override @Override
public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) { public void handleExport(HttpServletResponse response, List<Long> ids, String alarmType) {
...@@ -267,6 +270,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec ...@@ -267,6 +270,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
video.setName(x.getName()); video.setName(x.getName());
video.setTokens(x.getToken()); video.setTokens(x.getToken());
video.setUrl(x.getUrl()); video.setUrl(x.getUrl());
video.setVedioFormat(vedioFormat);
video.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode())); video.setUrl(videoService.getVideoUrl(x.getName(), x.getPresetPosition(), x.getUrl(), x.getCode()));
video.setIp(x.getIp()); video.setIp(x.getIp());
video.setPort(x.getPort()); video.setPort(x.getPort());
......
...@@ -137,6 +137,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -137,6 +137,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Value("${systemctl.sync.switch}") @Value("${systemctl.sync.switch}")
private Boolean syncSwitch; private Boolean syncSwitch;
@Value("${window.vedioFormat}")
String vedioFormat;
private final String injection = "{\n" + private final String injection = "{\n" +
...@@ -993,6 +996,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -993,6 +996,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
if (!ObjectUtils.isEmpty(video)) { if (!ObjectUtils.isEmpty(video)) {
video.setUrl(videoService.getVideoUrl(video.getName().toString(), video.getPresetPosition(), video.getUrl(), video.getCode())); video.setUrl(videoService.getVideoUrl(video.getName().toString(), video.getPresetPosition(), video.getUrl(), video.getCode()));
video.setId(id); video.setId(id);
video.setVedioFormat(vedioFormat);
} }
return video; return video;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment