V4完成: 预览+云台整合 操作列JSX按钮 全链路调通

api_sqlsugar/VolPro.Entity/DomainModels/device_manager/base_device.cs

@@ -41,13 +41,10 @@ namespace VolPro.Entity.DomainModels
        /// <summary>
        ///来源适配器(类型:实例)
        /// </summary>
-       [SugarColumn(IsPrimaryKey = true)]
-       [Key]
        [Display(Name ="来源适配器(类型:实例)")]
        [MaxLength(50)]
        [Column(TypeName="nvarchar(50)")]
        [Editable(true)]
-       [Required(AllowEmptyStrings=false)]
        public string AdapterCode { get; set; }
 
        /// <summary>
@@ -57,7 +54,6 @@ namespace VolPro.Entity.DomainModels
        [MaxLength(100)]
        [Column(TypeName="nvarchar(100)")]
        [Editable(true)]
-       [Required(AllowEmptyStrings=false)]
        public string SourceId { get; set; }
 
        /// <summary>
@@ -73,8 +69,6 @@ namespace VolPro.Entity.DomainModels
        /// <summary>
        ///设备分组(数据字典)
        /// </summary>
-       [SugarColumn(IsPrimaryKey = true)]
-       [Key]
        [Display(Name ="设备分组(数据字典)")]
        [MaxLength(20)]
        [Column(TypeName="nvarchar(20)")]
@@ -85,23 +79,11 @@ namespace VolPro.Entity.DomainModels
        /// <summary>
        ///所属点位ID
        /// </summary>
-       [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
-       [Key]
        [Display(Name ="所属点位ID")]
        [Column(TypeName="int")]
        [Editable(true)]
        public int? PointId { get; set; }
 
-       /// <summary>
-       ///所属网关节点ID
-       /// </summary>
-       [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
-       [Key]
-       [Display(Name ="所属网关节点ID")]
-       [Column(TypeName="int")]
-       [Editable(true)]
-       public int? GatewayNodeId { get; set; }
-
        /// <summary>
        ///是否父设备(数据字典)
        /// </summary>
@@ -115,8 +97,6 @@ namespace VolPro.Entity.DomainModels
        /// <summary>
        ///父设备ID(自引用,子设备挂父设备下)
        /// </summary>
-       [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
-       [Key]
        [Display(Name ="父设备ID(自引用,子设备挂父设备下)")]
        [Column(TypeName="int")]
        [Editable(true)]
@@ -129,7 +109,6 @@ namespace VolPro.Entity.DomainModels
        [MaxLength(20)]
        [Column(TypeName="nvarchar(20)")]
        [Editable(true)]
-       [Required(AllowEmptyStrings=false)]
        public string IsOnline { get; set; }
 
        /// <summary>
@@ -284,6 +263,16 @@ namespace VolPro.Entity.DomainModels
        [Editable(true)]
        public DateTime? ModifyDate { get; set; }
 
+       /// <summary>
+       ///所属网关节点ID
+       /// </summary>
+       [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+       [Key]
+       [Display(Name ="所属网关节点ID")]
+       [Column(TypeName="int")]
+       [Editable(true)]
+       public int? NodeId { get; set; }
+
        [Display(Name ="视频通道")]
        [ForeignKey("DeviceId")][Navigate(NavigateType.OneToMany,nameof(DeviceId),nameof(DeviceId))]
        public List<video_channel> video_channel { get; set; }