修复兼容接口

648540858

2021-11-29 3c0dde2f3c6beb441184b033f1e3c6369100c0b5

修复兼容接口

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java

@@ -108,7 +108,7 @@
            if (result == null) {

                return;

            }

            result.setResult(new ResponseEntity<>(msg.getData(),HttpStatus.OK));

            result.setResult(ResponseEntity.ok().body(msg.getData()));

        }

        map.remove(msg.getKey());




 src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java

@@ -304,7 +304,7 @@
    @Override
    public void sendStreamChangeMsg(JSONObject jsonObject) {
        String key = VideoManagerConstants.WVP_MSG_STREAM_PUSH_CHANGE_PREFIX;
        redis.convertAndSend(key, jsonObject.toJSONString());
        redis.convertAndSend(key, jsonObject);
    }

    @Override

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

@@ -1,18 +1,20 @@
package com.genersoft.iot.vmp.web.gb28181;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.gb28181.play.PlayController;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;

@@ -34,15 +36,13 @@
    private IVideoManagerStorager storager;

    @Autowired
    private IRedisCatchStorage redisCatchStorage;


    // @Autowired
    // private ZLMRESTfulUtils zlmresTfulUtils;

    private UserSetup userSetup;

    @Autowired
    private PlayController playController;
    private IRedisCatchStorage redisCatchStorage;

    @Autowired
    private IPlayService playService;

    /**
     * 实时直播 - 开始直播
@@ -69,7 +69,7 @@
                                             @RequestParam(required = false)String timeout

    ){
        DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<JSONObject>();
        DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<>(userSetup.getPlayTimeout() + 10);
        Device device = storager.queryVideoDevice(serial);
        if (device == null ) {
            JSONObject result = new JSONObject();
@@ -99,11 +99,9 @@
            result.put("error","channel[ " + code + " ]offline");
            resultDeferredResult.setResult(result);
        }
        DeferredResult<ResponseEntity<String>> play = playController.play(serial, code);

        play.setResultHandler((Object o)->{
            ResponseEntity<String> responseEntity = (ResponseEntity)o;
            StreamInfo streamInfo = JSON.parseObject(responseEntity.getBody(), StreamInfo.class);
        MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
        PlayResult play = playService.play(newMediaServerItem, serial, code, (mediaServerItem, response)->{
            StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(serial, code);
            JSONObject result = new JSONObject();
            result.put("StreamID", streamInfo.getStreamId());
            result.put("DeviceID", device.getDeviceId());
@@ -134,7 +132,23 @@
            result.put("NumOutputs", "");
            result.put("CascadeSize", "");
            result.put("RelaySize", "");
            result.put("ChannelPTZType", 0);
            result.put("ChannelPTZType", "0");
            resultDeferredResult.setResult(result);
//            Class<?> aClass = responseEntity.getClass().getSuperclass();
//            Field body = null;
//            try {
//                // 使用反射动态修改返回的body
//                body = aClass.getDeclaredField("body");
//                body.setAccessible(true);
//                body.set(responseEntity, result);
//            } catch (NoSuchFieldException e) {
//                e.printStackTrace();
//            } catch (IllegalAccessException e) {
//                e.printStackTrace();
//            }
        }, (eventResult) -> {
            JSONObject result = new JSONObject();
            result.put("error", "channel[ " + code + " ] " + eventResult.msg);
            resultDeferredResult.setResult(result);
        });
        return resultDeferredResult;