Merge branch 'talk' into main-dev

648540858

2023-03-20 039fbf7e243d4bf0f46b44e7dae2a5d36e978056

 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java

@@ -202,7 +202,7 @@
                    Map<String, Object> param = new HashMap<>();
                    param.put("vhost", "__defaultVhost__");
                    param.put("app", sendRtpItem.getApp());
                    param.put("stream", sendRtpItem.getStreamId());
                    param.put("stream", sendRtpItem.getStream());
                    zlmresTfulUtils.stopSendRtp(mediaInfo, param);
                }

@@ -655,4 +655,9 @@
    public ResourceBaceInfo getOverview() {
        return deviceMapper.getOverview();
    }

    @Override
    public List<Device> getAll() {
        return deviceMapper.getAll();
    }
}