diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java index a7f3fd7a4..606a3fd73 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectVideoConfig.java @@ -3,8 +3,6 @@ package com.zhgd.xmgl.modules.project.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -90,5 +88,9 @@ public class ProjectVideoConfig implements Serializable { @Excel(name = "大华clientSecret", width = 15) @ApiModelProperty(value = "大华clientSecret") private java.lang.String clientSecret; - + /** + * 是否启用无插件播放1是0否 + */ + @ApiModelProperty(value = "是否启用无插件播放1是0否") + private java.lang.Integer enableNotPlugin; } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java index fcfb074fe..9fc490cd9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java @@ -177,7 +177,7 @@ public class VideoItemController { @ApiImplicitParams({ @ApiImplicitParam(name = "itemId", value = "视频记录ID", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "streamType", value = "2主码流,不传子码流", paramType = "body", required = false, dataType = "String"), - @ApiImplicitParam(name = "type", value = "取流协议 rtsp、rtmp、hls,不传默认hls", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "取流协议 hik、rtsp、rtmp、hls、ws,不传默认hls", paramType = "body", required = false, dataType = "String"), }) @PostMapping("/getVideoItemInfo") public Result> getVideoItemInfo(@RequestBody Map map) {