Commit 4ad394f7711514f56b6bf36d70d89c16e748d186
1 parent
456f90cd
修正错行及Swagger参数缺少dataTypeClass定义问题
Showing
1 changed file
with
3 additions
and
4 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
| @@ -132,15 +132,14 @@ public class DeviceQuery { | @@ -132,15 +132,14 @@ public class DeviceQuery { | ||
| 132 | */ | 132 | */ |
| 133 | @ApiOperation("同步设备通道") | 133 | @ApiOperation("同步设备通道") |
| 134 | @ApiImplicitParams({ | 134 | @ApiImplicitParams({ |
| 135 | - @ApiImplicitParam(name="deviceId", value = "设备id", required = true ,dataTypeClass = String.class), | 135 | + @ApiImplicitParam(name="deviceId", value = "设备id", required = true, dataTypeClass = String.class), |
| 136 | }) | 136 | }) |
| 137 | @PostMapping("/devices/{deviceId}/sync") | 137 | @PostMapping("/devices/{deviceId}/sync") |
| 138 | public DeferredResult<ResponseEntity<Device>> devicesSync(@PathVariable String deviceId){ | 138 | public DeferredResult<ResponseEntity<Device>> devicesSync(@PathVariable String deviceId){ |
| 139 | 139 | ||
| 140 | if (logger.isDebugEnabled()) { | 140 | if (logger.isDebugEnabled()) { |
| 141 | - } | ||
| 142 | logger.debug("设备通道信息同步API调用,deviceId:" + deviceId); | 141 | logger.debug("设备通道信息同步API调用,deviceId:" + deviceId); |
| 143 | - | 142 | + } |
| 144 | Device device = storager.queryVideoDevice(deviceId); | 143 | Device device = storager.queryVideoDevice(deviceId); |
| 145 | cmder.catalogQuery(device, event -> { | 144 | cmder.catalogQuery(device, event -> { |
| 146 | Response response = event.getResponse(); | 145 | Response response = event.getResponse(); |
| @@ -264,7 +263,7 @@ public class DeviceQuery { | @@ -264,7 +263,7 @@ public class DeviceQuery { | ||
| 264 | @ApiImplicitParams({ | 263 | @ApiImplicitParams({ |
| 265 | @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, dataTypeClass = String.class), | 264 | @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, dataTypeClass = String.class), |
| 266 | @ApiImplicitParam(name = "streamMode", value = "数据流传输模式, 取值:" + | 265 | @ApiImplicitParam(name = "streamMode", value = "数据流传输模式, 取值:" + |
| 267 | - "UDP(udp传输),TCP-ACTIVE(tcp主动模式,暂不支持),TCP-PASSIVE(tcp被动模式)"), | 266 | + "UDP(udp传输),TCP-ACTIVE(tcp主动模式,暂不支持),TCP-PASSIVE(tcp被动模式)", dataTypeClass = String.class), |
| 268 | }) | 267 | }) |
| 269 | @PostMapping("/transport/{deviceId}/{streamMode}") | 268 | @PostMapping("/transport/{deviceId}/{streamMode}") |
| 270 | public ResponseEntity<PageInfo> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){ | 269 | public ResponseEntity<PageInfo> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){ |