Commit 21e83eaa36f5323033585a34b7d6218c7ae20ef4
1 parent
7c2a0dbe
feat: 设备新增字段“设备厂商”
1、设备表新增字段 2、新增数据字典网关设备厂商
Showing
3 changed files
with
5 additions
and
3 deletions
... | ... | @@ -45,7 +45,8 @@ public class DeviceDTO extends TenantDTO { |
45 | 45 | private YtCredentialsDto deviceToken; |
46 | 46 | |
47 | 47 | private String tbDeviceId; |
48 | - private String deviceTypeId; | |
48 | + @ApiModelProperty(value = "设备厂商") | |
49 | + private String brand; | |
49 | 50 | |
50 | 51 | @NotEmpty( |
51 | 52 | message = "设备编号不能为空", | ... | ... |
... | ... | @@ -25,7 +25,7 @@ public class YtDevice extends TenantBaseEntity { |
25 | 25 | private String profileId; |
26 | 26 | private String tbDeviceId; |
27 | 27 | private String gatewayId; |
28 | - private String deviceTypeId; | |
28 | + private String brand; | |
29 | 29 | private String label; |
30 | 30 | @TableField(typeHandler = EnumTypeHandler.class) |
31 | 31 | private DeviceTypeEnum deviceType; | ... | ... |
... | ... | @@ -15,6 +15,7 @@ |
15 | 15 | <result property="profileId" column="profile_id"/> |
16 | 16 | <result property="activeTime" column="active_time"/> |
17 | 17 | <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> |
18 | + <result property="brand" column="brand" /> | |
18 | 19 | <result property="sn" column="sn"/> |
19 | 20 | <result property="tenantId" column="tenant_id"/> |
20 | 21 | <result property="tbDeviceId" column="tb_device_id"/> |
... | ... | @@ -62,7 +63,7 @@ |
62 | 63 | ifd |
63 | 64 | . |
64 | 65 | id |
65 | - ,ifd.sn,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description | |
66 | + ,ifd.sn,ifd.brand,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description | |
66 | 67 | ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator, |
67 | 68 | ifd.updater,ifd.organization_id,ifd.alarm_status |
68 | 69 | </sql> | ... | ... |