XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1078-支持设备录像FTP方式下载

Browse Source
This commit is contained in:
panlinlin
2024-06-10 00:33:55 +08:00
parent a030c15c8f
commit f564ff0aba
6 changed files with 56 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078Controller.java
View File

@@ -354,8 +354,10 @@ public class JT1078Controller {
@Parameter(name = "channelId", description = "通道国标编号, 一般为从1开始的数字", required = true)
@Parameter(name = "startTime", description = "开始时间,格式： yyyy-MM-dd HH:mm:ss", required = true)
@Parameter(name = "endTime", description = "结束时间,格式： yyyy-MM-dd HH:mm:ss", required = true)
@Parameter(name = "type", description = "0.音视频 1.音频 2.视频 3.视频或音视频", required = true)
@Parameter(name = "rate", description = "0.所有码流 1.主码流 2.子码流(如果此通道只传输音频,此字段置0)", required = true)
@Parameter(name = "alarmSign", description = "报警标志", required = true)
@Parameter(name = "mediaType", description = "音视频资源类型： 0.音视频 1.音频 2.视频 3.视频或音视频", required = true)
@Parameter(name = "streamType", description = "码流类型：0.所有码流 1.主码流 2.子码流(如果此通道只传输音频,此字段置0)", required = true)
@Parameter(name = "storageType", description = "存储器类型", required = true)
@GetMapping("/playback/download")
public DeferredResult<Void> recordDownload(HttpServletRequest request,
HttpServletResponse response,
@@ -363,21 +365,23 @@ public class JT1078Controller {
@Parameter(required = true) Integer channelId,
@Parameter(required = true) String startTime,
@Parameter(required = true) String endTime,
@Parameter(required = false) Integer type,
@Parameter(required = false) Integer rate
@Parameter(required = false) Integer alarmSign,
@Parameter(required = false) Integer mediaType,
@Parameter(required = false) Integer streamType,
@Parameter(required = false) Integer storageType
) throws IOException {
logger.info("[1078-录像] 下载，设备:{}， 通道： {}， 开始时间： {}， 结束时间： {}， 音视频类型： {}， 码流类型： {}， ",
phoneNumber, channelId, startTime, endTime, type, rate);
logger.info("[1078-录像] 下载，设备:{}， 通道： {}， 开始时间： {}， 结束时间： {}，报警标志: {}, 音视频类型： {}， 码流类型： {}，存储器类型： {}， ",
phoneNumber, channelId, startTime, endTime, alarmSign, mediaType, streamType, storageType);
if (!ftpSetting.getEnable()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未启用ftp服务，无法下载录像");
}
DeferredResult<Void> result = new DeferredResult<>();
DeferredResult<Void> result = new DeferredResult<>(600000L);
ServletOutputStream outputStream = response.getOutputStream();
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(phoneNumber + "_" + channelId + ".mp4", "UTF-8"));
response.setStatus(HttpServletResponse.SC_OK);
service.recordDownload(phoneNumber, channelId, startTime, endTime, type, rate, (code, msg, data) -> {
service.recordDownload(phoneNumber, channelId, startTime, endTime, alarmSign, mediaType, streamType, storageType, (code, msg, data) -> {
String filePath = "ftp" + data;
File file = new File(filePath);
if (!file.exists()) {

14
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J1205.java
View File

@@ -40,7 +40,7 @@ public class J1205 extends Re {
item.setStartTime(DateUtil.jt1078Toyyyy_MM_dd_HH_mm_ss(startTime));
String endTime = ByteBufUtil.hexDump(buf.readSlice(6));
item.setEndTime(DateUtil.jt1078Toyyyy_MM_dd_HH_mm_ss(endTime));
item.setWarn(buf.readLong());
item.setAlarmSign(buf.readLong());
item.setMediaType(buf.readUnsignedByte());
item.setStreamType(buf.readUnsignedByte());
item.setStorageType(buf.readUnsignedByte());
@@ -89,7 +89,7 @@ public class J1205 extends Re {
private String endTime;
// 报警标志
private long warn;
private long alarmSign;
// 音视频资源类型
private int mediaType;
@@ -127,12 +127,12 @@ public class J1205 extends Re {
this.endTime = endTime;
}
public long getWarn() {
return warn;
public long getAlarmSign() {
return alarmSign;
}
public void setWarn(long warn) {
this.warn = warn;
public void setAlarmSign(long alarmSign) {
this.alarmSign = alarmSign;
}
public int getMediaType() {
@@ -173,7 +173,7 @@ public class J1205 extends Re {
"channelId=" + channelId +
", startTime='" + startTime + '\'' +
", endTime='" + endTime + '\'' +
", warn=" + warn +
", warn=" + alarmSign +
", mediaType=" + mediaType +
", streamType=" + streamType +
", storageType=" + storageType +

14
src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J9206.java
View File

@@ -34,7 +34,7 @@ public class J9206 extends Rs {
private String endTime;
// 报警标志
private final int warnType = 0;
private int alarmSign = 0;
// 音视频资源类型：0.音视频 1.音频 2.视频 3.视频或音视频
private int mediaType;
@@ -71,7 +71,7 @@ public class J9206 extends Rs {
buffer.writeByte(channelId);
buffer.writeBytes(ByteBufUtil.decodeHexDump(startTime));
buffer.writeBytes(ByteBufUtil.decodeHexDump(endTime));
buffer.writeLong(warnType);
buffer.writeLong(alarmSign);
buffer.writeByte(mediaType);
buffer.writeByte(streamType);
buffer.writeByte(storageType);
@@ -144,8 +144,8 @@ public class J9206 extends Rs {
this.endTime = endTime;
}
public int getWarnType() {
return warnType;
public int getAlarmSign() {
return alarmSign;
}
public int getMediaType() {
@@ -180,6 +180,10 @@ public class J9206 extends Rs {
this.taskConditions = taskConditions;
}
public void setAlarmSign(int alarmSign) {
this.alarmSign = alarmSign;
}
@Override
public String toString() {
return "J9206{" +
@@ -191,7 +195,7 @@ public class J9206 extends Rs {
", channelId=" + channelId +
", startTime='" + startTime + '\'' +
", endTime='" + endTime + '\'' +
", warnType=" + warnType +
", warnType=" + alarmSign +
", mediaType=" + mediaType +
", streamType=" + streamType +
", storageType=" + storageType +

2
src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java
View File

@@ -118,7 +118,7 @@ public interface Ijt1078Service {
void playbackControl(String phoneNumber, Integer channelId, Integer command, Integer playbackSpeed, String time);
void recordDownload(String phoneNumber, Integer channelId, String startTime, String endTime, Integer type, Integer rate, GeneralCallback<String> fileCallback);
void recordDownload(String phoneNumber, Integer channelId, String startTime, String endTime, Integer alarmSign, Integer mediaType, Integer streamType, Integer storageType, GeneralCallback<String> fileCallback);
PageInfo<JTChannel> getChannelList(int page, int count, int deviceId, String query);

16
src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
View File

@@ -470,7 +470,7 @@ public class jt1078ServiceImpl implements Ijt1078Service {
}
@Override
public void recordDownload(String phoneNumber, Integer channelId, String startTime, String endTime, Integer type, Integer rate, GeneralCallback<String> fileCallback) {
public void recordDownload(String phoneNumber, Integer channelId, String startTime, String endTime, Integer alarmSign, Integer mediaType, Integer streamType, Integer storageType, GeneralCallback<String> fileCallback) {
String filePath = UUID.randomUUID().toString();
fileUploadMap.put(filePath, fileCallback);
dynamicTask.startDelay(filePath, ()->{
@@ -489,11 +489,17 @@ public class jt1078ServiceImpl implements Ijt1078Service {
j92026.setPassword(ftpSetting.getPassword());
j92026.setPath(filePath);
if (type != null) {
j92026.setMediaType(type);
if (mediaType != null) {
j92026.setMediaType(mediaType);
}
if (rate != null) {
j92026.setStreamType(rate);
if (streamType != null) {
j92026.setStreamType(streamType);
}
if (storageType != null) {
j92026.setStorageType(storageType);
}
if (alarmSign != null) {
j92026.setAlarmSign(alarmSign);
}
jt1078Template.fileUpload(phoneNumber, j92026, 7200);
}