设备类添加产品字段、添加物模型类，新增产品CRUD方法

2026-09-03 17:16:28 +08:00
parent cfa8e78d33
commit bcd6484f45
29 changed files with 1611 additions and 23 deletions
@@ -0,0 +1,28 @@
+namespace Model.Dto.Config
+{
+    /// <summary>
+    /// 设备指令下发请求 DTO
+    /// </summary>
+    public class DeviceCommandDto
+    {
+        /// <summary>
+        /// 设备主键 Id（string）
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 物模型点 Id（string，决定写哪个寄存器/线圈）
+        /// </summary>
+        public string PointId { get; set; }
+
+        /// <summary>
+        /// 下发的工程值
+        /// </summary>
+        public double Value { get; set; }
+
+        /// <summary>
+        /// 是否仅记录（模拟/离线调试：不实际发网络报文）
+        /// </summary>
+        public bool IsSimulated { get; set; }
+    }
+}
@@ -19,6 +19,12 @@ namespace Model.Dto.Config
        /// <summary>设备类型（型号，对应 DeviceCommand 驱动类）</summary>
        public string DeviceType { get; set; }

+        /// <summary>所属产品Id（string，0=未分类）</summary>
+        public string ProductId { get; set; }
+
+        /// <summary>所属产品型号/名称（只读展示）</summary>
+        public string? ProductName { get; set; }
+
        /// <summary>所属网关Code</summary>
        public string GatewayCode { get; set; }

@@ -0,0 +1,26 @@
+namespace Model.Dto.Config
+{
+    /// <summary>
+    /// 产品分类 DTO（Id 由 long 改为 string，避免前端精度丢失）
+    /// </summary>
+    public class ProductCategoryDto
+    {
+        /// <summary>主键 Id（long → string）</summary>
+        public string Id { get; set; }
+
+        /// <summary>分类编码</summary>
+        public string Code { get; set; }
+
+        /// <summary>分类名称</summary>
+        public string? Name { get; set; }
+
+        /// <summary>排序号</summary>
+        public int Sort { get; set; }
+
+        /// <summary>备注</summary>
+        public string? Remark { get; set; }
+
+        /// <summary>创建时间</summary>
+        public DateTime? CreateTime { get; set; }
+    }
+}
@@ -0,0 +1,46 @@
+using Model.Entity.Config;
+
+namespace Model.Dto.Config
+{
+    /// <summary>
+    /// 产品 DTO（Id 由 long 改为 string，避免前端精度丢失）
+    /// </summary>
+    public class ProductDto
+    {
+        /// <summary>主键 Id（long → string）</summary>
+        public string Id { get; set; }
+
+        /// <summary>型号（唯一）</summary>
+        public string Model { get; set; }
+
+        /// <summary>产品名称</summary>
+        public string? Name { get; set; }
+
+        /// <summary>产品分类Id</summary>
+        public string CategoryId { get; set; }
+
+        /// <summary>分类名称（只读展示）</summary>
+        public string? CategoryName { get; set; }
+
+        /// <summary>制造商</summary>
+        public string? Manufacturer { get; set; }
+
+        /// <summary>产品描述</summary>
+        public string? Description { get; set; }
+
+        /// <summary>通讯协议</summary>
+        public IotDeviceProtocolEnum ProtocolType { get; set; }
+
+        /// <summary>消息模型</summary>
+        public string? MessageModel { get; set; }
+
+        /// <summary>是否启用</summary>
+        public bool IsEnabled { get; set; } = true;
+
+        /// <summary>备注</summary>
+        public string? Remark { get; set; }
+
+        /// <summary>创建时间</summary>
+        public DateTime? CreateTime { get; set; }
+    }
+}
@@ -0,0 +1,17 @@
+namespace Model.Dto.Config
+{
+    /// <summary>
+    /// 产品下拉选项 DTO（设备选择"所属产品"、筛选下拉用）
+    /// </summary>
+    public class ProductOptionDto
+    {
+        /// <summary>主键 Id（string）</summary>
+        public string Id { get; set; }
+
+        /// <summary>型号</summary>
+        public string Model { get; set; }
+
+        /// <summary>产品名称</summary>
+        public string? Name { get; set; }
+    }
+}
@@ -0,0 +1,58 @@
+using Model.Entity.Config;
+
+namespace Model.Dto.Config
+{
+    /// <summary>
+    /// 物模型点 DTO（Id 由 long 改为 string，避免前端精度丢失）
+    /// </summary>
+    public class ThingModelPointDto
+    {
+        /// <summary>主键 Id（long → string）</summary>
+        public string Id { get; set; }
+
+        /// <summary>归属类型（1=产品 2=设备）</summary>
+        public ThingOwnerTypeEnum OwnerType { get; set; }
+
+        /// <summary>归属对象Id（string）</summary>
+        public string OwnerId { get; set; }
+
+        /// <summary>点编码</summary>
+        public string Code { get; set; }
+
+        /// <summary>点名称</summary>
+        public string? Name { get; set; }
+
+        /// <summary>寄存器类型</summary>
+        public ThingRegisterTypeEnum RegisterType { get; set; }
+
+        /// <summary>读写权限</summary>
+        public ThingRwEnum Rw { get; set; }
+
+        /// <summary>数据类型</summary>
+        public ThingDataTypeEnum DataType { get; set; }
+
+        /// <summary>寄存器起始地址</summary>
+        public ushort Address { get; set; }
+
+        /// <summary>换算系数</summary>
+        public double Scale { get; set; } = 1;
+
+        /// <summary>偏移量</summary>
+        public double Offset { get; set; }
+
+        /// <summary>单位</summary>
+        public string? Unit { get; set; }
+
+        /// <summary>是否启用</summary>
+        public bool Enabled { get; set; } = true;
+
+        /// <summary>排序号</summary>
+        public int Sort { get; set; }
+
+        /// <summary>备注</summary>
+        public string? Remark { get; set; }
+
+        /// <summary>创建时间</summary>
+        public DateTime? CreateTime { get; set; }
+    }
+}
@@ -8,6 +8,15 @@ namespace Model.Dto.Inspection
        /// <summary>主键 Id（long → string）</summary>
        public string Id { get; set; }

+        /// <summary>归属类型（0=全局；1=产品 2=设备）</summary>
+        public byte OwnerType { get; set; }
+
+        /// <summary>归属对象Id（0 表示全局）</summary>
+        public long OwnerId { get; set; }
+
+        /// <summary>绑定点编码（空表示整产品/设备级规则）</summary>
+        public string PointCode { get; set; }
+
        /// <summary>删除状态（0、未删除；1、已删除）</summary>
        public byte IsDel { get; set; }