Commit c8b7dab85675712aabc77993898f7af0d7de85a3

Authored by xp.Huang
1 parent 31e34bb6

fix: 视频配置附加信息添加

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty;
11 @EqualsAndHashCode(callSuper = true) 11 @EqualsAndHashCode(callSuper = true)
12 public class TkVideoDTO extends TenantDTO { 12 public class TkVideoDTO extends TenantDTO {
13 @ApiModelProperty(value = "摄像头附加信息,json格式") 13 @ApiModelProperty(value = "摄像头附加信息,json格式")
14 - private String additionalJson; 14 + private JsonNode additionalJson;
15 15
16 @ApiModelProperty(value = "封面图") 16 @ApiModelProperty(value = "封面图")
17 private String avatar; 17 private String avatar;
@@ -35,8 +35,8 @@ public class TkVideoDTO extends TenantDTO { @@ -35,8 +35,8 @@ public class TkVideoDTO extends TenantDTO {
35 @ApiModelProperty(value = "组织名称") 35 @ApiModelProperty(value = "组织名称")
36 private String organizationName; 36 private String organizationName;
37 37
38 - @ApiModelProperty(value = "摄像头状态")  
39 - private Boolean status; 38 + @ApiModelProperty(value = "摄像头状态: 0 离线 1在线")
  39 + private Integer status;
40 40
41 @ApiModelProperty(value = "摄像头描述") 41 @ApiModelProperty(value = "摄像头描述")
42 private String description; 42 private String description;
@@ -20,7 +20,8 @@ public class TkVideoEntity extends TenantBaseEntity { @@ -20,7 +20,8 @@ public class TkVideoEntity extends TenantBaseEntity {
20 20
21 private static final long serialVersionUID = 1498859811403607497L; 21 private static final long serialVersionUID = 1498859811403607497L;
22 private String name; 22 private String name;
23 - private String additionalJson; 23 + @TableField(typeHandler = JacksonTypeHandler.class)
  24 + private JsonNode additionalJson;
24 @TableField(fill = FieldFill.UPDATE) 25 @TableField(fill = FieldFill.UPDATE)
25 private String avatar; 26 private String avatar;
26 private String videoUrl; 27 private String videoUrl;
@@ -28,7 +29,7 @@ public class TkVideoEntity extends TenantBaseEntity { @@ -28,7 +29,7 @@ public class TkVideoEntity extends TenantBaseEntity {
28 private String deviceType; 29 private String deviceType;
29 private String sn; 30 private String sn;
30 private String organizationId; 31 private String organizationId;
31 - private Boolean status; 32 + private Integer status;
32 private String description; 33 private String description;
33 private Integer accessMode; 34 private Integer accessMode;
34 private String videoPlatformId; 35 private String videoPlatformId;
@@ -17,7 +17,8 @@ @@ -17,7 +17,8 @@
17 <result property="updater" column="updater"/> 17 <result property="updater" column="updater"/>
18 <result property="description" column="description"/> 18 <result property="description" column="description"/>
19 <result property="status" column="status"/> 19 <result property="status" column="status"/>
20 - <result property="additionalJson" column="additional_json"/> 20 + <result property="additionalJson" column="additional_json"
  21 + typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
21 <result property="organizationId" column="organization_id"/> 22 <result property="organizationId" column="organization_id"/>
22 <result property="organizationName" column="organization_name"/> 23 <result property="organizationName" column="organization_name"/>
23 <result property="accessMode" column="access_mode"/> 24 <result property="accessMode" column="access_mode"/>