Commit c8b7dab85675712aabc77993898f7af0d7de85a3

Authored by xp.Huang
1 parent 31e34bb6

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

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