web页面集成

648540858

2020-10-10 d881c982247d66139f5a941d7021743ad0c6b43c

 src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java

@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.vmanager.play;

import com.alibaba.fastjson.JSON;
import com.genersoft.iot.vmp.common.StreamInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,17 +36,15 @@
   public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
      
      Device device = storager.queryVideoDevice(deviceId);
      String ssrc = cmder.playStreamCmd(device, channelId);
      StreamInfo streamInfo = cmder.playStreamCmd(device, channelId);
      
      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备预览 API调用，deviceId：%s ，channelId：%s",deviceId, channelId));
         logger.debug("设备预览 API调用，ssrc："+ssrc+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(ssrc)));
         logger.debug("设备预览 API调用，ssrc："+streamInfo.getSsrc()+",ZLMedia streamId:"+Integer.toHexString(Integer.parseInt(streamInfo.getSsrc())));
      }
      
      if(ssrc!=null) {
         JSONObject json = new JSONObject();
         json.put("ssrc", ssrc);
         return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
      if(streamInfo!=null) {
         return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
      } else {
         logger.warn("设备预览API调用失败！");
         return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);