From 33f97d8770e9e69566e50734b4900e5bd9b62d08 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Thu, 12 Feb 2026 19:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E5=AE=87=E4=B8=8D=E4=BC=A0=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mappers/ex/DeviceInfoMapperExt.xml | 1 + .../java/com/dongjian/dashboard/back/vo/data/BaseData.java | 3 +++ .../back/service/impl/DeviceDataAccumulateServiceImpl.java | 6 +++--- .../back/service/impl/DeviceDataAlarmServiceImpl.java | 6 +++--- .../back/service/impl/DeviceDataBaStatusServiceImpl.java | 6 +++--- .../back/service/impl/DeviceDataMeasureServiceImpl.java | 6 +++--- 6 files changed, 16 insertions(+), 12 deletions(-) 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 9041565..f3c4fc5 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 @@ -6,6 +6,7 @@ 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, 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 04675b4..3c72960 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 @@ -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; diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java index f0c111f..3c86c7a 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java +++ b/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 getDataList(AccumulateDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) { - if (null == pageSearchParam.getBuildingId()) { - return new PageInfo<>(new ArrayList<>()); - } +// if (null == pageSearchParam.getBuildingId()) { +// return new PageInfo<>(new ArrayList<>()); +// } //list防${}注入 if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) { diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java index e01502e..ef5c9d4 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java +++ b/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 getDataList(AlarmDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) { - if (null == pageSearchParam.getBuildingId()) { - return new PageInfo<>(new ArrayList<>()); - } +// if (null == pageSearchParam.getBuildingId()) { +// return new PageInfo<>(new ArrayList<>()); +// } //list防${}注入 if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) { diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java index 2c55682..d27cc77 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java +++ b/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 getDataList(BaStatusDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) { - if (null == pageSearchParam.getBuildingId()) { - return new PageInfo<>(new ArrayList<>()); - } +// if (null == pageSearchParam.getBuildingId()) { +// return new PageInfo<>(new ArrayList<>()); +// } //list防${}注入 if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) { diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java index 63e37aa..67b61e6 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java +++ b/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 getDataList(MeasureDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) { - if (null == pageSearchParam.getBuildingId()) { - return new PageInfo<>(new ArrayList<>()); - } +// if (null == pageSearchParam.getBuildingId()) { +// return new PageInfo<>(new ArrayList<>()); +// } //list防${}注入 if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {