规范返回格式

songww

2020-05-11 c785f5b625aa11134c7482e333cae8f627922901

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

@@ -10,7 +10,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

@RestController
@RequestMapping("/api")
@@ -21,10 +24,14 @@
   @Autowired
   private SIPCommander cmder;
   
   @GetMapping("/play/{deviceId}_{channelId}")
   @Autowired
   private IVideoManagerStorager storager;
	
   @GetMapping("/play/{deviceId}/{channelId}")
   public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId){
      
      String ssrc = cmder.playStreamCmd(deviceId, channelId);
      Device device = storager.queryVideoDevice(deviceId);
      String ssrc = cmder.playStreamCmd(device, channelId);
      
      if (logger.isDebugEnabled()) {
         logger.debug(String.format("设备预览 API调用，deviceId：%s ，channelId：%s",deviceId, channelId));
@@ -32,7 +39,9 @@
      }
      
      if(ssrc!=null) {
         return new ResponseEntity<String>(ssrc,HttpStatus.OK);
         JSONObject json = new JSONObject();
         json.put("ssrc", ssrc);
         return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
      } else {
         logger.warn("设备预览API调用失败！");
         return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);