2021与蓝度共同重构项目,服务端
zhanzhiqin
2021-12-30 b2ad6e608b6a75856bff198f7acc16b359a2849a
摄像头fix
已修改3个文件
11 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -177,7 +177,8 @@
     */
    @GetMapping("/getMonitorVideoUrl")
    public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
        String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getProtocol());
        String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
                monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
        return ResponseUtil.success(URL);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java
@@ -34,6 +34,8 @@
     */
    //流播放协议,1-ezopen、2-hls、3-rtmp、4-flv,默认为1
    private int protocol;
    //过期时长,单位秒;针对hls/rtmp设置有效期,相对时间;30秒-720天
    private int expireTime;
    /**
     * 结束萤石云摄像头播放地址相关参数
     */
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -217,11 +217,15 @@
     * @param deviceSerial
     * @return
     */
    public String getMonitorVideoUrl(String accessToken, String deviceSerial, int protocol) {
    public String getMonitorVideoUrl(String accessToken, String deviceSerial, int protocol, int expireTime) {
        if (expireTime < 30 || expireTime > 62208000) {
            throw new BusinessException("设置的URL播放地址过期时长数据错误");
        }
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
        paramMap.put("protocol", protocol);
        paramMap.put("expireTime", expireTime);
        String s = HttpUtil.post(YSY_URL + GET_VEDIO_URL, paramMap);
        System.out.println(s);
        YSY_MonitorDto monitor = JSON.parseObject(s, YSY_MonitorDto.class);