楼宇不传，返回全部

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

@@ -6,6 +6,7 @@
     <sql id="deviceDataSelect">
         basic_floor.floor_id as floorId,
         basic_floor.name as floorName,
+        basic_building.building_id,
         basic_building.name as buildingName,
         device_info.id,
         device_info.device_id,

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java

@@ -15,6 +15,9 @@ public class BaseData {
     @Schema(description = "device name", example = "12-34")
     private String deviceName;
 
+    @Schema(description = "building ID", example = "33")
+    private Long buildingId;
+
     @Schema(description = "building name", example = "66")
     private String buildingName;
 

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java

@@ -64,9 +64,9 @@ public class DeviceDataAccumulateServiceImpl implements DeviceDataAccumulateServ
 
 	@Override
 	public PageInfo<DeviceAccumulateData> getDataList(AccumulateDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java

@@ -61,9 +61,9 @@ public class DeviceDataAlarmServiceImpl implements DeviceDataAlarmService {
 
 	@Override
 	public PageInfo<DeviceAlarmData> getDataList(AlarmDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java

@@ -65,9 +65,9 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService
 
 	@Override
 	public PageInfo<DeviceBaStatusData> getDataList(BaStatusDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java

@@ -75,9 +75,9 @@ public class DeviceDataMeasureServiceImpl implements DeviceDataMeasureService {
 
 	@Override
 	public PageInfo<DeviceMeasureData> getDataList(MeasureDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {