简柏林 / thingskit · Commits

Commit c14ce76171f50408e1692263ddc455e5c1ec5d1b

Authored by xp.Huang
1 parent fce4095a

feat: 流媒体配置增加备注字段，并且允许设置为null

Inline Side-by-side
Showing 3 changed files with 24 additions and 16 deletions
... ... @@ -11,6 +11,8 @@ ALTER TABLE "public"."tk_things_model" ADD COLUMN "extension_desc" varchar COLLA
11 11
12 12 COMMENT ON COLUMN "public"."tk_things_model"."extension_desc" IS 'TCP/UDP属性扩展描述';
13 13
  14 +ALTER TABLE "public"."tk_video_platform" ADD COLUMN "remark" varchar(255) COLLATE "pg_catalog"."default";
  15 +COMMENT ON COLUMN "public"."tk_video_platform"."remark" IS '备注';
14 16
15 17
16 18
... ...
... ... @@ -55,4 +55,7 @@ public class TkVideoDTO extends TenantDTO {
55 55
56 56 @ApiModelProperty(value = "流媒体平台基础信息")
57 57 private TkVideoPlatformDTO videoPlatformDTO;
  58 +
  59 + @ApiModelProperty(value = "备注")
  60 + private String remark;
58 61 }
... ...
1 1 package org.thingsboard.server.dao.yunteng.entities;
2 2
  3 +import com.baomidou.mybatisplus.annotation.FieldStrategy;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
3 5 import com.baomidou.mybatisplus.annotation.TableName;
4 6 import lombok.Data;
5 7 import lombok.EqualsAndHashCode;
... ... @@ -13,21 +15,22 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
13 15 @TableName(ModelConstants.Table.TK_VIDEO_STREAM_TABLE_NAME)
14 16 public class TkVideoEntity extends TenantBaseEntity {
15 17
  18 + private static final long serialVersionUID = 1498859811403607497L;
  19 + private String name;
  20 + private String additionalJson;
  21 + private String avatar;
  22 + private String videoUrl;
  23 + private String brand;
  24 + private String deviceType;
  25 + private String sn;
  26 + private String organizationId;
  27 + private Boolean status;
  28 + private String description;
  29 + private Integer accessMode;
  30 + private String videoPlatformId;
  31 + private Integer streamType;
  32 + private Integer playProtocol;
16 33
17   - private static final long serialVersionUID = 1498859811403607497L;
18   - private String name;
19   - private String additionalJson;
20   - private String avatar;
21   - private String videoUrl;
22   - private String brand;
23   - private String deviceType;
24   - private String sn;
25   - private String organizationId;
26   - private Boolean status;
27   - private String description;
28   - private Integer accessMode;
29   - private String videoPlatformId;
30   - private Integer streamType;
31   - private Integer playProtocol;
32   -
  34 + @TableField(updateStrategy = FieldStrategy.IGNORED)
  35 + private String remark;
33 36 }
... ...