diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml index f40f392..068c9c6 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml @@ -32,7 +32,9 @@ bbuilding.name buildingName, bbuilding.retain_alert, bbuilding.latitude, - bbuilding.longitude + bbuilding.longitude, + bbuilding.picture_introduction, + bbuilding.udf_building_id FROM basic_building bbuilding WHERE diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/OverviewVO.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/OverviewVO.java index 4408b2c..8b12751 100644 --- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/OverviewVO.java +++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/OverviewVO.java @@ -13,12 +13,17 @@ public class OverviewVO { private String buildingName; + private String udfBuildingId; + @Schema(description ="latitude", example = "22.467") private String latitude; @Schema(description ="longitude", example = "115.783") private String longitude; + @Schema(description = "images info", example = "{}", hidden = false) + private String pictureIntroduction; + @Schema(description = "dashboard自动恢复告警时是否保留告警:0-不保留,1-保留", example = "1") private Integer retainAlert;