From 1401ce98d480cc4c77507d86dc35c939a5becfe9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 15 十二月 2021 11:46:26 +0800
Subject: [PATCH] 优化mysql脚本
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
index 90ecfd4..8f83e7c 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -9,7 +9,6 @@
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.service.IPlayService;
-import com.genersoft.iot.vmp.vmanager.gb28181.session.InfoCseqCache;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -31,7 +30,6 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
-import javax.sip.message.Response;
import java.util.UUID;
@Api(tags = "瑙嗛鍥炴斁")
@@ -78,7 +76,7 @@
logger.debug(String.format("璁惧鍥炴斁 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s", deviceId, channelId));
}
String uuid = UUID.randomUUID().toString();
- String key = DeferredResultHolder.CALLBACK_CMD_PLAY + deviceId + channelId;
+ String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(30000L);
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
@@ -168,7 +166,6 @@
logger.warn("streamId涓嶅瓨鍦�!");
return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
}
- setCseq(streamId);
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
cmder.playPauseCmd(device, streamInfo);
json.put("msg", "ok");
@@ -189,7 +186,6 @@
logger.warn("streamId涓嶅瓨鍦�!");
return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
}
- setCseq(streamId);
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
cmder.playResumeCmd(device, streamInfo);
json.put("msg", "ok");
@@ -211,7 +207,6 @@
logger.warn("streamId涓嶅瓨鍦�!");
return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
}
- setCseq(streamId);
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
cmder.playSeekCmd(device, streamInfo, seekTime);
json.put("msg", "ok");
@@ -221,10 +216,10 @@
@ApiOperation("鍥炴斁鍊嶉�熸挱鏀�")
@ApiImplicitParams({
@ApiImplicitParam(name = "streamId", value = "鍥炴斁娴両D", dataTypeClass = String.class),
- @ApiImplicitParam(name = "speed", value = "鍊嶉�� 1銆�2銆�4", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "speed", value = "鍊嶉��0.25 0.5 1銆�2銆�4", dataTypeClass = Double.class),
})
@GetMapping("/speed/{streamId}/{speed}")
- public ResponseEntity<String> playSpeed(@PathVariable String streamId, @PathVariable String speed) {
+ public ResponseEntity<String> playSpeed(@PathVariable String streamId, @PathVariable Double speed) {
logger.info("playSpeed: "+streamId+", "+speed);
JSONObject json = new JSONObject();
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
@@ -233,18 +228,15 @@
logger.warn("streamId涓嶅瓨鍦�!");
return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
}
- setCseq(streamId);
+ if(speed != 0.25 && speed != 0.5 && speed != 1 && speed != 2.0 && speed != 4.0) {
+ json.put("msg", "涓嶆敮鎸佺殑speed锛�0.25 0.5 1銆�2銆�4锛�");
+ logger.warn("涓嶆敮鎸佺殑speed锛� " + speed);
+ return new ResponseEntity<String>(json.toString(), HttpStatus.BAD_REQUEST);
+ }
Device device = storager.queryVideoDevice(streamInfo.getDeviceID());
cmder.playSpeedCmd(device, streamInfo, speed);
json.put("msg", "ok");
return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
}
- public void setCseq(String streamId) {
- if (InfoCseqCache.CSEQCACHE.containsKey(streamId)) {
- InfoCseqCache.CSEQCACHE.put(streamId, InfoCseqCache.CSEQCACHE.get(streamId) + 1);
- } else {
- InfoCseqCache.CSEQCACHE.put(streamId, 2L);
- }
- }
}
--
Gitblit v1.8.0