优化异常处理以及级联设备状态查询

648540858

2023-03-17 c3ce2bc5d069ba57309567aee4ae418bc0cf75ed

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

@@ -40,7 +40,7 @@
import java.util.UUID;

@Tag(name  = "国标设备点播")
@CrossOrigin

@RestController
@RequestMapping("/api/play")
public class PlayController {
@@ -106,24 +106,21 @@
         msg.setData(wvpResult);
         resultHolder.invokeResult(msg);
      });


         // TODO 在点播未成功的情况下在此调用接口点播会导致返回的流地址ip错误
         deferredResultEx.setFilter(result1 -> {
            WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>)result1;
            WVPResult<StreamContent> resultStream = null;
            if (wvpResult1.getCode() == ErrorCode.SUCCESS.getCode()) {
               StreamInfo data = wvpResult1.getData().clone();
               if (userSetting.getUseSourceIpAsStreamIp()) {
                  data.channgeStreamIp(request.getLocalName());
               }
               resultStream = new WVPResult<>();
               resultStream.setCode(wvpResult1.getCode());
               resultStream.setMsg(wvpResult1.getMsg());
               resultStream.setData(new StreamContent(wvpResult1.getData()));
      // TODO 在点播未成功的情况下在此调用接口点播会导致返回的流地址ip错误
      deferredResultEx.setFilter(result1 -> {
         WVPResult<StreamInfo> wvpResult1 = (WVPResult<StreamInfo>)result1;
         WVPResult<StreamContent> resultStream = new WVPResult<>();
         resultStream.setCode(wvpResult1.getCode());
         resultStream.setMsg(wvpResult1.getMsg());
         if (wvpResult1.getCode() == ErrorCode.SUCCESS.getCode()) {
            StreamInfo data = wvpResult1.getData().clone();
            if (userSetting.getUseSourceIpAsStreamIp()) {
               data.channgeStreamIp(request.getLocalName());
            }
            return resultStream;
         });
            resultStream.setData(new StreamContent(wvpResult1.getData()));
         }
         return resultStream;
      });


      // 录像查询以channelId作为deviceId查询