diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml index d23d822..e1a4acf 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml @@ -8,6 +8,7 @@ basic_floor.name as floorName, device_info.id, device_info.device_id, + device_info.device_name, device_info.device_sn, device_info.type_id, device_info.retain_alert, diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java index de8b255..f99afca 100644 --- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java +++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java @@ -12,6 +12,9 @@ public class BaseData { @Schema(description = "deviceId", example = "12-34") private String deviceId; + @Schema(description = "device name", example = "12-34") + private String deviceName; + @Schema(description = "upload timestamp", example = "1740033000234") private Long uploadTimestamp;