Merge pull request #1 from lawrencehj/master

648540858

2020-11-16 f20682cc6fa84b96c1ecac294dd2283032924699

Merge pull request #1 from lawrencehj/master

修正处理Catalog信息时遇到空字段的错误

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -215,12 +215,27 @@
                    deviceChannel.setPort(itemDevice.element("Port") == null ? 0

                            : Integer.parseInt(XmlUtil.getText(itemDevice, "Port")));

                    deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password"));

                    deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00

                            : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));

                    deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00

                            : Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));

                    deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0

                            : Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));

                    if (itemDevice.element("Longitute")==null) {

                        deviceChannel.setLongitude(0.00);

                    } else {

                        deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));

                    }

                    if (itemDevice.element("Latitute") == null) {

                        deviceChannel.setLatitude(0.00);

                    } else {

                        deviceChannel.setLatitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));

                    }

                    if (itemDevice.element("PTZType") == null) {

                        deviceChannel.setPTZType(0);

                    } else {

                        deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));

                    }

                    // deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00

                    //         : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));

                    // deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00

                    //         : Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));

                    // deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0

                    //         : Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));

                    deviceChannel.setHasAudio(true); // 默认含有音频，播放时再检查是否有音频及是否AAC

                    storager.updateChannel(device.getDeviceId(), deviceChannel);

                }


 src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java

@@ -7,6 +7,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.StringUtils;
@@ -26,29 +27,33 @@
@RestController
@RequestMapping("/api")
public class PlaybackController {
	

    private final static Logger logger = LoggerFactory.getLogger(PlaybackController.class);
	

    @Autowired
    private SIPCommander cmder;
	

    @Autowired
    private IVideoManagerStorager storager;

    @Autowired
    private ZLMRESTfulUtils zlmresTfulUtils;

    @Value("${media.closeWaitRTPInfo}")
    private boolean closeWaitRTPInfo;

    @GetMapping("/playback/{deviceId}/{channelId}")
    public ResponseEntity<String> play(@PathVariable String deviceId,@PathVariable String channelId, String startTime,  String endTime){
		
    public ResponseEntity<String> play(@PathVariable String deviceId, @PathVariable String channelId, String startTime,
            String endTime) {

        if (logger.isDebugEnabled()) {
            logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s",deviceId, channelId));
            logger.debug(String.format("设备回放 API调用，deviceId：%s ，channelId：%s", deviceId, channelId));
        }
		

        if (StringUtils.isEmpty(deviceId) || StringUtils.isEmpty(channelId)) {
            String log = String.format("设备回放 API调用失败，deviceId：%s ，channelId：%s",deviceId, channelId);
            String log = String.format("设备回放 API调用失败，deviceId：%s ，channelId：%s", deviceId, channelId);
            logger.warn(log);
            return new ResponseEntity<String>(log,HttpStatus.BAD_REQUEST);
            return new ResponseEntity<String>(log, HttpStatus.BAD_REQUEST);
        }

        Device device = storager.queryVideoDevice(deviceId);
@@ -58,20 +63,22 @@
            cmder.streamByeCmd(streamInfo.getSsrc());
        }

//        }else {
//            String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
//            JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
//            if (rtpInfo.getBoolean("exist")) {
//                return new ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
//            }else {
//                storager.stopPlayback(streamInfo);
//                streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
//            }
//        }
        // }else {
        // String streamId = String.format("%08x",
        // Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
        // JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
        // if (rtpInfo.getBoolean("exist")) {
        // return new
        // ResponseEntity<String>(JSON.toJSONString(streamInfo),HttpStatus.OK);
        // }else {
        // storager.stopPlayback(streamInfo);
        // streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);
        // }
        // }
        streamInfo = cmder.playbackStreamCmd(device, channelId, startTime, endTime);

        String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
		

        if (logger.isDebugEnabled()) {
            logger.debug("设备回放 API调用，ssrc：" + streamInfo.getSsrc() + ",ZLMedia streamId:" + streamId);
        }
@@ -81,62 +88,71 @@
        long lockStartTime = System.currentTimeMillis();
        JSONObject rtpInfo = null;

        while (lockFlag) {
            try {
                if (System.currentTimeMillis() - lockStartTime > 75 * 1000) {
                    storager.stopPlayback(streamInfo);
                    logger.info("播放等待超时");
                    return new ResponseEntity<String>("timeout",HttpStatus.OK);
                }else {
                    streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);
                    if (!rtpPushed) {
                        logger.info("查询RTP推流信息...");
                        rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
                    }
                    if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null && streamInfo.getFlv() != null){
                        logger.info("查询流编码信息："+streamInfo.getFlv());
                        rtpPushed = true;
                        Thread.sleep(2000);
                        JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
                        if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
                            lockFlag = false;
                            logger.info("流编码信息已获取");
                            JSONArray tracks = mediaInfo.getJSONArray("tracks");
                            streamInfo.setTracks(tracks);
                            storager.startPlayback(streamInfo);
                        }else {
                            logger.info("流编码信息未获取，2秒后重试...");
        if (closeWaitRTPInfo) {
            String flv = storager.getMediaInfo().getWanIp() + ":" + storager.getMediaInfo().getHttpPort() + "/rtp/"
                    + streamId + ".flv";
            streamInfo.setFlv("http://" + flv);
            streamInfo.setWs_flv("ws://" + flv);
            storager.startPlayback(streamInfo);
        } else {
            while (lockFlag) {
                try {
                    if (System.currentTimeMillis() - lockStartTime > 75 * 1000) {
                        storager.stopPlayback(streamInfo);
                        logger.info("播放等待超时");
                        return new ResponseEntity<String>("timeout", HttpStatus.OK);
                    } else {
                        streamInfo = storager.queryPlaybackByDevice(deviceId, channelId);
                        if (!rtpPushed) {
                            logger.info("查询RTP推流信息...");
                            rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
                        }
                    }else {
                        Thread.sleep(2000);
                        continue;
                        if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo != null
                                && streamInfo.getFlv() != null) {
                            logger.info("查询流编码信息：" + streamInfo.getFlv());
                            rtpPushed = true;
                            Thread.sleep(2000);
                            JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
                            if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
                                lockFlag = false;
                                logger.info("流编码信息已获取");
                                JSONArray tracks = mediaInfo.getJSONArray("tracks");
                                streamInfo.setTracks(tracks);
                                storager.startPlayback(streamInfo);
                            } else {
                                logger.info("流编码信息未获取，2秒后重试...");
                            }
                        } else {
                            Thread.sleep(2000);
                            continue;
                        }
                    }
                } catch (InterruptedException e) {
                    e.printStackTrace();
                }
            } catch (InterruptedException e) {
                e.printStackTrace();
            }
        }
        if(streamInfo!=null) {
            return new ResponseEntity<String>(JSON.toJSONString(streamInfo),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);
        }
    }
	

    @RequestMapping("/playback/{ssrc}/stop")
    public ResponseEntity<String> playStop(@PathVariable String ssrc){
		
    public ResponseEntity<String> playStop(@PathVariable String ssrc) {

        cmder.streamByeCmd(ssrc);
		

        if (logger.isDebugEnabled()) {
            logger.debug(String.format("设备录像回放停止 API调用，ssrc：%s", ssrc));
        }
		
        if(ssrc!=null) {

        if (ssrc != null) {
            JSONObject json = new JSONObject();
            json.put("ssrc", ssrc);
            return new ResponseEntity<String>(json.toString(),HttpStatus.OK);
            return new ResponseEntity<String>(json.toString(), HttpStatus.OK);
        } else {
            logger.warn("设备录像回放停止API调用失败！");
            return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);