|
@@ -15,6 +15,7 @@ import org.springframework.web.context.request.async.DeferredResult;
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping(value = "/internal/device")
|
|
@RequestMapping(value = "/internal/device")
|
|
@@ -40,11 +41,17 @@ public class ExtendDeviceController {
|
|
|
return deviceService.page(dto);
|
|
return deviceService.page(dto);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @RequestMapping("/getDevices")
|
|
|
|
|
+ public Map<String,ExtendDevice> getDevices(@RequestParam List<String> deviceIds) {
|
|
|
|
|
+ return deviceService.getDevices(deviceIds);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@RequestMapping("/deviceChannel")
|
|
@RequestMapping("/deviceChannel")
|
|
|
public List<ExtendDeviceChannel> deviceChannel(@RequestParam String deviceId) {
|
|
public List<ExtendDeviceChannel> deviceChannel(@RequestParam String deviceId) {
|
|
|
return deviceChannelService.deviceChannel(deviceId);
|
|
return deviceChannelService.deviceChannel(deviceId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
@RequestMapping("/start")
|
|
@RequestMapping("/start")
|
|
|
public DeferredResult<WVPResult<StreamContent>> start(HttpServletRequest request, @RequestParam String deviceId,
|
|
public DeferredResult<WVPResult<StreamContent>> start(HttpServletRequest request, @RequestParam String deviceId,
|
|
|
@RequestParam String channelId) {
|
|
@RequestParam String channelId) {
|